Skip to content

Commit

Permalink
Hostile humans (shiptest-ss13#2972)
Browse files Browse the repository at this point in the history 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Repaths hostile humans to a generic type so we don't have to redefine
that same thing 100 times
Also I am probably going to add some stuff to make them all affected by
something similar?
None of them act human.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
refactor: refactored hostile humans
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
@FalloutFalcon @MrCat15352
FalloutFalcon authored and MrCat15352 committed Jun 22, 2024
1 parent 73b441c commit 9f039f6
Show file tree
Hide file tree
Showing 60 changed files with 565 additions and 1,029 deletions.
14 changes: 7 additions & 7 deletions _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"Bg" = (
/obj/effect/turf_decal/corner/opaque/pink/diagonal,
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/plastic,
Expand Down Expand Up @@ -827,7 +827,7 @@
/area/ruin/beach)
"Gt" = (
/obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
/mob/living/simple_animal/hostile/cat_butcherer{
/mob/living/simple_animal/hostile/human/cat_butcherer{
atmos_requirements = list("min_oxy"=0,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=0,"min_n2"=0,"max_n2"=0);
desc = "A profession carp butcher, gone mad due to carptoxin exposure. There seems to be something in their pocket...";
faction = list("beach","pirate");
Expand All @@ -853,7 +853,7 @@
"GP" = (
/obj/structure/chair/sofa/brown/right/directional/south,
/obj/effect/decal/cleanable/cobweb,
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/carpet,
Expand Down Expand Up @@ -1045,7 +1045,7 @@
/obj/structure/chair/plastic{
dir = 8
},
/mob/living/simple_animal/hostile/pirate/ranged{
/mob/living/simple_animal/hostile/human/pirate/ranged{
faction = list("beach","pirate")
},
/turf/open/floor/wood/ebony,
Expand Down Expand Up @@ -1135,7 +1135,7 @@
/area/ruin/beach)
"Rh" = (
/obj/structure/chair/sofa/brown/corner/directional/south,
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/carpet,
Expand Down Expand Up @@ -1250,7 +1250,7 @@
pixel_x = 4;
layer = 2.9
},
/mob/living/simple_animal/hostile/pirate/ranged{
/mob/living/simple_animal/hostile/human/pirate/ranged{
faction = list("beach","pirate")
},
/turf/open/floor/wood/ebony,
Expand Down Expand Up @@ -1333,7 +1333,7 @@
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"ZJ" = (
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/wood,
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"jE" = (
/mob/living/simple_animal/hostile/pirate/ranged{
/mob/living/simple_animal/hostile/human/pirate/ranged{
environment_smash = 0;
faction = list("pirate","mining")
},
Expand Down Expand Up @@ -522,7 +522,7 @@
/obj/structure/cable{
icon_state = "1-4"
},
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
environment_smash = 0;
faction = list("pirate","mining")
},
Expand Down Expand Up @@ -1508,7 +1508,7 @@
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/cave/explored)
"Vc" = (
/mob/living/simple_animal/hostile/pirate/melee{
/mob/living/simple_animal/hostile/human/pirate/melee{
environment_smash = 0;
faction = list("pirate","mining")
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/pirate/ranged/space,
/mob/living/simple_animal/hostile/human/pirate/ranged/space,
/turf/open/floor/wood,
/area/ruin/beach/treasure_cove)
"oR" = (
Expand Down Expand Up @@ -970,12 +970,12 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/pirate/melee,
/mob/living/simple_animal/hostile/human/pirate/melee,
/turf/open/floor/plating/dirt/jungle/lit,
/area/ruin/beach/treasure_cove)
"EU" = (
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/pirate/melee,
/mob/living/simple_animal/hostile/human/pirate/melee,
/turf/open/floor/plating/dirt/jungle/lit,
/area/ruin/beach/treasure_cove)
"Gm" = (
Expand Down Expand Up @@ -1301,7 +1301,7 @@
/obj/structure/chair/wood{
dir = 8
},
/mob/living/simple_animal/hostile/pirate/ranged,
/mob/living/simple_animal/hostile/human/pirate/ranged,
/turf/open/floor/carpet/red,
/area/ruin/beach/treasure_cove)
"SX" = (
Expand Down
26 changes: 13 additions & 13 deletions _maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 9
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
faction = list("DeserterNT");
name = "Benny Bleighch"
Expand Down Expand Up @@ -566,7 +566,7 @@
/turf/open/floor/vault,
/area/ruin/unpowered/corprejectrooms)
"or" = (
/mob/living/simple_animal/hostile/nanotrasen/elite{
/mob/living/simple_animal/hostile/human/nanotrasen/elite{
desc = "A former major player for Nanotrasen militaristic needs. He doesn't seem like someone who'd want to talk over tea.";
faction = list("DeserterNT");
name = "Sam the Sharp"
Expand Down Expand Up @@ -780,7 +780,7 @@
/area/ruin/unpowered/corprejectrooms)
"tb" = (
/obj/effect/turf_decal/corner/opaque/white/diagonal,
/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Rebecca Slouch"
Expand Down Expand Up @@ -1064,7 +1064,7 @@
/obj/structure/cable/blue{
icon_state = "4-9"
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Gloria the Glorious"
Expand Down Expand Up @@ -1106,7 +1106,7 @@
/obj/structure/chair{
dir = 8
},
/mob/living/simple_animal/hostile/nanotrasen/screaming{
/mob/living/simple_animal/hostile/human/nanotrasen/screaming{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Jimmy Firecracker"
Expand Down Expand Up @@ -1879,7 +1879,7 @@
/obj/structure/cable/blue{
icon_state = "4-9"
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Todd Clorox"
Expand All @@ -1902,7 +1902,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 4
},
/mob/living/simple_animal/hostile/nanotrasen/elite{
/mob/living/simple_animal/hostile/human/nanotrasen/elite{
desc = "A former major player for Nanotrasen militaristic needs. He doesn't seem like someone who'd want to talk over tea.";
faction = list("DeserterNT");
name = "Max the Maniac"
Expand All @@ -1927,7 +1927,7 @@
/area/ruin/unpowered/corprejectrooms)
"Rp" = (
/obj/effect/turf_decal/corner/opaque/white/diagonal,
/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
faction = list("DeserterNT");
name = "Gordon Lary"
Expand Down Expand Up @@ -2003,7 +2003,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 4
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
faction = list("DeserterNT");
name = "Gary Larson"
Expand Down Expand Up @@ -2086,15 +2086,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 4
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
faction = list("DeserterNT");
name = "Nancy Drew"
},
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/unpowered/corprejectrooms)
"Us" = (
/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Larry Liessahl"
Expand Down Expand Up @@ -2231,7 +2231,7 @@
/obj/structure/cable/blue{
icon_state = "0-4"
},
/mob/living/simple_animal/hostile/nanotrasen/screaming{
/mob/living/simple_animal/hostile/human/nanotrasen/screaming{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Wendy Wallaby"
Expand Down Expand Up @@ -2286,7 +2286,7 @@
/obj/structure/cable/blue{
icon_state = "4-5"
},
/mob/living/simple_animal/hostile/nanotrasen/screaming{
/mob/living/simple_animal/hostile/human/nanotrasen/screaming{
desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
faction = list("DeserterNT");
name = "Wetzel the Pretzel"
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@
/area/ruin/powered)
"Wp" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space,
/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space,
/turf/open/floor/plasteel/freezer,
/area/ruin/powered)
"Ws" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@
/area/ruin/powered)
"PQ" = (
/obj/effect/decal/cleanable/blood/splatter,
/mob/living/simple_animal/hostile/frontier/ranged/trooper,
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/powered)
Expand Down
Loading

0 comments on commit 9f039f6

Please sign in to comment.