From 8afe98f749e10203d8b6ce7bd110d5ab1f537ea7 Mon Sep 17 00:00:00 2001 From: NETNICK Date: Mon, 2 Sep 2024 21:48:33 -0300 Subject: [PATCH] mutie rework yaaay (#194) --- .../map_files/Pahrump-AB/Pahrump-AB-Upper.dmm | 89 ++- _maps/map_files/Pahrump-AB/Pahrump-AB.dmm | 511 ++++++++++-------- code/_onclick/item_attack.dm | 2 +- code/game/objects/items/fallout13misc.dm | 20 +- .../objects/structures/ghost_role_spawners.dm | 6 +- code/modules/jobs/job_types/mutants.dm | 105 +++- .../carbon/human/species_types/supermutant.dm | 7 +- .../simple_animal/hostile/f13/centaur.dm | 19 + .../simple_animal/hostile/f13/supermutant.dm | 13 +- 9 files changed, 480 insertions(+), 292 deletions(-) diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm index 4f940cad81c..dbb50504fbc 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm @@ -1021,6 +1021,7 @@ "bOS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/wooden, +/obj/item/bedsheet/black, /turf/open/floor/f13/wood, /area/f13/radiation) "bPf" = ( @@ -1623,6 +1624,7 @@ color = "#845f58" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/simple_door/room/dirty, /turf/open/floor/f13/wood, /area/f13/radiation) "dfb" = ( @@ -1799,6 +1801,11 @@ icon_state = "neutralrustyfull" }, /area/f13/wasteland) +"dxN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/footlocker, +/turf/open/floor/f13/wood, +/area/f13/radiation) "dAm" = ( /obj/structure/bed/wooden, /obj/item/bedsheet/wiz, @@ -1824,13 +1831,6 @@ "dDq" = ( /turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/ncr) -"dDZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/wood{ - dir = 1 - }, -/turf/open/floor/f13/wood, -/area/f13/radiation) "dGM" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood{ @@ -2137,6 +2137,14 @@ icon_state = "neutralrustyfull" }, /area/f13/wasteland) +"enJ" = ( +/obj/structure/curtain{ + color = "#845f58" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/simple_door/room, +/turf/open/floor/f13/wood, +/area/f13/radiation) "erm" = ( /obj/machinery/seed_extractor, /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess/neutralchess2, @@ -3181,6 +3189,11 @@ }, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/city) +"gRi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/f13/smutant, +/turf/open/floor/f13/wood, +/area/f13/radiation) "gRD" = ( /obj/structure/railing{ color = "#A47449" @@ -3581,6 +3594,10 @@ /obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/f13/wood, /area/f13/building) +"hQc" = ( +/obj/item/storage/secure/safe, +/turf/closed/wall/f13/wood, +/area/f13/radiation) "hQv" = ( /obj/structure/decoration/legion/chains, /obj/structure/railing/handrail/legion/end, @@ -4617,6 +4634,12 @@ }, /turf/open/floor/f13/wood, /area/f13/legion) +"kcd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/obj/item/twohanded/baseball/spiked, +/turf/open/floor/f13/wood, +/area/f13/radiation) "kdI" = ( /obj/structure/simple_door/room, /turf/open/floor/plasteel/f13/vault_floor/white, @@ -6910,9 +6933,7 @@ /area/f13/building/massfusion) "oNs" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/wood{ - dir = 4 - }, +/obj/structure/dresser, /turf/open/floor/f13/wood, /area/f13/radiation) "oOo" = ( @@ -7403,6 +7424,13 @@ /obj/machinery/button/door, /turf/open/floor/wood_mosaic, /area/f13/city) +"pWk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/f13/smutant_boss, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/radiation) "pWV" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -7644,6 +7672,9 @@ /obj/effect/turf_decal/shadow/floor, /turf/open/floor/wood_fancy, /area/f13/legion) +"qzF" = ( +/turf/closed/mineral/random/low_chance, +/area/f13/radiation) "qzP" = ( /turf/open/floor/wood_fancy/wood_fancy_dark{ icon_state = "fancy_dark-broken4" @@ -8011,6 +8042,11 @@ icon_state = "darkrusty" }, /area/f13/wasteland) +"ryo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/comfy/black, +/turf/open/floor/f13/wood, +/area/f13/radiation) "rza" = ( /obj/effect/decal/cleanable/robot_debris, /obj/effect/decal/cleanable/dirt, @@ -8737,8 +8773,8 @@ /turf/open/floor/carpet/vault, /area/f13/city) "sUD" = ( -/obj/structure/rack, /obj/effect/decal/cleanable/dirt, +/obj/structure/rack/shelf_wood, /turf/open/floor/f13/wood, /area/f13/radiation) "sVC" = ( @@ -9109,7 +9145,7 @@ /area/f13/wasteland) "tFP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/wood/settler, +/obj/structure/closet/cabinet/anchored, /turf/open/floor/f13/wood, /area/f13/radiation) "tGt" = ( @@ -9193,6 +9229,11 @@ /obj/structure/decoration/rag, /turf/closed/wall/f13/wood/house, /area/f13/radiation) +"tSU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/kitchenspike, +/turf/open/floor/f13/wood, +/area/f13/radiation) "tTA" = ( /obj/structure/railing/corner{ dir = 4 @@ -17368,7 +17409,7 @@ vLb vLb uYs foW -eJE +gRi rlg uYs vLb @@ -17626,7 +17667,7 @@ vLb uYs hqx hvE -eJE +dxN yaC eWb tik @@ -17883,7 +17924,7 @@ vLb uYs ktd afb -eJE +dxN dUZ eWb eWb @@ -18139,7 +18180,7 @@ vLb vLb uYs sUD -eJE +gRi raE vMW eWb @@ -18651,7 +18692,7 @@ uYs oNs vpi rRa -eJE +tSU uYs awU uYs @@ -18906,10 +18947,10 @@ vLb vLb uYs tFP -dDZ eJE eJE -ddf +eJE +enJ eJE yaC eWb @@ -19163,9 +19204,9 @@ vLb vLb uYs bOS -brR -eJE -eJE +pWk +ryo +kcd vMW bfF uYs @@ -19420,7 +19461,7 @@ vLb vLb uYs uYs -uYs +hQc uYs uYs uYs @@ -22271,7 +22312,7 @@ eWb eWb eWb eWb -eWb +qzF tot vLb eWb diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm index 34ddc8513f3..d9d7931b7f2 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm @@ -14380,11 +14380,6 @@ icon_state = "floorrusty" }, /area/f13/building) -"bfh" = ( -/obj/structure/barricade/wooden/strong, -/obj/structure/barricade/wooden/planks, -/turf/closed/wall/f13/wood, -/area/f13/caves) "bfi" = ( /obj/structure/car/rubbish3, /turf/open/indestructible/ground/outside/sidewalk{ @@ -14928,6 +14923,10 @@ icon_state = "yellowrustyfull" }, /area/f13/building/museum) +"bhY" = ( +/obj/machinery/smartfridge/drying_rack, +/turf/open/indestructible/ground/outside/desert, +/area/f13/radiation) "bhZ" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/sidewalk{ @@ -15728,14 +15727,6 @@ icon_state = "yellowrustysolid" }, /area/f13/building/massfusion) -"bme" = ( -/obj/structure/rack/shelf_metal, -/obj/item/gun/energy/laser/pistol, -/obj/item/gun/energy/laser/plasma/pistol, -/turf/open/floor/f13{ - icon_state = "reddirtyfull" - }, -/area/f13/brotherhood) "bmg" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -20903,6 +20894,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/graveldirt, /area/f13/wasteland) +"cBf" = ( +/obj/structure/table/wood, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 4 + }, +/obj/item/reagent_containers/food/snacks/meat/steak/mirelurk, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/radiation) "cBn" = ( /obj/structure/flora/grass/coyote/thirty, /turf/open/indestructible/ground/outside/road{ @@ -21590,6 +21589,12 @@ icon_state = "verticalinnermainbottom" }, /area/f13/wasteland) +"cRS" = ( +/obj/effect/spawner/lootdrop/f13/weapon/melee/tier2, +/turf/open/indestructible/ground/outside/water/running{ + color = " A6635D" + }, +/area/f13/caves) "cSo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/simple_door/metal/store, @@ -22505,6 +22510,12 @@ icon_state = "floorrusty" }, /area/f13/building/mall) +"dnM" = ( +/mob/living/simple_animal/hostile/molerat, +/turf/open/indestructible/ground/outside/water/running{ + color = " A6635D" + }, +/area/f13/caves) "dnY" = ( /obj/structure/flora/grass/coyote/twentyfour, /turf/open/indestructible/ground/outside/desert/sonora/rough{ @@ -22556,6 +22567,10 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland) +"doX" = ( +/obj/effect/landmark/start/f13/secretary, +/turf/open/floor/f13/wood, +/area/f13/city) "dpf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -23608,6 +23623,11 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"dLM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/roller, +/turf/open/floor/f13/wood, +/area/f13/radiation) "dMc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -26033,6 +26053,11 @@ icon_state = "horizontalinnermain1" }, /area/f13/wasteland) +"eKM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/blacksmith/quenching, +/turf/open/floor/f13/wood, +/area/f13/radiation) "eKZ" = ( /obj/structure/bonfire/dense, /obj/item/stack/rods/ten, @@ -27563,13 +27588,6 @@ icon_state = "horizontaltopbordertop2" }, /area/f13/wasteland) -"foh" = ( -/obj/structure/table/wood, -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 4 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/radiation) "foo" = ( /obj/structure/table/wood/settler, /obj/item/flashlight/lamp, @@ -30771,6 +30789,12 @@ /obj/structure/barricade/wooden/planks/pregame, /turf/open/floor/f13/wood, /area/f13/building/museum) +"gEk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/shelf_metal, +/obj/item/twohanded/sledgehammer/simple, +/turf/open/floor/f13/wood, +/area/f13/radiation) "gEn" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -31603,6 +31627,14 @@ icon_state = "verticalrightborderleft0" }, /area/f13/wasteland) +"gVc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/storage/pill_bottle/chem_tin/radx, +/obj/item/stack/medical/gauze, +/obj/machinery/defibrillator_mount/primitive, +/turf/open/floor/f13/wood, +/area/f13/radiation) "gVg" = ( /obj/structure/rack, /obj/item/clothing/suit/hooded/cloak/desert, @@ -31630,11 +31662,6 @@ icon_state = "innermaincornerinner - W" }, /area/f13/wasteland) -"gWl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack/shelf_metal, -/turf/open/floor/f13/wood, -/area/f13/radiation) "gWr" = ( /obj/structure/rack, /obj/item/storage/bag/ore, @@ -34181,19 +34208,6 @@ /obj/structure/spacevine, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) -"idw" = ( -/obj/structure/sign/poster/contraband/pinup_pink{ - pixel_x = -31 - }, -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8; - light_color = "#d8b1b1"; - pixel_y = -32 - }, -/turf/open/floor/f13/wood, -/area/f13/radiation) "idH" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -36782,6 +36796,11 @@ /obj/structure/dresser, /turf/open/floor/carpet, /area/f13/building) +"iZd" = ( +/obj/structure/barricade/wooden/strong, +/obj/structure/barricade/wooden/planks, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "iZh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -38955,13 +38974,6 @@ /obj/item/shovel/spade, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"jYB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/storage/pill_bottle/chem_tin/radx, -/obj/item/stack/medical/gauze, -/turf/open/floor/f13/wood, -/area/f13/radiation) "jYO" = ( /obj/structure/simple_door/metal/store, /obj/effect/decal/cleanable/dirt, @@ -39354,10 +39366,6 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/plasteel/f13/vault_floor/blue/white, /area/f13/building/museum) -"kje" = ( -/obj/effect/landmark/start/f13/secretary, -/turf/open/floor/f13/wood, -/area/f13/city) "kjm" = ( /obj/structure/rack/shelf_metal{ dir = 4 @@ -40875,6 +40883,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/hospital) +"kNs" = ( +/obj/item/mining_scanner, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "kNC" = ( /obj/item/paper_bin{ pixel_y = 6 @@ -40940,6 +40952,20 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"kOr" = ( +/obj/structure/sign/poster/contraband/pinup_pink{ + pixel_x = -31 + }, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 8; + light_color = "#d8b1b1"; + pixel_y = -32 + }, +/obj/item/stack/sheet/coke/twenty, +/turf/open/floor/f13/wood, +/area/f13/radiation) "kOz" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -41205,18 +41231,6 @@ /mob/living/simple_animal/hostile/mirelurk, /turf/open/floor/plasteel/f13/vault_floor/blue, /area/f13/village) -"kTR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/flashlight/glowstick/red, -/obj/item/flashlight/glowstick/red, -/obj/item/flashlight/glowstick/red, -/obj/item/reagent_containers/food/drinks/bottle/molotov/filled, -/obj/structure/rack/shelf_metal, -/obj/machinery/light/floor, -/turf/open/floor/f13/wood{ - icon_state = "housewood2-broken" - }, -/area/f13/radiation) "kUg" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_2"; @@ -41486,6 +41500,11 @@ icon_state = "dirt" }, /area/f13/legion) +"kZL" = ( +/obj/structure/decoration/rag, +/obj/structure/sign/flag_texas, +/turf/closed/wall/f13/wood/house, +/area/f13/radiation) "kZN" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -41497,6 +41516,10 @@ /obj/structure/chair/stool/retro/tan, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"lag" = ( +/obj/item/flag/supermutant, +/turf/open/indestructible/ground/outside/desert, +/area/f13/radiation) "lah" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -41784,6 +41807,16 @@ /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland) +"lhm" = ( +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_4" + }, +/obj/item/flag/supermutant, +/turf/open/indestructible/ground/outside/dirt{ + dir = 1; + icon_state = "dirtcorner" + }, +/area/f13/wasteland) "lhJ" = ( /obj/structure/sign/legion/mess{ pixel_y = -11 @@ -42970,13 +43003,6 @@ icon_state = "outerborder" }, /area/f13/wasteland) -"lHB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack/shelf_metal, -/obj/item/twohanded/sledgehammer/simple, -/obj/item/twohanded/sledgehammer/simple, -/turf/open/floor/f13/wood, -/area/f13/radiation) "lHH" = ( /obj/structure/destructible/tribal_torch/wall, /turf/open/indestructible/ground/inside/mountain, @@ -43586,6 +43612,13 @@ /mob/living/simple_animal/hostile/bloatfly, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"lUa" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/pet/dog/centaur, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/radiation) "lUb" = ( /obj/machinery/light/small{ dir = 8 @@ -44090,10 +44123,6 @@ }, /turf/open/floor/f13/wood, /area/f13/village) -"men" = ( -/obj/effect/landmark/start/f13/smutant, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/radiation) "meo" = ( /obj/structure/table/wood, /obj/structure/barricade/wooden/strong, @@ -44513,6 +44542,11 @@ dir = 9 }, /area/f13/building) +"mlp" = ( +/obj/machinery/hydroponics/soil, +/mob/living/simple_animal/pet/dog/mutant, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/radiation) "mlt" = ( /obj/machinery/hydroponics/soil/pot, /obj/structure/flora/wasteplant/wild_horsenettle{ @@ -46823,6 +46857,11 @@ icon_state = "desertcracked2" }, /area/f13/wasteland) +"ngZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/blacksmith/anvil/obtainable/table, +/turf/open/floor/f13/wood, +/area/f13/radiation) "nha" = ( /obj/effect/decal/marking{ icon_state = "dottedverticalcorroded" @@ -47975,6 +48014,14 @@ }, /turf/open/indestructible/ground/outside/water, /area/f13/caves) +"nFt" = ( +/obj/structure/rack/shelf_metal, +/obj/item/gun/energy/laser/pistol, +/obj/item/gun/energy/laser/plasma/pistol, +/turf/open/floor/f13{ + icon_state = "reddirtyfull" + }, +/area/f13/brotherhood) "nFu" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/low, @@ -48675,6 +48722,13 @@ /obj/structure/barricade/wooden, /turf/closed/mineral/random/low_chance, /area/f13/caves) +"nWj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/shelf_metal, +/obj/item/gun/ballistic/rifle/hunting, +/obj/item/ammo_box/a3006, +/turf/open/floor/f13/wood, +/area/f13/radiation) "nWm" = ( /obj/machinery/light/lamp_post{ dir = 8 @@ -48755,6 +48809,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/blue/bluechess, /area/f13/city) +"nXQ" = ( +/obj/effect/turf_decal/vg_decals/radiation_huge, +/turf/closed/wall/f13/wood/house, +/area/f13/radiation) "nYf" = ( /obj/structure/wreck/car, /turf/open/indestructible/ground/outside/desert, @@ -52754,6 +52812,11 @@ icon_state = "bar" }, /area/f13/building) +"pyQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/blacksmith/furnace, +/turf/open/floor/f13/wood, +/area/f13/radiation) "pyU" = ( /obj/item/stack/sheet/animalhide/human, /turf/open/indestructible/ground/outside/dirt, @@ -52895,6 +52958,10 @@ icon_state = "horizontaltopborderbottom0" }, /area/f13/city) +"pAu" = ( +/obj/effect/spawner/lootdrop/f13/armor/tier2, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "pAx" = ( /obj/structure/fence/wooden{ dir = 4 @@ -53400,16 +53467,6 @@ icon_state = "outerborder" }, /area/f13/wasteland) -"pLb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/legion_extractor{ - pixel_x = -7; - pixel_y = 5 - }, -/turf/open/floor/f13/wood{ - icon_state = "housewood4-broken" - }, -/area/f13/radiation) "pLf" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical/old, @@ -53653,10 +53710,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood_common, /area/f13/village) -"pRd" = ( -/obj/structure/sign/radiation_l, -/turf/closed/wall/f13/tentwall, -/area/f13/village) "pRf" = ( /obj/structure/barricade/tentleatheredge{ plane = -6 @@ -53772,6 +53825,11 @@ icon_state = "verticalinnermain2top" }, /area/f13/wasteland) +"pSz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/legion_extractor, +/turf/open/floor/f13/wood, +/area/f13/radiation) "pSA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -53872,6 +53930,11 @@ }, /turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/city) +"pUT" = ( +/obj/structure/decoration/rag, +/obj/effect/turf_decal/vg_decals/radiation_huge, +/turf/closed/wall/f13/wood/house, +/area/f13/radiation) "pVg" = ( /obj/structure/barricade/wooden{ plane = -6 @@ -55306,11 +55369,6 @@ /obj/structure/simple_door/metal/fence/wooden, /turf/open/indestructible/ground/outside/dirt, /area/f13/radiation) -"qEm" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/radiation) "qEH" = ( /obj/structure/window/fulltile/house{ icon_state = "housewindowvertical" @@ -55520,10 +55578,6 @@ dir = 8 }, /area/f13/building) -"qJK" = ( -/obj/effect/landmark/start/f13/smutant_boss, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/radiation) "qJP" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -57398,10 +57452,9 @@ /obj/structure/flora/ausbushes/grassybush, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"rCt" = ( +"rCA" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/defibrillator/primitive, -/obj/structure/closet, +/obj/machinery/chem_master/primitive, /turf/open/floor/f13/wood, /area/f13/radiation) "rCB" = ( @@ -58943,6 +58996,16 @@ icon_state = "dirt" }, /area/f13/wasteland) +"sky" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + pixel_y = -10 + }, +/obj/structure/rack/shelf_metal, +/obj/item/gun/ballistic/automatic/autopipe, +/obj/item/ammo_box/magazine/autopipe, +/turf/open/floor/f13/wood, +/area/f13/radiation) "skA" = ( /obj/structure/flora/bush, /obj/effect/turf_decal/weather/dirt{ @@ -59656,6 +59719,19 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"sAJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/flashlight/glowstick/red, +/obj/item/flashlight/glowstick/red, +/obj/item/flashlight/glowstick/red, +/obj/item/reagent_containers/food/drinks/bottle/molotov/filled, +/obj/structure/rack/shelf_metal, +/obj/machinery/light/floor, +/obj/item/grenade/f13/dynamite, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/radiation) "sAO" = ( /obj/structure/flora/tree/wasteland, /obj/structure/flora/ausbushes/fullgrass, @@ -61763,13 +61839,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/radiation) -"txa" = ( -/obj/effect/decal/waste{ - icon_state = "goo12" - }, -/obj/effect/landmark/start/f13/smutant, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/radiation) "txf" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop3" @@ -65687,11 +65756,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"vaz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/turf/open/floor/f13/wood, -/area/f13/radiation) "vaD" = ( /turf/open/indestructible/ground/outside/gravel/edge{ dir = 6 @@ -69767,13 +69831,6 @@ icon_state = "desertcracked3" }, /area/f13/wasteland) -"wNJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack/shelf_metal, -/obj/effect/spawner/bundle/f13/hunting, -/obj/effect/spawner/bundle/f13/hunting, -/turf/open/floor/f13/wood, -/area/f13/radiation) "wNO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -70013,17 +70070,18 @@ /mob/living/simple_animal/hostile/ghoul, /turf/open/floor/f13, /area/f13/building) +"wRM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/shelf_metal, +/obj/item/melee/unarmed/brass, +/turf/open/floor/f13/wood, +/area/f13/radiation) "wRT" = ( /turf/open/indestructible/ground/outside/dirt{ icon_state = "dirt"; dir = 1 }, /area/f13/wasteland) -"wSj" = ( -/obj/machinery/smartfridge/drying_rack, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/radiation) "wSm" = ( /obj/structure/fence/corner{ dir = 5 @@ -71047,6 +71105,9 @@ icon_state = "horizontaltopborderbottom0" }, /area/f13/wasteland) +"xod" = ( +/turf/open/indestructible/ground/outside/dirt/dark, +/area/f13/radiation) "xoe" = ( /obj/structure/flora/tallgrass6, /turf/open/indestructible/ground/outside/dirt{ @@ -72062,16 +72123,6 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland) -"xIo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - pixel_y = -10 - }, -/obj/structure/rack/shelf_metal, -/obj/effect/spawner/bundle/f13/piperifle, -/obj/effect/spawner/bundle/f13/piperifle, -/turf/open/floor/f13/wood, -/area/f13/radiation) "xIE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -73336,6 +73387,10 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"ykK" = ( +/obj/structure/sign/flag_texas, +/turf/closed/wall/f13/wood/house, +/area/f13/radiation) "ykM" = ( /obj/structure/reagent_dispensers/barrel/three, /obj/effect/decal/cleanable/oil, @@ -74064,7 +74119,7 @@ ubs lHH aae aae -aaB +pAu aae aae aak @@ -74321,7 +74376,7 @@ aaB aaB aaB aae -bfh +iZd aae aak aak @@ -74331,7 +74386,7 @@ aae aae aae aae -bby +dnM bby bby aae @@ -74570,7 +74625,7 @@ aae aae aae aaa -aae +aak aak aae aae @@ -74588,8 +74643,8 @@ aae aae aae cxq -bby -bby +dnM +cRS jzN aae aaa @@ -74827,7 +74882,7 @@ aae aae aae aaa -aae +aak aak aae aae @@ -74836,17 +74891,17 @@ aaB aaB aaB aaB +qgX aaB aaB -qgX aae aae aae aae brA +dnM bby -bby -bby +dnM aae aae aaa @@ -75084,7 +75139,7 @@ aae aae aae aaa -aae +aak aak aae bar @@ -75350,7 +75405,7 @@ eHM aae aae aae -aaB +qgX eHM eHM lHH @@ -75359,8 +75414,8 @@ jiQ bby bby jzN -aae -aae +aak +aak aae aae aaa @@ -75616,8 +75671,8 @@ bby ybm ybm bby -aae -aae +aak +aak aae aae aaa @@ -75858,13 +75913,13 @@ aae aaa aaa aak -aae -aae -aae -aae -aak -aak -aae +aaa +aaa +aaa +aaa +aaa +aaa +aaa yju aaB nxk @@ -75873,8 +75928,8 @@ aaB ybm ybm aaB -aae -aae +aak +aak aae aae aaa @@ -76115,13 +76170,13 @@ aae aaa aae aak -aae +aaa aae aae aae aak aae -aae +aaa aae eHM aaB @@ -76130,8 +76185,8 @@ aaB aaB aaB aaB -aae -aae +aak +aak aae aae aaa @@ -76372,13 +76427,13 @@ aae aaa aae aak +aaa aae aae aae aae aae -aae -aae +aaa aae eHM eHM @@ -76628,14 +76683,14 @@ aae aae aaa aae +aaa +aaa aae aae aae aae aae -aaB -aaB -aaB +aaa eHM eHM eHM @@ -76889,16 +76944,16 @@ aae aae aae aae -aaB -aaB -iqY -aaB -aaB +aae +aae +aae +aaa +aae eHM aae aae aaB -aaB +iqY aae aaa aae @@ -77146,11 +77201,11 @@ aaa aae aae aae -aaB -aaB -aaB -aaB -aaB +aae +aae +aae +aaa +aae aae aae aae @@ -77403,10 +77458,10 @@ aaa aae aae aae -aaB -aaB -aaB -aaB +aae +aae +aae +aaa aae aae mwa @@ -77660,10 +77715,10 @@ aaa aae aae aae -aaa -aae aae +aaa aae +aaa aae aae aae @@ -77920,13 +77975,13 @@ aae aae aaa aae +aaa aae -aae -aaB -aaB -aaB -aaB +aaa +aaa +aaa aaB +kNs aaB aae aae @@ -78178,10 +78233,10 @@ aaa aaa aaa aaa -aaB -aaB -aaB -aaB +aaa +aaa +aaa +aaa aaB aaB aaB @@ -78696,9 +78751,9 @@ aae aaa byE ppM -xjF -xjF -xjF +xod +xod +xod xjF xjF aaa @@ -80226,7 +80281,7 @@ aak aak aak nKy -txa +hbk ija hiX hiX @@ -80483,7 +80538,7 @@ aak aak aak hop -qJK +hiX hiX eXT hiX @@ -80740,7 +80795,7 @@ aak aak aak nKy -men +hiX oUe hiX hiX @@ -81766,11 +81821,11 @@ iFP rAz hGQ wFx -qEm -idw -vaz +pyQ +kOr +stG vae -mYU +pUT koF mrt odi @@ -82275,15 +82330,15 @@ aaa aaa aae aae -mYU +kZL hhe tGX stG boq -vaz -vaz +ngZ +eKM stG -rCt +dLM wef kVL mrt @@ -82534,13 +82589,13 @@ aae aae vcL uPV -hSb +lUa stG vUa stG mYz wFQ -jYB +gVc mYU koF xWy @@ -82793,7 +82848,7 @@ jTe fAb stG wFQ -kTR +sAJ stG stG wFQ @@ -83065,7 +83120,7 @@ uLl dPn hiX iGQ -foh +cBf hiX hiX lZH @@ -83076,7 +83131,7 @@ hiX hiX hiX bGM -koF +lag koF koF koF @@ -83311,7 +83366,7 @@ hSb baK wFQ oBW -stG +rCA eZs viL fFB @@ -83564,8 +83619,8 @@ wFQ hSb baK hSb -lHB -vcL +gEk +nXQ vdh tqf kQX @@ -83821,7 +83876,7 @@ wFQ tGX wFQ hSb -xIo +sky mYU dBT hiX @@ -84078,7 +84133,7 @@ hSb qPB stG wFQ -wNJ +nWj ksl olP mYD @@ -84091,7 +84146,7 @@ hiX hiX bGM cut -koF +bhY fEI eJv hiX @@ -84334,7 +84389,7 @@ oeJ nea bQF jnh -gWl +wRM gZX kGg koF @@ -84589,7 +84644,7 @@ vcL vcL vcL vcL -vcL +ykK vcL tqf kQX @@ -84654,7 +84709,7 @@ vva vva vva vkp -pRd +cvp ePt gCe aQZ @@ -84859,7 +84914,7 @@ hiX pHI pHI pHI -pHI +mlp xdv qUc uYz @@ -85137,7 +85192,7 @@ xdG gND ctf fNj -koF +lag hop aae aae @@ -85373,7 +85428,7 @@ hSb hSb eEt eEt -pLb +eEt oXC uDX rPB @@ -85630,7 +85685,7 @@ wRd gVr xdT oQj -wSj +pSz jrJ aae aaa @@ -86137,7 +86192,7 @@ xdG ccL hiX bGM -koF +lag koF koF aae @@ -87422,7 +87477,7 @@ aOk nWp oiD oiD -ebN +lhm xLC xLC xLC @@ -94913,7 +94968,7 @@ xhd jeh iht yco -kje +doX tQn iht aiO @@ -105549,7 +105604,7 @@ aae tVu waP dmv -bme +nFt drq iwX dTD diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 7b4c728f07f..c34b9dada1b 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -114,7 +114,7 @@ force_modifier += (force * 0.35) if(HAS_TRAIT(user, TRAIT_SMUTANT)) - force_modifier += (force * 0.25) + force_modifier += 5 if(HAS_TRAIT(user, TRAIT_GHOULMELEE)) //negative trait force_modifier += (-force * 0.25) diff --git a/code/game/objects/items/fallout13misc.dm b/code/game/objects/items/fallout13misc.dm index a0bd8c387b5..95e489478a6 100644 --- a/code/game/objects/items/fallout13misc.dm +++ b/code/game/objects/items/fallout13misc.dm @@ -224,14 +224,14 @@ -/// Locust flag but renamed to bandit. +/// Locust flag but renamed to Super mutant. -/obj/item/flag/locust - name = "Bandit flag" - desc = "A flag with a skull, maybe it marking where the cemetary is." +/obj/item/flag/supermutant + name = "Super Mutant flag" + desc = "A flag with a skull, Used by the Sub-divion of Shale's Warband in the region." icon_state = "locustflag" item_state = "locustflag" - faction = "Locust" + faction = FACTION_SMUTANT /// Gunner flag but renamed to Outlaw. @@ -275,15 +275,15 @@ if(do_after(user, 60, target = src)) var/obj/item/stack/sheet/leather/H = I if(H.use(1)) - var/list/choices = list("Bandit", "Outlaw", "BOS", "BOS Snow", "NCR", "NCR Snow", "Legion", "Legion Snow", "Eastwood", "Eastwood Snow", "Enclave", "Kebab") + var/list/choices = list("Super Mutant", "Outlaw", "BOS", "BOS Snow", "NCR", "NCR Snow", "Legion", "Legion Snow", "Eastwood", "Eastwood Snow", "Enclave", "Kebab") var/flag = input("Please choose which faction flag you wish to create.") in choices switch(flag) - if("Bandit") - name = "Bandit flag" - desc = "A flag with a skull, maybe it marking where the cemetary is." + if("Super Mutant") + name = "Super Mutant flag" + desc = "A flag with a skull, Used by the Sub-divion of Shale's Warband in the region." icon_state = "locustflag" item_state = "locustflag" - faction = "Locust" + faction = FACTION_SMUTANT if("Outlaw") name = "Outlaw flag" desc = "A ragged flag with a skull emblazoned on it, commonly used by the local raider gangs." diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 2f248b3e5e2..97828b9f567 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -904,19 +904,19 @@ mob_name = "Mutant" job_description = "Mutant" short_desc = "You are a mutant, risen from the FEV vat stronger and faster than before!" - flavour_text = "Folow your leader; and melt more disgusting humans into the pit." + flavour_text = "Follow your new masters, and melt more disgusting humans into the pit." assignedrole = "Mutant" icon = 'icons/fallout/machines/64x32.dmi' icon_state = "reactoroff" pixel_x = -16 mob_type = /mob/living/carbon/human/species/smutant - uses = 3 //Starts with 3, gets more as you put more goobers in here + uses = 0 //Starts with 0, gets more as you put more goobers in here can_buckle = TRUE density = FALSE death = FALSE roundstart = FALSE permanent = TRUE - uniform = /obj/item/clothing/under/f13/vaultmutie + uniform = /obj/item/clothing/under/f13/raiderrags /obj/effect/mob_spawn/human/fev_pit/buckle_mob(mob/living/carbon/human/species/M, force = FALSE, check_loc = TRUE) if (!istype(M, /mob/living/carbon/human)) diff --git a/code/modules/jobs/job_types/mutants.dm b/code/modules/jobs/job_types/mutants.dm index 91cde656131..3cbeca0f5c4 100644 --- a/code/modules/jobs/job_types/mutants.dm +++ b/code/modules/jobs/job_types/mutants.dm @@ -3,11 +3,56 @@ flag = F13SMUTANT faction = FACTION_SMUTANT selection_color = "#26bf47" - total_positions = 10 - spawn_positions = 10 + total_positions = 2 + spawn_positions = 2 + description = "You are one of Shale's Super Mutants sent to help secure a foothold in this region, Your main goal is the strengthening of your Warband, Do NOT fraternize with non Super Mutants, Secure weapons and supplies, Get Human subjects for your Warband, Follow your leader, And help The Army restore The Unity's former glory." + supervisors = "Your Super Mutant Leader" display_order = JOB_DISPLAY_ORDER_F13SMUTANT outfit = /datum/outfit/job/smutant + loadout_options = list( + /datum/outfit/loadout/smutantbrute, + /datum/outfit/loadout/smutantsoldier, + /datum/outfit/loadout/smutantogre, + ) + +/datum/outfit/job/smutant + name = "Super Mutant" + jobtype = /datum/job/smutant + shoes = /obj/item/clothing/shoes/jackboots + backpack = /obj/item/storage/backpack/explorer + uniform = /obj/item/clothing/under/f13/raider_leather + r_pocket = /obj/item/flashlight/flare + box = /obj/item/storage/survivalkit + box_two = /obj/item/storage/survivalkit/medical + +/datum/outfit/loadout/smutantbrute + name = "Brute" + backpack_contents = list( + /obj/item/clothing/suit/armor/light/leather = 1, + /obj/item/clothing/head/helmet/f13/raidermetal = 1, + /obj/item/twohanded/sledgehammer/simple = 1, + /obj/item/grenade/f13/frag = 2 + ) + +/datum/outfit/loadout/smutantsoldier + name = "Soldier" + backpack_contents = list( + /obj/item/clothing/suit/armor/heavy/metal = 1, + /obj/item/clothing/head/helmet/knight/f13/metal = 1, + /obj/item/gun/ballistic/rifle/hunting/obrez = 1, + /obj/item/ammo_box/a308 = 2 + ) + +/datum/outfit/loadout/smutantogre + name = "Ogre" + backpack_contents = list( + /obj/item/clothing/suit/armor/medium/raider/raidercombat = 1, + /obj/item/clothing/head/helmet/f13/raidercombathelmet = 1, + /obj/item/melee/unarmed/brass/spiked = 1, + /obj/item/restraints/legcuffs/bola = 3 + ) + /datum/job/smutant_boss title = "Super Mutant Leader" flag = F13SMUTANTLEADER @@ -15,29 +60,55 @@ selection_color = "#26bf47" total_positions = 1 spawn_positions = 1 + description = "You are the Super Mutant Master in charge of this area's Warband, A seasoned killer, Your main goal is the strengthening of your Warband, Do NOT fraternize with non Super Mutants, Organize your men, Gather supplies, Bolster your numbers, And help The Army restore The Unity's Former Glory." + supervisors = "Shale's Army" display_order = JOB_DISPLAY_ORDER_F13SMUTANTLEADER outfit = /datum/outfit/job/smutant_boss -/datum/outfit/job/smutant - name = "Super Mutant" - jobtype = /datum/job/smutant - suit = /obj/item/clothing/suit/armor/medium/vest - suit_store = /obj/item/gun/ballistic/rifle/hunting - shoes = /obj/item/clothing/shoes/jackboots - backpack = /obj/item/twohanded/fireaxe/bmprsword - uniform = /obj/item/clothing/under/f13/tribe - r_pocket = /obj/item/flashlight/flare - box = /obj/item/storage/survivalkit - box_two = /obj/item/storage/survivalkit/medical + loadout_options = list( + /datum/outfit/loadout/smutantassassin, + /datum/outfit/loadout/smutantsergeant, + /datum/outfit/loadout/smutantboar, + ) /datum/outfit/job/smutant_boss name = "Super Mutant Leader" jobtype = /datum/job/smutant_boss - suit = /obj/item/clothing/suit/armor/medium/vest - suit_store = /obj/item/gun/ballistic/automatic/bar shoes = /obj/item/clothing/shoes/jackboots - backpack = /obj/item/twohanded/fireaxe/bmprsword - uniform = /obj/item/clothing/under/f13/tribe + backpack = /obj/item/storage/backpack/explorer + uniform = /obj/item/clothing/under/f13/raiderharness r_pocket = /obj/item/flashlight/flare box = /obj/item/storage/survivalkit box_two = /obj/item/storage/survivalkit/medical + +/datum/outfit/loadout/smutantassassin + name = "Assassin" + backpack_contents = list( + /obj/item/clothing/suit/armor/light/leather/leathermk2 = 1, + /obj/item/clothing/head/helmet/f13/deathskull = 1, + /obj/item/clothing/mask/balaclava = 1, + /obj/item/twohanded/fireaxe/bmprsword = 1, + /obj/item/grenade/smokebomb = 1, + /obj/item/stealthboy = 1 + ) + +/datum/outfit/loadout/smutantsergeant + name = "Sergeant" + backpack_contents = list( + /obj/item/clothing/suit/armor/heavy/metal/reinforced = 1, + /obj/item/clothing/head/helmet/knight/f13/metal/reinforced = 1, + /obj/item/clothing/mask/facewrap = 1, + /obj/item/gun/ballistic/automatic/bar = 1, + /obj/item/ammo_box/magazine/m308/ext = 2 + ) + +/datum/outfit/loadout/smutantboar + name = "Raging Boar" + backpack_contents = list( + /obj/item/clothing/suit/armor/medium/combat/dark = 1, + /obj/item/clothing/head/helmet/f13/combat/dark = 1, + /obj/item/clothing/mask/pig = 1, + /obj/item/melee/unarmed/lacerator = 1, + /obj/item/book/granter/martial/raging_boar = 1 + ) + diff --git a/code/modules/mob/living/carbon/human/species_types/supermutant.dm b/code/modules/mob/living/carbon/human/species_types/supermutant.dm index 9434f1e6f5f..03577afee4a 100644 --- a/code/modules/mob/living/carbon/human/species_types/supermutant.dm +++ b/code/modules/mob/living/carbon/human/species_types/supermutant.dm @@ -5,13 +5,14 @@ limbs_id = "smutant" inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_SMUTANT,) inherent_biotypes = list(MOB_INORGANIC, MOB_HUMANOID) - speedmod = 0.90 + speedmod = -0.5 siemens_coeff = 0 - punchdamagelow = 25 + punchdamagelow = 20 punchdamagehigh = 30 + armor = 5 use_skintones = 0 sexes = 0 - liked_food = JUNKFOOD | FRIED | RAW + liked_food = JUNKFOOD | FRIED | RAW /datum/species/smutant/on_species_gain(mob/living/carbon/C, datum/species/old_species) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/f13/centaur.dm b/code/modules/mob/living/simple_animal/hostile/f13/centaur.dm index e7f04f6c7c4..626d10d0a70 100644 --- a/code/modules/mob/living/simple_animal/hostile/f13/centaur.dm +++ b/code/modules/mob/living/simple_animal/hostile/f13/centaur.dm @@ -75,6 +75,25 @@ melee_damage_upper = 35 armour_penetration = 0.1 +/mob/living/simple_animal/pet/dog/centaur //Cutie + name = "Doug" + desc = "A docile centaur. Was brought here along with the warband, Isn't he adorable?" + icon = 'icons/fallout/mobs/monsters/freaks.dmi' + icon_state = "centaur" + icon_living = "centaur" + icon_dead = "centaur_dead" + icon_gib = "centaur_g" + maxHealth = 200 + health = 200 + turns_per_move = 5 + speak_emote = list("growls") + emote_see = list("screeches", "screams", "howls", "bellows", "flails", "fidgets", "festers") + idlesound = list('sound/f13npc/centaur/idle1.ogg', 'sound/f13npc/centaur/idle2.ogg') + death_sound = 'sound/f13npc/centaur/centaur_death.ogg' + response_help_simple = "pet" + response_disarm_simple = "push" + response_harm_simple = "punch" + // ----------------------------------- // ABOMINATION diff --git a/code/modules/mob/living/simple_animal/hostile/f13/supermutant.dm b/code/modules/mob/living/simple_animal/hostile/f13/supermutant.dm index 853099b29ce..fce2af23457 100644 --- a/code/modules/mob/living/simple_animal/hostile/f13/supermutant.dm +++ b/code/modules/mob/living/simple_animal/hostile/f13/supermutant.dm @@ -101,10 +101,11 @@ /mob/living/simple_animal/pet/dog/mutant //This is a supermutant, totally not a dog, and he is friendly name = "Brah-Min" - desc = "A large, docile supermutant. Adopted by Kebab-town as a sort of watch dog for their brahmin herd." + desc = "A large, docile supermutant. Adopted by Shale's Army as a sort of watch dog for their brahmin herd." icon = 'icons/fallout/mobs/supermutant.dmi' - icon_state = "hulk_brahmin_s" - icon_dead = "hulk_brahmin_s" + icon_state = "hulk_113_s" + icon_living = "hulk_113_s" + icon_dead = "hulk_113_s" maxHealth = 240 health = 240 speak_chance = 7 //30 //Oh my god he never shuts up. @@ -114,9 +115,9 @@ speak_emote = list("shouts", "yells") emote_hear = list("yawns", "mumbles","sighs") emote_see = list("raises his shovel", "shovels some dirt away", "waves his shovel above his head angrily") - response_help_simple = "touches" - response_disarm_simple = "pushes" - response_harm_simple = "punches" + response_help_simple = "pat" + response_disarm_simple = "push" + response_harm_simple = "punch" // butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/bearsteak = 3) /mob/living/simple_animal/pet/dog/mutant/death(gibbed)