From 236eba033febe021a97490b44e451da229ed877f Mon Sep 17 00:00:00 2001 From: NPC1314 <110836368+NPC1314@users.noreply.github.com> Date: Tue, 3 Dec 2024 00:41:17 +0100 Subject: [PATCH] garrison map (#1208) * garrison * d --- _maps/map_files/stonehamlet/stonehamlet.dmm | 756 +++++++++--------- .../dwarf_outpost/Dwarf_Outpost_1.dmm | 45 +- .../simple_animal/rogue/creacher/_corpses.dm | 26 + modular/Mapping/Mapping_aides.dm | 2 - 4 files changed, 421 insertions(+), 408 deletions(-) diff --git a/_maps/map_files/stonehamlet/stonehamlet.dmm b/_maps/map_files/stonehamlet/stonehamlet.dmm index f0526b1819..101530c014 100644 --- a/_maps/map_files/stonehamlet/stonehamlet.dmm +++ b/_maps/map_files/stonehamlet/stonehamlet.dmm @@ -48,17 +48,12 @@ /turf/open/floor/rogue/grass, /area/rogue/outdoors/mountains) "aei" = ( -/obj/structure/bed/rogue, -/obj/item/clothing/mask/cigarette/rollie/nicotine{ - pixel_x = 5; - pixel_y = 35 - }, -/obj/item/clothing/mask/cigarette/rollie/nicotine{ - pixel_x = -5; - pixel_y = 35 +/obj/structure/bars/pipe{ + dir = 6; + icon_state = "pipe" }, -/turf/open/floor/rogue/wood/saiga, -/area/rogue/indoors/town/garrison) +/turf/open/water/sewer, +/area/rogue/under/town/sewer) "aeu" = ( /obj/effect/decal/cleanable/dirt/cobweb{ dir = 1 @@ -97,8 +92,9 @@ /turf/open/water/sewer, /area/rogue/under/town/sewer) "afZ" = ( -/obj/structure/fluff/statue/gargoyle, -/turf/open/floor/rogue/cobble, +/obj/structure/rack/rogue, +/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow, +/turf/open/floor/rogue/cobble/alt, /area/rogue/indoors/town/garrison) "agk" = ( /obj/effect/landmark/map_load_mark/hamlet_outlaws, @@ -188,10 +184,12 @@ /turf/open/floor/rogue/wood/nosmooth/saiga, /area/rogue/indoors/town/tavern/saiga) "ajU" = ( -/obj/structure/rack/rogue, -/obj/item/rogueweapon/polearm/spear/billhook/neu, -/turf/open/floor/rogue/cobble/alt, -/area/rogue/indoors/town/garrison) +/obj/structure/bars/pipe{ + dir = 5; + icon_state = "pipe" + }, +/turf/open/water/sewer, +/area/rogue/under/town/sewer) "akf" = ( /obj/machinery/light/rogue/firebowl/stump, /turf/open/floor/rogue/rooftop/green, @@ -540,7 +538,8 @@ /turf/open/floor/rogue/dirt, /area/rogue/outdoors/exposed/town/hamlet) "aCn" = ( -/turf/open/floor/rogue/cobble/mossy/alt, +/obj/structure/fluff/statue/gargoyle, +/turf/open/floor/rogue/cobble, /area/rogue/indoors/town/garrison) "aCw" = ( /obj/structure/closet/crate/chest/crate, @@ -704,11 +703,10 @@ /turf/open/floor/rogue/grass, /area/rogue/outdoors/exposed/town/hamlet) "aJW" = ( -/obj/structure/rack/rogue/shelf/notdense{ - pixel_x = 32; - pixel_y = -3 - }, -/turf/closed/wall/mineral/rogue/stonebrick, +/obj/structure/rack/rogue, +/obj/item/rogueweapon/shield/wood, +/obj/item/rogueweapon/shield/wood, +/turf/open/floor/rogue/wood/saiga, /area/rogue/indoors/town/garrison) "aKs" = ( /obj/structure/roguetent, @@ -1072,14 +1070,12 @@ /area/rogue/outdoors/rtfield/hamlet) "bcX" = ( /obj/structure/rack/rogue, -/obj/item/clothing/suit/roguetown/armor/chainmail/iron, -/obj/item/clothing/suit/roguetown/armor/chainmail/iron, -/obj/item/clothing/suit/roguetown/armor/chainmail/iron, -/obj/item/clothing/wrists/roguetown/bracers/leather, /obj/item/clothing/wrists/roguetown/bracers/leather, /obj/item/clothing/wrists/roguetown/bracers/leather, -/turf/open/floor/rogue/ruinedwood/spiral, -/area/rogue/indoors/town/garrison) +/turf/open/floor/rogue/ruinedwood/spiralfade, +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "bdj" = ( /obj/item/grown/log/tree/small, /obj/item/grown/log/tree/small, @@ -1330,10 +1326,10 @@ /turf/open/floor/rogue/dirt/road, /area/rogue/under/town/basement) "bsU" = ( -/obj/structure/flora/roguegrass/maneater/real, -/obj/structure/flora/roguegrass, -/turf/open/floor/rogue/grass, -/area/rogue/outdoors/rtfield/hamlet) +/obj/structure/rack/rogue, +/obj/item/rogueweapon/polearm/spear/billhook/neu, +/turf/open/floor/rogue/cobble/alt, +/area/rogue/indoors/town/garrison) "btB" = ( /turf/closed/wall/mineral/rogue/stone/window, /area/rogue/indoors/town/manor{ @@ -1596,7 +1592,7 @@ pixel_x = -32; pixel_y = 29 }, -/turf/closed/wall/mineral/rogue/stonebrick, +/turf/closed/wall/mineral/rogue/stone, /area/rogue/indoors/town/garrison) "bIK" = ( /obj/structure/rack/rogue/shelf/notdense{ @@ -1894,7 +1890,9 @@ name = "armory" }, /turf/open/floor/rogue/blocks, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "bTC" = ( /obj/effect/decal/cleanable/blood_neu/tracks, /turf/open/floor/rogue/grass, @@ -2048,9 +2046,11 @@ /turf/open/water/sewer, /area/rogue/under/town/sewer) "caY" = ( -/obj/structure/ladder, -/turf/open/floor/rogue/wood/nosmooth/saiga, -/area/rogue) +/obj/structure/rack/rogue, +/obj/item/rogueweapon/mace/cudgel, +/obj/machinery/light/rogue/torchholder/c, +/turf/open/floor/rogue/cobble/alt, +/area/rogue/indoors/town/garrison) "cce" = ( /obj/structure/stairs{ dir = 8; @@ -2646,8 +2646,7 @@ /area/rogue/under/town/basement) "cKT" = ( /obj/structure/rack/rogue, -/obj/item/rogueweapon/mace/cudgel, -/obj/machinery/light/rogue/torchholder/c, +/obj/item/rogueweapon/mace/goden/neu, /turf/open/floor/rogue/cobble/alt, /area/rogue/indoors/town/garrison) "cLh" = ( @@ -2687,7 +2686,9 @@ /obj/structure/rack/rogue, /obj/item/rogueweapon/polearm/halberd/neu, /turf/open/floor/rogue/blocks, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "cOl" = ( /obj/effect/landmark/start/steward{ dir = 1 @@ -2806,10 +2807,9 @@ /turf/open/floor/rogue/dirt/ambush, /area/rogue/outdoors/rtfield/outlaw) "cVF" = ( -/obj/structure/table/wood/plain, -/obj/item/keyring/guard, -/turf/open/floor/rogue/wood/saiga, -/area/rogue/indoors/town/garrison) +/obj/item/natural/worms, +/turf/open/floor/rogue/naturalstone, +/area/rogue/under/town/sewer) "cWr" = ( /obj/structure/flora/roguegrass, /obj/effect/decal/turfedge_neu/road{ @@ -2957,8 +2957,9 @@ /turf/open/floor/rogue/grass, /area/rogue/outdoors/rtfield/hamlet/unsafe) "dfC" = ( -/obj/structure/rack/rogue, -/obj/item/rogueweapon/mace/goden/neu, +/obj/machinery/light/rogue/torchholder/c{ + pixel_x = 32 + }, /turf/open/floor/rogue/cobble/alt, /area/rogue/indoors/town/garrison) "dfU" = ( @@ -3224,7 +3225,7 @@ /area/rogue/outdoors/rtfield/hamlet) "dvp" = ( /obj/structure/rack/rogue, -/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow, +/obj/item/quiver/bolts, /turf/open/floor/rogue/cobble/alt, /area/rogue/indoors/town/garrison) "dvI" = ( @@ -3383,7 +3384,6 @@ /area/rogue/outdoors/exposed/town/hamlet) "dEv" = ( /obj/structure/rack/rogue, -/obj/item/quiver/bolts, /turf/open/floor/rogue/cobble/alt, /area/rogue/indoors/town/garrison) "dEz" = ( @@ -4178,11 +4178,8 @@ /turf/open/floor/rogue/grass, /area/rogue/outdoors/rtfield/hamlet) "epZ" = ( -/obj/structure/closet/crate/roguecloset/dark, -/obj/item/flint, -/obj/item/clothing/suit/roguetown/armor/gambeson/heavy, -/obj/item/clothing/neck/roguetown/coif/cloth, -/turf/open/floor/rogue/wood/saiga, +/obj/structure/closet/crate/chest/neu_iron, +/turf/open/floor/rogue/cobble/alt, /area/rogue/indoors/town/garrison) "eqm" = ( /obj/structure/closet/crate/drawer, @@ -4264,10 +4261,11 @@ dir = 6 }, /obj/structure/rack/rogue, -/obj/item/quiver/bolts, /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow, /turf/open/floor/rogue/blocks, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "evd" = ( /obj/machinery/light/rogue/firebowl/standing, /turf/open/floor/rogue/tile/kitchen, @@ -4462,8 +4460,16 @@ /turf/open/floor/rogue/oak, /area/rogue/indoors) "eAM" = ( -/turf/closed/wall/mineral/rogue/wooddark/window, -/area/rogue/outdoors/mountains) +/obj/structure/rack/rogue, +/obj/item/clothing/neck/roguetown/chaincoif/iron{ + pixel_y = 3 + }, +/obj/item/clothing/suit/roguetown/armor/chainmail/iron{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/open/floor/rogue/wood/saiga, +/area/rogue/indoors/town/garrison) "eAR" = ( /obj/effect/decal/shadow_floor{ dir = 8 @@ -4524,8 +4530,15 @@ /turf/open/floor/rogue/ruinedwood/spiralfade, /area/rogue/indoors/town/shop) "eCq" = ( -/turf/closed/wall/mineral/rogue/stone, -/area/rogue/outdoors/mountains) +/obj/structure/rack/rogue, +/obj/item/clothing/suit/roguetown/armor/gambeson{ + pixel_y = -4 + }, +/obj/item/clothing/neck/roguetown/gorget{ + pixel_y = 5 + }, +/turf/open/floor/rogue/wood/saiga, +/area/rogue/indoors/town/garrison) "eDh" = ( /turf/open/floor/rogue/ruinedwood/turned, /area/rogue/outdoors) @@ -4957,8 +4970,9 @@ /turf/closed, /area/rogue) "eXr" = ( +/obj/item/natural/dirtclod, /obj/structure/bars/pipe{ - dir = 5; + dir = 6; icon_state = "pipe" }, /turf/open/water/sewer, @@ -5207,8 +5221,11 @@ /turf/open/floor/rogue/sandstone/temple, /area/rogue/indoors/town/church/chapel) "fkm" = ( -/obj/structure/bed/rogue, -/turf/open/floor/rogue/wood/saiga, +/obj/structure/rack/rogue/shelf/notdense{ + pixel_x = -32; + pixel_y = -4 + }, +/turf/closed/wall/mineral/rogue/stone, /area/rogue/indoors/town/garrison) "fkZ" = ( /obj/structure/fluff/railing/stonehedge{ @@ -5900,15 +5917,10 @@ /turf/open/floor/rogue/rooftop, /area/rogue/outdoors/exposed/manorgarri) "fVg" = ( -/obj/effect/decal/turfedge_neu{ - dir = 6 - }, -/obj/structure/fluff/railing/fence{ - dir = 4; - icon_state = "fence" - }, -/turf/open/floor/rogue/grass, -/area/rogue/outdoors/rtfield/plague_district) +/obj/structure/closet/crate/chest/neu_iron, +/obj/item/clothing/cloak/stabard/guard, +/turf/open/floor/rogue/wood/saiga, +/area/rogue/indoors/town/garrison) "fVh" = ( /turf/closed/wall/mineral/rogue/stonebrick, /area/rogue/outdoors/rtfield/hamlet) @@ -6063,12 +6075,11 @@ /area/rogue/indoors/town/tavern/saiga) "gcd" = ( /obj/structure/rack/rogue, -/obj/item/rogueweapon/shield/wood, -/obj/item/rogueweapon/shield/wood, -/obj/item/rogueweapon/shield/wood, -/obj/item/rogueweapon/shield/wood, -/turf/open/floor/rogue/ruinedwood/spiral, -/area/rogue/indoors/town/garrison) +/obj/item/rogueweapon/shield/tower/metal, +/turf/open/floor/rogue/ruinedwood/spiralfade, +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "gce" = ( /obj/structure/bed/rogue/shit, /obj/item/natural/worms, @@ -6428,11 +6439,6 @@ "gwL" = ( /turf/closed/wall/mineral/rogue/decostone/fluffstone, /area/rogue/indoors) -"gwY" = ( -/obj/structure/bed/rogue/wool, -/obj/item/bedsheet/rogue/pelt, -/turf/open/floor/rogue/ruinedwood/spiral, -/area/rogue/indoors/town/garrison) "gxx" = ( /obj/structure/closet/dirthole/grave, /turf/open/floor/rogue/grass, @@ -6703,9 +6709,11 @@ /turf/open/floor/rogue/rooftop/green, /area/rogue/outdoors/rtfield/plague_district) "gJg" = ( -/obj/item/natural/worms, -/turf/open/floor/rogue/naturalstone, -/area/rogue/under/town/sewer) +/obj/item/flint{ + pixel_y = 36 + }, +/turf/open/floor/rogue/wood/saiga, +/area/rogue/indoors/town/garrison) "gJs" = ( /obj/effect/decal/remains/saiga, /turf/open/floor/rogue/grass/peril, @@ -7185,15 +7193,6 @@ "hpx" = ( /turf/open/floor/rogue/cobblerock, /area/rogue/outdoors/rtfield/hamlet) -"hpV" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/turf/open/floor/rogue/cobblerock/alt, -/area/rogue/indoors/town) "hqF" = ( /obj/effect/decal/shadow_floor, /obj/effect/decal/shadow_floor{ @@ -8174,9 +8173,15 @@ /turf/open/floor/rogue/cobblerock/alt, /area/rogue/outdoors/exposed/church) "iox" = ( -/obj/structure/closet/crate/chest/neu, -/obj/item/flint, -/turf/open/floor/rogue/wood/saiga, +/obj/item/clothing/mask/cigarette/rollie/nicotine{ + pixel_x = 5; + pixel_y = 35 + }, +/obj/item/clothing/mask/cigarette/rollie/nicotine{ + pixel_x = -5; + pixel_y = 35 + }, +/turf/open/floor/rogue/woodturned/saiga, /area/rogue/indoors/town/garrison) "ioD" = ( /obj/effect/decal/shadow_floor, @@ -8963,7 +8968,7 @@ /turf/open/floor/rogue/dirt/road, /area/rogue/outdoors/exposed/town/hamlet) "jbv" = ( -/obj/structure/closet/crate/chest/neu_iron, +/obj/structure/bed/rogue, /turf/open/floor/rogue/wood/saiga, /area/rogue/indoors/town/garrison) "jbw" = ( @@ -9150,6 +9155,13 @@ /obj/item/grown/log/tree/small, /turf/open/floor/rogue/grass, /area/rogue/outdoors/rtfield/hamlet) +"jlg" = ( +/obj/structure/rack/rogue, +/obj/item/clothing/head/roguetown/helmet/bascinet, +/turf/open/floor/rogue/ruinedwood/spiralfade, +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "jlE" = ( /obj/structure/table/church{ dir = 1 @@ -9628,9 +9640,10 @@ dir = 5 }, /obj/structure/rack/rogue, -/obj/item/rogueweapon/sword/iron, /turf/open/floor/rogue/blocks, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "jHG" = ( /obj/structure/flora/roguegrass, /turf/closed/mineral/rogue/bedrock, @@ -9681,10 +9694,8 @@ /turf/open/floor/rogue/sandstone, /area/rogue/indoors/town/church/chapel) "jJO" = ( -/obj/effect/decal/turfedge_neu/mossy{ - dir = 5 - }, -/turf/open/floor/rogue/dirt/road, +/obj/machinery/light/rogue/torchholder/l, +/turf/open/floor/rogue/wood/saiga, /area/rogue/indoors/town/garrison) "jJQ" = ( /turf/open/floor/rogue/sandstone/temple, @@ -9862,7 +9873,7 @@ icon_state = "wcr"; locked = 1; lockid = "garrison"; - name = "Storage" + name = "storage" }, /turf/open/floor/rogue/cobble/alt, /area/rogue/indoors/town/garrison) @@ -9995,8 +10006,6 @@ dir = 8; icon_state = "border" }, -/obj/effect/turf_decal/stripes/red, -/obj/effect/turf_decal/stripes/red/line, /turf/open/floor/rogue/blocks, /area/rogue/indoors/town) "jZz" = ( @@ -10186,7 +10195,9 @@ "kjq" = ( /obj/structure/ladder, /turf/open/floor/rogue/blocks, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "kjt" = ( /obj/structure/fluff/railing/wood{ dir = 8; @@ -11365,7 +11376,10 @@ /turf/open/floor/rogue/dirt/road, /area/rogue/indoors/shelter/mountains) "lze" = ( -/obj/structure/mineral_door/swing_door, +/obj/structure/mineral_door/wood/deadbolt{ + dir = 1; + locked = 1 + }, /turf/open/floor/rogue/dirt/road, /area/rogue/outdoors/exposed/town/hamlet) "lzl" = ( @@ -11796,15 +11810,6 @@ "lRz" = ( /turf/closed/wall/mineral/rogue/roofwall/outercorner, /area/rogue/indoors/town) -"lSl" = ( -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/turf/open/floor/rogue/herringbone, -/area/rogue/indoors/town/shop) "lSo" = ( /turf/closed/wall/mineral/rogue/wooddark/window, /area/rogue/indoors) @@ -13902,8 +13907,10 @@ /area/rogue/indoors/shelter/rtfield) "oda" = ( /obj/structure/ladder, -/turf/open/floor/rogue/ruinedwood/spiral, -/area/rogue/indoors/town/garrison) +/turf/open/floor/rogue/ruinedwood/spiralfade, +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "odm" = ( /obj/structure/stairs/stone{ dir = 1; @@ -14202,12 +14209,6 @@ /area/rogue/outdoors/rtfield/hamlet) "oqv" = ( /obj/machinery/light/rogue/firebowl/standing/blue, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, /turf/open/floor/rogue/herringbone, /area/rogue/indoors/town/shop) "oqz" = ( @@ -14311,7 +14312,9 @@ "ovX" = ( /obj/machinery/light/rogue/torchholder/l, /turf/open/floor/rogue/cobble/mossy/alt, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "owj" = ( /obj/structure/flora/roguegrass, /turf/open/floor/rogue/oak/broken, @@ -15459,7 +15462,9 @@ /obj/structure/closet/crate/chest/neu_iron, /obj/item/rogueweapon/knife/dagger, /turf/open/floor/rogue/blocks, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "ppV" = ( /obj/structure/fluff/walldeco/customflag, /turf/closed/wall/mineral/rogue/wooddark, @@ -15629,12 +15634,6 @@ redstone_id = "balloon_shutter" }, /obj/structure/closet/crate/chest/neu, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, /turf/open/floor/rogue/herringbone, /area/rogue/indoors/town/shop) "pxU" = ( @@ -15837,8 +15836,10 @@ /area/rogue/indoors/town/bath/redhouse) "pJz" = ( /obj/machinery/light/rogue/torchholder/r, -/turf/open/floor/rogue/ruinedwood/spiral, -/area/rogue/indoors/town/garrison) +/turf/open/floor/rogue/ruinedwood/spiralfade, +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "pKh" = ( /obj/structure/fermenting_barrel/water, /turf/open/floor/rogue/ruinedwood/spiral, @@ -16010,7 +16011,9 @@ "pUU" = ( /obj/machinery/light/rogue/torchholder/l, /turf/open/floor/rogue/blocks, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "pUX" = ( /obj/structure/stairs{ dir = 8; @@ -16399,7 +16402,9 @@ lockid = "manor" }, /turf/open/floor/rogue/concrete, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "qnG" = ( /obj/structure/stationary_bell{ pixel_x = -31; @@ -16934,7 +16939,9 @@ dir = 8 }, /turf/open/floor/rogue/dirt, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "qQr" = ( /obj/structure/table/wood/plain_alt, /turf/open/floor/rogue/twig, @@ -17044,13 +17051,11 @@ first_time_text = "STONEHILL CASTLE" }) "qVO" = ( -/obj/item/natural/dirtclod, -/obj/structure/bars/pipe{ - dir = 6; - icon_state = "pipe" +/obj/structure/table/wood/large/corner_alt{ + dir = 9 }, -/turf/open/water/sewer, -/area/rogue/under/town/sewer) +/turf/open/floor/rogue/woodturned/saiga, +/area/rogue/indoors/town/garrison) "qVT" = ( /obj/structure/flora/roguetree, /obj/structure/flora/roguetree, @@ -17448,7 +17453,9 @@ /obj/structure/rack/rogue, /obj/item/rogueweapon/mace/steel/morningstar, /turf/open/floor/rogue/blocks, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "rpx" = ( /obj/structure/stairs{ dir = 1 @@ -17584,8 +17591,10 @@ /area/rogue/under/town/basement) "rxp" = ( /obj/structure/closet/crate/chest/neu, -/turf/open/floor/rogue/ruinedwood/spiral, -/area/rogue/indoors/town/garrison) +/turf/open/floor/rogue/ruinedwood/spiralfade, +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "rxy" = ( /obj/structure/fluff/railing/border{ dir = 5; @@ -18005,15 +18014,6 @@ }, /turf/open/floor/rogue/dirt, /area/rogue/under/town/sewer) -"rWo" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/red/corner{ - dir = 4 - }, -/turf/open/floor/rogue/cobblerock/alt, -/area/rogue/indoors/town) "rWD" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/rogue/herringbone, @@ -18165,15 +18165,6 @@ "sdU" = ( /turf/closed/mineral/rogue/bedrock, /area/rogue/indoors/shelter/rtfield) -"sek" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/red/corner{ - dir = 1 - }, -/turf/open/floor/rogue/cobblerock/alt, -/area/rogue/indoors/town) "seB" = ( /obj/effect/decal/shadow_floor, /turf/open/floor/rogue/dirt/road, @@ -18671,8 +18662,11 @@ }, /area/rogue/outdoors/town/roofs) "sIp" = ( -/turf/open/floor/rogue/wood/nosmooth/saiga, -/area/rogue) +/obj/structure/table/wood/large/corner_alt{ + dir = 5 + }, +/turf/open/floor/rogue/woodturned/saiga, +/area/rogue/indoors/town/garrison) "sJc" = ( /obj/structure/fluff/railing/border{ dir = 1; @@ -19415,8 +19409,11 @@ /turf/open/floor/rogue/dirt, /area/rogue/outdoors/exposed/town/hamlet) "txE" = ( -/turf/closed/wall/mineral/rogue/stone/moss, -/area/rogue/outdoors/mountains) +/obj/structure/table/wood/large/corner_alt{ + dir = 10 + }, +/turf/open/floor/rogue/woodturned/saiga, +/area/rogue/indoors/town/garrison) "txR" = ( /obj/structure/fluff/railing/border{ dir = 5; @@ -19720,7 +19717,9 @@ /obj/structure/rack/rogue, /obj/item/rogueweapon/sword/iron, /turf/open/floor/rogue/blocks, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "tLJ" = ( /obj/effect/decal/turfedge_neu{ dir = 5 @@ -19770,10 +19769,10 @@ "tOw" = ( /obj/structure/rack/rogue, /obj/item/clothing/neck/roguetown/gorget, -/obj/item/clothing/neck/roguetown/gorget, -/obj/item/clothing/neck/roguetown/gorget, -/turf/open/floor/rogue/ruinedwood/spiral, -/area/rogue/indoors/town/garrison) +/turf/open/floor/rogue/ruinedwood/spiralfade, +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "tOU" = ( /obj/effect/decal/cleanable/blood_neu/random, /turf/open/floor/rogue/cobble, @@ -19923,14 +19922,11 @@ /turf/closed/wall/mineral/rogue/wooddark, /area/rogue/indoors) "tVK" = ( -/obj/structure/closet/dirthole/closed/loot, -/obj/structure/flora/roguegrass, -/obj/structure/fluff/railing/fence{ - dir = 4; - icon_state = "fence" +/obj/structure/table/wood/large/corner_alt{ + dir = 6 }, -/turf/open/floor/rogue/grass, -/area/rogue/outdoors/rtfield/plague_district) +/turf/open/floor/rogue/woodturned/saiga, +/area/rogue/indoors/town/garrison) "tVP" = ( /turf/closed/wall/mineral/rogue/pipe{ dir = 4; @@ -20781,12 +20777,11 @@ /turf/open/floor/rogue/blocks/paving, /area/rogue/indoors/town/bath/redhouse) "uGG" = ( -/obj/structure/fluff/railing/fence{ - dir = 4; - icon_state = "fence" - }, -/turf/open/floor/rogue/dirt, -/area/rogue/outdoors/rtfield/plague_district) +/obj/structure/closet/crate/chest/neu, +/obj/item/clothing/cloak/stabard/guard, +/obj/item/clothing/wrists/roguetown/bracers/leather, +/turf/open/floor/rogue/wood/saiga, +/area/rogue/indoors/town/garrison) "uGM" = ( /obj/structure/fluff/psycross/copper, /turf/open/floor/rogue/dirt, @@ -21068,7 +21063,9 @@ "uSJ" = ( /obj/item/roguebin/water/gross, /turf/open/floor/rogue/cobble/mossy/alt, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "uSP" = ( /obj/structure/flora/roguegrass, /obj/structure/flora/roguegrass, @@ -21786,9 +21783,10 @@ "vEY" = ( /obj/structure/rack/rogue, /obj/item/quiver/bolts, -/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow, /turf/open/floor/rogue/blocks, -/area/rogue/indoors/town/garrison) +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "vFC" = ( /turf/open/floor/rogue/dirt/road, /area/rogue/under/cave{ @@ -22199,13 +22197,13 @@ /turf/open/floor/rogue/grass, /area/rogue/outdoors/mountains) "wbi" = ( -/obj/structure/closet/crate/drawer, -/obj/item/candle/skull/lit{ - pixel_x = -1; - pixel_y = 7 - }, -/turf/open/floor/rogue/ruinedwood/spiral, -/area/rogue/indoors/town/garrison) +/obj/structure/rack/rogue, +/obj/item/clothing/neck/roguetown/coif, +/obj/item/clothing/neck/roguetown/coif/cloth, +/turf/open/floor/rogue/ruinedwood/spiralfade, +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "wbA" = ( /obj/structure/chair/stool/rogue, /turf/open/floor/rogue/woodturned/saiga, @@ -23250,12 +23248,10 @@ /turf/open/floor/rogue/twig, /area/rogue/indoors/town/tavern/saiga) "xgA" = ( -/obj/structure/bars/pipe{ - dir = 6; - icon_state = "pipe" - }, -/turf/open/water/sewer, -/area/rogue/under/town/sewer) +/obj/structure/table/wood/plain, +/obj/item/keyring/guard, +/turf/open/floor/rogue/wood/saiga, +/area/rogue/indoors/town/garrison) "xgK" = ( /obj/structure/stairs{ dir = 8; @@ -23370,12 +23366,6 @@ "xkE" = ( /turf/open/floor/rogue/grass, /area/rogue/outdoors/exposed/town/hamlet) -"xlw" = ( -/obj/structure/fluff/walldeco/painting/seraphina{ - pixel_y = 32 - }, -/turf/open/floor/rogue/ruinedwood/spiral, -/area/rogue/indoors/town/garrison) "xlV" = ( /obj/structure/fluff/railing/border, /turf/open/floor/rogue/woodturned/saiga, @@ -23449,10 +23439,13 @@ /turf/open/floor/rogue/dirt/road, /area/rogue/indoors/shelter/rtfield) "xpW" = ( -/obj/structure/flora/roguegrass, -/obj/structure/flora/roguegrass, -/turf/closed/wall/mineral/rogue/decowood, -/area/rogue/indoors) +/obj/structure/rack/rogue, +/obj/item/clothing/suit/roguetown/armor/chainmail/iron, +/obj/item/clothing/suit/roguetown/armor/chainmail/iron, +/turf/open/floor/rogue/ruinedwood/spiralfade, +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "xqf" = ( /obj/structure/bars/pipe{ dir = 6; @@ -23466,10 +23459,9 @@ /turf/open/water/sewer, /area/rogue/outdoors/exposed/under/sewer) "xqm" = ( -/obj/structure/mineral_door/swing_door{ - locked = 1; - lockid = "woodsm"; - name = "stable door" +/obj/structure/mineral_door/wood/deadbolt{ + dir = 8; + locked = 1 }, /turf/open/floor/rogue/dirt/road, /area/rogue/indoors) @@ -23505,13 +23497,6 @@ /obj/structure/ladder, /turf/open/floor/rogue/dirt/road, /area/rogue/indoors) -"xtN" = ( -/obj/structure/rack/rogue, -/obj/item/clothing/cloak/stabard/guard, -/obj/item/clothing/cloak/stabard/guard, -/obj/item/clothing/cloak/stabard/guard, -/turf/open/floor/rogue/ruinedwood/spiral, -/area/rogue/indoors/town/garrison) "xtX" = ( /obj/structure/fluff/railing/border{ dir = 4; @@ -24130,7 +24115,10 @@ /turf/open/floor/rogue/dirt/road, /area/rogue/outdoors/rtfield/plague_district) "xWJ" = ( -/turf/closed/wall/mineral/rogue/stonebrick, +/obj/structure/rack/rogue, +/obj/item/clothing/suit/roguetown/armor/gambeson/heavy, +/obj/item/clothing/neck/roguetown/coif/cloth, +/turf/open/floor/rogue/wood/saiga, /area/rogue/indoors/town/garrison) "xXh" = ( /obj/structure/fluff/railing/stonehedge{ @@ -24355,8 +24343,10 @@ /turf/open/floor/rogue/cobble/mossy/alt, /area/rogue/indoors/town/tavern/saiga) "yiC" = ( -/turf/open/floor/carpet/royalblack, -/area/rogue/indoors/town/garrison) +/turf/open/floor/rogue/ruinedwood/spiralfade, +/area/rogue/indoors/town/manor{ + first_time_text = "STONEHILL CASTLE" + }) "yjL" = ( /turf/open/transparent/openspace, /area/rogue/outdoors/rtfield/hamlet) @@ -31827,7 +31817,7 @@ psp psp psp psp -psp +ijK ijK ijK ijK @@ -32020,7 +32010,7 @@ psp psp psp psp -psp +ijK ijK ijK ijK @@ -32216,8 +32206,8 @@ psp psp ijK ijK -ijK -psp +qLT +qLT qLT qLT qLT @@ -32410,7 +32400,6 @@ ijK ijK ijK ijK -psp qLT xnA wgc @@ -32421,6 +32410,7 @@ xnA xnA xnA xnA +xnA qLT qLT nlJ @@ -32604,10 +32594,10 @@ ijK ijK ijK psp -psp qLT rGL -xgA +aei +wlB wlB wlB wlB @@ -32798,12 +32788,12 @@ psp psp psp psp -psp qLT xnA wlB feV feV +feV mbn mbn feV @@ -32992,11 +32982,11 @@ psp psp psp psp -psp qLT xnA wlB feV +aCn afZ dvp dEv @@ -33186,15 +33176,15 @@ psp psp psp psp -psp qLT xnA wlB feV -ajU +bsU wvB wvB -feV +wvB +mbn bwi feV mbn @@ -33380,16 +33370,16 @@ psp psp psp psp -psp qLT xnA wlB mbn -cKT +caY +wvB wvB wvB mbn -sue +gJg sue sue sue @@ -33574,14 +33564,14 @@ psp psp psp psp -psp qLT rGL qTv -feV -dfC +mbn +cKT wvB wvB +dfC jTS sue mbn @@ -33768,14 +33758,14 @@ psp psp psp psp -psp qLT xnA wlB feV feV feV -feV +mbn +epZ mbn sue sue @@ -33962,20 +33952,20 @@ psp psp psp psp -psp qLT xnA wlB +ajU eXr -qVO gGC feV -xWJ +mbn +mbn bIi -xWJ +mbn sSX -xWJ -xWJ +mbn +mbn feV orW lOZ @@ -34156,7 +34146,6 @@ psp psp psp psp -psp qLT bTg xnA @@ -34164,12 +34153,13 @@ gGC xnA wlB feV +mbn aJW -epZ sue +jJO sue oUu -xWJ +mbn mbn llQ lOZ @@ -34350,19 +34340,19 @@ psp psp psp psp -psp qLT qLT qLT qLT -gJg +cVF wfm mbn +mbn xWJ -aei xqH xqH -sue +xqH +xqH kBr szw lZE @@ -34548,16 +34538,16 @@ psp qLT qLT qLT -qLT xnA wlB feV -aJW -vNy +mbn +eAM xqH +qVO +txE xqH -sue -xWJ +mbn lcf szw lOZ @@ -34743,15 +34733,15 @@ xnA xnA xnA xnA -xnA wlB feV -xWJ -fkm +mbn +eCq xqH +sIp +tVK xqH -fkm -xWJ +mbn mbn lOZ lOZ @@ -34938,15 +34928,15 @@ qLT qLT xnA wlB -wlB -qLT -xWJ +feV +mbn +mbn iox -sue +xqH +xqH +xqH jbv -cVF -xWJ -mbn +fVg lOZ jqC cPH @@ -35133,14 +35123,14 @@ fqY xnA wlB feV -feV -xWJ -xWJ -xWJ -xWJ -xWJ -xWJ mbn +fkm +vNy +sue +uGG +sue +sue +xgA lOZ hKD cPH @@ -35328,13 +35318,13 @@ cSp ppN feV mbn -mbn -mbn -mbn -mbn -mbn -mbn -mbn +fVg +jbv +sue +jbv +sue +jbv +fVg lOZ cPH lOZ @@ -56466,7 +56456,7 @@ fyl oVT fNt vIR -fyl +hQx hQx hQx hQx @@ -56659,7 +56649,6 @@ vIR fNt oVT fNt -fyl hQx hZX hZX @@ -56668,6 +56657,7 @@ hZX hZX hZX hZX +hZX fyl pjU ldB @@ -56852,8 +56842,8 @@ fyl vIR fNt fyl -fyl -uJn +hQx +hZX hZX hZX hZX @@ -57049,7 +57039,7 @@ hQx uJn hZX hZX -hZX +mDZ mDZ fyl fyl @@ -58017,7 +58007,7 @@ fyl pLb jWx eOe -rWo +iId aUb pkV czT @@ -58211,7 +58201,7 @@ fyl pLb mdE qZt -hpV +iId iId shd czT @@ -58405,7 +58395,7 @@ fyl pLb mdE qZt -hpV +iId boQ fDx mVy @@ -58599,7 +58589,7 @@ fyl pLb mdE qZt -hpV +iId iId kux xEd @@ -58793,7 +58783,7 @@ fyl pLb mdE qZt -hpV +iId iId kux xEd @@ -58987,7 +58977,7 @@ czT pLb aCw mVE -sek +iId iwZ fDx vCa @@ -61406,7 +61396,7 @@ fyl fyl fyl oHv -bsU +mDZ fyl fyl fyl @@ -63236,13 +63226,13 @@ kfF iNo ukD ukD -mbn -mbn -mbn -mbn -mbn -mbn -mbn +vFV +vFV +vFV +vFV +vFV +vFV +vFV asj tFN vWP @@ -63431,12 +63421,12 @@ nMd xdp xdp qny -jJO -aCn -aCn -aCn +kOz +hom +hom +hom ovX -mbn +vFV eud jpH vWP @@ -63624,13 +63614,13 @@ oiA dsB dsB puJ -mbn +vFV qQj -aCn -aCn -aCn +hom +hom +hom uSJ -mbn +vFV wMq tFN xkE @@ -63820,11 +63810,11 @@ auy tRx vFV vFV -mbn -mbn +vFV +vFV bTt -mbn -mbn +vFV +vFV asj tFN vWP @@ -64016,9 +64006,9 @@ bGv vFV cOe pUU -szw +hOg ppO -mbn +vFV rix jpH xkE @@ -64209,10 +64199,10 @@ dsB asj vFV tLH -szw -szw +hOg +hOg ppO -mbn +vFV wrs tFN vWP @@ -64403,10 +64393,10 @@ qyR dsB vFV roZ -szw -szw +hOg +hOg vEY -mbn +vFV hom tFN tFN @@ -64597,10 +64587,10 @@ bGv asj vFV jHy -szw +hOg kjq euA -mbn +vFV hom hom tFN @@ -68158,7 +68148,7 @@ gcU oko cke hPR -xpW +gcU fyl jbh bsm @@ -68699,9 +68689,9 @@ iBU wsP wsP gcU -tVK -fVg -uGG +boT +opd +uVp gcU hPR gqY @@ -88458,12 +88448,12 @@ jZE jZE jZE eNh -mbn -mbn -mbn -mbn -mbn -mbn +vFV +vFV +vFV +vFV +vFV +vFV iiz bNO hZX @@ -88652,12 +88642,12 @@ auy auy auy auy -mbn +vFV tOw -xtN +yiC bcX gcd -mbn +vFV iiz rDz hZX @@ -88846,12 +88836,12 @@ llW llW llW llW -mbn -xlw +vFV yiC yiC -xvK -mbn +yiC +yiC +vFV iiz bNO hZX @@ -89040,12 +89030,12 @@ llW llW llW llW -mbn +vFV wbi yiC -yiC -xvK -mbn +xpW +jlg +vFV iiz tsd hZX @@ -89234,15 +89224,15 @@ llW vFV llW llW -mbn -gwY +vFV +yiC pJz -xvK -xvK -mbn -sIp -rTk -rTk +yiC +yiC +vFV +qSW +vFV +vFV hZX hZX hZX @@ -89428,15 +89418,15 @@ llW llW llW llW -mbn -mbn -mbn +vFV +vFV +vFV oda rxp -mbn -sIp -sIp -edR +vFV +qSW +qSW +lYN dxA dxA dxA @@ -89624,13 +89614,13 @@ vFV vFV vFV lBv -mbn -ogl -mbn -mbn -caY -sIp -edR +vFV +tRx +vFV +vFV +eaC +qSW +lYN dxA dxA dxA @@ -89821,10 +89811,10 @@ hZX hZX hZX hZX -rTk -eAM -eCq -txE +vFV +tRx +vFV +lYN hZX hZX hZX @@ -110617,7 +110607,7 @@ tEi wnB dxA wnB -lSl +dSD pxM oqv wnB diff --git a/_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_1.dmm b/_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_1.dmm index b590e3dc08..c1754a8767 100644 --- a/_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_1.dmm +++ b/_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_1.dmm @@ -62,7 +62,7 @@ /turf/open/floor/rogue/hexstone, /area/rogue/under/catacombs/dwarfoutpost/orcy) "gf" = ( -/obj/effect/mob_spawn/human/orc/corpse/orcmarauder, +/obj/effect/mob_spawn/human/orc/corpse/dwarfinvasion, /obj/effect/decal/cleanable/blood_neu/random, /obj/effect/decal/shadow_floor, /turf/open/floor/rogue/metal{ @@ -119,7 +119,7 @@ /turf/open/floor/rogue/concrete, /area/rogue/under/catacombs/dwarfoutpost/orcy) "hR" = ( -/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/blood_neu/random, /obj/effect/decal/shadow_floor{ dir = 9 }, @@ -176,7 +176,7 @@ /area/rogue/under/catacombs/dwarfoutpost/orcy) "mx" = ( /obj/effect/decal/cleanable/blood_neu/random, -/obj/effect/mob_spawn/human/orc/corpse/orcmarauder, +/obj/effect/mob_spawn/human/orc/corpse/dwarfinvasion, /turf/open/floor/rogue/metal{ icon_state = "plating2" }, @@ -223,8 +223,10 @@ /turf/open/floor/rogue/concrete, /area/rogue/under/catacombs/dwarfoutpost/orcy) "pw" = ( -/obj/effect/mob_spawn/human/orc/corpse/orcmarauder, -/obj/effect/decal/cleanable/blood/splatter, +/obj/effect/mob_spawn/human/orc/corpse/dwarfinvasion, +/obj/effect/decal/cleanable/blood_neu/random, +/obj/item/ammo_casing/caseless/rogue/arrow/poison, +/obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve, /turf/open/floor/rogue/metal{ icon_state = "plating2" }, @@ -237,7 +239,10 @@ /turf/open/floor/rogue/concrete, /area/rogue/under/catacombs/dwarfoutpost/orcy) "pV" = ( -/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/shadow_floor{ + dir = 4 + }, +/obj/item/ammo_casing/caseless/rogue/arrow, /turf/open/floor/rogue/concrete, /area/rogue/under/catacombs/dwarfoutpost/orcy) "qz" = ( @@ -362,13 +367,6 @@ /obj/effect/decal/cleanable/blood_neu/tracks, /turf/open/floor/rogue/concrete, /area/rogue/under/catacombs/dwarfoutpost/orcy) -"xw" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/decal/shadow_floor{ - dir = 8 - }, -/turf/open/floor/rogue/concrete, -/area/rogue/under/catacombs/dwarfoutpost/orcy) "yN" = ( /obj/structure/closet/crate/chest/old_crate, /obj/item/flashlight/flare/torch/lantern, @@ -461,7 +459,7 @@ /area/rogue/under/catacombs/dwarfoutpost/orcy) "GC" = ( /obj/effect/decal/cleanable/blood_neu/random, -/obj/effect/mob_spawn/human/orc/corpse/orcmarauder, +/obj/effect/mob_spawn/human/orc/corpse/dwarfinvasion, /obj/effect/decal/cleanable/blood_neu/tracks{ dir = 4 }, @@ -471,6 +469,7 @@ /turf/open/floor/rogue/concrete, /area/rogue/under/catacombs/dwarfoutpost/orcy) "Hh" = ( +/obj/effect/decal/cleanable/blood_neu/random, /obj/effect/spawner/roguemap/beartrap, /turf/open/floor/rogue/metal{ icon_state = "plating2" @@ -548,7 +547,7 @@ /turf/open/floor/rogue/metal, /area/rogue/under/catacombs/dwarfoutpost/orcy) "NG" = ( -/obj/effect/mob_spawn/human/orc/corpse/orcmarauder, +/obj/effect/mob_spawn/human/orc/corpse/dwarfinvasion, /turf/open/floor/rogue/metal{ icon_state = "plating2" }, @@ -559,7 +558,7 @@ /area/rogue/under/catacombs/dwarfoutpost/orcy) "Pk" = ( /obj/effect/mob_spawn/human/corpse/damaged/underdweller, -/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/blood_neu/random, /obj/effect/decal/shadow_floor{ dir = 8 }, @@ -591,7 +590,7 @@ /turf/open/floor/rogue/concrete, /area/rogue/under/catacombs/dwarfoutpost/orcy) "Qe" = ( -/obj/effect/mob_spawn/human/orc/corpse/orcmarauder, +/obj/effect/mob_spawn/human/orc/corpse/dwarfinvasion, /obj/effect/decal/cleanable/blood_neu/random, /turf/open/floor/rogue/metal, /area/rogue/under/catacombs/dwarfoutpost/orcy) @@ -902,7 +901,7 @@ gl vf Zs Zs -Zs +iS Zs eB eB @@ -1433,7 +1432,7 @@ gP gU vf gU -xw +gU Pk hR MX @@ -1464,9 +1463,9 @@ Jw Zs qz vo -UK -NG Hh +NG +QF UK Yt Ro @@ -1535,7 +1534,7 @@ vf bS oj Wa -Ta +pV vf Ta Ta @@ -1575,7 +1574,7 @@ vf Zs vf co -pV +dV Pp rA XT diff --git a/code/modules/mob/living/simple_animal/rogue/creacher/_corpses.dm b/code/modules/mob/living/simple_animal/rogue/creacher/_corpses.dm index b306885077..a389029183 100644 --- a/code/modules/mob/living/simple_animal/rogue/creacher/_corpses.dm +++ b/code/modules/mob/living/simple_animal/rogue/creacher/_corpses.dm @@ -63,6 +63,32 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif /// mask = /obj/item/clothing/mask/rogue/skullmask Vanderlin clothing TO DO review it +/obj/effect/mob_spawn/human/orc/corpse/dwarfinvasion + color = "#82aa00" + mob_type = /mob/living/carbon/human/species/orc/dwarfinvasion + +/mob/living/carbon/human/species/orc/dwarfinvasion/after_creation() + ..() + equipOutfit(new /datum/outfit/job/roguetown/npc/orc/dead_invader) + +/datum/outfit/job/roguetown/npc/orc/dead_invader/pre_equip(mob/living/carbon/human/H) + ..() + var/loadout = rand(1,5) + switch(loadout) + if(1) + armor = /obj/item/clothing/suit/roguetown/armor/leather/hide/orc + if(2) + armor = /obj/item/clothing/suit/roguetown/armor/leather/hide/orc + cloak = /obj/item/clothing/cloak/raincloak/brown + if(3) + cloak = /obj/item/clothing/cloak/raincloak/brown + if(4) + armor = /obj/item/clothing/suit/roguetown/armor/leather/hide/orc + cloak = /obj/item/clothing/cloak/raincloak/brown + if(5) + armor = /obj/item/clothing/suit/roguetown/armor/leather/hide/orc + cloak = /obj/item/clothing/cloak/raincloak/brown + /* .................. Dwarf Underdweller Corpse ................... */ /obj/effect/mob_spawn/human/corpse/damaged/underdweller icon = 'icons/effects/blood.dmi' diff --git a/modular/Mapping/Mapping_aides.dm b/modular/Mapping/Mapping_aides.dm index 468b0a7063..740a6cf205 100644 --- a/modular/Mapping/Mapping_aides.dm +++ b/modular/Mapping/Mapping_aides.dm @@ -874,8 +874,6 @@ /obj/effect/decal/cleanable/blood_neu/Initialize(mapload) . = ..() - if(. == INITIALIZE_HINT_QDEL) - return . pixel_x = rand(-5,5) pixel_y = rand(5,5) GLOB.weather_act_upon_list += src