From 1458a56c56f91e92aee8c0e72f8c64437d13ecf5 Mon Sep 17 00:00:00 2001 From: NETNICK Date: Wed, 5 Jun 2024 03:03:13 -0300 Subject: [PATCH 1/8] mutie rework yaaay --- .../map_files/Pahrump-AB/Pahrump-AB-Upper.dmm | 89 ++++-- _maps/map_files/Pahrump-AB/Pahrump-AB.dmm | 297 +++++++++++------- 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, 373 insertions(+), 185 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 afaa6b5084d..08256f04d15 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm @@ -4678,6 +4678,10 @@ }, /turf/open/floor/f13/wood, /area/f13/building) +"auh" = ( +/obj/item/mining_scanner, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "aui" = ( /obj/structure/table/wood, /obj/item/clothing/mask/bandana/gold, @@ -14383,7 +14387,7 @@ "bfh" = ( /obj/structure/barricade/wooden/strong, /obj/structure/barricade/wooden/planks, -/turf/closed/wall/f13/wood, +/turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "bfi" = ( /obj/structure/car/rubbish3, @@ -17637,6 +17641,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/black, /area/f13/building) +"bID" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/blacksmith/anvil/obtainable/table, +/turf/open/floor/f13/wood, +/area/f13/radiation) "bIH" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid, @@ -24140,6 +24149,10 @@ icon_state = "shadowright" }, /area/f13/wasteland) +"dXS" = ( +/obj/effect/spawner/lootdrop/f13/armor/tier2, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "dYb" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/trash_stack{ @@ -24701,6 +24714,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) +"ejJ" = ( +/obj/structure/decoration/rag, +/obj/effect/turf_decal/vg_decals/radiation_huge, +/turf/closed/wall/f13/wood/house, +/area/f13/radiation) "ejT" = ( /turf/open/indestructible/ground/outside/gravel/corner{ dir = 1 @@ -26495,6 +26513,10 @@ name = "concrete wall" }, /area/f13/building) +"eTo" = ( +/obj/item/flag/supermutant, +/turf/open/indestructible/ground/outside/desert, +/area/f13/radiation) "eTp" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_3" @@ -27574,6 +27596,7 @@ /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) "foo" = ( @@ -31639,6 +31662,7 @@ "gWl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack/shelf_metal, +/obj/item/melee/unarmed/brass, /turf/open/floor/f13/wood, /area/f13/radiation) "gWr" = ( @@ -32394,6 +32418,10 @@ icon_state = "reddirtyfull" }, /area/f13/brotherhood) +"hmL" = ( +/obj/structure/sign/flag_texas, +/turf/closed/wall/f13/wood/house, +/area/f13/radiation) "hmM" = ( /obj/machinery/hydroponics/soil, /turf/open/indestructible/ground/outside/dirt{ @@ -34198,6 +34226,7 @@ light_color = "#d8b1b1"; pixel_y = -32 }, +/obj/item/stack/sheet/coke/twenty, /turf/open/floor/f13/wood, /area/f13/radiation) "idH" = ( @@ -37819,6 +37848,10 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"jwO" = ( +/obj/machinery/smartfridge/drying_rack, +/turf/open/indestructible/ground/outside/desert, +/area/f13/radiation) "jxi" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt{ @@ -38966,6 +38999,7 @@ /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) "jYO" = ( @@ -41215,6 +41249,7 @@ /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" }, @@ -42976,7 +43011,6 @@ /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" = ( @@ -44092,10 +44126,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, @@ -45566,6 +45596,9 @@ icon_state = "bluerustysolid" }, /area/f13/building/museum) +"mGW" = ( +/turf/open/indestructible/ground/outside/dirt/dark, +/area/f13/radiation) "mGZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -45734,6 +45767,11 @@ icon_state = "bluerustysolid" }, /area/f13/building/museum) +"mKS" = ( +/obj/machinery/hydroponics/soil, +/mob/living/simple_animal/pet/dog/mutant, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/radiation) "mLa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -48310,6 +48348,10 @@ icon_state = "verticaloutermain0" }, /area/f13/wasteland) +"nNO" = ( +/obj/effect/turf_decal/vg_decals/radiation_huge, +/turf/closed/wall/f13/wood/house, +/area/f13/radiation) "nOi" = ( /obj/machinery/light/small{ dir = 1 @@ -53402,16 +53444,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, @@ -53655,10 +53687,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 @@ -55309,8 +55337,8 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/radiation) "qEm" = ( -/obj/structure/table, /obj/effect/decal/cleanable/dirt, +/obj/structure/blacksmith/furnace, /turf/open/floor/f13/wood, /area/f13/radiation) "qEH" = ( @@ -55323,6 +55351,13 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"qEW" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/pet/dog/centaur, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/radiation) "qFk" = ( /obj/structure/barricade/wooden{ plane = -6 @@ -55522,10 +55557,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" @@ -57402,8 +57433,7 @@ /area/f13/wasteland) "rCt" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/defibrillator/primitive, -/obj/structure/closet, +/obj/structure/bed/roller, /turf/open/floor/f13/wood, /area/f13/radiation) "rCB" = ( @@ -58129,6 +58159,16 @@ /obj/structure/simple_door/house, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/mall) +"rSR" = ( +/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) "rSW" = ( /turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/building/hospital) @@ -60910,6 +60950,11 @@ icon_state = "dirtcorner" }, /area/f13/radiation) +"tfe" = ( +/obj/structure/decoration/rag, +/obj/structure/sign/flag_texas, +/turf/closed/wall/f13/wood/house, +/area/f13/radiation) "tfh" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_3" @@ -61765,13 +61810,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" @@ -64618,6 +64656,12 @@ /obj/item/clothing/under/f13/vault, /turf/open/floor/plasteel/f13, /area/f13/building/museum) +"uEi" = ( +/mob/living/simple_animal/hostile/molerat, +/turf/open/indestructible/ground/outside/water/running{ + color = " A6635D" + }, +/area/f13/caves) "uEx" = ( /obj/structure/table/wood/settler, /obj/effect/decal/cleanable/dirt, @@ -65691,7 +65735,7 @@ /area/f13/wasteland) "vaz" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table, +/obj/structure/blacksmith/quenching, /turf/open/floor/f13/wood, /area/f13/radiation) "vaD" = ( @@ -67274,6 +67318,12 @@ /obj/structure/flora/tree/tall, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"vKw" = ( +/obj/effect/spawner/lootdrop/f13/weapon/melee/tier2, +/turf/open/indestructible/ground/outside/water/running{ + color = " A6635D" + }, +/area/f13/caves) "vKF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -69772,8 +69822,8 @@ "wNJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack/shelf_metal, -/obj/effect/spawner/bundle/f13/hunting, -/obj/effect/spawner/bundle/f13/hunting, +/obj/item/gun/ballistic/rifle/hunting, +/obj/item/ammo_box/a3006, /turf/open/floor/f13/wood, /area/f13/radiation) "wNO" = ( @@ -70022,8 +70072,8 @@ }, /area/f13/wasteland) "wSj" = ( -/obj/machinery/smartfridge/drying_rack, /obj/effect/decal/cleanable/dirt, +/obj/structure/legion_extractor, /turf/open/floor/f13/wood, /area/f13/radiation) "wSm" = ( @@ -70646,6 +70696,11 @@ dir = 10 }, /area/f13/building/mall) +"xen" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/chem_master/primitive, +/turf/open/floor/f13/wood, +/area/f13/radiation) "xeu" = ( /obj/structure/displaycase, /obj/effect/decal/cleanable/dirt, @@ -72070,8 +72125,8 @@ pixel_y = -10 }, /obj/structure/rack/shelf_metal, -/obj/effect/spawner/bundle/f13/piperifle, -/obj/effect/spawner/bundle/f13/piperifle, +/obj/item/gun/ballistic/automatic/autopipe, +/obj/item/ammo_box/magazine/autopipe, /turf/open/floor/f13/wood, /area/f13/radiation) "xIE" = ( @@ -74066,7 +74121,7 @@ ubs lHH aae aae -aaB +dXS aae aae aak @@ -74333,7 +74388,7 @@ aae aae aae aae -bby +uEi bby bby aae @@ -74572,7 +74627,7 @@ aae aae aae aaa -aae +aak aak aae aae @@ -74590,8 +74645,8 @@ aae aae aae cxq -bby -bby +uEi +vKw jzN aae aaa @@ -74829,7 +74884,7 @@ aae aae aae aaa -aae +aak aak aae aae @@ -74838,17 +74893,17 @@ aaB aaB aaB aaB +qgX aaB aaB -qgX aae aae aae aae brA +uEi bby -bby -bby +uEi aae aae aaa @@ -75086,7 +75141,7 @@ aae aae aae aaa -aae +aak aak aae bar @@ -75352,7 +75407,7 @@ eHM aae aae aae -aaB +qgX eHM eHM lHH @@ -75361,8 +75416,8 @@ jiQ bby bby jzN -aae -aae +aak +aak aae aae aaa @@ -75618,8 +75673,8 @@ bby ybm ybm bby -aae -aae +aak +aak aae aae aaa @@ -75860,13 +75915,13 @@ aae aaa aaa aak -aae -aae -aae -aae -aak -aak -aae +aaa +aaa +aaa +aaa +aaa +aaa +aaa yju aaB nxk @@ -75875,8 +75930,8 @@ aaB ybm ybm aaB -aae -aae +aak +aak aae aae aaa @@ -76117,13 +76172,13 @@ aae aaa aae aak -aae +aaa aae aae aae aak aae -aae +aaa aae eHM aaB @@ -76132,8 +76187,8 @@ aaB aaB aaB aaB -aae -aae +aak +aak aae aae aaa @@ -76374,13 +76429,13 @@ aae aaa aae aak +aaa aae aae aae aae aae -aae -aae +aaa aae eHM eHM @@ -76630,14 +76685,14 @@ aae aae aaa aae +aaa +aaa aae aae aae aae aae -aaB -aaB -aaB +aaa eHM eHM eHM @@ -76891,16 +76946,16 @@ aae aae aae aae -aaB -aaB -iqY -aaB -aaB +aae +aae +aae +aaa +aae eHM aae aae aaB -aaB +iqY aae aaa aae @@ -77148,11 +77203,11 @@ aaa aae aae aae -aaB -aaB -aaB -aaB -aaB +aae +aae +aae +aaa +aae aae aae aae @@ -77405,10 +77460,10 @@ aaa aae aae aae -aaB -aaB -aaB -aaB +aae +aae +aae +aaa aae aae mwa @@ -77662,10 +77717,10 @@ aaa aae aae aae -aaa -aae aae +aaa aae +aaa aae aae aae @@ -77922,13 +77977,13 @@ aae aae aaa aae +aaa aae -aae -aaB -aaB -aaB -aaB +aaa +aaa +aaa aaB +auh aaB aae aae @@ -78180,10 +78235,10 @@ aaa aaa aaa aaa -aaB -aaB -aaB -aaB +aaa +aaa +aaa +aaa aaB aaB aaB @@ -78698,9 +78753,9 @@ aae aaa byE ppM -xjF -xjF -xjF +mGW +mGW +mGW xjF xjF aaa @@ -80228,7 +80283,7 @@ aak aak aak nKy -txa +hbk ija hiX hiX @@ -80485,7 +80540,7 @@ aak aak aak hop -qJK +hiX hiX eXT hiX @@ -80742,7 +80797,7 @@ aak aak aak nKy -men +hiX oUe hiX hiX @@ -81770,9 +81825,9 @@ hGQ wFx qEm idw -vaz +stG vae -mYU +ejJ koF mrt odi @@ -82277,12 +82332,12 @@ aaa aaa aae aae -mYU +tfe hhe tGX stG boq -vaz +bID vaz stG rCt @@ -82536,7 +82591,7 @@ aae aae vcL uPV -hSb +qEW stG vUa stG @@ -83078,7 +83133,7 @@ hiX hiX hiX bGM -koF +eTo koF koF koF @@ -83313,7 +83368,7 @@ hSb baK wFQ oBW -stG +xen eZs viL fFB @@ -83567,7 +83622,7 @@ hSb baK hSb lHB -vcL +nNO vdh tqf kQX @@ -84093,7 +84148,7 @@ hiX hiX bGM cut -koF +jwO fEI eJv hiX @@ -84591,7 +84646,7 @@ vcL vcL vcL vcL -vcL +hmL vcL tqf kQX @@ -84656,7 +84711,7 @@ vva vva vva vkp -pRd +cvp ePt gCe aQZ @@ -84861,7 +84916,7 @@ hiX pHI pHI pHI -pHI +mKS xdv qUc uYz @@ -85139,7 +85194,7 @@ xdG gND ctf fNj -koF +eTo hop aae aae @@ -85375,7 +85430,7 @@ hSb hSb eEt eEt -pLb +eEt oXC uDX rPB @@ -86139,7 +86194,7 @@ xdG ccL hiX bGM -koF +eTo koF koF aae @@ -87424,7 +87479,7 @@ aOk nWp oiD oiD -ebN +rSR xLC xLC xLC diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 7b4c728f07f..36668b390f0 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 += (force * 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..ce795f9ee94 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.10 siemens_coeff = 0 - punchdamagelow = 25 + punchdamagelow = 20 punchdamagehigh = 30 + armor = 10 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) From 74af84cbf18fd25f3dddf6cd4fc6ef91a155b560 Mon Sep 17 00:00:00 2001 From: NETNICK Date: Sat, 8 Jun 2024 08:18:46 -0300 Subject: [PATCH 2/8] Update item_attack.dm nerf --- code/_onclick/item_attack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 36668b390f0..339008d84b6 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 * 5) + force_modifier += (force * 2) if(HAS_TRAIT(user, TRAIT_GHOULMELEE)) //negative trait force_modifier += (-force * 0.25) From 162c7a97bb125e7ef64efd5a65dad5dff51aeaef Mon Sep 17 00:00:00 2001 From: NETNICK Date: Sat, 8 Jun 2024 08:19:36 -0300 Subject: [PATCH 3/8] Update supermutant.dm another nerf --- .../mob/living/carbon/human/species_types/supermutant.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ce795f9ee94..8e260d7f3b9 100644 --- a/code/modules/mob/living/carbon/human/species_types/supermutant.dm +++ b/code/modules/mob/living/carbon/human/species_types/supermutant.dm @@ -9,7 +9,7 @@ siemens_coeff = 0 punchdamagelow = 20 punchdamagehigh = 30 - armor = 10 + armor = 3 use_skintones = 0 sexes = 0 liked_food = JUNKFOOD | FRIED | RAW From 430ef26398da9e66ab700d6e8a4ab529afdf8d27 Mon Sep 17 00:00:00 2001 From: NETNICK Date: Sat, 8 Jun 2024 08:21:31 -0300 Subject: [PATCH 4/8] Update supermutant.dm last nerf --- .../mob/living/carbon/human/species_types/supermutant.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8e260d7f3b9..8f5d47833be 100644 --- a/code/modules/mob/living/carbon/human/species_types/supermutant.dm +++ b/code/modules/mob/living/carbon/human/species_types/supermutant.dm @@ -5,7 +5,7 @@ limbs_id = "smutant" inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_SMUTANT,) inherent_biotypes = list(MOB_INORGANIC, MOB_HUMANOID) - speedmod = -0.10 + speedmod = -0.6 siemens_coeff = 0 punchdamagelow = 20 punchdamagehigh = 30 From efef43dc45697c500c39de72bfe8425f1bdf5a4a Mon Sep 17 00:00:00 2001 From: NETNICK Date: Sat, 8 Jun 2024 08:35:51 -0300 Subject: [PATCH 5/8] Update item_attack.dm i lied, last nerf for real --- code/_onclick/item_attack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 339008d84b6..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 * 2) + force_modifier += 5 if(HAS_TRAIT(user, TRAIT_GHOULMELEE)) //negative trait force_modifier += (-force * 0.25) From 6430d0ab80ba2d0b5d6f155c0b8137e083c9c1f9 Mon Sep 17 00:00:00 2001 From: NETNICK Date: Sat, 8 Jun 2024 08:37:22 -0300 Subject: [PATCH 6/8] Update supermutant.dm tweak --- .../mob/living/carbon/human/species_types/supermutant.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 8f5d47833be..be38c8df037 100644 --- a/code/modules/mob/living/carbon/human/species_types/supermutant.dm +++ b/code/modules/mob/living/carbon/human/species_types/supermutant.dm @@ -5,11 +5,11 @@ limbs_id = "smutant" inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_SMUTANT,) inherent_biotypes = list(MOB_INORGANIC, MOB_HUMANOID) - speedmod = -0.6 + speedmod = -0.5 siemens_coeff = 0 punchdamagelow = 20 punchdamagehigh = 30 - armor = 3 + armor = 2 use_skintones = 0 sexes = 0 liked_food = JUNKFOOD | FRIED | RAW From 79167a0ca0fbec4acb4b407ef15561e3011f8482 Mon Sep 17 00:00:00 2001 From: NETNICK Date: Sat, 8 Jun 2024 08:39:01 -0300 Subject: [PATCH 7/8] Update supermutant.dm i'm a very finnicky man --- .../mob/living/carbon/human/species_types/supermutant.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 be38c8df037..f625dc6ec5a 100644 --- a/code/modules/mob/living/carbon/human/species_types/supermutant.dm +++ b/code/modules/mob/living/carbon/human/species_types/supermutant.dm @@ -9,7 +9,7 @@ siemens_coeff = 0 punchdamagelow = 20 punchdamagehigh = 30 - armor = 2 + armor = 3 use_skintones = 0 sexes = 0 liked_food = JUNKFOOD | FRIED | RAW From 39cf068a67c621b5f7870e68b9ca5a5a24f05150 Mon Sep 17 00:00:00 2001 From: NETNICK Date: Sat, 8 Jun 2024 08:42:46 -0300 Subject: [PATCH 8/8] Update supermutant.dm yeah --- .../mob/living/carbon/human/species_types/supermutant.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f625dc6ec5a..03577afee4a 100644 --- a/code/modules/mob/living/carbon/human/species_types/supermutant.dm +++ b/code/modules/mob/living/carbon/human/species_types/supermutant.dm @@ -9,7 +9,7 @@ siemens_coeff = 0 punchdamagelow = 20 punchdamagehigh = 30 - armor = 3 + armor = 5 use_skintones = 0 sexes = 0 liked_food = JUNKFOOD | FRIED | RAW