From 6686dcba9f0cef9c3a6989a71a6da471c4b4d933 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Tue, 14 May 2024 19:16:35 -0500 Subject: [PATCH] stuff --- .../BeachRuins/beach_ancient_ruin.dmm | 1 + .../BeachRuins/beach_fishing_hut.dmm | 14 +-- .../BeachRuins/beach_pirate_crash.dmm | 6 +- .../BeachRuins/beach_treasure_cove.dmm | 8 +- .../icemoon_surface_corporate_rejects.dmm | 26 +++--- .../icemoon_underground_abandoned_newcops.dmm | 2 +- .../icemoon_underground_abandoned_village.dmm | 4 +- .../icemoon_underground_brazillianlab.dmm | 32 +++---- .../JungleRuins/jungle_cavecrew.dmm | 22 ++--- .../RandomRuins/JungleRuins/jungle_pirate.dmm | 12 +-- .../JungleRuins/jungle_syndicate.dmm | 10 +-- .../lavaland_surface_ashwalker_shrine.dmm | 6 +- .../lavaland_surface_biodome_winter.dmm | 2 +- .../lavaland_surface_comm_outpost.dmm | 2 +- .../RockRuins/rockplanet_budgetcuts.dmm | 22 ++--- .../RockRuins/rockplanet_dangerpod.dmm | 2 +- .../RockRuins/rockplanet_miningexpedition.dmm | 2 +- .../whitesands_surface_camp_combination.dmm | 30 +++---- .../whitesands_surface_camp_drugstore.dmm | 2 +- .../whitesands_surface_camp_saloon.dmm | 32 +++---- .../whitesands_surface_chokepoint.dmm | 8 +- .../whitesands_surface_onlyaspoonful.dmm | 8 +- .../whitesands_surface_pubbyslopcrash.dmm | 16 ++-- .../whitesands_surface_starfurycrash.dmm | 20 ++--- .../RandomRuins/SpaceRuins/provinggrounds.dmm | 42 ++++----- .../wasteplanet_abandoned_mechbay.dmm | 28 +++--- .../wasteplanet_fortress_of_solitide.dmm | 4 +- .../WasteRuins/wasteplanet_pandora.dmm | 6 +- code/controllers/subsystem/traumas.dm | 2 +- code/datums/mapgen/planetary/SandGenerator.dm | 6 +- code/game/machinery/computer/arcade.dm | 4 +- code/game/mecha/mecha.dm | 4 +- .../structures/icemoon/cave_entrance.dm | 90 +++++++++---------- code/game/objects/structures/spawner.dm | 4 +- .../awaymissions/mission_code/spacebattle.dm | 4 +- .../hostile/human/cat_butcher.dm | 20 +---- .../hostile/human/frontiersman.dm | 48 ++++------ .../simple_animal/hostile/human/human.dm | 2 +- .../simple_animal/hostile/human/nanotrasen.dm | 67 +++++++++----- .../simple_animal/hostile/human/pirate.dm | 37 +++----- .../simple_animal/hostile/human/skeleton.dm | 22 ++--- .../simple_animal/hostile/human/survivors.dm | 42 ++------- .../simple_animal/hostile/human/syndicate.dm | 83 +++++++---------- .../simple_animal/hostile/mecha_pilot.dm | 42 ++++----- code/modules/ruins/lavaland_ruin_code.dm | 2 +- .../ruins/spaceruin_code/forgottenship.dm | 42 --------- tools/UpdatePaths/Scripts/human_hostile.txt | 1 + 47 files changed, 388 insertions(+), 503 deletions(-) diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm index be52f6a67f46..00da7d5c7a20 100644 --- a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm @@ -374,6 +374,7 @@ }, /obj/item/gun/energy/lasercannon{ pixel_y = 5; + }, /obj/item/gun/energy/lasercannon, /obj/effect/turf_decal/industrial/hatch, diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm index 4aaff2b5a160..84fabfbe5ff7 100644 --- a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm @@ -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, @@ -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"); @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm b/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm index 3cdd90e5e1cb..e47ffa92a5e9 100644 --- a/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm @@ -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") }, @@ -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") }, @@ -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") }, diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm index 7943cf93372e..e97a926aec6b 100644 --- a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm @@ -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" = ( @@ -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" = ( @@ -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" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm index 28a963ed476a..0fac07bbb493 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -2086,7 +2086,7 @@ /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" @@ -2094,7 +2094,7 @@ /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" @@ -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" @@ -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" diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm index bf034757b5a2..149f4a579542 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm @@ -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" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm index 946d28dc1a13..6f4fa46c3d62 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm @@ -101,7 +101,7 @@ "la" = ( /obj/effect/decal/cleanable/blood/gibs/up, /obj/effect/mob_spawn/human/corpse/assistant, -/mob/living/simple_animal/hostile/skeleton/eskimo{ +/mob/living/simple_animal/hostile/human/skeleton/eskimo{ name = "Village Hunter" }, /turf/open/floor/plating/asteroid/snow/icemoon, @@ -486,7 +486,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) diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm index 7fde87854827..4954a9a5aaf4 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm @@ -55,7 +55,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/overmap_encounter/planetoid/cave/explored) "ct" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ faction = list("brazillian") }, /turf/open/floor/wood{ @@ -88,7 +88,7 @@ /area/ruin/unpowered) "fB" = ( /obj/structure/chair/stool/bar, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."; faction = list("brazillian") }, @@ -101,7 +101,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/ruin/unpowered) "gH" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/gunslinger{ +/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger{ faction = list("brazillian") }, /turf/open/floor/carpet/green{ @@ -117,7 +117,7 @@ "hp" = ( /obj/item/stack/cable_coil, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ faction = list("brazillian") }, /turf/open/floor/wood{ @@ -128,7 +128,7 @@ /turf/closed/wall/mineral/wood/nonmetal, /area/overmap_encounter/planetoid/cave/explored) "ht" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ faction = list("brazillian") }, /turf/open/floor/plating/asteroid/snow/icemoon, @@ -177,7 +177,7 @@ /obj/structure/chair/wood{ dir = 1 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."; faction = list("brazillian") }, @@ -341,7 +341,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/overmap_encounter/planetoid/cave/explored) "qS" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ desc = "The greatest chef this side of the wastes."; faction = list("brazillian"); health = 150; @@ -475,7 +475,7 @@ /obj/structure/bed, /obj/structure/curtain, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."; faction = list("brazillian") }, @@ -535,7 +535,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/overmap_encounter/planetoid/cave/explored) "zy" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."; faction = list("brazillian") }, @@ -545,7 +545,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ faction = list("brazillian") }, /turf/open/floor/wood{ @@ -635,7 +635,7 @@ /area/ruin/unpowered) "CI" = ( /obj/structure/flora/junglebush/c, -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ faction = list("brazillian") }, /turf/open/floor/plating/grass/jungle{ @@ -775,7 +775,7 @@ "JM" = ( /obj/structure/bed, /obj/structure/curtain, -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ faction = list("brazillian") }, /obj/effect/turf_decal/corner/opaque/green/border, @@ -827,7 +827,7 @@ /obj/structure/chair/stool/bar{ dir = 4 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."; faction = list("brazillian") }, @@ -895,7 +895,7 @@ }, /area/ruin/unpowered) "NR" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."; faction = list("brazillian") }, @@ -1070,7 +1070,7 @@ }, /area/ruin/unpowered) "Ux" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ faction = list("brazillian") }, /turf/open/floor/plating/grass/jungle{ @@ -1205,7 +1205,7 @@ }, /area/ruin/unpowered) "Yy" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."; faction = list("brazillian") }, diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm index 928318c23ffe..9798d8e4f0de 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm @@ -658,7 +658,7 @@ dir = 4; name = "tactical swivel chair" }, -/mob/living/simple_animal/hostile/frontier/ranged/officer/neutured, +/mob/living/simple_animal/hostile/human/frontier/ranged/officer/neutured, /turf/open/floor/plasteel/dark, /area/ruin/jungle/cavecrew/bridge) "iE" = ( @@ -1342,7 +1342,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/mob/living/simple_animal/hostile/frontier/ranged/trooper/heavy/neutered, +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered, /turf/open/floor/plasteel/patterned/brushed, /area/ruin/jungle/cavecrew/security) "pB" = ( @@ -1432,7 +1432,7 @@ /area/ruin/jungle/cavecrew/hallway) "rN" = ( /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/frontier/ranged/trooper/neutered, +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/neutered, /turf/open/floor/plating/dirt/old, /area/ruin/powered) "rQ" = ( @@ -1832,7 +1832,7 @@ /obj/structure/railing/corner{ dir = 8 }, -/mob/living/simple_animal/hostile/frontier/ranged/trooper/skm/neutured, +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm/neutured, /turf/open/floor/plasteel/stairs{ dir = 1 }, @@ -2354,7 +2354,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/mob/living/simple_animal/hostile/frontier/ranged/neutered, +/mob/living/simple_animal/hostile/human/frontier/ranged/neutered, /turf/open/floor/plasteel, /area/ruin/jungle/cavecrew/hallway) "CN" = ( @@ -2365,7 +2365,7 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/frontier, +/mob/living/simple_animal/hostile/human/frontier, /obj/structure/cable{ icon_state = "4-8" }, @@ -2570,7 +2570,7 @@ /turf/open/floor/plating/dirt/jungle, /area/overmap_encounter/planetoid/cave/explored) "Fw" = ( -/mob/living/simple_animal/hostile/frontier/ranged/mosin/neutered, +/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered, /turf/open/floor/plating/dirt/jungle, /area/ruin/powered) "Fy" = ( @@ -2797,7 +2797,7 @@ dir = 4; layer = 3.1 }, -/mob/living/simple_animal/hostile/frontier/ranged/neutered, +/mob/living/simple_animal/hostile/human/frontier/ranged/neutered, /turf/open/water/jungle, /area/ruin/jungle/cavecrew/cargo) "II" = ( @@ -3208,7 +3208,7 @@ /obj/structure/cable{ icon_state = "2-5" }, -/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle/neutered, +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/neutered, /turf/open/floor/plasteel, /area/ruin/jungle/cavecrew/hallway) "MW" = ( @@ -3391,7 +3391,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/mob/living/simple_animal/hostile/frontier/ranged/neutered, +/mob/living/simple_animal/hostile/human/frontier/ranged/neutered, /turf/open/floor/plating, /area/ruin/powered) "Pg" = ( @@ -4092,7 +4092,7 @@ /turf/open/floor/plating/dirt/jungle, /area/ruin/powered) "Xx" = ( -/mob/living/simple_animal/hostile/frontier/ranged/mosin/neutered, +/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/tech, /area/ship/storage) diff --git a/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm b/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm index 83f17d9f7026..739244a8b282 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm @@ -124,7 +124,7 @@ /obj/structure/railing{ dir = 4 }, -/mob/living/simple_animal/hostile/pirate/ranged, +/mob/living/simple_animal/hostile/human/pirate/ranged, /turf/open/floor/wood, /area/ruin/unpowered) "qL" = ( @@ -209,11 +209,11 @@ /turf/open/floor/wood, /area/ruin/unpowered) "DH" = ( -/mob/living/simple_animal/hostile/pirate/ranged/space, +/mob/living/simple_animal/hostile/human/pirate/ranged/space, /turf/open/floor/carpet/red, /area/ruin/unpowered) "DS" = ( -/mob/living/simple_animal/hostile/pirate/ranged, +/mob/living/simple_animal/hostile/human/pirate/ranged, /turf/open/floor/wood, /area/overmap_encounter/planetoid/jungle/explored) "DV" = ( @@ -270,7 +270,7 @@ /turf/open/floor/wood, /area/ruin/unpowered) "LT" = ( -/mob/living/simple_animal/hostile/pirate/melee, +/mob/living/simple_animal/hostile/human/pirate/melee, /obj/structure/chair/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -355,7 +355,7 @@ /turf/open/floor/plating/dirt/jungle/lit, /area/overmap_encounter/planetoid/jungle/explored) "UX" = ( -/mob/living/simple_animal/hostile/pirate/melee, +/mob/living/simple_animal/hostile/human/pirate/melee, /turf/open/floor/wood, /area/ruin/unpowered) "Vf" = ( @@ -391,7 +391,7 @@ /turf/open/floor/carpet/red, /area/ruin/unpowered) "XA" = ( -/mob/living/simple_animal/hostile/pirate/melee, +/mob/living/simple_animal/hostile/human/pirate/melee, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/ruin/unpowered) diff --git a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm index ebd333289382..4ecf5ee382b1 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm @@ -123,7 +123,7 @@ /turf/open/floor/plating/rust, /area/ruin/jungle/syndifort) "ef" = ( -/mob/living/simple_animal/hostile/syndicate{ +/mob/living/simple_animal/hostile/human/syndicate{ desc = "God dammit Jerry! Why the fuck are you barricading yourself in with all of our weapon supplies?"; name = "Jerry"; unsuitable_atmos_damage = 0 @@ -180,7 +180,7 @@ /turf/open/floor/plating/grass/jungle/lit, /area/overmap_encounter/planetoid/jungle/explored) "fS" = ( -/mob/living/simple_animal/hostile/syndicate{ +/mob/living/simple_animal/hostile/human/syndicate{ unsuitable_atmos_damage = 0 }, /obj/effect/decal/cleanable/dirt/dust, @@ -533,7 +533,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/jungle/syndifort) "rg" = ( -/mob/living/simple_animal/hostile/syndicate/space, +/mob/living/simple_animal/hostile/human/syndicate/space, /obj/structure/cable{ icon_state = "1-2" }, @@ -1102,7 +1102,7 @@ /area/overmap_encounter/planetoid/jungle/explored) "HR" = ( /obj/structure/chair/plastic, -/mob/living/simple_animal/hostile/syndicate/ranged{ +/mob/living/simple_animal/hostile/human/syndicate/ranged{ unsuitable_atmos_damage = 0 }, /turf/open/floor/plating/dirt/jungle/lit, @@ -1365,7 +1365,7 @@ /area/ruin/jungle/syndifort) "Qs" = ( /obj/structure/cable, -/mob/living/simple_animal/hostile/syndicate{ +/mob/living/simple_animal/hostile/human/syndicate{ unsuitable_atmos_damage = 0 }, /obj/machinery/light/directional/north, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ashwalker_shrine.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ashwalker_shrine.dmm index 5001fd7a1831..b3d7e439a805 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ashwalker_shrine.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ashwalker_shrine.dmm @@ -394,7 +394,7 @@ /turf/open/floor/plating/ashplanet/ash, /area/overmap_encounter/planetoid/lava/explored) "pJ" = ( -/mob/living/simple_animal/hostile/nanotrasen/ranged/smg, +/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg, /turf/open/floor/wood, /area/overmap_encounter/planetoid/lava/explored) "pT" = ( @@ -645,7 +645,7 @@ /area/overmap_encounter/planetoid/lava/explored) "yJ" = ( /obj/structure/stone_tile/slab, -/mob/living/simple_animal/hostile/nanotrasen/ranged/assault, +/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/overmap_encounter/planetoid/lava/explored) "zG" = ( @@ -1064,7 +1064,7 @@ /area/overmap_encounter/planetoid/lava/explored) "Ty" = ( /obj/structure/stone_tile/slab/cracked, -/mob/living/simple_animal/hostile/nanotrasen/ranged, +/mob/living/simple_animal/hostile/human/nanotrasen/ranged, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/overmap_encounter/planetoid/lava/explored) "TX" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index 0f7efcf3f2ad..8c50d67b06e6 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -139,7 +139,7 @@ /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "aH" = ( -/mob/living/simple_animal/hostile/skeleton/eskimo, +/mob/living/simple_animal/hostile/human/skeleton/eskimo, /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "aI" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm index 91b482df849f..44988210b7e4 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm @@ -211,7 +211,7 @@ }, /area/ruin/unpowered/syndicate_outpost) "Ts" = ( -/mob/living/simple_animal/hostile/syndicate/ranged{ +/mob/living/simple_animal/hostile/human/syndicate/ranged{ dir = 8; health = 125; name = "Syndicate Radio Operative" diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm index 505ae3600d31..fa8958c51cba 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm @@ -35,7 +35,7 @@ /turf/open/floor/plastic, /area/ruin/rockplanet/nanotrasen) "aQ" = ( -/mob/living/simple_animal/hostile/nanotrasen, +/mob/living/simple_animal/hostile/human/nanotrasen, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/white{ dir = 1 @@ -339,7 +339,7 @@ /turf/open/floor/engine, /area/ruin/rockplanet/nanotrasen) "ff" = ( -/mob/living/simple_animal/hostile/nanotrasen/ranged/smg, +/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg, /obj/effect/turf_decal/siding/white{ dir = 4 }, @@ -1347,7 +1347,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/oil, /obj/machinery/light/small/broken/directional/north, -/mob/living/simple_animal/hostile/pirate/ranged/space, +/mob/living/simple_animal/hostile/human/pirate/ranged/space, /turf/open/floor/plating, /area/ruin/rockplanet/nanotrasen) "vz" = ( @@ -1462,7 +1462,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/mob/living/simple_animal/hostile/nanotrasen, +/mob/living/simple_animal/hostile/human/nanotrasen, /turf/open/floor/wood{ icon_state = "wood-broken7" }, @@ -1728,7 +1728,7 @@ /turf/open/floor/plasteel/white, /area/ruin/rockplanet/nanotrasen) "CJ" = ( -/mob/living/simple_animal/hostile/pirate/melee/space, +/mob/living/simple_animal/hostile/human/pirate/melee/space, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -1767,7 +1767,7 @@ /turf/open/floor/plasteel, /area/ruin/rockplanet/nanotrasen) "Dt" = ( -/mob/living/simple_animal/hostile/pirate/ranged/space, +/mob/living/simple_animal/hostile/human/pirate/ranged/space, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -2036,7 +2036,7 @@ /obj/effect/turf_decal/corner/opaque/red/border{ dir = 8 }, -/mob/living/simple_animal/hostile/nanotrasen/ranged, +/mob/living/simple_animal/hostile/human/nanotrasen/ranged, /turf/open/floor/plasteel/dark, /area/ruin/rockplanet/nanotrasen) "Hs" = ( @@ -2069,7 +2069,7 @@ }, /area/ruin/rockplanet/nanotrasen) "Ie" = ( -/mob/living/simple_animal/hostile/pirate/melee/space, +/mob/living/simple_animal/hostile/human/pirate/melee/space, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -2697,7 +2697,7 @@ /turf/open/floor/plasteel/rockvault, /area/ruin/rockplanet/nanotrasen) "Vn" = ( -/mob/living/simple_animal/hostile/nanotrasen/ranged, +/mob/living/simple_animal/hostile/human/nanotrasen/ranged, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, @@ -2835,7 +2835,7 @@ /turf/open/floor/plating/dirt/jungle/lit, /area/overmap_encounter/planetoid/rockplanet/explored) "Ze" = ( -/mob/living/simple_animal/hostile/nanotrasen/ranged/smg, +/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg, /obj/effect/turf_decal/corner/transparent/purple/border{ dir = 1 }, @@ -2908,7 +2908,7 @@ /obj/structure/railing{ dir = 8 }, -/mob/living/simple_animal/hostile/nanotrasen/ranged/assault, +/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault, /turf/open/floor/plasteel/dark, /area/ruin/rockplanet/nanotrasen) "ZZ" = ( diff --git a/_maps/RandomRuins/RockRuins/rockplanet_dangerpod.dmm b/_maps/RandomRuins/RockRuins/rockplanet_dangerpod.dmm index dd6bb43fd913..cf91b07b4072 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_dangerpod.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_dangerpod.dmm @@ -8,7 +8,7 @@ /turf/open/floor/pod/dark, /area/overmap_encounter/planetoid/rockplanet/explored) "h" = ( -/mob/living/simple_animal/hostile/skeleton/plasmaminer/jackhammer, +/mob/living/simple_animal/hostile/human/skeleton/plasmaminer/jackhammer, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/pod/dark, /area/overmap_encounter/planetoid/rockplanet/explored) diff --git a/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm b/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm index 088015c83b13..83e80f79a4a3 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm @@ -114,7 +114,7 @@ /turf/open/floor/plating/asteroid/rockplanet/lit, /area/overmap_encounter/planetoid/rockplanet/explored) "sP" = ( -/mob/living/simple_animal/hostile/skeleton/plasmaminer, +/mob/living/simple_animal/hostile/human/skeleton/plasmaminer, /turf/open/floor/plating/asteroid/rockplanet/lit, /area/overmap_encounter/planetoid/rockplanet/explored) "tN" = ( diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm index f8b569cebdf4..f59cff023b4a 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm @@ -89,7 +89,7 @@ }, /area/overmap_encounter/planetoid/sand/explored) "eq" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor, +/mob/living/simple_animal/hostile/human/hermit/survivor, /turf/open/floor/plating/asteroid/whitesands{ light_range = 2 }, @@ -157,7 +157,7 @@ /area/ruin) "fO" = ( /obj/structure/chair/plastic, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ faction = list("adobe") }, /turf/open/floor/plating/asteroid/whitesands{ @@ -360,7 +360,7 @@ }, /area/overmap_encounter/planetoid/sand/explored) "nx" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 4; faction = list("adobe") }, @@ -425,7 +425,7 @@ "oB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ faction = list("saloon"); name = "Whitesands Bartender" }, @@ -592,7 +592,7 @@ /turf/open/floor/concrete, /area/ruin) "we" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor, +/mob/living/simple_animal/hostile/human/hermit/survivor, /turf/open/floor/plating/asteroid/whitesands/dried{ light_range = 2 }, @@ -678,14 +678,14 @@ }, /area/overmap_encounter/planetoid/sand/explored) "zB" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1; faction = list("adobe") }, /turf/open/floor/concrete, /area/ruin) "AC" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/gunslinger{ +/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger{ dir = 4; faction = list("adobe") }, @@ -704,7 +704,7 @@ /turf/open/floor/wood, /area/ruin) "AR" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter, +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter, /turf/open/floor/plating/asteroid/whitesands{ light_range = 2 }, @@ -782,14 +782,14 @@ /area/ruin) "Ed" = ( /obj/item/chair/stool/bar, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1; faction = list("saloon") }, /turf/open/floor/wood, /area/ruin) "Ef" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ dir = 4; faction = list("adobe") }, @@ -939,7 +939,7 @@ /obj/structure/chair/plastic{ dir = 4 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 4; faction = list("adobe") }, @@ -1189,7 +1189,7 @@ /turf/open/floor/concrete, /area/ruin) "TH" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ faction = list("adobe") }, /turf/open/floor/concrete, @@ -1200,7 +1200,7 @@ /area/ruin) "UT" = ( /obj/structure/chair/stool/bar, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1; faction = list("saloon") }, @@ -1209,7 +1209,7 @@ "Vq" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 8; faction = list("saloon") }, @@ -1253,7 +1253,7 @@ /area/overmap_encounter/planetoid/sand/explored) "Ws" = ( /obj/structure/chair/stool/bar, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 8; faction = list("saloon") }, diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_drugstore.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_drugstore.dmm index 4bf53b738636..7f69ca337c00 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_drugstore.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_drugstore.dmm @@ -80,7 +80,7 @@ /turf/open/floor/wood, /area/ruin/unpowered) "n" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 4 }, /turf/open/floor/wood{ diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm index b17207b75020..400a710091b4 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm @@ -243,7 +243,7 @@ }, /obj/effect/turf_decal/siding/wood, /obj/structure/chair/stool/bar, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor, +/mob/living/simple_animal/hostile/human/hermit/survivor, /turf/open/floor/wood, /area/ruin/whitesands/saloon) "gC" = ( @@ -328,7 +328,7 @@ "ih" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ name = "Hermit Bartender" }, /turf/open/floor/wood{ @@ -499,7 +499,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1 }, /turf/open/floor/wood, @@ -615,7 +615,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1 }, /turf/open/floor/wood, @@ -654,7 +654,7 @@ /obj/structure/chair/stool/bar{ dir = 1 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1 }, /turf/open/floor/wood{ @@ -666,7 +666,7 @@ dir = 8 }, /obj/item/chair/stool/bar, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 8 }, /turf/open/floor/wood, @@ -744,7 +744,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ dir = 8 }, /turf/open/floor/wood{ @@ -756,7 +756,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1 }, /turf/open/floor/wood{ @@ -981,7 +981,7 @@ /area/ruin/whitesands/saloon) "DT" = ( /obj/structure/chair/wood, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ name = "Robert"; desc = "This fellow seems relatively sane and normal"; faction = list("neutral") @@ -1114,7 +1114,7 @@ /obj/structure/chair/stool/bar{ dir = 8 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 8 }, /turf/open/floor/wood, @@ -1148,7 +1148,7 @@ }, /area/ruin/whitesands/saloon) "Ie" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1 }, /turf/open/floor/plating/asteroid/whitesands/lit, @@ -1389,7 +1389,7 @@ /obj/structure/chair/stool/bar{ dir = 8 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 8 }, /turf/open/floor/wood, @@ -1421,7 +1421,7 @@ /turf/open/floor/wood, /area/ruin/whitesands/saloon) "QV" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter{ +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{ name = "Hermit Bartender"; dir = 4 }, @@ -1497,7 +1497,7 @@ /area/ruin/whitesands/saloon) "Ua" = ( /obj/structure/chair/stool/bar, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 8 }, /turf/open/floor/wood{ @@ -1525,7 +1525,7 @@ /obj/structure/sign/poster/official/cohiba_robusto_ad{ pixel_y = 32 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor, +/mob/living/simple_animal/hostile/human/hermit/survivor, /turf/open/floor/wood{ icon_state = "wood-broken7" }, @@ -1641,7 +1641,7 @@ /obj/structure/chair/stool/bar{ dir = 1 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1 }, /turf/open/floor/wood, diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_chokepoint.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_chokepoint.dmm index 5d63a30bf22b..d4fa2737cd38 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_chokepoint.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_chokepoint.dmm @@ -26,7 +26,7 @@ "g" = ( /obj/structure/bed, /obj/item/bedsheet/hos, -/mob/living/simple_animal/hostile/nanotrasen/ranged{ +/mob/living/simple_animal/hostile/human/nanotrasen/ranged{ atmos_requirements = list("min_oxy"=5,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=999,"min_n2"=0,"max_n2"=0); damage_coeff = list("brute"=1,"fire"=1,"toxin"=1,"clone"=1,"stamina"=0,"oxygen"=0); name = "\improper Nanotrasen Stranded Security Officer" @@ -34,7 +34,7 @@ /turf/open/floor/plating/asteroid/whitesands/dried, /area/ruin) "h" = ( -/mob/living/simple_animal/hostile/nanotrasen/ranged{ +/mob/living/simple_animal/hostile/human/nanotrasen/ranged{ atmos_requirements = list("min_oxy"=5,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=999,"min_n2"=0,"max_n2"=0); damage_coeff = list("brute"=1,"fire"=1,"toxin"=1,"clone"=1,"stamina"=0,"oxygen"=0); dir = 4; @@ -46,7 +46,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/mob/living/simple_animal/hostile/nanotrasen/ranged{ +/mob/living/simple_animal/hostile/human/nanotrasen/ranged{ atmos_requirements = list("min_oxy"=5,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=999,"min_n2"=0,"max_n2"=0); damage_coeff = list("brute"=1,"fire"=1,"toxin"=1,"clone"=1,"stamina"=0,"oxygen"=0); dir = 8; @@ -93,7 +93,7 @@ /turf/open/floor/plating/asteroid/whitesands, /area/ruin) "v" = ( -/mob/living/simple_animal/hostile/nanotrasen/ranged{ +/mob/living/simple_animal/hostile/human/nanotrasen/ranged{ atmos_requirements = list("min_oxy"=5,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=999,"min_n2"=0,"max_n2"=0); damage_coeff = list("brute"=1,"fire"=1,"toxin"=1,"clone"=1,"stamina"=0,"oxygen"=0); dir = 8; diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_onlyaspoonful.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_onlyaspoonful.dmm index f74a8895976a..f84ccaf6c8ef 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_onlyaspoonful.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_onlyaspoonful.dmm @@ -65,7 +65,7 @@ /area/ruin/powered) "ew" = ( /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor, +/mob/living/simple_animal/hostile/human/hermit/survivor, /turf/open/floor/plastic, /area/ruin/powered) "eH" = ( @@ -155,7 +155,7 @@ /turf/open/floor/plastic, /area/ruin/powered) "hw" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter, +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter, /turf/open/floor/plastic, /area/ruin/powered) "hA" = ( @@ -318,7 +318,7 @@ pixel_y = 9 }, /obj/effect/decal/cleanable/blood/tracks, -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/gunslinger, +/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger, /turf/open/floor/plastic, /area/ruin/powered) "wr" = ( @@ -439,7 +439,7 @@ /turf/open/floor/plastic, /area/ruin/powered) "EC" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter, +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter, /turf/open/floor/plating/asteroid/whitesands, /area/overmap_encounter/planetoid/sand/explored) "Fi" = ( diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm index 209709f2599b..e664dfec8d96 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm @@ -804,7 +804,7 @@ /obj/effect/decal/fakelattice{ icon_state = "lattice-2" }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1; faction = list("adobe"); desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body, twisted by the heavy metals and high background radiation of the sandworlds. Their helmet also seems to be filled with vomit" @@ -1003,7 +1003,7 @@ /turf/open/floor/plasteel/tech, /area/ruin/whitesands/pubbycrash/engine_room) "xc" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 4 }, /turf/open/floor/plating/asteroid/whitesands/lit, @@ -1145,7 +1145,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/directional/west, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1; faction = list("saloon") }, @@ -1744,7 +1744,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ faction = list("saloon") }, /turf/open/floor/plasteel/dark, @@ -1777,7 +1777,7 @@ /obj/effect/turf_decal/ntspaceworks_small/left{ dir = 4 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 4; faction = list("saloon") }, @@ -1946,7 +1946,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/vomit/old, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 1; faction = list("saloon") }, @@ -1969,7 +1969,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 1 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ +/mob/living/simple_animal/hostile/human/hermit/survivor{ dir = 4; faction = list("adobe"); desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body, twisted by the heavy metals and high background radiation of the sandworlds. Their helmet also seems to be filled with vomit" @@ -2060,7 +2060,7 @@ /turf/open/floor/plating/asteroid/whitesands/dried, /area/overmap_encounter/planetoid/cave/explored) "Qo" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged, +/mob/living/simple_animal/hostile/human/hermit/ranged, /turf/open/floor/plating/asteroid/whitesands/dried, /area/overmap_encounter/planetoid/cave/explored) "Qu" = ( diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_starfurycrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_starfurycrash.dmm index bc8616028058..9e00376a8953 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_starfurycrash.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_starfurycrash.dmm @@ -147,7 +147,7 @@ /obj/effect/turf_decal/industrial/traffic{ dir = 4 }, -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space, /turf/open/floor/engine{ initial_gas_mix = "ws_atmos" }, @@ -224,7 +224,7 @@ }, /area/overmap_encounter/planetoid/cave/explored) "mv" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/space, /turf/open/floor/plating/asteroid/whitesands, /area/overmap_encounter/planetoid/cave/explored) "mP" = ( @@ -395,15 +395,15 @@ }, /area/overmap_encounter/planetoid/cave/explored) "wS" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space, /turf/open/floor/plating{ icon_state = "platingdmg2"; initial_gas_mix = "ws_atmos" }, /area/overmap_encounter/planetoid/cave/explored) "xr" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space, -/mob/living/simple_animal/hostile/syndicate/ranged/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/space, /turf/open/floor/plating{ icon_state = "platingdmg2"; initial_gas_mix = "ws_atmos" @@ -467,7 +467,7 @@ }, /area/overmap_encounter/planetoid/cave/explored) "Bt" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space, /turf/open/floor/plating{ icon_state = "platingdmg1"; initial_gas_mix = "ws_atmos" @@ -546,7 +546,7 @@ }, /area/overmap_encounter/planetoid/cave/explored) "Eu" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper, +/mob/living/simple_animal/hostile/human/syndicate/ranged/space/stormtrooper, /turf/open/floor/plating{ icon_state = "panelscorched"; initial_gas_mix = "ws_atmos" @@ -632,7 +632,7 @@ }, /area/overmap_encounter/planetoid/cave/explored) "KR" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space, /turf/open/floor/plating/asteroid/whitesands, /area/overmap_encounter/planetoid/cave/explored) "KT" = ( @@ -645,7 +645,7 @@ }, /area/overmap_encounter/planetoid/cave/explored) "Md" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/space, /turf/open/floor/plating{ initial_gas_mix = "ws_atmos" }, @@ -880,7 +880,7 @@ /area/overmap_encounter/planetoid/cave/explored) "Xh" = ( /obj/item/stack/tile/plasteel, -/mob/living/simple_animal/hostile/syndicate/ranged/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/space, /turf/open/floor/plating/asteroid/whitesands/dried, /area/overmap_encounter/planetoid/cave/explored) "XR" = ( diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm index 7577cdeb99f5..83e662b69ad0 100644 --- a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm +++ b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm @@ -115,7 +115,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ruin/space/has_grav/syndicircle/research) "du" = ( -/mob/living/simple_animal/hostile/syndicate/civilian{ +/mob/living/simple_animal/hostile/human/syndicate/civilian{ name = "Syndicate Researcher" }, /turf/open/floor/mineral/plastitanium/red, @@ -232,7 +232,7 @@ /turf/open/floor/plating/asteroid/snow/atmosphere, /area/ruin/space/has_grav/syndicircle/winter) "gz" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/smg{ +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg{ name = "REDFOR operative" }, /turf/open/floor/plating/asteroid/snow/atmosphere, @@ -309,7 +309,7 @@ /obj/structure/flippedtable{ dir = 4 }, -/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{ +/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{ name = "BLUFOR operative" }, /turf/open/floor/plasteel/tech, @@ -422,7 +422,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicircle/halls) "lX" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/infiltrator{ +/mob/living/simple_animal/hostile/human/syndicate/ranged/infiltrator{ name = "REDFOR operative" }, /turf/open/floor/plasteel/tech/techmaint, @@ -465,7 +465,7 @@ /area/ruin/space/has_grav/syndicircle/winter) "na" = ( /obj/structure/flippedtable, -/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{ +/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{ name = "BLUFOR operative" }, /obj/structure/cable{ @@ -497,7 +497,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/syndicircle/winter) "ov" = ( -/mob/living/simple_animal/hostile/syndicate/civilian{ +/mob/living/simple_animal/hostile/human/syndicate/civilian{ name = "Syndicate Researcher" }, /obj/structure/cable{ @@ -561,7 +561,7 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/space/has_grav/syndicircle/winter) "qv" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/shotgun{ +/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun{ name = "REDFOR operative" }, /turf/open/floor/plating/ice, @@ -610,7 +610,7 @@ /obj/effect/turf_decal/ntlogo{ dir = 1 }, -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space{ +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space{ name = "REDFOR commando" }, /turf/open/floor/mineral/titanium/white, @@ -693,7 +693,7 @@ /obj/effect/turf_decal/ntlogo{ dir = 4 }, -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space{ +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space{ name = "REDFOR commando" }, /turf/open/floor/mineral/titanium/white, @@ -1222,7 +1222,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/mob/living/simple_animal/hostile/syndicate, +/mob/living/simple_animal/hostile/human/syndicate, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicircle/halls) "Fv" = ( @@ -1247,7 +1247,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ruin/space/has_grav/syndicircle/research) "FM" = ( -/mob/living/simple_animal/hostile/syndicate/civilian{ +/mob/living/simple_animal/hostile/human/syndicate/civilian{ name = "Syndicate Researcher" }, /turf/open/floor/mineral/plastitanium, @@ -1304,7 +1304,7 @@ /turf/open/space/basic, /area/ruin/space/has_grav/syndicircle/halls) "HC" = ( -/mob/living/simple_animal/hostile/syndicate/civilian{ +/mob/living/simple_animal/hostile/human/syndicate/civilian{ name = "Syndicate Researcher" }, /obj/structure/cable{ @@ -1507,7 +1507,7 @@ /area/ruin/space/has_grav/syndicircle/training) "MP" = ( /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space{ +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space{ name = "REDFOR commando" }, /obj/item/storage/backpack/duffelbag/syndie/c4, @@ -1608,7 +1608,7 @@ /turf/open/floor/plating/dirt/jungle/wasteland, /area/ruin/space/has_grav/syndicircle/training) "Rj" = ( -/mob/living/simple_animal/hostile/syndicate, +/mob/living/simple_animal/hostile/human/syndicate, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicircle/halls) "Rs" = ( @@ -1670,7 +1670,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/mob/living/simple_animal/hostile/nanotrasen/ranged{ +/mob/living/simple_animal/hostile/human/nanotrasen/ranged{ name = "BLUFOR operative" }, /turf/open/floor/mineral/titanium, @@ -1705,7 +1705,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/nanotrasen/ranged{ +/mob/living/simple_animal/hostile/human/nanotrasen/ranged{ name = "BLUFOR operative" }, /turf/open/floor/mineral/titanium, @@ -1756,7 +1756,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/syndicircle/halls) "UA" = ( -/mob/living/simple_animal/hostile/syndicate, +/mob/living/simple_animal/hostile/human/syndicate, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/syndicircle/halls) "UI" = ( @@ -1794,7 +1794,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/mob/living/simple_animal/hostile/nanotrasen/ranged{ +/mob/living/simple_animal/hostile/human/nanotrasen/ranged{ name = "BLUFOR operative" }, /turf/open/floor/mineral/titanium, @@ -1931,7 +1931,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicircle/halls) "XW" = ( -/mob/living/simple_animal/hostile/syndicate/melee/space{ +/mob/living/simple_animal/hostile/human/syndicate/melee/space{ name = "REDFOR commando" }, /turf/open/space, @@ -1950,7 +1950,7 @@ /area/ruin/space/has_grav/syndicircle/escape) "Yr" = ( /obj/structure/chair/comfy/shuttle, -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech/nanotrasen{ +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/no_mech/nanotrasen{ name = "BLUFOR Pilot" }, /turf/open/floor/mineral/titanium/blue, @@ -2027,7 +2027,7 @@ /area/ruin/space/has_grav/syndicircle/halls) "ZU" = ( /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space{ +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space{ name = "REDFOR commando" }, /turf/open/floor/plating/asteroid/airless, diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm index 20301b381145..31c53d09a82e 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm @@ -480,7 +480,7 @@ /area/ruin/wasteplanet/abandoned_mechbay/bay1) "fe" = ( /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/syndicate/melee{ +/mob/living/simple_animal/hostile/human/syndicate/melee{ name = "Syndicate Mech Pilot" }, /turf/open/floor/concrete/slab_1, @@ -1376,7 +1376,7 @@ dir = 4 }, /obj/effect/decal/cleanable/plastic, -/mob/living/simple_animal/hostile/syndicate/ranged/shotgun, +/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun, /turf/open/floor/plasteel/dark, /area/ruin/wasteplanet/abandoned_mechbay/mechlab) "pA" = ( @@ -1499,7 +1499,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/mob/living/simple_animal/hostile/syndicate{ +/mob/living/simple_animal/hostile/human/syndicate{ name = "Syndicate Engineer"; desc = "Death to bad mechanics." }, @@ -1558,7 +1558,7 @@ /area/ruin/wasteplanet/abandoned_mechbay/bay1) "rT" = ( /obj/structure/chair/sofa/brown/right/directional/south, -/mob/living/simple_animal/hostile/syndicate{ +/mob/living/simple_animal/hostile/human/syndicate{ name = "Syndicate Engineer"; desc = "Death to bad mechanics." }, @@ -1779,7 +1779,7 @@ /obj/machinery/camera/autoname{ dir = 4 }, -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space, /turf/open/floor/plasteel/tech/techmaint, /area/ruin/wasteplanet/abandoned_mechbay/crewquarters) "uM" = ( @@ -1907,7 +1907,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/mob/living/simple_animal/hostile/syndicate/ranged/shotgun, +/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun, /turf/open/floor/plasteel/dark, /area/ruin/wasteplanet/abandoned_mechbay/mechlab) "vS" = ( @@ -2047,7 +2047,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/mob/living/simple_animal/hostile/syndicate{ +/mob/living/simple_animal/hostile/human/syndicate{ name = "Syndicate Launderer"; desc = "Death to Dirty Laundry?" }, @@ -2180,7 +2180,7 @@ dir = 8 }, /obj/machinery/light/floor, -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space, +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -2473,7 +2473,7 @@ pixel_y = 19 }, /obj/structure/curtain, -/mob/living/simple_animal/hostile/syndicate/civilian{ +/mob/living/simple_animal/hostile/human/syndicate/civilian{ desc = "Can an armored mook not shower in peace?" }, /turf/open/floor/carpet/blue, @@ -2722,7 +2722,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/syndicate/melee{ +/mob/living/simple_animal/hostile/human/syndicate/melee{ name = "Syndicate Mech Pilot" }, /turf/open/floor/plasteel/tech/techmaint, @@ -2770,7 +2770,7 @@ /area/overmap_encounter/planetoid/cave/explored) "Hj" = ( /obj/machinery/light/dim/directional/south, -/mob/living/simple_animal/hostile/syndicate/melee{ +/mob/living/simple_animal/hostile/human/syndicate/melee{ name = "Syndicate Mech Pilot" }, /turf/open/floor/plasteel/tech/techmaint, @@ -3015,7 +3015,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/directional/south, -/mob/living/simple_animal/hostile/syndicate/melee{ +/mob/living/simple_animal/hostile/human/syndicate/melee{ name = "Syndicate Mech Pilot" }, /turf/open/floor/plasteel/dark, @@ -3056,7 +3056,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/mob/living/simple_animal/hostile/syndicate{ +/mob/living/simple_animal/hostile/human/syndicate{ name = "Syndicate Engineer"; desc = "Death to bad mechanics." }, @@ -3375,7 +3375,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/west, -/mob/living/simple_animal/hostile/syndicate{ +/mob/living/simple_animal/hostile/human/syndicate{ name = "Syndicate Engineer"; desc = "Death to bad mechanics." }, diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm index 73735c65542b..6aa83a87ca32 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm @@ -2100,7 +2100,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/mob/living/simple_animal/hostile/frontier{ +/mob/living/simple_animal/hostile/human/frontier{ dir = 8 }, /turf/open/floor/wood, @@ -5549,7 +5549,7 @@ /turf/open/floor/plating, /area/ruin/powered) "Zo" = ( -/mob/living/simple_animal/hostile/cat_butcherer{ +/mob/living/simple_animal/hostile/human/cat_butcherer{ dir = 4 }, /obj/effect/decal/cleanable/blood, diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm index b6298e29f39d..a880d2947ae2 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm @@ -659,7 +659,7 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/wasteplanet) "Bb" = ( -/mob/living/simple_animal/hostile/skeleton{ +/mob/living/simple_animal/hostile/human/skeleton{ desc = "A villager resurrected by the power of an unknown deity, eternally seeking vengeance for its people." }, /turf/open/floor/plating/dirt/old/waste, @@ -791,7 +791,7 @@ /turf/open/indestructible/hierophant/waste, /area/ruin/wasteplanet) "Fc" = ( -/mob/living/simple_animal/hostile/skeleton{ +/mob/living/simple_animal/hostile/human/skeleton{ desc = "A villager resurrected by the power of an unknown deity, eternally seeking vengeance for its people." }, /turf/open/floor/wood/waste, @@ -1378,7 +1378,7 @@ /turf/open/indestructible/hierophant/waste, /area/ruin/wasteplanet) "Xq" = ( -/mob/living/simple_animal/hostile/skeleton{ +/mob/living/simple_animal/hostile/human/skeleton{ desc = "A villager resurrected by the power of an unknown deity, eternally seeking vengeance for its people." }, /turf/open/floor/plating/grass/wasteplanet, diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index d60eff11f391..8e3cc4a371af 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(traumas) "spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)), "security" = typecacheof(list(/mob/living/simple_animal/bot/secbot)), "lizards" = typecacheof(list(/mob/living/simple_animal/hostile/lizard)), - "skeletons" = typecacheof(list(/mob/living/simple_animal/hostile/skeleton)), + "skeletons" = typecacheof(list(/mob/living/simple_animal/hostile/human/skeleton)), "snakes" = typecacheof(list(/mob/living/simple_animal/hostile/retaliate/poison/snake)), "robots" = typecacheof(list(/mob/living/silicon/robot, /mob/living/silicon/ai, /mob/living/simple_animal/drone, /mob/living/simple_animal/bot, /mob/living/simple_animal/hostile/swarmer)), diff --git a/code/datums/mapgen/planetary/SandGenerator.dm b/code/datums/mapgen/planetary/SandGenerator.dm index 442daa0c7705..91fad1430a47 100644 --- a/code/datums/mapgen/planetary/SandGenerator.dm +++ b/code/datums/mapgen/planetary/SandGenerator.dm @@ -103,7 +103,7 @@ /mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /mob/living/simple_animal/hostile/asteroid/basilisk/whitesands = 40, /mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, - /mob/living/simple_animal/hostile/asteroid/whitesands/survivor/random = 25, + /mob/living/simple_animal/hostile/human/hermit/survivor/random = 25, ) /datum/biome/sand/wasteland @@ -135,7 +135,7 @@ ) mob_spawn_chance = 1 mob_spawn_list = list( - /mob/living/simple_animal/hostile/asteroid/whitesands/survivor/random = 1, + /mob/living/simple_animal/hostile/human/hermit/survivor/random = 1, ) /datum/biome/sand/grass/dead @@ -169,7 +169,7 @@ /mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 40, /mob/living/simple_animal/hostile/asteroid/basilisk/whitesands = 30, /mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 20, - /mob/living/simple_animal/hostile/asteroid/whitesands/survivor/random = 40, + /mob/living/simple_animal/hostile/human/hermit/survivor/random = 40, ) /datum/biome/sand/acid //plains diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index b665a36bcf32..d7f80fc45680 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -867,7 +867,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( say("WEEWOO! WEEWOO! Spaceport security en route!") playsound(src, 'sound/items/weeoo1.ogg', 100, FALSE) for(var/i, i<=3, i++) - var/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion/O = new/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion(get_turf(src)) + var/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/orion/O = new/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/orion(get_turf(src)) O.target = usr @@ -1242,7 +1242,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( newgame() obj_flags |= EMAGGED -/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/orion name = "spaceport security" desc = "Premier corporate security forces for all spaceports found along the Orion Trail." faction = list("orion") diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index d2c712d32ea8..88c2ca721da2 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -831,7 +831,7 @@ //An actual AI (simple_animal mecha pilot) entering the mech -/obj/mecha/proc/aimob_enter_mech(mob/living/simple_animal/hostile/syndicate/mecha_pilot/pilot_mob) +/obj/mecha/proc/aimob_enter_mech(mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/pilot_mob) if(pilot_mob && pilot_mob.Adjacent(src)) if(occupant) return @@ -841,7 +841,7 @@ pilot_mob.forceMove(src) GrantActions(pilot_mob)//needed for checks, and incase a badmin puts somebody in the mob -/obj/mecha/proc/aimob_exit_mech(mob/living/simple_animal/hostile/syndicate/mecha_pilot/pilot_mob) +/obj/mecha/proc/aimob_exit_mech(mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/pilot_mob) if(occupant == pilot_mob) occupant = null if(pilot_mob.mecha == src) diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index 07ecef04afac..0ec3f36e5e70 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -312,18 +312,18 @@ GLOBAL_LIST_INIT(ore_probability, list( playsound(loc,'sound/ambience/ambiholy.ogg', 100, FALSE, 50, TRUE, TRUE) if(prob(30)) new /obj/item/reagent_containers/glass/bottle/potion/flight(loc) - new /mob/living/simple_animal/hostile/skeleton/templar(loc) + new /mob/living/simple_animal/hostile/human/skeleton/templar(loc) else new /obj/item/clothing/neck/memento_mori(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) - new /mob/living/simple_animal/hostile/skeleton/templar(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton/templar(loc) if(prob(35)) new /obj/item/storage/box/holy_grenades(loc) - new /mob/living/simple_animal/hostile/skeleton/templar(loc) - new /mob/living/simple_animal/hostile/skeleton/templar(loc) + new /mob/living/simple_animal/hostile/human/skeleton/templar(loc) + new /mob/living/simple_animal/hostile/human/skeleton/templar(loc) if(prob(40)) new /obj/item/claymore(loc) - new /mob/living/simple_animal/hostile/skeleton/templar(loc) + new /mob/living/simple_animal/hostile/human/skeleton/templar(loc) if(prob(45)) new /obj/item/gun/ballistic/bow(loc) new /obj/item/storage/bag/quiver(loc) @@ -332,38 +332,38 @@ GLOBAL_LIST_INIT(ore_probability, list( new /obj/item/ammo_casing/caseless/arrow/bronze(loc) new /obj/item/ammo_casing/caseless/arrow/bronze(loc) new /obj/item/ammo_casing/caseless/arrow/bronze(loc) - new /mob/living/simple_animal/hostile/skeleton/templar(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton/templar(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) if(prob(30)) new /obj/item/stack/sheet/mineral/wood/fifty(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) if(prob(35)) new /obj/item/staff/bostaff(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) if(prob(45)) new /obj/item/disk/design_disk/adv/cleric_mace(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) if(prob(25)) new /obj/item/shield/riot/roman(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) if(prob(55)) new /obj/item/clothing/suit/armor/riot/knight/blue(loc) new /obj/item/clothing/head/helmet/knight/blue(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) if(prob(35)) new /obj/item/disk/design_disk/adv/knight_gear(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) - new /mob/living/simple_animal/hostile/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) + new /mob/living/simple_animal/hostile/human/skeleton(loc) new /obj/item/instrument/trombone(loc) new /obj/item/stack/sheet/bone(loc) new /obj/item/stack/sheet/bone(loc) new /obj/item/stack/sheet/bone(loc) new /obj/item/stack/sheet/bone(loc) - new /mob/living/simple_animal/hostile/skeleton/templar(loc) + new /mob/living/simple_animal/hostile/human/skeleton/templar(loc) new /turf/open/floor/mineral/silver(loc) if(4)//syndicate incursion. Again, high-quality loot at low chances, this time with excessive levels of danger visible_message("Radio chatter echoes out from the portal. Red-garbed figures step through, weapons raised.") @@ -372,74 +372,74 @@ GLOBAL_LIST_INIT(ore_probability, list( if(prob(35)) if(prob(15)) new /obj/item/clothing/suit/space/hardsuit/syndi/elite(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc) else if(prob(50)) new /obj/item/clothing/suit/space/hardsuit/syndi(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc) else new /obj/item/clothing/suit/space/hardsuit/syndi(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg/space(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc) if(prob(25))//the real prize new /obj/effect/spawner/lootdrop/donkpockets(loc) new /obj/effect/spawner/lootdrop/donkpockets(loc) new /obj/effect/spawner/lootdrop/donkpockets(loc) if(prob(35)) new /obj/item/clothing/shoes/magboots/syndie(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc) if(prob(25)) new /obj/item/gun/ballistic/automatic/pistol/suppressed(loc) new /obj/item/ammo_box/magazine/ - new /mob/living/simple_animal/hostile/syndicate/melee/sword(loc) + new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc) if(prob(25)) new /obj/item/gun/ballistic/automatic/pistol/tec9(loc) new /obj/item/ammo_box/magazine/tec9(loc) new /obj/item/ammo_box/magazine/tec9(loc) - new /mob/living/simple_animal/hostile/syndicate/melee/sword(loc) + new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc) if(prob(35)) new /obj/item/clothing/gloves/rapid(loc) - new /mob/living/simple_animal/hostile/syndicate/melee/sword/space(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/melee/sword/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc) if(prob(35)) new /obj/item/wrench/combat(loc) new /obj/item/storage/toolbox/syndicate(loc) - new /mob/living/simple_animal/hostile/syndicate/melee/sword/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/melee/sword/space(loc) if(prob(35)) new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(loc) if(prob(35)) new /obj/item/borg/upgrade/transform/assault(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg(loc) if(prob(25)) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc) if(prob(25)) - new /mob/living/simple_animal/hostile/syndicate/melee/sword/space(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/melee/sword/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc) if(prob(25)) - new /mob/living/simple_animal/hostile/syndicate/melee/sword(loc) + new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc) new /obj/item/storage/backpack/duffelbag/syndie/c4(loc) if(prob(35)) new /obj/item/storage/belt/military(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg(loc) if(prob(35)) new /obj/item/kinetic_crusher/syndie_crusher(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc) if(prob(25)) new /obj/item/card/id/syndicate/anyone(loc) if(prob(35)) new /obj/item/clothing/glasses/thermal/syndi(loc) - new /mob/living/simple_animal/hostile/syndicate/melee/sword(loc) + new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc) if(prob(35)) new /obj/item/reagent_containers/hypospray(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/shotgun(loc) - new /mob/living/simple_animal/hostile/syndicate/melee/sword(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun(loc) + new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc) if(prob(25)) new /obj/item/card/emag(loc) - new /mob/living/simple_animal/hostile/syndicate/melee/sword(loc) - new /mob/living/simple_animal/hostile/syndicate/ranged/smg/space(loc) - new /mob/living/simple_animal/hostile/syndicate/melee/sword/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc) + new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc) + new /mob/living/simple_animal/hostile/human/syndicate/melee/sword/space(loc) new /turf/open/floor/mineral/plastitanium/red(loc) if(5)//;HELP BLOB IN MEDICAL visible_message("You hear a robotic voice saying something about a \"Delta-level biohazard\".") diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm index 9773221f0c22..a5369a547d39 100644 --- a/code/game/objects/structures/spawner.dm +++ b/code/game/objects/structures/spawner.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(astroloot, list( icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" spawn_text = "warps in from" - mob_types = list(/mob/living/simple_animal/hostile/syndicate/ranged) + mob_types = list(/mob/living/simple_animal/hostile/human/syndicate/ranged) faction = list(ROLE_SYNDICATE) /obj/structure/spawner/skeleton @@ -68,7 +68,7 @@ GLOBAL_LIST_INIT(astroloot, list( max_integrity = 150 max_mobs = 15 spawn_time = 150 - mob_types = list(/mob/living/simple_animal/hostile/skeleton) + mob_types = list(/mob/living/simple_animal/hostile/human/skeleton) spawn_text = "climbs out of" faction = list("skeleton") diff --git a/code/modules/awaymissions/mission_code/spacebattle.dm b/code/modules/awaymissions/mission_code/spacebattle.dm index dee4def256b0..efe429b86b73 100644 --- a/code/modules/awaymissions/mission_code/spacebattle.dm +++ b/code/modules/awaymissions/mission_code/spacebattle.dm @@ -41,11 +41,11 @@ name = "Hidden Chamber" icon_state = "awaycontent10" -/mob/living/simple_animal/hostile/syndicate/ranged/spacebattle +/mob/living/simple_animal/hostile/human/syndicate/ranged/spacebattle loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/gun/ballistic/automatic/smg/c20r, /obj/item/shield/energy) -/mob/living/simple_animal/hostile/syndicate/melee/spacebattle +/mob/living/simple_animal/hostile/human/syndicate/melee/spacebattle deathmessage = "falls limp as they release their grip from the energy weapons, activating their self-destruct function!" loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier) diff --git a/code/modules/mob/living/simple_animal/hostile/human/cat_butcher.dm b/code/modules/mob/living/simple_animal/hostile/human/cat_butcher.dm index 8da384aaca4b..80c2ee22f3ef 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/cat_butcher.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/cat_butcher.dm @@ -1,41 +1,27 @@ -/mob/living/simple_animal/hostile/cat_butcherer +/mob/living/simple_animal/hostile/human/cat_butcherer name = "Cat Surgeon" desc = "Feline genemod physiological modification surgery is outlawed in Nanotrasen-controlled sectors. This doctor doesn't seem to care, and thus, is wanted for several warcrimes." - icon = 'icons/mob/simple_human.dmi' icon_state = "cat_butcher" icon_living = "cat_butcher" - icon_dead = "syndicate_dead" - icon_gib = "syndicate_gib" projectiletype = /obj/projectile/bullet/dart/tranq projectilesound = 'sound/items/syringeproj.ogg' ranged = 1 ranged_message = "fires the syringe gun at" ranged_cooldown_time = 30 speak_chance = 0 - turns_per_move = 5 - speed = 0 stat_attack = HARD_CRIT - robust_searching = 1 - maxHealth = 100 - health = 100 - harm_intent_damage = 5 melee_damage_lower = 15 melee_damage_upper = 15 attack_verb_continuous = "slashes at" attack_verb_simple = "slash at" attack_sound = 'sound/weapons/circsawhit.ogg' - a_intent = INTENT_HARM - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID loot = list(/obj/effect/mob_spawn/human/corpse/cat_butcher, /obj/item/circular_saw, /obj/item/gun/syringe) atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) - unsuitable_atmos_damage = 15 faction = list("hostile") check_friendly_fire = 1 - status_flags = CANPUSH - del_on_death = 1 var/impatience = 0 -/mob/living/simple_animal/hostile/cat_butcherer/CanAttack(atom/the_target) +/mob/living/simple_animal/hostile/human/cat_butcherer/CanAttack(atom/the_target) if(iscarbon(target)) var/mob/living/carbon/human/C = target if(C.getorgan(/obj/item/organ/ears/cat) && C.getorgan(/obj/item/organ/tail/cat) && C.has_trauma_type(/datum/brain_trauma/severe/pacifism))//he wont attack his creations @@ -45,7 +31,7 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/cat_butcherer/AttackingTarget() +/mob/living/simple_animal/hostile/human/cat_butcherer/AttackingTarget() if(iscarbon(target)) var/mob/living/carbon/human/L = target if(!L.getorgan(/obj/item/organ/ears/cat) && L.stat >= UNCONSCIOUS) //target doesnt have cat ears diff --git a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm index 213cd8c2b822..2404a763363c 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm @@ -1,36 +1,20 @@ -/mob/living/simple_animal/hostile/frontier +/mob/living/simple_animal/hostile/human/frontier name = "Frontiersman" desc = "A frontiersman! A terrorist that would probably kill everyone without mercy." - icon = 'icons/mob/simple_human.dmi' icon_state = "frontiersmanmelee" icon_living = "frontiersmanmelee" icon_dead = "frontiersmanmelee_dead" - icon_gib = "syndicate_gib" - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID speak_chance = 0 - turns_per_move = 5 - speed = 0 - maxHealth = 100 - health = 100 harm_intent_damage = 5 melee_damage_lower = 15 melee_damage_upper = 15 - attack_verb_continuous = "punches" - attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' a_intent = INTENT_HARM loot = list(/obj/effect/mob_spawn/human/corpse/frontier, /obj/item/kitchen/knife) atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) - unsuitable_atmos_damage = 15 faction = list(FACTION_ANTAG_FRONTIERSMEN) - status_flags = CANPUSH - del_on_death = 1 - footstep_type = FOOTSTEP_MOB_SHOE - - -/mob/living/simple_animal/hostile/frontier/ranged +/mob/living/simple_animal/hostile/human/frontier/ranged icon_state = "frontiersmanranged" icon_living = "frontiersmanranged" loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged, @@ -41,10 +25,10 @@ projectilesound = 'sound/weapons/gun/revolver/shot.ogg' casingtype = /obj/item/ammo_casing/a357 -/mob/living/simple_animal/hostile/frontier/ranged/neutered +/mob/living/simple_animal/hostile/human/frontier/ranged/neutered loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged) -/mob/living/simple_animal/hostile/frontier/ranged/mosin +/mob/living/simple_animal/hostile/human/frontier/ranged/mosin icon_state = "frontiersmanrangedrifle" icon_living = "frontiersmanrangedrifle" loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged, @@ -52,10 +36,10 @@ casingtype = /obj/item/ammo_casing/a8_50r projectilesound = 'sound/weapons/gun/rifle/mosin.ogg' -/mob/living/simple_animal/hostile/frontier/ranged/mosin/neutered +/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged) -/mob/living/simple_animal/hostile/frontier/ranged/trooper +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper icon_state = "frontiersmanrangedelite" icon_living = "frontiersmanrangedelite" maxHealth = 170 @@ -65,10 +49,10 @@ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper, /obj/item/gun/ballistic/shotgun/brimstone) -/mob/living/simple_animal/hostile/frontier/ranged/trooper/neutered +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/neutered loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper) -/mob/living/simple_animal/hostile/frontier/ranged/trooper/skm +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm icon_state = "frontiersmanrangedak47" icon_living = "frontiersmanrangedak47" projectilesound = 'sound/weapons/gun/rifle/skm.ogg' @@ -78,10 +62,10 @@ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper, /obj/item/gun/ballistic/automatic/assault/skm) -/mob/living/simple_animal/hostile/frontier/ranged/trooper/skm/neutured +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm/neutured loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper) -/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle icon_state = "frontiersmanrangedmosin" icon_living = "frontiersmanrangedmosin" @@ -90,10 +74,10 @@ casingtype = /obj/item/ammo_casing/a8_50r projectilesound = 'sound/weapons/gun/rifle/mosin.ogg' -/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle/neutered +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/neutered loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper) -/mob/living/simple_animal/hostile/frontier/ranged/trooper/heavy +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy icon_state = "frontiersmanrangedminigun" icon_living = "frontiersmanrangedminigun" projectilesound = 'sound/weapons/laser4.ogg' @@ -105,10 +89,10 @@ projectiletype = /obj/projectile/beam/weak/penetrator loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy) -/mob/living/simple_animal/hostile/frontier/ranged/trooper/heavy/neutered +/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless) -/mob/living/simple_animal/hostile/frontier/ranged/officer +/mob/living/simple_animal/hostile/human/frontier/ranged/officer name = "Frontiersman Officer" icon_state = "frontiersmanofficer" icon_living = "frontiersmanofficer" @@ -119,10 +103,10 @@ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer, /obj/item/gun/ballistic/automatic/pistol/APS) -/mob/living/simple_animal/hostile/frontier/ranged/officer/neutured +/mob/living/simple_animal/hostile/human/frontier/ranged/officer/neutured loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer) -/mob/living/simple_animal/hostile/frontier/ranged/officer/Aggro() +/mob/living/simple_animal/hostile/human/frontier/ranged/officer/Aggro() ..() summon_backup(15) say(pick("Help!!", "They're right here!!", "Don't let me die!!")) diff --git a/code/modules/mob/living/simple_animal/hostile/human/human.dm b/code/modules/mob/living/simple_animal/hostile/human/human.dm index d4c64de5e6d3..e08d917e7b78 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/human.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/human.dm @@ -34,7 +34,7 @@ unsuitable_atmos_damage = 15 minbodytemp = 180 status_flags = CANPUSH - del_on_death = 1 + del_on_death = TRUE footstep_type = FOOTSTEP_MOB_SHOE diff --git a/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm index 4417e68e2ec1..224890874d37 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm @@ -1,47 +1,30 @@ -/mob/living/simple_animal/hostile/nanotrasen +/mob/living/simple_animal/hostile/human/nanotrasen name = "\improper Nanotrasen Private Security Officer" desc = "An officer part of Nanotrasen's private security force, he seems rather unpleased to meet you." - icon = 'icons/mob/simple_human.dmi' icon_state = "nanotrasen" icon_living = "nanotrasen" - icon_dead = null - icon_gib = "syndicate_gib" - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID speak_chance = 0 - turns_per_move = 5 - speed = 0 stat_attack = HARD_CRIT - robust_searching = 1 - maxHealth = 100 - health = 100 - harm_intent_damage = 5 melee_damage_lower = 10 melee_damage_upper = 15 - attack_verb_continuous = "punches" - attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' - a_intent = INTENT_HARM loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier) atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) unsuitable_atmos_damage = 15 faction = list(ROLE_DEATHSQUAD) check_friendly_fire = TRUE - status_flags = CANPUSH - del_on_death = TRUE dodging = TRUE - footstep_type = FOOTSTEP_MOB_SHOE -/mob/living/simple_animal/hostile/nanotrasen/screaming +/mob/living/simple_animal/hostile/human/nanotrasen/screaming icon_state = "nanotrasen" icon_living = "nanotrasen" -/mob/living/simple_animal/hostile/nanotrasen/screaming/Aggro() +/mob/living/simple_animal/hostile/human/nanotrasen/screaming/Aggro() ..() summon_backup(15) say("411 in progress, requesting backup!") -/mob/living/simple_animal/hostile/nanotrasen/ranged +/mob/living/simple_animal/hostile/human/nanotrasen/ranged icon_state = "nanotrasenranged" icon_living = "nanotrasenranged" ranged = 1 @@ -51,9 +34,49 @@ projectilesound = 'sound/weapons/gun/pistol/shot_alt.ogg' -/mob/living/simple_animal/hostile/nanotrasen/ranged/smg +/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg icon_state = "nanotrasenrangedsmg" icon_living = "nanotrasenrangedsmg" rapid = 3 casingtype = /obj/item/ammo_casing/c46x30mm projectilesound = 'sound/weapons/gun/smg/shot.ogg' + +/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault + name = "Nanotrasen Assault Officer" + desc = "A Nanotrasen Assault Officer. Prepare to die, if you've been found near Syndicate property." + icon_state = "nanotrasenrangedassault" + icon_living = "nanotrasenrangedassault" + icon_dead = null + icon_gib = "syndicate_gib" + ranged = TRUE + rapid = 4 + rapid_fire_delay = 1 + rapid_melee = 1 + retreat_distance = 2 + minimum_distance = 4 + casingtype = /obj/item/ammo_casing/c46x30mm + projectilesound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' + loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasenassaultsoldier) + +/mob/living/simple_animal/hostile/human/nanotrasen/elite + name = "Nanotrasen Elite Assault Officer" + desc = "Pray for your life, syndicate. Run while you can." + icon = 'icons/mob/simple_human.dmi' + icon_state = "nanotrasen_ert" + icon_living = "nanotrasen_ert" + maxHealth = 150 + health = 150 + melee_damage_lower = 13 + melee_damage_upper = 18 + ranged = TRUE + rapid = 3 + rapid_fire_delay = 5 + rapid_melee = 3 + retreat_distance = 0 + minimum_distance = 1 + 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) + minbodytemp = 0 + projectiletype = /obj/projectile/beam/laser + projectilesound = 'sound/weapons/laser.ogg' + loot = list(/obj/effect/gibspawner/human) + faction = list(ROLE_DEATHSQUAD) diff --git a/code/modules/mob/living/simple_animal/hostile/human/pirate.dm b/code/modules/mob/living/simple_animal/hostile/human/pirate.dm index b0bc7941fd69..082184b1eb26 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/pirate.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/pirate.dm @@ -1,35 +1,18 @@ -/mob/living/simple_animal/hostile/pirate +/mob/living/simple_animal/hostile/human/pirate name = "Pirate" desc = "Does what he wants cause a pirate is free." - icon = 'icons/mob/simple_human.dmi' icon_state = "piratemelee" icon_living = "piratemelee" icon_dead = "pirate_dead" - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID speak_chance = 0 - turns_per_move = 5 - response_help_continuous = "pushes" - response_help_simple = "push" - speed = 0 - maxHealth = 100 - health = 100 - harm_intent_damage = 5 - melee_damage_lower = 10 - melee_damage_upper = 10 - attack_verb_continuous = "punches" - attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' - a_intent = INTENT_HARM atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) unsuitable_atmos_damage = 15 speak_emote = list("yarrs") loot = list(/obj/effect/mob_spawn/human/corpse/pirate, /obj/item/melee/transforming/energy/sword/saber/pirate) - del_on_death = 1 faction = list("pirate") - -/mob/living/simple_animal/hostile/pirate/melee +/mob/living/simple_animal/hostile/human/pirate/melee name = "Pirate Swashbuckler" icon_state = "piratemelee" icon_living = "piratemelee" @@ -44,7 +27,7 @@ footstep_type = FOOTSTEP_MOB_SHOE -/mob/living/simple_animal/hostile/pirate/melee/space +/mob/living/simple_animal/hostile/human/pirate/melee/space name = "Space Pirate Swashbuckler" icon_state = "piratespace" icon_living = "piratespace" @@ -53,23 +36,23 @@ minbodytemp = 0 speed = 1 -/mob/living/simple_animal/hostile/pirate/melee/space/Initialize() +/mob/living/simple_animal/hostile/human/pirate/melee/space/Initialize() . = ..() ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT) -/mob/living/simple_animal/hostile/pirate/melee/Initialize() +/mob/living/simple_animal/hostile/human/pirate/melee/Initialize() . = ..() sord = new(src) -/mob/living/simple_animal/hostile/pirate/melee/Destroy() +/mob/living/simple_animal/hostile/human/pirate/melee/Destroy() QDEL_NULL(sord) return ..() -/mob/living/simple_animal/hostile/pirate/melee/Initialize() +/mob/living/simple_animal/hostile/human/pirate/melee/Initialize() . = ..() set_light(2) -/mob/living/simple_animal/hostile/pirate/ranged +/mob/living/simple_animal/hostile/human/pirate/ranged name = "Pirate Gunner" icon_state = "pirateranged" icon_living = "pirateranged" @@ -84,7 +67,7 @@ loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged, /obj/item/gun/energy/laser) -/mob/living/simple_animal/hostile/pirate/ranged/space +/mob/living/simple_animal/hostile/human/pirate/ranged/space name = "Space Pirate Gunner" icon_state = "piratespaceranged" icon_living = "piratespaceranged" @@ -93,6 +76,6 @@ minbodytemp = 0 speed = 1 -/mob/living/simple_animal/hostile/pirate/ranged/space/Initialize() +/mob/living/simple_animal/hostile/human/pirate/ranged/space/Initialize() . = ..() ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT) diff --git a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm index 477233566f35..678f8987b5fa 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm @@ -1,20 +1,16 @@ -/mob/living/simple_animal/hostile/skeleton +/mob/living/simple_animal/hostile/human/skeleton name = "reanimated skeleton" desc = "A real bonefied skeleton, doesn't seem like it wants to socialize." - icon = 'icons/mob/simple_human.dmi' icon_state = "skeleton" icon_living = "skeleton" icon_dead = "skeleton" gender = NEUTER mob_biotypes = MOB_UNDEAD|MOB_HUMANOID - turns_per_move = 5 speak_emote = list("rattles") emote_see = list("rattles") - a_intent = INTENT_HARM maxHealth = 40 health = 40 speed = 1 - harm_intent_damage = 5 melee_damage_lower = 15 melee_damage_upper = 15 minbodytemp = 0 @@ -25,18 +21,14 @@ attack_sound = 'sound/hallucinations/growl1.ogg' 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) unsuitable_atmos_damage = 10 - robust_searching = 1 stat_attack = HARD_CRIT faction = list("skeleton") see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE deathmessage = "collapses into a pile of bones!" - del_on_death = 1 loot = list(/obj/effect/decal/remains/human) - footstep_type = FOOTSTEP_MOB_SHOE - -/mob/living/simple_animal/hostile/skeleton/eskimo +/mob/living/simple_animal/hostile/human/skeleton/eskimo name = "undead eskimo" desc = "The reanimated remains of some poor traveler." icon_state = "eskimo" @@ -54,7 +46,7 @@ /obj/item/clothing/suit/hooded/wintercoat) -/mob/living/simple_animal/hostile/skeleton/templar +/mob/living/simple_animal/hostile/human/skeleton/templar name = "undead templar" desc = "The reanimated remains of a holy templar knight." icon_state = "templar" @@ -76,7 +68,7 @@ /obj/item/clothing/head/helmet/chaplain, /obj/item/claymore/weak{name = "holy sword"}) -/mob/living/simple_animal/hostile/skeleton/ice +/mob/living/simple_animal/hostile/human/skeleton/ice name = "ice skeleton" desc = "A reanimated skeleton protected by a thick sheet of natural ice armor. Looks slow, though." speed = 5 @@ -86,7 +78,7 @@ color = rgb(114,228,250) loot = list(/obj/effect/decal/remains/human{color = rgb(114,228,250)}) -/mob/living/simple_animal/hostile/skeleton/plasmaminer +/mob/living/simple_animal/hostile/human/skeleton/plasmaminer name = "shambling miner" desc = "A plasma-soaked miner, their exposed limbs turned into a grossly incandescent bone seemingly made of plasma." icon_state = "plasma_miner" @@ -104,7 +96,7 @@ deathmessage = "collapses into a pile of bones, their suit dissolving among the plasma!" loot = list(/obj/effect/decal/remains/plasma) -/mob/living/simple_animal/hostile/skeleton/plasmaminer/jackhammer +/mob/living/simple_animal/hostile/human/skeleton/plasmaminer/jackhammer desc = "A plasma-soaked miner, their exposed limbs turned into a grossly incandescent bone seemingly made of plasma. They seem to still have their mining tool in their hand, gripping tightly." icon_state = "plasma_miner_tool" icon_living = "plasma_miner_tool" @@ -119,6 +111,6 @@ attack_sound = 'sound/weapons/sonic_jackhammer.ogg' loot = list(/obj/effect/decal/remains/plasma, /obj/item/pickaxe/drill/jackhammer) -/mob/living/simple_animal/hostile/skeleton/plasmaminer/Initialize() +/mob/living/simple_animal/hostile/human/skeleton/plasmaminer/Initialize() . = ..() set_light(2) diff --git a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm index d5759431d65a..34f9241310f6 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm @@ -1,38 +1,14 @@ -/mob/living/simple_animal/hostile/asteroid/whitesands +/mob/living/simple_animal/hostile/human/hermit name = "Whitesands Inhabitant" desc = "If you can read this, yell at a coder!" - icon = 'icons/mob/simple_human.dmi' icon_state = "survivor_base" icon_living = "survivor_base" - icon_dead = null - icon_gib = "syndicate_gib" - mob_biotypes = MOB_ORGANIC - minbodytemp = 180 - unsuitable_atmos_damage = 15 atmos_requirements = list("min_oxy" = 1, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 999, "min_n2" = 0, "max_n2" = 0) - speak_chance = 20 - turns_per_move = 5 - response_help_continuous = "pushes" - response_help_simple = "push" - speed = 0 - maxHealth = 100 - health = 100 - harm_intent_damage = 5 - melee_damage_lower = 10 - melee_damage_upper = 10 - attack_verb_continuous = "punches" - attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' - a_intent = INTENT_HARM - unsuitable_atmos_damage = 15 - speak_emote = list("groans") loot = list( /obj/effect/mob_spawn/human/corpse/damaged/whitesands ) - del_on_death = 1 - faction = list("hermit") -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor/death(gibbed) +/mob/living/simple_animal/hostile/human/hermit/survivor/death(gibbed) move_force = MOVE_FORCE_DEFAULT move_resist = MOVE_RESIST_DEFAULT pull_force = PULL_FORCE_DEFAULT @@ -41,19 +17,19 @@ visible_message("You notice a glimmering nugget of shiny metal.") ..() -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor +/mob/living/simple_animal/hostile/human/hermit/survivor name = "Hermit Wanderer" desc =" A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body, twisted by the heavy metals and high background radiation of the sandworlds." -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor/random/Initialize() +/mob/living/simple_animal/hostile/human/hermit/survivor/random/Initialize() . = ..() if(prob(35)) - new /mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter(loc) + new /mob/living/simple_animal/hostile/human/hermit/ranged/hunter(loc) if(prob(10)) - new /mob/living/simple_animal/hostile/asteroid/whitesands/ranged/gunslinger(loc) + new /mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger(loc) return INITIALIZE_HINT_QDEL -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged +/mob/living/simple_animal/hostile/human/hermit/ranged icon_state = "survivor_hunter" icon_living = "survivor_hunter" projectiletype = null @@ -64,14 +40,14 @@ retreat_distance = 5 minimum_distance = 5 -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/hunter +/mob/living/simple_animal/hostile/human/hermit/ranged/hunter name = "Hermit Hunter" desc ="A wild-eyed figure. Watch out- he has a gun, and he remembers just enough of his old life to use it!" loot = list( /obj/effect/mob_spawn/human/corpse/damaged/whitesands/hunter, ) -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged/gunslinger +/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger name = "Hermit Soldier" desc = "The miner's rebellion, though mostly underground, recieved a few good weapon shipments from an off-sector source. You should probably start running." icon_state = "survivor_gunslinger" diff --git a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm index 81755a7358b1..46ec15db982a 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm @@ -14,43 +14,24 @@ light_color = COLOR_SOFT_RED -/mob/living/simple_animal/hostile/syndicate +/mob/living/simple_animal/hostile/human/syndicate name = "Syndicate Operative" desc = "Death to Nanotrasen." - icon = 'icons/mob/simple_human.dmi' icon_state = "syndicate" icon_living = "syndicate" - icon_dead = "syndicate_dead" - icon_gib = "syndicate_gib" - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID speak_chance = 0 - turns_per_move = 5 - speed = 0 stat_attack = HARD_CRIT - robust_searching = 1 - maxHealth = 100 - health = 100 - harm_intent_damage = 5 - melee_damage_lower = 10 - melee_damage_upper = 10 - attack_verb_continuous = "punches" - attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' - a_intent = INTENT_HARM loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier) atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) - unsuitable_atmos_damage = 15 faction = list(FACTION_ANTAG_SYNDICATE) check_friendly_fire = 1 status_flags = CANPUSH - del_on_death = 1 dodging = TRUE rapid_melee = 2 - footstep_type = FOOTSTEP_MOB_SHOE ///////////////Melee//////////// -/mob/living/simple_animal/hostile/syndicate/space +/mob/living/simple_animal/hostile/human/syndicate/space icon_state = "syndicate_space" icon_living = "syndicate_space" name = "Syndicate Commando" @@ -60,19 +41,19 @@ minbodytemp = 0 speed = 1 -/mob/living/simple_animal/hostile/syndicate/space/Initialize() +/mob/living/simple_animal/hostile/human/syndicate/space/Initialize() . = ..() ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT) set_light(4) -/mob/living/simple_animal/hostile/syndicate/space/stormtrooper +/mob/living/simple_animal/hostile/human/syndicate/space/stormtrooper icon_state = "syndicate_stormtrooper" icon_living = "syndicate_stormtrooper" name = "Syndicate Stormtrooper" maxHealth = 250 health = 250 -/mob/living/simple_animal/hostile/syndicate/melee //dude with a knife and no shields +/mob/living/simple_animal/hostile/human/syndicate/melee //dude with a knife and no shields melee_damage_lower = 15 melee_damage_upper = 15 icon_state = "syndicate_knife" @@ -84,7 +65,7 @@ status_flags = 0 var/projectile_deflect_chance = 0 -/mob/living/simple_animal/hostile/syndicate/melee/space +/mob/living/simple_animal/hostile/human/syndicate/melee/space icon_state = "syndicate_space_knife" icon_living = "syndicate_space_knife" name = "Syndicate Commando" @@ -95,12 +76,12 @@ speed = 1 projectile_deflect_chance = 50 -/mob/living/simple_animal/hostile/syndicate/melee/space/Initialize() +/mob/living/simple_animal/hostile/human/syndicate/melee/space/Initialize() . = ..() ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT) set_light(4) -/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper +/mob/living/simple_animal/hostile/human/syndicate/melee/space/stormtrooper icon_state = "syndicate_stormtrooper_knife" icon_living = "syndicate_stormtrooper_knife" name = "Syndicate Stormtrooper" @@ -108,7 +89,7 @@ health = 250 projectile_deflect_chance = 50 -/mob/living/simple_animal/hostile/syndicate/melee/sword +/mob/living/simple_animal/hostile/human/syndicate/melee/sword melee_damage_lower = 30 melee_damage_upper = 30 icon_state = "syndicate_sword" @@ -122,21 +103,21 @@ var/obj/effect/light_emitter/red_energy_sword/sord projectile_deflect_chance = 50 -/mob/living/simple_animal/hostile/syndicate/melee/sword/Initialize() +/mob/living/simple_animal/hostile/human/syndicate/melee/sword/Initialize() . = ..() set_light(2) -/mob/living/simple_animal/hostile/syndicate/melee/sword/Destroy() +/mob/living/simple_animal/hostile/human/syndicate/melee/sword/Destroy() QDEL_NULL(sord) return ..() -/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/projectile/Proj) +/mob/living/simple_animal/hostile/human/syndicate/melee/bullet_act(obj/projectile/Proj) if(prob(projectile_deflect_chance)) visible_message("[src] blocks [Proj] with its shield!") return BULLET_ACT_BLOCK return ..() -/mob/living/simple_animal/hostile/syndicate/melee/sword/space +/mob/living/simple_animal/hostile/human/syndicate/melee/sword/space icon_state = "syndicate_space_sword" icon_living = "syndicate_space_sword" name = "Syndicate Commando" @@ -147,17 +128,17 @@ speed = 1 projectile_deflect_chance = 50 -/mob/living/simple_animal/hostile/syndicate/melee/sword/space/Initialize() +/mob/living/simple_animal/hostile/human/syndicate/melee/sword/space/Initialize() . = ..() ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT) sord = new(src) set_light(4) -/mob/living/simple_animal/hostile/syndicate/melee/sword/space/Destroy() +/mob/living/simple_animal/hostile/human/syndicate/melee/sword/space/Destroy() QDEL_NULL(sord) return ..() -/mob/living/simple_animal/hostile/syndicate/melee/sword/space/stormtrooper +/mob/living/simple_animal/hostile/human/syndicate/melee/sword/space/stormtrooper icon_state = "syndicate_stormtrooper_sword" icon_living = "syndicate_stormtrooper_sword" name = "Syndicate Stormtrooper" @@ -167,7 +148,7 @@ ///////////////Guns//////////// -/mob/living/simple_animal/hostile/syndicate/ranged +/mob/living/simple_animal/hostile/human/syndicate/ranged ranged = 1 retreat_distance = 5 minimum_distance = 5 @@ -179,11 +160,11 @@ dodging = FALSE rapid_melee = 1 -/mob/living/simple_animal/hostile/syndicate/ranged/infiltrator //shuttle loan event +/mob/living/simple_animal/hostile/human/syndicate/ranged/infiltrator //shuttle loan event projectilesound = 'sound/weapons/gun/smg/shot_suppressed.ogg' loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier) -/mob/living/simple_animal/hostile/syndicate/ranged/space +/mob/living/simple_animal/hostile/human/syndicate/ranged/space icon_state = "syndicate_space_pistol" icon_living = "syndicate_space_pistol" name = "Syndicate Commando" @@ -193,30 +174,30 @@ minbodytemp = 0 speed = 1 -/mob/living/simple_animal/hostile/syndicate/ranged/space/Initialize() +/mob/living/simple_animal/hostile/human/syndicate/ranged/space/Initialize() . = ..() ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT) set_light(4) -/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper +/mob/living/simple_animal/hostile/human/syndicate/ranged/space/stormtrooper icon_state = "syndicate_stormtrooper_pistol" icon_living = "syndicate_stormtrooper_pistol" name = "Syndicate Stormtrooper" maxHealth = 250 health = 250 -/mob/living/simple_animal/hostile/syndicate/ranged/smg +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg rapid = 2 icon_state = "syndicate_smg" icon_living = "syndicate_smg" casingtype = /obj/item/ammo_casing/c45 projectilesound = 'sound/weapons/gun/smg/shot.ogg' -/mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot //caravan ambush ruin +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/pilot //caravan ambush ruin name = "Syndicate Salvage Pilot" loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier) -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space icon_state = "syndicate_space_smg" icon_living = "syndicate_space_smg" name = "Syndicate Commando" @@ -226,19 +207,19 @@ minbodytemp = 0 speed = 1 -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space/Initialize() +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space/Initialize() . = ..() ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT) set_light(4) -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space/stormtrooper +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space/stormtrooper icon_state = "syndicate_stormtrooper_smg" icon_living = "syndicate_stormtrooper_smg" name = "Syndicate Stormtrooper" maxHealth = 250 health = 250 -/mob/living/simple_animal/hostile/syndicate/ranged/shotgun +/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun rapid = 2 rapid_fire_delay = 6 minimum_distance = 3 @@ -246,7 +227,7 @@ icon_living = "syndicate_shotgun" casingtype = /obj/item/ammo_casing/shotgun/buckshot //buckshot (up to 72.5 brute) fired in a two-round burst -/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space +/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space icon_state = "syndicate_space_shotgun" icon_living = "syndicate_space_shotgun" name = "Syndicate Commando" @@ -256,12 +237,12 @@ minbodytemp = 0 speed = 1 -/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/Initialize() +/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space/Initialize() . = ..() ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT) set_light(4) -/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/stormtrooper +/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space/stormtrooper icon_state = "syndicate_stormtrooper_shotgun" icon_living = "syndicate_stormtrooper_shotgun" name = "Syndicate Stormtrooper" @@ -270,13 +251,13 @@ ///////////////Misc//////////// -/mob/living/simple_animal/hostile/syndicate/civilian +/mob/living/simple_animal/hostile/human/syndicate/civilian minimum_distance = 10 retreat_distance = 10 obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE -/mob/living/simple_animal/hostile/syndicate/civilian/Aggro() +/mob/living/simple_animal/hostile/human/syndicate/civilian/Aggro() ..() summon_backup(15) say("GUARDS!!") diff --git a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm index cf8a32af157c..2a60b3c52fc2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm +++ b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm @@ -18,7 +18,7 @@ Featuring: */ -/mob/living/simple_animal/hostile/syndicate/mecha_pilot +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot name = "Syndicate Mecha Pilot" desc = "Death to Nanotrasen. This variant comes in MECHA DEATH flavour." wanted_objects = list() @@ -36,15 +36,15 @@ Featuring: var/smoke_chance = 20 //Chance to deploy smoke for crowd control var/retreat_chance = 40 //Chance to run away -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/no_mech spawn_mecha_type = null search_objects = 2 -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech/Initialize() +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/no_mech/Initialize() . = ..() wanted_objects = typecacheof(/obj/mecha/combat, TRUE) -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/nanotrasen //nanotrasen are syndies! no it's just a weird path. +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/nanotrasen //nanotrasen are syndies! no it's just a weird path. name = "\improper Nanotrasen Mecha Pilot" desc = "Death to the Syndicate. This variant comes in MECHA DEATH flavour." icon_living = "nanotrasen" @@ -52,7 +52,7 @@ Featuring: faction = list("nanotrasen") spawn_mecha_type = /obj/mecha/combat/marauder/loaded -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech/nanotrasen +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/no_mech/nanotrasen name = "\improper Nanotrasen Mecha Pilot" desc = "Death to the Syndicate. This variant comes in MECHA DEATH flavour." icon_living = "nanotrasen" @@ -60,7 +60,7 @@ Featuring: faction = list("nanotrasen") -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/Initialize() +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/Initialize() . = ..() if(spawn_mecha_type) var/obj/mecha/M = new spawn_mecha_type (get_turf(src)) @@ -68,7 +68,7 @@ Featuring: INVOKE_ASYNC(src, PROC_REF(enter_mecha), M) -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/proc/enter_mecha(obj/mecha/M) +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/proc/enter_mecha(obj/mecha/M) if(!M) return 0 LoseTarget() //Target was our mecha, so null it out @@ -93,7 +93,7 @@ Featuring: mecha.lights_action.Activate() -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/proc/exit_mecha(obj/mecha/M) +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/proc/exit_mecha(obj/mecha/M) if(!M) return 0 @@ -116,7 +116,7 @@ Featuring: walk(M,0)//end any lingering movement loops, to prevent the haunted mecha bug //Checks if a mecha is valid for theft -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/proc/is_valid_mecha(obj/mecha/M) +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/proc/is_valid_mecha(obj/mecha/M) if(!M) return 0 if(M.occupant) @@ -128,7 +128,7 @@ Featuring: return 1 -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/proc/mecha_face_target(atom/A) +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/proc/mecha_face_target(atom/A) if(mecha) var/dirto = get_dir(mecha,A) if(mecha.dir != dirto) //checking, because otherwise the mecha makes too many turn noises @@ -136,7 +136,7 @@ Featuring: -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/proc/mecha_reload() +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/proc/mecha_reload() if(mecha) for(var/equip in mecha.equipment) var/obj/item/mecha_parts/mecha_equipment/ME = equip @@ -144,7 +144,7 @@ Featuring: ME.rearm() -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/proc/get_mecha_equip_by_flag(flag = MECHA_RANGED) +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/proc/get_mecha_equip_by_flag(flag = MECHA_RANGED) . = list() if(mecha) for(var/equip in mecha.equipment) @@ -156,7 +156,7 @@ Featuring: //Pick a ranged weapon/tool //Fire it -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/OpenFire(atom/A) +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/OpenFire(atom/A) if(mecha) mecha_reload() mecha_face_target(A) @@ -171,7 +171,7 @@ Featuring: ..() -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/AttackingTarget() +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/AttackingTarget() if(mecha) var/list/possible_weapons = get_mecha_equip_by_flag(MECHA_MELEE) if(possible_weapons.len) @@ -198,7 +198,7 @@ Featuring: return target.attack_animal(src) -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/handle_automated_action() +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/handle_automated_action() if(..()) if(!mecha) for(var/obj/mecha/combat/C in range(src,vision_range)) @@ -245,12 +245,12 @@ Featuring: -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/death(gibbed) +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/death(gibbed) if(mecha) mecha.aimob_exit_mech(src) ..() -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/gib() +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/gib() if(mecha) mecha.aimob_exit_mech(src) ..() @@ -258,7 +258,7 @@ Featuring: //Yes they actually try and pull this shit //~simple animals~ -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/CanAttack(atom/the_target) +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/CanAttack(atom/the_target) if(ismecha(the_target)) var/obj/mecha/M = the_target if(mecha) @@ -275,19 +275,19 @@ Featuring: . = ..() -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/EscapeConfinement() +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/EscapeConfinement() if(mecha && loc == mecha) return 0 ..() -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/Move(NewLoc,Dir=0,step_x=0,step_y=0) +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/Move(NewLoc,Dir=0,step_x=0,step_y=0) if(mecha && loc == mecha) return mecha.relaymove(src, Dir) return ..() -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/Goto(target, delay, minimum_distance) +/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot/Goto(target, delay, minimum_distance) if(mecha) walk_to(mecha, target, minimum_distance, mecha.step_in) else diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 1115224a6733..7f050c3ac5e5 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -75,7 +75,7 @@ /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space/Initialize() . = ..() if(prob(90)) //only has a 10% chance of existing, otherwise it'll just be a NPC syndie. - new /mob/living/simple_animal/hostile/syndicate/ranged(get_turf(src)) + new /mob/living/simple_animal/hostile/human/syndicate/ranged(get_turf(src)) return INITIALIZE_HINT_QDEL /datum/outfit/lavaland_syndicate/comms diff --git a/code/modules/ruins/spaceruin_code/forgottenship.dm b/code/modules/ruins/spaceruin_code/forgottenship.dm index def148f22239..57b9f64bf60f 100644 --- a/code/modules/ruins/spaceruin_code/forgottenship.dm +++ b/code/modules/ruins/spaceruin_code/forgottenship.dm @@ -81,45 +81,3 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) area_flags = NOTELEPORT | UNIQUE_AREA //Cybersun hardsuit - -//Special NT NPCs - -/mob/living/simple_animal/hostile/nanotrasen/ranged/assault - name = "Nanotrasen Assault Officer" - desc = "A Nanotrasen Assault Officer. Prepare to die, if you've been found near Syndicate property." - icon_state = "nanotrasenrangedassault" - icon_living = "nanotrasenrangedassault" - icon_dead = null - icon_gib = "syndicate_gib" - ranged = TRUE - rapid = 4 - rapid_fire_delay = 1 - rapid_melee = 1 - retreat_distance = 2 - minimum_distance = 4 - casingtype = /obj/item/ammo_casing/c46x30mm - projectilesound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' - loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasenassaultsoldier) - -/mob/living/simple_animal/hostile/nanotrasen/elite - name = "Nanotrasen Elite Assault Officer" - desc = "Pray for your life, syndicate. Run while you can." - icon = 'icons/mob/simple_human.dmi' - icon_state = "nanotrasen_ert" - icon_living = "nanotrasen_ert" - maxHealth = 150 - health = 150 - melee_damage_lower = 13 - melee_damage_upper = 18 - ranged = TRUE - rapid = 3 - rapid_fire_delay = 5 - rapid_melee = 3 - retreat_distance = 0 - minimum_distance = 1 - 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) - minbodytemp = 0 - projectiletype = /obj/projectile/beam/laser - projectilesound = 'sound/weapons/laser.ogg' - loot = list(/obj/effect/gibspawner/human) - faction = list(ROLE_DEATHSQUAD) diff --git a/tools/UpdatePaths/Scripts/human_hostile.txt b/tools/UpdatePaths/Scripts/human_hostile.txt index 63cacb1675ad..297ba2df7bb9 100644 --- a/tools/UpdatePaths/Scripts/human_hostile.txt +++ b/tools/UpdatePaths/Scripts/human_hostile.txt @@ -4,3 +4,4 @@ /mob/living/simple_animal/hostile/skeleton/@SUBTYPES: /mob/living/simple_animal/hostile/human/skeleton/@SUBTYPES {@OLD} /mob/living/simple_animal/hostile/asteroid/whitesands/@SUBTYPES: /mob/living/simple_animal/hostile/human/hermit/@SUBTYPES {@OLD} /mob/living/simple_animal/hostile/cat_butcherer/@SUBTYPES: /mob/living/simple_animal/hostile/human/cat_butcherer/@SUBTYPES {@OLD} +/mob/living/simple_animal/hostile/syndicate/@SUBTYPES:: /mob/living/simple_animal/hostile/human/syndicate/@SUBTYPES {@OLD}