From f4749b53979f28e3d32c7f45b413545ed0f69423 Mon Sep 17 00:00:00 2001 From: NPC1314 <110836368+NPC1314@users.noreply.github.com> Date: Thu, 5 Dec 2024 21:44:16 +0100 Subject: [PATCH] Hamlet polishing (#1232) * garrison * d * mapsss * Update stonehamlet.dmm * Update rotting.dm * key * Update stonehamlet.dmm * Update keyrings.dm --- _maps/custom/roguehamlet.dmm | 3 - _maps/custom/roguetown.dmm | 1 - _maps/custom/stonekeep.dmm | 1 - _maps/map_files/dakkatown/dakkatown.dmm | 1 - _maps/map_files/dun_manor/dun_manor.dmm | 1 - _maps/map_files/roguetown/roguetown.dmm | 1 - _maps/map_files/rogueworld/roguetown.dmm | 2 - _maps/map_files/stonehamlet/stonehamlet.dmm | 204 +++++++++--------- .../dwarf_outpost/Dwarf_Outpost_1.dmm | 11 +- .../dwarf_outpost/Dwarf_Outpost_2.dmm | 9 +- code/datums/components/rotting.dm | 32 +-- .../objects/effects/spawners/roguemapgen.dm | 6 + .../game/objects/items/rogueitems/keyrings.dm | 2 +- .../jobs/job_types/roguetown/nobility/lord.dm | 1 + modular/Mapping/Mapping_aides.dm | 2 +- 15 files changed, 136 insertions(+), 141 deletions(-) diff --git a/_maps/custom/roguehamlet.dmm b/_maps/custom/roguehamlet.dmm index 0a1ccdf4fa..769dbb877d 100644 --- a/_maps/custom/roguehamlet.dmm +++ b/_maps/custom/roguehamlet.dmm @@ -2664,9 +2664,6 @@ /area/rogue/under/town/basement) "daD" = ( /obj/structure/table/wood, -/obj/item/roguekey/lord{ - pixel_x = 5 - }, /obj/item/reagent_containers/glass/cup/golden{ pixel_x = -6; pixel_y = 3 diff --git a/_maps/custom/roguetown.dmm b/_maps/custom/roguetown.dmm index 2842e1e7d8..fd23e67867 100644 --- a/_maps/custom/roguetown.dmm +++ b/_maps/custom/roguetown.dmm @@ -1509,7 +1509,6 @@ "fD" = ( /obj/item/reagent_containers/glass/cup/golden, /obj/structure/table/wood, -/obj/item/roguekey/lord, /turf/open/floor/rogue/carpet/lord/right, /area/rogue/indoors/town/manor) "fE" = ( diff --git a/_maps/custom/stonekeep.dmm b/_maps/custom/stonekeep.dmm index 6a791b8ba8..cf76b6990b 100644 --- a/_maps/custom/stonekeep.dmm +++ b/_maps/custom/stonekeep.dmm @@ -1509,7 +1509,6 @@ "fD" = ( /obj/item/reagent_containers/glass/cup/golden, /obj/structure/table/wood, -/obj/item/roguekey/lord, /turf/open/floor/rogue/carpet/lord/right, /area/rogue/indoors/town/manor) "fE" = ( diff --git a/_maps/map_files/dakkatown/dakkatown.dmm b/_maps/map_files/dakkatown/dakkatown.dmm index 67eca7695e..ecbbc68146 100644 --- a/_maps/map_files/dakkatown/dakkatown.dmm +++ b/_maps/map_files/dakkatown/dakkatown.dmm @@ -1730,7 +1730,6 @@ /area/rogue/indoors/town) "gx" = ( /obj/structure/table/wood, -/obj/item/roguekey/lord, /turf/open/floor/rogue/carpet/lord/right, /area/rogue/indoors/town/manor) "gy" = ( diff --git a/_maps/map_files/dun_manor/dun_manor.dmm b/_maps/map_files/dun_manor/dun_manor.dmm index 32678403d8..581001bc72 100644 --- a/_maps/map_files/dun_manor/dun_manor.dmm +++ b/_maps/map_files/dun_manor/dun_manor.dmm @@ -14029,7 +14029,6 @@ dir = 1; icon_state = "longtable" }, -/obj/item/roguekey/lord, /turf/open/floor/rogue/ruinedwood{ icon_state = "weird1" }, diff --git a/_maps/map_files/roguetown/roguetown.dmm b/_maps/map_files/roguetown/roguetown.dmm index f35a9966bf..384f82cdac 100644 --- a/_maps/map_files/roguetown/roguetown.dmm +++ b/_maps/map_files/roguetown/roguetown.dmm @@ -16846,7 +16846,6 @@ /obj/item/clothing/mask/cigarette/pipe/westman, /obj/item/reagent_containers/food/snacks/produce/dry_westleach, /obj/item/reagent_containers/food/snacks/produce/dry_westleach, -/obj/item/roguekey/lord, /turf/open/floor/rogue/ruinedwood{ icon_state = "weird1" }, diff --git a/_maps/map_files/rogueworld/roguetown.dmm b/_maps/map_files/rogueworld/roguetown.dmm index 9217241b94..d7fc5dd68b 100644 --- a/_maps/map_files/rogueworld/roguetown.dmm +++ b/_maps/map_files/rogueworld/roguetown.dmm @@ -1562,7 +1562,6 @@ "fD" = ( /obj/item/reagent_containers/glass/cup/golden, /obj/structure/table/wood, -/obj/item/roguekey/lord, /turf/open/floor/rogue/carpet/lord/right, /area/rogue/indoors/town/manor) "fE" = ( @@ -1835,7 +1834,6 @@ /obj/structure/table/wood{ icon_state = "longtable" }, -/obj/item/roguekey/lord, /turf/open/floor/rogue/carpet/lord/center, /area/rogue/indoors/town/manor) "gD" = ( diff --git a/_maps/map_files/stonehamlet/stonehamlet.dmm b/_maps/map_files/stonehamlet/stonehamlet.dmm index 101530c014..ed4524fb5e 100644 --- a/_maps/map_files/stonehamlet/stonehamlet.dmm +++ b/_maps/map_files/stonehamlet/stonehamlet.dmm @@ -1806,7 +1806,7 @@ /obj/item/roguekey/manor, /obj/item/roguekey/manor, /obj/item/candle/yellow/lit, -/turf/open/floor/rogue/cobble, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "bQv" = ( /turf/closed/wall/mineral/rogue/stone/moss, @@ -2535,13 +2535,6 @@ /obj/structure/flora/roguegrass, /turf/open/floor/rogue/grass, /area/rogue/outdoors/exposed/town/hamlet) -"cEf" = ( -/obj/structure/rack/rogue, -/obj/item/rogueweapon/sword/long/exe/cloth{ - desc = "The last work of a forgotten swordsmith. You can hear a heavy liquid slosh in its hollow spine." - }, -/turf/open/floor/rogue/tile/kitchen, -/area/rogue/indoors/town/vault) "cEi" = ( /turf/closed/wall/mineral/rogue/wood, /area/rogue/outdoors/river) @@ -2763,7 +2756,7 @@ /obj/structure/mineral_door/wood/fancywood{ locked = 1; lockid = "elder"; - name = "Mayor's House" + name = "mayor's House" }, /turf/open/floor/rogue/twig, /area/rogue/indoors) @@ -2877,12 +2870,9 @@ /area/rogue/under/town/basement) "daD" = ( /obj/structure/table/wood, -/obj/item/roguekey/lord{ - pixel_x = 5 - }, /obj/item/reagent_containers/glass/cup/golden{ - pixel_x = -6; - pixel_y = 3 + pixel_x = 1; + pixel_y = 7 }, /turf/open/floor/rogue/carpet/lord/right, /area/rogue/indoors/town/manor{ @@ -3277,6 +3267,9 @@ dir = 8; icon_state = "border" }, +/obj/structure/stairs{ + dir = 1 + }, /turf/open/floor/rogue/ruinedwood{ icon_state = "horzw" }, @@ -4216,9 +4209,6 @@ /obj/effect/spawner/roguemap/treeorbush, /turf/open/floor/rogue/dirt/road, /area/rogue/indoors) -"erC" = ( -/turf/open/floor/carpet/royalblack, -/area/rogue/outdoors/exposed/under/basement) "erS" = ( /obj/structure/fluff/railing/border{ dir = 10; @@ -5711,7 +5701,7 @@ "fIm" = ( /obj/effect/decal/cleanable/dirt/cobweb, /obj/structure/bed/rogue/shit, -/turf/open/floor/rogue/wood, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "fIp" = ( /obj/item/reagent_containers/glass/bucket/wooden/alter, @@ -5734,7 +5724,7 @@ /area/rogue/outdoors/exposed/manorgarri) "fKq" = ( /obj/structure/bed/rogue/shit, -/turf/open/floor/rogue/wood, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "fKy" = ( /obj/structure/roguemachine/submission, @@ -5828,7 +5818,7 @@ dir = 9 }, /obj/structure/bed/rogue/inn, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/red, /area/rogue/outdoors/exposed/under/basement) "fOQ" = ( /obj/structure/fermenting_barrel/beer, @@ -6649,7 +6639,7 @@ /obj/structure/table/wood/nice/decorated, /obj/item/book/rogue/secret/ledger, /obj/item/book/rogue/secret/xylix, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/red, /area/rogue/outdoors/exposed/under/basement) "gGC" = ( /obj/structure/fluff/clodpile, @@ -6698,7 +6688,7 @@ /obj/structure/table/wood{ icon_state = "tablewood3" }, -/obj/item/rogueweapon/sword/iron, +/obj/item/clothing/neck/roguetown/psycross, /turf/open/floor/rogue/blocks, /area/rogue/under/town/basement) "gIB" = ( @@ -6835,7 +6825,7 @@ "gSH" = ( /obj/item/clothing/cloak/cape/archivist, /obj/structure/closet/crate/chest/neu_iron, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/red, /area/rogue/outdoors/exposed/under/basement) "gSS" = ( /obj/item/book/rogue/noc, @@ -8760,10 +8750,11 @@ }, /area/rogue/outdoors/town/roofs) "iNk" = ( -/obj/effect/decal/turfedge_neu/mossy{ - dir = 5 +/obj/structure/mineral_door/wood{ + locked = 1; + lockid = "manor" }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/rogue/tile/kitchen, /area/rogue/outdoors/exposed/under/basement) "iNo" = ( /obj/structure/chair/stool/rogue, @@ -10144,7 +10135,7 @@ /turf/open/floor/rogue/grass, /area/rogue/outdoors/rtfield/outlaw) "khv" = ( -/obj/effect/spawner/roguemap/beartrap, +/obj/effect/spawner/roguemap/beartrap_obvious, /turf/open/floor/rogue/ruinedwood/turned, /area/rogue/outdoors/rtfield/hamlet) "khz" = ( @@ -11611,7 +11602,7 @@ /turf/open/floor/rogue/wood/saiga, /area/rogue/under/town/basement) "lJI" = ( -/turf/open/floor/rogue/wood, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "lJT" = ( /obj/structure/bed/rogue/shit, @@ -12035,7 +12026,7 @@ /area/rogue/under/town/sewer) "mgy" = ( /obj/machinery/printingpress, -/turf/open/floor/rogue/tile/kitchen, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "mgH" = ( /turf/closed/wall/mineral/rogue/roofwall/outercorner{ @@ -12756,7 +12747,7 @@ /area/rogue/outdoors/rtfield/outlaw) "mUT" = ( /obj/machinery/light/rogue/wallfire/candle, -/turf/open/floor/rogue/tile/kitchen, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "mVa" = ( /obj/structure/chair/bench/ultimacouch/r{ @@ -13702,9 +13693,6 @@ /area/rogue/indoors/town/manor{ first_time_text = "STONEHILL CASTLE" }) -"nRT" = ( -/turf/open/floor/rogue/woodturned/nosmooth, -/area/rogue/indoors/town/garrison) "nRU" = ( /obj/structure/flora/rock/pile, /obj/item/natural/stone, @@ -13800,7 +13788,7 @@ /area/rogue/indoors/town/church) "nWf" = ( /obj/structure/fluff/railing/border, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/rogue/concrete, /area/rogue/outdoors/exposed/under/basement) "nWE" = ( /obj/structure/roguewindow/stained, @@ -14013,7 +14001,7 @@ /obj/effect/decal/turfedge_neu{ dir = 8 }, -/turf/open/floor/rogue/wood, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "ojm" = ( /obj/item/reagent_containers/food/snacks/butter, @@ -14855,6 +14843,7 @@ /area/rogue/outdoors/rtfield/outlaw) "oQh" = ( /obj/structure/mineral_door/wood{ + locked = 1; lockid = "doctor" }, /obj/effect/decal/cleanable/blood_neu/tracks{ @@ -14897,7 +14886,7 @@ /obj/item/paper, /obj/item/paper, /obj/item/paper, -/turf/open/floor/rogue/tile/kitchen, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "oRK" = ( /obj/structure/ladder, @@ -15312,7 +15301,9 @@ /turf/open/floor/rogue/cobblerock/alt, /area/rogue/indoors/town) "plb" = ( -/obj/structure/bed/rogue/wool, +/obj/structure/bed/rogue/wool{ + name = "acolyte bed" + }, /obj/item/bedsheet/rogue/wool, /obj/machinery/light/rogue/wallfire/candle/l, /turf/open/floor/rogue/ruinedwood/spiral, @@ -15700,7 +15691,7 @@ dir = 6; icon_state = "border" }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/rogue/cobble/mossy/alt, /area/rogue/outdoors/exposed/under/basement) "pBL" = ( /obj/structure/flora/roguetree/burnt, @@ -16888,7 +16879,7 @@ /obj/machinery/light/rogue/wallfire/candle/l, /obj/item/book_crafting_kit, /obj/item/book_crafting_kit, -/turf/open/floor/rogue/tile/kitchen, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "qOE" = ( /obj/structure/stairs{ @@ -17066,7 +17057,7 @@ /area/rogue/outdoors/exposed/church) "qWc" = ( /obj/structure/mineral_door/wood/red{ - lockid = "woodsm"; + lockid = "elder"; name = "Mayors room" }, /turf/open/floor/rogue/ruinedwood/spiral, @@ -17489,7 +17480,9 @@ /turf/open/floor/rogue/cobble/mossy/alt, /area/rogue/indoors/town/tavern/saiga) "rrl" = ( -/obj/structure/bed/rogue/wool, +/obj/structure/bed/rogue/wool{ + name = "acolyte bed" + }, /obj/item/bedsheet/rogue/wool, /turf/open/floor/rogue/ruinedwood/spiral, /area/rogue/indoors/town/church) @@ -18963,7 +18956,7 @@ /area/rogue/outdoors/rtfield/boggish) "sXY" = ( /obj/structure/fluff/statue/small, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/red, /area/rogue/outdoors/exposed/under/basement) "sYX" = ( /obj/structure/kneestingers, @@ -19135,7 +19128,7 @@ /obj/structure/mineral_door/wood/donjon/stone{ locked = 1; lockid = "makers"; - name = "secret door" + name = "door" }, /turf/open/floor/rogue/cobble/alt, /area/rogue/under/town/basement) @@ -19245,7 +19238,7 @@ locked = 1; lockid = "manor" }, -/turf/open/floor/rogue/woodturned/nosmooth, +/turf/open/floor/rogue/wood/saiga, /area/rogue/indoors/town/garrison) "tnO" = ( /obj/structure/mineral_door/wood/donjon/stone{ @@ -19393,7 +19386,7 @@ /area/rogue/outdoors/mountains) "twV" = ( /obj/machinery/bookbinder, -/turf/open/floor/rogue/tile/kitchen, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "txc" = ( /obj/structure/stairs/stone{ @@ -19656,7 +19649,7 @@ lockid = "manor"; name = "archivist's chambers" }, -/turf/open/floor/rogue/tile/kitchen, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "tKf" = ( /obj/structure/mineral_door/wood{ @@ -20558,7 +20551,7 @@ /obj/effect/decal/turfedge_neu/mossy{ dir = 4 }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/rogue/concrete, /area/rogue/outdoors/exposed/under/basement) "uxJ" = ( /obj/structure/fluff/railing/stonehedge, @@ -20987,10 +20980,6 @@ /obj/structure/fluff/railing/border, /turf/open/water/sewer, /area/rogue/under/town/sewer) -"uPQ" = ( -/obj/effect/spawner/roguemap/beartrap, -/turf/open/floor/rogue/dirt/road, -/area/rogue/indoors) "uPR" = ( /turf/closed/wall/mineral/rogue/roofwall/outercorner{ dir = 8 @@ -21439,7 +21428,6 @@ /area/rogue/outdoors/rtfield/hamlet) "vlr" = ( /obj/structure/closet/crate/coffin, -/obj/item/clothing/accessory/skullcodpiece, /obj/item/roguecoin/silver, /obj/item/roguecoin/silver, /turf/open/floor/rogue/naturalstone, @@ -21548,7 +21536,7 @@ /obj/effect/decal/turfedge_neu{ dir = 9 }, -/turf/open/floor/rogue/wood, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "vrK" = ( /obj/structure/flora/roguegrass/thorn_bush, @@ -21838,7 +21826,7 @@ /area/rogue/outdoors/rtfield/hamlet) "vHH" = ( /obj/structure/roguetent/preopen, -/turf/open/floor/rogue/tile/kitchen, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "vHP" = ( /obj/structure/chair/stool/rogue, @@ -22931,7 +22919,7 @@ "wOS" = ( /obj/structure/mineral_door/wood/fancywood{ locked = 1; - lockid = "lord"; + lockid = "vault"; name = "THE VAULT" }, /obj/item/restraints/legcuffs/beartrap/armed, @@ -23284,7 +23272,7 @@ /obj/effect/decal/turfedge_neu/mossy{ dir = 8 }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/rogue/concrete, /area/rogue/outdoors/exposed/under/basement) "xhy" = ( /obj/effect/decal/turfedge_neu/alt_small, @@ -23871,7 +23859,7 @@ /obj/effect/decal/turfedge_neu/mossy{ dir = 10 }, -/turf/open/floor/rogue/wood, +/turf/open/floor/rogue/wood/saiga, /area/rogue/outdoors/exposed/under/basement) "xLU" = ( /turf/open/floor/rogue/rooftop/green{ @@ -34901,8 +34889,8 @@ xSd syZ eRP gtw -erC -iNk +gKG +aTI gtw bQk oiJ @@ -35095,8 +35083,8 @@ xSd pxn brT hPq -erC -erC +gKG +gKG mNM qio qio @@ -35289,8 +35277,8 @@ wDj brT pqq gtw -erC -erC +xhr +owX gtw rje qio @@ -35483,8 +35471,8 @@ brT brT ojm gtw -erC -erC +wdf +wdf gtw wxb jne @@ -35667,7 +35655,7 @@ xSd mgy qNI twV -tbe +lJI pbD gSH sXY @@ -35677,7 +35665,7 @@ brT hmu asE tvZ -erC +wdf pBw tvZ gtw @@ -35859,19 +35847,19 @@ tvZ fws hcr mUT -tbe -tbe -tbe +lJI +lJI +lJI vHH -erC -erC +vTq +vTq xSd tvZ brT brT pak xSd -xhr +wdf lil drL kmu @@ -36053,9 +36041,9 @@ tvZ wdf xSd oRy -tbe -tbe -tbe +lJI +lJI +lJI pbD gGy fOo @@ -36453,7 +36441,7 @@ fpB lug jOm pbD -iNk +aTI uxG gtw teg @@ -36647,7 +36635,7 @@ jXM tvZ vAv tvZ -erC +gKG nWf iqm wdf @@ -36841,8 +36829,8 @@ tvZ pbD tvZ gtw -tbe -tbe +gKG +gKG tvZ gtw gtw @@ -37218,7 +37206,7 @@ etw gKG gtw uQr -cEf +vwS dBO aVE dBO @@ -37808,9 +37796,9 @@ gtw gtw brT sMX -wdf -wdf -kqz +tbe +tbe +iNk tbe bOo dir @@ -59930,9 +59918,9 @@ hOg bdj hUL lIB -qbe -qbe -qbe +sue +sue +sue raA hUL asj @@ -60124,9 +60112,9 @@ oHL iHy hUL eqU -nRT -nRT -nRT +sue +sue +sue iDr hUL asj @@ -71591,7 +71579,7 @@ gcU ppM hDi gcU -uPQ +cke gcU hDi rMM @@ -89768,7 +89756,7 @@ psp psp uZo uZo -psp +hZX hZX hZX hZX @@ -89962,8 +89950,8 @@ psp psp psp uZo -psp -psp +hZX +hZX hZX hZX hZX @@ -90156,7 +90144,6 @@ psp psp psp uZo -uZo psp psp hZX @@ -90173,6 +90160,7 @@ hZX hZX hZX hZX +hZX uQd uQd xvr @@ -90349,7 +90337,6 @@ psp psp psp psp -psp uZo uZo psp @@ -90400,6 +90387,7 @@ hZX hZX hZX hZX +hZX kvS old old @@ -90544,12 +90532,12 @@ psp psp psp psp -psp uZo hZX hZX hZX hZX +hZX psp hZX hZX @@ -90738,7 +90726,6 @@ psp psp psp psp -psp uZo hZX hZX @@ -90790,6 +90777,7 @@ hZX hZX hZX hZX +hZX gfN kwb iFi @@ -90932,7 +90920,6 @@ psp psp psp psp -psp uZo hZX hZX @@ -90943,6 +90930,7 @@ hZX hZX hZX hZX +hZX psp hZX hZX @@ -91126,7 +91114,6 @@ psp psp psp psp -psp uZo psp psp @@ -91153,6 +91140,7 @@ hZX hZX hZX hZX +hZX lQc hZX hZX @@ -91320,7 +91308,6 @@ jsn psp psp psp -psp koX npJ psp @@ -91342,6 +91329,7 @@ hZX hZX hZX hZX +hZX mMv hZX hZX @@ -91514,12 +91502,12 @@ jsn psp psp psp -psp ezG koX tvc tvc hZX +hZX eoL hZX hZX @@ -91708,7 +91696,6 @@ jsn psp psp psp -psp iXr koX aDu @@ -91764,6 +91751,7 @@ hZX hZX hZX hZX +hZX vzv qwa qxN @@ -91902,7 +91890,6 @@ jsn psp psp psp -psp esl koX esl @@ -91911,6 +91898,7 @@ hZX hZX hZX hZX +hZX psp psp hZX @@ -114207,7 +114195,6 @@ psp psp psp psp -psp uZo psp hZX @@ -114229,6 +114216,7 @@ hZX hZX hZX hZX +hZX uQd eLR euk @@ -114401,7 +114389,6 @@ psp psp psp psp -psp uZo hWY hZX @@ -114423,6 +114410,7 @@ hZX hZX hZX hZX +hZX xvr vVD rBL @@ -114595,7 +114583,7 @@ psp psp psp psp -psp +uZo uZo uZo uZo @@ -114790,7 +114778,7 @@ psp psp psp psp -psp +uZo uZo uZo uZo 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 c1754a8767..f54a168ae3 100644 --- a/_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_1.dmm +++ b/_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_1.dmm @@ -27,6 +27,9 @@ }, /turf/open/floor/rogue/concrete, /area/rogue/under/catacombs/dwarfoutpost/orcy) +"dM" = ( +/turf/open/water/swamp, +/area/rogue) "dV" = ( /obj/effect/decal/cleanable/blood_neu/random, /turf/open/floor/rogue/concrete, @@ -556,6 +559,10 @@ /obj/machinery/light/rogue/torchholder/l, /turf/open/floor/rogue/concrete, /area/rogue/under/catacombs/dwarfoutpost/orcy) +"Os" = ( +/obj/structure/bars, +/turf/open/water/swamp, +/area/rogue/under/catacombs/dwarfoutpost/orcy) "Pk" = ( /obj/effect/mob_spawn/human/corpse/damaged/underdweller, /obj/effect/decal/cleanable/blood_neu/random, @@ -1487,8 +1494,8 @@ Zs Zs Zs Zs -vf -gl +Os +dM gl "} (21,1,1) = {" diff --git a/_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_2.dmm b/_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_2.dmm index c781882345..2562b0752c 100644 --- a/_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_2.dmm +++ b/_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_2.dmm @@ -560,6 +560,9 @@ }, /turf/open/floor/rogue/concrete, /area/rogue/under/catacombs/dwarfoutpost) +"VX" = ( +/turf/open/water/swamp, +/area/rogue) "VZ" = ( /obj/item/natural/rock, /turf/open/floor/rogue/dirt, @@ -1326,8 +1329,8 @@ iB QJ iB IM -vl -gl +BW +VX gl "} (21,1,1) = {" @@ -1362,7 +1365,7 @@ vf iB Tm vf -gl +VX gl "} (22,1,1) = {" diff --git a/code/datums/components/rotting.dm b/code/datums/components/rotting.dm index af8df6359d..625b353a1c 100644 --- a/code/datums/components/rotting.dm +++ b/code/datums/components/rotting.dm @@ -1,7 +1,7 @@ /datum/component/rot var/amount = 0 var/last_process = 0 - var/datum/looping_sound/fliesloop/soundloop +// var/datum/looping_sound/fliesloop/soundloop commented out looping sound flies because of runtimes. TO DO. /datum/component/rot/Initialize(new_amount) ..() @@ -11,13 +11,13 @@ if(new_amount) amount = new_amount - soundloop = new(list(parent), FALSE) +// soundloop = new(list(parent), FALSE) START_PROCESSING(SSroguerot, src) /datum/component/rot/Destroy() - if(soundloop) - soundloop.stop() +// if(soundloop) +// soundloop.stop() . = ..() /datum/component/rot/process() @@ -80,21 +80,21 @@ var/turf/open/T = C.loc if(istype(T)) T.add_pollutants(/datum/pollutant/rot, 5) - if(soundloop && soundloop.stopped && !is_zombie) - soundloop.start() - else - if(soundloop && !soundloop.stopped) - soundloop.stop() - else - if(soundloop && !soundloop.stopped) - soundloop.stop() +// if(soundloop && soundloop.stopped && !is_zombie) +// soundloop.start() +// else +// if(soundloop && !soundloop.stopped) +// soundloop.stop() +// else +// if(soundloop && !soundloop.stopped) +// soundloop.stop() if(shouldupdate) if(findonerotten) if(ishuman(C)) var/mob/living/carbon/human/H = C H.skin_tone = "878f79" //elf ears - if(soundloop && soundloop.stopped && !is_zombie) - soundloop.start() +// if(soundloop && soundloop.stopped && !is_zombie) +// soundloop.start() C.update_body() /datum/component/rot/simple/process() @@ -105,8 +105,8 @@ qdel(R) return if(amount > 10 MINUTES) - if(soundloop && soundloop.stopped) - soundloop.start() +// if(soundloop && soundloop.stopped) +// soundloop.start() var/turf/open/T = get_turf(L) if(istype(T)) T.add_pollutants(/datum/pollutant/rot, 5) diff --git a/code/game/objects/effects/spawners/roguemapgen.dm b/code/game/objects/effects/spawners/roguemapgen.dm index 8e5177f078..d76b32655a 100644 --- a/code/game/objects/effects/spawners/roguemapgen.dm +++ b/code/game/objects/effects/spawners/roguemapgen.dm @@ -65,6 +65,12 @@ probby = 50 spawned = list(/obj/item/restraints/legcuffs/beartrap/armed/camouflage) +/obj/effect/spawner/roguemap/beartrap_obvious + icon_state = "beartrap" + name = "beartrap" + probby = 50 + spawned = list(/obj/item/restraints/legcuffs/beartrap/armed) + /obj/effect/spawner/roguemap/tallgrass icon_state = "grass" name = "grass tile loot spawner" diff --git a/code/game/objects/items/rogueitems/keyrings.dm b/code/game/objects/items/rogueitems/keyrings.dm index eeec6cbb79..c0cacda373 100644 --- a/code/game/objects/items/rogueitems/keyrings.dm +++ b/code/game/objects/items/rogueitems/keyrings.dm @@ -276,7 +276,7 @@ keys = list(/obj/item/roguekey/niteman, /obj/item/roguekey/nitemaiden) /obj/item/keyring/hand - keys = list(/obj/item/roguekey/hand, /obj/item/roguekey/steward, /obj/item/roguekey/tavern, /obj/item/roguekey/church, /obj/item/roguekey/merchant, /obj/item/roguekey/dungeon, /obj/item/roguekey/walls, /obj/item/roguekey/garrison, /obj/item/roguekey/manor, /obj/item/roguekey/guest) + keys = list(/obj/item/roguekey/hand, /obj/item/roguekey/steward, /obj/item/roguekey/tavern, /obj/item/roguekey/church, /obj/item/roguekey/merchant, /obj/item/roguekey/dungeon, /obj/item/roguekey/walls, /obj/item/roguekey/garrison, /obj/item/roguekey/manor, /obj/item/roguekey/vault) /obj/item/keyring/steward keys = list(/obj/item/roguekey/steward, /obj/item/roguekey/vault, /obj/item/roguekey/manor, /obj/item/roguekey/warehouse) diff --git a/code/modules/jobs/job_types/roguetown/nobility/lord.dm b/code/modules/jobs/job_types/roguetown/nobility/lord.dm index ab5ad04f97..479488da2f 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/lord.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/lord.dm @@ -42,6 +42,7 @@ backr = /obj/item/storage/backpack/rogue/satchel belt = /obj/item/storage/belt/rogue/leather/plaquegold backpack_contents = list(/obj/item/rogueweapon/knife/dagger/steel/special = 1) + neck = /obj/item/roguekey/lord id = /obj/item/clothing/ring/active/nomag l_hand = /obj/item/rogueweapon/lordscepter if(H.mind) diff --git a/modular/Mapping/Mapping_aides.dm b/modular/Mapping/Mapping_aides.dm index 740a6cf205..23e5ded193 100644 --- a/modular/Mapping/Mapping_aides.dm +++ b/modular/Mapping/Mapping_aides.dm @@ -66,7 +66,7 @@ /datum/map_template/dwarf_outpost_ii name = "Dwarf Outpost Beastmen" id = "Dwarf_Outpost_2" - mappath = "_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_1.dmm" + mappath = "_maps/map_files/templates/dwarf_outpost/Dwarf_Outpost_2.dmm" /* .................. Roadblock ................... */