diff --git a/_maps/map_files/Drought/Drought.dmm b/_maps/map_files/Drought/Drought.dmm
index 202aa49b942..f3212275148 100644
--- a/_maps/map_files/Drought/Drought.dmm
+++ b/_maps/map_files/Drought/Drought.dmm
@@ -104,6 +104,9 @@
/obj/machinery/griddle/ms13,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"afD" = (
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/desert)
"agi" = (
/obj/structure/table/ms13/low_wall/concrete,
/obj/structure/window/fulltile/ms13/glass,
@@ -237,6 +240,12 @@
/obj/structure/ms13/sandbag,
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/desert)
+"alX" = (
+/obj/effect/decal/cleanable/blood/footprints{
+ dir = 4
+ },
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/desert)
"amy" = (
/obj/effect/turf_decal/ms13/graffiti/clueless,
/turf/closed/wall/ms13/craftable/scrap,
@@ -439,6 +448,10 @@
/obj/structure/table/ms13/low_wall/brick/gray,
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/town)
+"axv" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/town)
"ayj" = (
/obj/structure/table/ms13/crafting/workbench,
/turf/open/floor/ms13/concrete/small,
@@ -495,6 +508,14 @@
/obj/effect/spawner/random/ms13/gun/lowrandom,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"aEQ" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/desert)
+"aER" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/water_baron)
"aFh" = (
/obj/structure/ms13/road_barrier/concrete{
dir = 4
@@ -608,6 +629,11 @@
"aKh" = (
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/water_baron)
+"aKq" = (
+/obj/structure/table/ms13/no_smooth/counter/metal,
+/obj/structure/ms13/chem_set,
+/turf/open/floor/ms13/tile/full/navy,
+/area/ms13/water_baron/interior)
"aKs" = (
/obj/structure/bed/ms13/bedframe/metal,
/obj/structure/bed/ms13/mattress/dirty,
@@ -971,6 +997,10 @@
"bcV" = (
/turf/open/floor/wood/ms13/carpet/shaggy,
/area/ms13/drylanders/building)
+"bdp" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/town)
"bdU" = (
/obj/machinery/light/ms13/bulb{
dir = 4
@@ -993,6 +1023,13 @@
dir = 8
},
/area/ms13/water_baron/interior)
+"beT" = (
+/obj/structure/lattice/catwalk/ms13,
+/obj/machinery/light/ms13/bulb{
+ dir = 4
+ },
+/turf/open/openspace/ms13,
+/area/ms13/town)
"bfo" = (
/obj/structure/ms13/celldoor/rusty{
dir = 1
@@ -1025,6 +1062,10 @@
/obj/item/clothing/under/ms13/wasteland/mechanicprewar/mechanicgrey,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/factory)
+"bit" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/water_baron)
"biV" = (
/obj/structure/railing/ms13/solo/industrial{
dir = 8
@@ -1085,6 +1126,10 @@
/obj/effect/spawner/random/ms13/tools/lights,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"bmk" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/desert)
"bmF" = (
/obj/machinery/door/unpowered/ms13/metal,
/obj/machinery/door/poddoor/shutters/ms13/horizontal/red/solo/pre_open{
@@ -1522,6 +1567,18 @@
/obj/structure/table/ms13/low_wall/siding/green,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"bJN" = (
+/obj/effect/decal/cleanable/blood/footprints{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood{
+ icon_state = "floor7"
+ },
+/obj/effect/decal/cleanable/blood{
+ icon_state = "floor3"
+ },
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/desert)
"bJP" = (
/obj/effect/turf_decal/ms13/road/verticalline,
/obj/effect/ai_node,
@@ -2170,6 +2227,10 @@
"crx" = (
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"crK" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/town)
"crP" = (
/obj/effect/turf_decal/ms13/covering/paint/white,
/obj/effect/turf_decal/ms13/graffiti/ourtown,
@@ -2315,6 +2376,18 @@
},
/turf/open/floor/ms13/tile/large/checkered,
/area/ms13/town)
+"cAI" = (
+/obj/item/ammo_casing/ms13/spent,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
+"cBr" = (
+/obj/effect/decal/cleanable/blood/footprints,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/desert)
+"cBy" = (
+/obj/effect/turf_decal/ms13/graffiti/do_not,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/desert)
"cBA" = (
/obj/structure/ms13/barricade,
/obj/structure/table/ms13/wood/constructed,
@@ -2754,6 +2827,10 @@
/obj/machinery/door/unpowered/ms13/wood,
/turf/open/floor/wood/ms13/carpet/shaggy/green,
/area/ms13/town)
+"dgB" = (
+/obj/effect/turf_decal/ms13/graffiti/reaper,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/desert)
"dgT" = (
/obj/machinery/ms13/fusion_generator,
/turf/open/floor/ms13/metal/grate/border{
@@ -2847,6 +2924,11 @@
/mob/living/basic/ms13/hostile_animal/gecko/golden,
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/desert)
+"djh" = (
+/obj/structure/noticeboard/ms13/cork,
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/ms13/concrete,
+/area/ms13/rangeroutpost/building)
"djv" = (
/obj/structure/chair/sofa/corp/right{
dir = 8
@@ -2990,6 +3072,10 @@
/obj/effect/spawner/random/ms13/drink/alcohol_beer,
/turf/open/floor/wood/ms13/carpet/green,
/area/ms13/town)
+"dpR" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13/water_baron)
"dqe" = (
/obj/machinery/door/poddoor/shutters/ms13/horizontal/indestructible/red/right{
id = "bikers_club_garage"
@@ -3002,10 +3088,14 @@
/obj/effect/landmark/start/ms13/legion_explorer,
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/legioncamp/building)
+"dqv" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"dqZ" = (
/obj/structure/table/ms13/no_smooth/counter/metal,
-/obj/effect/spawner/random/ms13/tools/lights,
-/turf/open/floor/ms13/concrete/industrial,
+/obj/effect/spawner/random/ms13/gun/lowunique,
+/turf/open/floor/ms13/concrete,
/area/ms13/town)
"drc" = (
/obj/structure/railing/ms13/solo/industrial{
@@ -3273,12 +3363,21 @@
/obj/machinery/light/ms13/bulb,
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
+"dJX" = (
+/obj/structure/table/ms13/no_smooth/metal,
+/obj/effect/spawner/random/ms13/smokeable/highrandom,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"dKg" = (
/obj/structure/railing/ms13/wood/single{
dir = 1
},
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/desert)
+"dKh" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/tile/fancy,
+/area/ms13/town)
"dKn" = (
/obj/structure/bed/ms13/sleepingbag/green,
/turf/open/floor/plating/ms13/ground/desert,
@@ -3411,6 +3510,10 @@
/obj/effect/spawner/random/ms13/food/packaged,
/turf/open/floor/ms13/tile/full/green,
/area/ms13/town)
+"dSM" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/concrete/small,
+/area/ms13/water_baron/interior)
"dSP" = (
/obj/structure/closet/ms13/wall/firstaid,
/obj/effect/spawner/random/ms13/medical/lowrandom,
@@ -3505,6 +3608,18 @@
/obj/structure/chair/ms13/metal/broken,
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
+"dYO" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/desert)
+"dZd" = (
+/obj/effect/decal/cleanable/blood{
+ icon_state = "floor4"
+ },
+/obj/effect/decal/cleanable/blood,
+/obj/effect/mob_spawn/corpse/human/ms13/nomad,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/desert)
"dZL" = (
/obj/item/shovel/ms13/spade,
/turf/open/floor/plating/ms13/ground/desert,
@@ -3588,6 +3703,10 @@
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"ehD" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13/desert)
"ehL" = (
/obj/structure/ms13/cave_decor/stalagmite,
/turf/open/floor/plating/ms13/ground/mountain/drought,
@@ -3991,6 +4110,10 @@
},
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/water_baron)
+"eEm" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"eGh" = (
/obj/machinery/door/unpowered/ms13/seethrough/grate{
dir = 4
@@ -4219,7 +4342,8 @@
/obj/structure/ms13/storage/vent,
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/obj/effect/spawner/random/ms13/crafting/lowrandom,
-/turf/open/floor/ms13/concrete/industrial,
+/obj/effect/spawner/random/ms13/tools/lights,
+/turf/open/floor/ms13/concrete,
/area/ms13/town)
"eSz" = (
/obj/structure/lattice/catwalk/ms13,
@@ -4360,7 +4484,7 @@
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/legioncamp)
"fci" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -4542,6 +4666,10 @@
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"foD" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/mountain/drought,
+/area/ms13/underground/mountain)
"foL" = (
/obj/structure/ms13/foundation/wide/variantfour{
dir = 1
@@ -4646,6 +4774,11 @@
},
/turf/open/floor/ms13/tile/large/white,
/area/ms13/town)
+"fuf" = (
+/obj/structure/ms13/pa_jack,
+/obj/structure/ms13/wall_decor/flag,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"fuj" = (
/obj/structure/bed/ms13/bedframe/wire,
/obj/structure/bed/ms13/mattress/stale,
@@ -4662,6 +4795,11 @@
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"fwO" = (
+/obj/machinery/light/ms13/bulb,
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"fwV" = (
/obj/structure/table/ms13/metal/grate,
/obj/effect/spawner/random/ms13/food/junkfood_boxed,
@@ -4740,6 +4878,10 @@
/mob/living/simple_animal/hostile/ms13/radscorpion/desert,
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/desert)
+"fCg" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/town)
"fCL" = (
/obj/structure/chair/ms13/wood{
dir = 1
@@ -4801,6 +4943,10 @@
/obj/structure/ms13/foundation/mosaic/variantone,
/turf/open/floor/plating/ms13/ground/mountain/drought,
/area/ms13/town)
+"fGf" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/rangeroutpost/building)
"fGh" = (
/obj/structure/table/ms13/low_wall/siding,
/obj/structure/window/fulltile/ms13/glass,
@@ -4843,6 +4989,10 @@
},
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/town)
+"fIx" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/concrete,
+/area/ms13/water_baron/interior)
"fIF" = (
/obj/structure/table/ms13/no_smooth/counter/wood/crafted,
/obj/structure/ms13/barricade{
@@ -5015,6 +5165,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"fQt" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/town)
"fQG" = (
/obj/structure/ms13/storage/large/shelf{
dir = 4
@@ -5095,6 +5249,18 @@
/obj/machinery/light/ms13,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
+"fUd" = (
+/obj/effect/decal/cleanable/blood/gibs/up,
+/obj/effect/decal/cleanable/blood/old{
+ pixel_x = 4
+ },
+/obj/effect/decal/cleanable/blood/old{
+ pixel_x = -5;
+ pixel_y = 13
+ },
+/obj/effect/decal/cleanable/blood/tracks,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"fUf" = (
/obj/structure/table/ms13/low_wall/siding,
/obj/structure/ms13/barricade{
@@ -5161,6 +5327,10 @@
},
/turf/open/floor/wood/ms13/common,
/area/ms13/water_baron/interior)
+"fXE" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/concrete/small,
+/area/ms13/water_baron/interior)
"fXG" = (
/obj/structure/lattice/catwalk/ms13,
/turf/open/openspace/ms13,
@@ -5220,6 +5390,10 @@
/obj/effect/spawner/random/ms13/drugs/prewar,
/turf/open/floor/ms13/tile/full/white,
/area/ms13/town)
+"gah" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/desert)
"gav" = (
/obj/structure/ms13/storage/store/metal{
dir = 8
@@ -5236,6 +5410,10 @@
/obj/item/radio/ms13/ham/receiver/radioking,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"gba" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/legioncamp/building)
"gbF" = (
/obj/structure/chair/ms13/metal/folding{
dir = 8
@@ -5253,6 +5431,15 @@
/obj/item/mop/ms13,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
+"gdd" = (
+/obj/structure/ms13/storage/shelf{
+ dir = 1
+ },
+/obj/machinery/light/ms13/bulb/industrial{
+ dir = 4
+ },
+/turf/open/floor/ms13/concrete,
+/area/ms13/desert)
"gdL" = (
/obj/structure/sink/ms13{
pixel_y = 14
@@ -5306,6 +5493,10 @@
},
/turf/open/floor/ms13/concrete,
/area/ms13/rangeroutpost/building)
+"gfO" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13/desert)
"gfS" = (
/obj/structure/ms13/storage/shelf{
dir = 4
@@ -5577,6 +5768,10 @@
/obj/effect/spawner/random/ms13/drink/soda,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"grC" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/ms13/metal,
+/area/ms13/water_baron/interior)
"grI" = (
/obj/structure/chair/ms13/metal{
dir = 1
@@ -5611,6 +5806,11 @@
/obj/structure/ms13/wall_decor/flag/legion,
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/legioncamp)
+"gvi" = (
+/obj/structure/ms13/pa_jack,
+/obj/effect/spawner/random/ms13/power_armor/lowrandom,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"gvI" = (
/obj/structure/closet/crate/ms13/footlocker{
dir = 4
@@ -5919,9 +6119,12 @@
/turf/open/floor/ms13/concrete/small,
/area/ms13/water_baron/interior)
"gQA" = (
-/obj/structure/ms13/barrel/single/warning/one,
-/turf/open/floor/plating/ms13/ground/desert,
-/area/ms13/desert)
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
"gQT" = (
/obj/machinery/vending/ms13/cigarettes{
dir = 4
@@ -6097,6 +6300,10 @@
"hgp" = (
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/desert)
+"hgE" = (
+/obj/machinery/door/unpowered/ms13/seethrough/fence/wire/barb,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13/desert)
"hgP" = (
/obj/structure/table/ms13/no_smooth/wood/low,
/obj/effect/spawner/random/ms13/medical/lowrandom,
@@ -6147,7 +6354,7 @@
/turf/open/floor/ms13/tile/large/cafeteria,
/area/ms13/town)
"hiJ" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -6341,6 +6548,18 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"hss" = (
+/obj/effect/spawner/random/ms13/tools/tool,
+/obj/structure/ms13/rug/mat/rubber/single,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
+"hsu" = (
+/obj/structure/table/ms13/no_smooth/counter/metal{
+ dir = 4
+ },
+/obj/effect/spawner/random/ms13/tools/tool,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
"hub" = (
/obj/machinery/door/unpowered/ms13/metal,
/turf/open/floor/ms13/concrete/industrial,
@@ -6421,10 +6640,6 @@
/obj/machinery/iv_drip/ms13,
/turf/open/floor/ms13/tile/full/white,
/area/ms13/town)
-"hzC" = (
-/obj/machinery/ms13/agriculture,
-/turf/open/floor/plating/ms13/ground/desert,
-/area/ms13/desert)
"hzL" = (
/obj/structure/table/ms13/no_smooth/counter/wood{
dir = 8
@@ -6439,6 +6654,11 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"hzR" = (
+/obj/item/ammo_casing/ms13/spent,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"hAm" = (
/obj/structure/ms13/toilet{
dir = 4
@@ -6675,6 +6895,10 @@
"hPc" = (
/turf/open/openspace/ms13,
/area/ms13/factory)
+"hPo" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"hPr" = (
/obj/structure/ms13/storage/shelf,
/turf/open/floor/wood/ms13/carpet,
@@ -6706,7 +6930,7 @@
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/desert)
"hPR" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -6752,6 +6976,19 @@
/obj/effect/spawner/random/ms13/food/packaged,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"hRl" = (
+/obj/structure/table/ms13/no_smooth/counter/metal{
+ dir = 4
+ },
+/obj/structure/ms13/tv/tube/tiny{
+ dir = 8;
+ pixel_y = 10
+ },
+/obj/machinery/light/ms13/bulb{
+ dir = 4
+ },
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"hRw" = (
/obj/structure/table/ms13/no_smooth/counter/wood/crafted{
dir = 4
@@ -6760,6 +6997,10 @@
/obj/effect/spawner/random/ms13/medical/herbal,
/turf/open/floor/wood/ms13/wide,
/area/ms13/drylanders/building)
+"hRz" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13/desert)
"hRG" = (
/obj/structure/table/ms13/no_smooth/counter/wood/crafted{
dir = 4
@@ -6842,6 +7083,10 @@
/obj/effect/spawner/random/ms13/drink/soda,
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/town)
+"hVJ" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/ms13/concrete/industrial,
+/area/ms13/town)
"hWo" = (
/obj/structure/ms13/rug/mat/rubber/single,
/turf/open/floor/wood/ms13/wide,
@@ -7023,6 +7268,10 @@
},
/turf/open/floor/plating/ms13/ground/road,
/area/ms13/water_baron/interior)
+"igm" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/tile/full/green,
+/area/ms13/town)
"ihi" = (
/obj/structure/ms13/wall_decor/clock,
/turf/open/floor/ms13/tile/large/white,
@@ -7109,6 +7358,10 @@
},
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/desert)
+"ilc" = (
+/obj/structure/table/ms13/no_smooth/counter/metal,
+/turf/open/floor/ms13/tile/full/navy,
+/area/ms13/water_baron/interior)
"ilf" = (
/obj/structure/table/ms13/low_wall/concrete,
/obj/structure/window/fulltile/ms13/glass,
@@ -7163,6 +7416,10 @@
/obj/structure/ms13/wall_decor/flag,
/turf/open/floor/wood/ms13/wide,
/area/ms13/water_baron/interior)
+"ioA" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/tile,
+/area/ms13/town)
"ioX" = (
/obj/structure/table/ms13/no_smooth/counter/metal{
dir = 4
@@ -7265,6 +7522,11 @@
},
/turf/open/floor/wood/ms13/carpet/shaggy/green,
/area/ms13/town)
+"ivP" = (
+/obj/structure/ms13/wall_decor/clock,
+/obj/effect/spawner/random/ms13/smokeable/lowrandom,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"ivW" = (
/obj/structure/bed/ms13/bedframe/wire,
/turf/open/floor/wood/ms13/wide,
@@ -7282,6 +7544,12 @@
/obj/machinery/ms13/terminal/wasteland,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/factory)
+"ixH" = (
+/obj/machinery/door/poddoor/shutters/ms13/horizontal/red/right{
+ id = "junkyard-gate"
+ },
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13/desert)
"iyl" = (
/obj/structure/chair/ms13/wood/padded{
dir = 4
@@ -7505,7 +7773,7 @@
/turf/open/floor/ms13/concrete,
/area/ms13/water_baron/interior)
"iJw" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
pixel_y = 24
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -7574,7 +7842,9 @@
"iNH" = (
/obj/machinery/ms13/terminal/wall{
dir = 8;
- id = "car_junk_press_door"
+ remote_capability = 1;
+ signal_id_1 = "car_junk_press_door";
+ signal_title_1 = "Junk Press Lockdown"
},
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/desert)
@@ -7639,6 +7909,13 @@
/obj/structure/ms13/pipes/vent,
/turf/open/openspace/ms13,
/area/ms13/desert)
+"iQq" = (
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"iQr" = (
/obj/effect/turf_decal/ms13/covering/paint/blue,
/turf/closed/wall/ms13/concrete,
@@ -7827,6 +8104,7 @@
/area/ms13/desert)
"jeD" = (
/obj/structure/table/ms13/no_smooth/counter/metal,
+/obj/structure/ms13/chem_set,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"jeR" = (
@@ -7844,6 +8122,10 @@
/obj/effect/spawner/random/ms13/smokeable/general,
/turf/open/floor/wood/ms13/carpet/shaggy,
/area/ms13/town)
+"jga" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13/desert)
"jgb" = (
/obj/item/reagent_containers/food/drinks/mug/ms13{
pixel_y = 6
@@ -8013,6 +8295,10 @@
/obj/structure/ms13/rug/red,
/turf/open/floor/wood/ms13/common,
/area/ms13/water_baron/interior)
+"joK" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/desert)
"jqd" = (
/obj/structure/table/ms13/no_smooth/counter/wood/crafted{
dir = 1
@@ -8021,6 +8307,13 @@
/obj/effect/spawner/random/ms13/tools/tool,
/turf/open/floor/ms13/concrete/small,
/area/ms13/water_baron/interior)
+"jqn" = (
+/obj/structure/railing/ms13/solo/industrial{
+ dir = 8
+ },
+/obj/structure/lattice/catwalk/ms13,
+/turf/open/openspace/ms13,
+/area/ms13/town)
"jqp" = (
/obj/machinery/door/unpowered/ms13/metal{
dir = 4
@@ -8051,6 +8344,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"jrq" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"jrs" = (
/obj/structure/table/ms13/no_smooth/counter/metal{
dir = 4
@@ -8169,6 +8466,10 @@
},
/turf/open/floor/plating/ms13/ground/mountain/drought,
/area/ms13/town)
+"jzZ" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"jAm" = (
/obj/structure/ms13/storage/shelf/wood/alt,
/turf/open/floor/plating/ms13/ground/desert,
@@ -8410,6 +8711,10 @@
/obj/effect/spawner/random/ms13/tools/farming,
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/drylanders)
+"jMn" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/water_baron)
"jMw" = (
/obj/structure/ms13/storage/large/clothing,
/obj/effect/spawner/random/ms13/clothing/under,
@@ -8531,6 +8836,11 @@
dir = 1
},
/area/ms13/town)
+"jUS" = (
+/obj/structure/lattice/catwalk/ms13,
+/obj/machinery/button/ms13,
+/turf/open/openspace/ms13,
+/area/ms13/town)
"jVU" = (
/obj/effect/turf_decal/ms13/covering/paint/green,
/turf/closed/wall/ms13/siding,
@@ -8540,6 +8850,10 @@
/obj/effect/landmark/start/ms13/denizen,
/turf/open/floor/ms13/concrete,
/area/ms13/water_baron/interior)
+"jXa" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/town)
"jXh" = (
/turf/open/floor/ms13/metal/walkway,
/area/ms13/town)
@@ -8557,6 +8871,12 @@
},
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"jXF" = (
+/obj/machinery/door/poddoor/shutters/ms13/horizontal/red/left{
+ id = "car_junk_storage-bay1"
+ },
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
"jXU" = (
/obj/structure/chair/ms13/metal,
/obj/machinery/light/ms13{
@@ -8619,7 +8939,7 @@
/turf/open/floor/ms13/tile/large/checkered,
/area/ms13/town)
"kbi" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -8643,12 +8963,27 @@
/mob/living/basic/ms13/ghoul/brown,
/turf/open/floor/ms13/tile,
/area/ms13/town)
+"kdf" = (
+/obj/machinery/door/poddoor/shutters/ms13/horizontal/red/right{
+ id = "car_junk_storage-bay1"
+ },
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
"kdL" = (
/obj/machinery/light/ms13{
dir = 4
},
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
+"kes" = (
+/obj/structure/table/ms13/metal/alt,
+/obj/machinery/ms13/terminal{
+ remote_capability = 1;
+ signal_id_1 = "junkyard-gate";
+ signal_title_1 = "Front Gate"
+ },
+/turf/open/floor/ms13/concrete,
+/area/ms13/desert)
"kfr" = (
/obj/structure/table/ms13/no_smooth/counter/wood{
dir = 1
@@ -8709,6 +9044,10 @@
},
/turf/open/floor/ms13/concrete,
/area/ms13/rangeroutpost/building)
+"kiy" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/legioncamp)
"kiY" = (
/obj/effect/spawner/random/ms13/tools/lights,
/turf/open/floor/plating/ms13/ground/road,
@@ -8949,6 +9288,10 @@
/obj/effect/turf_decal/ms13/graffiti/free,
/turf/closed/wall/ms13/siding,
/area/ms13/town)
+"kxX" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"kyd" = (
/obj/structure/ms13/barrel/double/yellow/two,
/turf/open/floor/plating/ms13/ground/desertalt,
@@ -8967,6 +9310,10 @@
},
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"kzo" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"kzt" = (
/obj/structure/railing/ms13/wood,
/turf/open/floor/plating/ms13/ground/desertalt,
@@ -9756,6 +10103,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"llL" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/desert)
"lmd" = (
/obj/structure/closet/ms13/wall/firstaid,
/obj/effect/spawner/random/ms13/medical/lowrandom,
@@ -9860,6 +10211,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"lpy" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"lpL" = (
/obj/structure/table/ms13/no_smooth/counter/metal,
/obj/structure/ms13/storage/vent,
@@ -10141,9 +10496,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/drylanders/building)
"lEH" = (
-/obj/structure/chair/office/ms13/green{
- dir = 2
- },
+/obj/structure/chair/office/ms13/green,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"lEN" = (
@@ -10283,6 +10636,10 @@
/obj/effect/turf_decal/ms13/graffiti/no_way,
/turf/closed/wall/ms13/brick/gray,
/area/ms13/town)
+"lLH" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/desert)
"lLK" = (
/obj/structure/ms13/storage/vent,
/obj/structure/ms13/pipes/horizontal/single/inwall,
@@ -10412,6 +10769,7 @@
/area/ms13/factory)
"lSm" = (
/obj/structure/noticeboard/ms13/cork,
+/obj/structure/ms13/trash/glass/cans,
/turf/open/floor/ms13/tile,
/area/ms13/town)
"lTl" = (
@@ -10492,6 +10850,10 @@
},
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/desert)
+"mad" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/water_baron)
"mbc" = (
/obj/effect/turf_decal/trimline/yellow/line{
dir = 5
@@ -10778,6 +11140,10 @@
dir = 4
},
/area/ms13/rangeroutpost)
+"mqZ" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/rangeroutpost/building)
"mrh" = (
/obj/structure/ms13/storage/large/shelf{
dir = 8
@@ -11035,6 +11401,10 @@
/obj/effect/spawner/random/ms13/clothing/hat,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
+"mGy" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/carpet/shaggy/blue,
+/area/ms13/town)
"mHi" = (
/obj/structure/table/ms13/no_smooth/large/wood/stand,
/obj/structure/ms13/tv/tube{
@@ -11043,6 +11413,10 @@
},
/turf/open/floor/wood/ms13/carpet,
/area/ms13/town)
+"mHN" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/desert)
"mIn" = (
/obj/effect/turf_decal/ms13/covering/wallpaper/blue/stripes,
/turf/closed/wall/ms13/wood,
@@ -11108,6 +11482,12 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"mMZ" = (
+/obj/structure/chair/office/ms13/green/broken{
+ dir = 8
+ },
+/turf/open/floor/ms13/concrete/small,
+/area/ms13/desert)
"mNa" = (
/obj/structure/ms13/foundation/variantsix{
dir = 10
@@ -11136,6 +11516,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"mON" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13/desert)
"mQd" = (
/obj/structure/table/ms13/no_smooth/cable_reel,
/obj/item/ms13/fluff/ashtray,
@@ -11335,6 +11719,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"nde" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/concrete,
+/area/ms13/rangeroutpost/building)
"ndw" = (
/obj/structure/chair/ms13/metal/folding{
dir = 1
@@ -11418,6 +11806,10 @@
},
/turf/open/floor/plating/ms13/ground/road,
/area/ms13/desert)
+"nhD" = (
+/obj/effect/spawner/random/ms13/ammo/lowrandom,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"nin" = (
/obj/effect/turf_decal/trimline/yellow/line{
dir = 10
@@ -11612,6 +12004,9 @@
},
/turf/open/floor/ms13/tile,
/area/ms13/factory)
+"nsX" = (
+/turf/open/floor/ms13/concrete/small,
+/area/ms13/desert)
"nta" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 4
@@ -11856,6 +12251,10 @@
},
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/desert)
+"nHD" = (
+/obj/machinery/door/unpowered/ms13/seethrough/metal,
+/turf/open/floor/ms13/concrete,
+/area/ms13/desert)
"nHI" = (
/obj/machinery/door/unpowered/ms13/seethrough/metal{
dir = 1
@@ -11972,7 +12371,7 @@
/area/ms13/town)
"nOg" = (
/obj/effect/turf_decal/ms13/showerdrains/small,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/turf/open/floor/ms13/tile,
@@ -12116,6 +12515,10 @@
/obj/structure/ms13/fence,
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/water_baron)
+"nWQ" = (
+/obj/effect/spawner/random/ms13/food/trash,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"nXj" = (
/obj/structure/ms13/bars/rusty{
dir = 1
@@ -12172,6 +12575,12 @@
/mob/living/basic/ms13/hostile_animal/pigrat,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"oaK" = (
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
"oaX" = (
/obj/structure/table/ms13/low_wall/concrete,
/obj/structure/window/fulltile/ms13/glass,
@@ -12199,6 +12608,10 @@
},
/turf/open/floor/ms13/concrete/small,
/area/ms13/water_baron/interior)
+"ocK" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/drylanders)
"odn" = (
/obj/structure/ms13/storage/large/shelf{
dir = 4
@@ -12749,6 +13162,17 @@
},
/turf/open/floor/wood/ms13/carpet/shaggy,
/area/ms13/town)
+"oID" = (
+/obj/machinery/ms13/terminal/wall/rust{
+ doc_title_1 = "drought_junkyard_warn";
+ remote_capability = 1;
+ signal_id_1 = "car_junk_storage-bay1";
+ signal_id_2 = "car_junk_storage-bay2";
+ signal_title_1 = "Left Bay";
+ signal_title_2 = "Right Bay"
+ },
+/turf/open/floor/ms13/concrete,
+/area/ms13/desert)
"oIS" = (
/obj/machinery/power/ms13/streetlamp/corner{
dir = 1
@@ -12791,8 +13215,18 @@
},
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/desert)
+"oKY" = (
+/obj/machinery/door/poddoor/shutters/ms13/horizontal/red/left{
+ id = "car_junk_storage-bay2"
+ },
+/obj/effect/decal/cleanable/blood/old{
+ pixel_x = 12;
+ pixel_y = -12
+ },
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
"oLo" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -12817,6 +13251,13 @@
/obj/effect/turf_decal/ms13/graffiti/followwater,
/turf/closed/wall/ms13/concrete,
/area/ms13/water_baron/interior)
+"oMj" = (
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
"oMv" = (
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/water_baron)
@@ -12976,6 +13417,11 @@
/obj/machinery/light/ms13,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
+"oVb" = (
+/obj/structure/table/ms13/metal/grate,
+/obj/effect/spawner/random/ms13/tools/farming,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"oVj" = (
/obj/structure/railing/ms13/solo{
dir = 4
@@ -13104,6 +13550,11 @@
/obj/effect/spawner/random/ms13/locked/random/medchance,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"paI" = (
+/obj/structure/ms13/sandbag,
+/obj/structure/ms13/wall_decor/sign/danger,
+/turf/open/floor/ms13/concrete,
+/area/ms13/desert)
"pba" = (
/obj/effect/turf_decal/ms13/graffiti/stop,
/turf/closed/indestructible/rock/ms13/drought,
@@ -13149,6 +13600,10 @@
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/ms13/tile,
/area/ms13/town)
+"pdn" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/town)
"pdD" = (
/obj/machinery/door/unpowered/ms13/seethrough/mirrored/metal,
/turf/open/floor/ms13/concrete,
@@ -13251,6 +13706,10 @@
/obj/effect/spawner/random/ms13/drink/soda,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"pjX" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/plating/ms13/ground/mountain/drought,
+/area/ms13/underground/mountain)
"pjZ" = (
/obj/effect/landmark/start/ms13/wastelander,
/turf/open/floor/ms13/tile/large/cafeteria,
@@ -13356,6 +13815,15 @@
},
/turf/open/floor/ms13/tile/large/checkered,
/area/ms13/town)
+"pra" = (
+/obj/structure/table/ms13/no_smooth/counter/metal{
+ dir = 4
+ },
+/obj/effect/spawner/random/ms13/medical/highrandom,
+/obj/effect/spawner/random/ms13/medical/lowrandom,
+/obj/structure/closet/ms13/wall/firstaid,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"prt" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = 7;
@@ -13379,6 +13847,10 @@
},
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/desert)
+"psj" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/ms13/concrete,
+/area/ms13/desert)
"psv" = (
/obj/effect/spawner/random/ms13/drink/alcohol_beer,
/turf/open/floor/wood/ms13/common,
@@ -13427,6 +13899,17 @@
},
/turf/open/openspace/ms13,
/area/ms13/rangeroutpost/building)
+"pvx" = (
+/obj/structure/table/ms13/no_smooth/counter/metal{
+ dir = 4
+ },
+/obj/machinery/button/ms13{
+ dir = 8;
+ id = "car_junk_storage-bay2"
+ },
+/obj/effect/spawner/random/ms13/tools/tool,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"pvA" = (
/obj/structure/bonfire/ms13/campfire,
/turf/open/floor/plating/ms13/ground/desertalt,
@@ -13589,7 +14072,7 @@
/turf/open/floor/ms13/tile,
/area/ms13/town)
"pBY" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -13672,6 +14155,10 @@
/obj/machinery/door/unpowered/ms13/seethrough/grate,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"pFq" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13/desert)
"pFs" = (
/obj/structure/ms13/pipes/horizontal/down,
/turf/open/floor/plating/ms13/ground/sidewalk,
@@ -13728,6 +14215,10 @@
/mob/living/simple_animal/hostile/retaliate/ms13/robot/eyebot,
/turf/open/floor/plating/ms13/ground/road,
/area/ms13/desert)
+"pKn" = (
+/obj/structure/table/ms13/crafting/weaponbench,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"pKD" = (
/obj/structure/table/ms13/wood/bar,
/obj/effect/spawner/random/ms13/melee/lowrandom,
@@ -13934,6 +14425,10 @@
/obj/structure/ms13/departure,
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/desert)
+"qas" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/drylanders)
"qba" = (
/obj/structure/table/ms13/wood,
/obj/effect/spawner/random/ms13/smokeable/general,
@@ -14485,6 +14980,11 @@
/obj/effect/spawner/random/ms13/gun/lowrandom,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"qzZ" = (
+/obj/effect/turf_decal/ms13/road/horizontalline,
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13/water_baron)
"qAd" = (
/obj/machinery/light/ms13{
dir = 8
@@ -14615,6 +15115,12 @@
/obj/effect/turf_decal/ms13/graffiti/desertrangers,
/turf/closed/wall/ms13/siding,
/area/ms13/town)
+"qGm" = (
+/obj/machinery/door/poddoor/shutters/ms13/horizontal/red/left{
+ id = "junkyard-gate"
+ },
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13/desert)
"qGx" = (
/obj/machinery/light/ms13/bulb{
dir = 4
@@ -14647,12 +15153,26 @@
/obj/structure/ms13/barrel/single/yellow/two,
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/desert)
+"qJa" = (
+/obj/machinery/button/ms13{
+ dir = 4;
+ id = "car_junk_storage-bay1"
+ },
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"qJE" = (
/obj/machinery/light/ms13/bulb{
dir = 4
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"qJI" = (
+/obj/effect/decal/cleanable/blood/old{
+ pixel_y = 16
+ },
+/obj/effect/decal/cleanable/blood/footprints,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/desert)
"qJJ" = (
/mob/living/simple_animal/hostile/ms13/robot/handy/gun,
/turf/open/floor/ms13/concrete/industrial,
@@ -15072,6 +15592,10 @@
},
/turf/open/floor/ms13/concrete,
/area/ms13/water_baron/interior)
+"rlZ" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13/desert)
"rmd" = (
/obj/item/stack/sheet/ms13/wood/scrap_wood,
/obj/effect/decal/cleanable/blood/tracks{
@@ -15199,6 +15723,14 @@
/obj/structure/sign/poster/ms13/tattered,
/turf/open/floor/wood/ms13/carpet/shaggy,
/area/ms13/town)
+"rrr" = (
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"rrx" = (
/obj/structure/ms13/foundation/variantfive{
dir = 5
@@ -15233,7 +15765,7 @@
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"rtD" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -15379,6 +15911,10 @@
/obj/structure/ms13/storage/trashcan,
/turf/open/floor/wood/ms13/common,
/area/ms13/water_baron/interior)
+"rzv" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/concrete,
+/area/ms13/water_baron/interior)
"rzA" = (
/obj/structure/ms13/storage/large/shelf{
dir = 4
@@ -15498,6 +16034,10 @@
},
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/factory)
+"rFz" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/water_baron)
"rFN" = (
/turf/closed/wall/ms13/adobe,
/area/ms13/town)
@@ -15627,6 +16167,10 @@
},
/turf/open/floor/ms13/tile/large/checkered,
/area/ms13/town)
+"rOD" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/town)
"rOL" = (
/turf/open/floor/ms13/metal/pipe/corner,
/area/ms13/water_baron/interior)
@@ -15657,6 +16201,10 @@
/obj/effect/spawner/random/ms13/medical/surgical,
/turf/open/floor/wood/ms13/wide,
/area/ms13/drylanders/building)
+"rQK" = (
+/obj/effect/decal/cleanable/blood/tracks,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"rQM" = (
/obj/structure/ms13/tv/tube/tiny{
dir = 4
@@ -15858,6 +16406,11 @@
/obj/effect/turf_decal/ms13/road/horizontalline,
/turf/open/floor/plating/ms13/ground/road,
/area/ms13/desert)
+"rXF" = (
+/obj/structure/table/ms13/low_wall/concrete,
+/obj/structure/window/fulltile/ms13/glass,
+/turf/open/floor/ms13/concrete,
+/area/ms13/desert)
"rXQ" = (
/obj/structure/sink/ms13{
pixel_y = 14
@@ -15957,6 +16510,10 @@
/obj/structure/ms13/pipes/horizontal/valve,
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/water_baron/interior)
+"shh" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/concrete,
+/area/ms13/water_baron/interior)
"shU" = (
/obj/structure/table/ms13/no_smooth/counter/wood/crafted{
dir = 4
@@ -16035,6 +16592,10 @@
/obj/structure/ms13/storage/trashcan,
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/legioncamp/building)
+"snW" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/desert)
"sof" = (
/obj/structure/closet/ms13/metal,
/obj/effect/spawner/random/ms13/clothing/under,
@@ -16053,6 +16614,14 @@
/obj/effect/spawner/random/ms13/crafting/electrical,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"spO" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/desert)
+"sqo" = (
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"sqy" = (
/obj/effect/landmark/start/ms13/ranger_elite,
/turf/open/floor/plating/ms13/ground/desertalt,
@@ -16070,6 +16639,14 @@
},
/turf/open/floor/ms13/concrete/small,
/area/ms13/water_baron/interior)
+"sqV" = (
+/obj/structure/railing/ms13/solo/industrial{
+ dir = 8
+ },
+/obj/structure/lattice/catwalk/ms13,
+/obj/structure/ms13/wall_decor/sign,
+/turf/open/openspace/ms13,
+/area/ms13/town)
"sqZ" = (
/obj/machinery/door/unpowered/ms13/metal/mirrored{
dir = 1
@@ -16114,6 +16691,10 @@
},
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/factory)
+"stg" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13/town)
"sui" = (
/obj/structure/ms13/wall_decor/flag/arizona,
/turf/open/floor/wood/ms13/carpet/shaggy,
@@ -16451,6 +17032,12 @@
/obj/structure/table/ms13/no_smooth/large/wood/desk/alt,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"sNk" = (
+/obj/machinery/door/poddoor/shutters/ms13/horizontal/red/mid{
+ id = "junkyard-gate"
+ },
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13/desert)
"sNp" = (
/obj/structure/railing/ms13/wood{
dir = 8
@@ -16474,6 +17061,25 @@
},
/turf/open/floor/ms13/tile,
/area/ms13/town)
+"sOj" = (
+/obj/structure/table/ms13/metal/grate,
+/obj/machinery/light/ms13{
+ dir = 8
+ },
+/obj/effect/spawner/random/ms13/tools/farming,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
+"sPm" = (
+/obj/machinery/door/poddoor/shutters/ms13/horizontal/red/right{
+ id = "car_junk_storage-bay2"
+ },
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
+"sPr" = (
+/obj/structure/ms13/sandbag,
+/turf/open/floor/ms13/concrete,
+/area/ms13/desert)
"sPE" = (
/obj/machinery/door/poddoor/shutters/ms13/horizontal/indestructible/red/right{
id = "robco_factory_wh1"
@@ -16522,13 +17128,6 @@
},
/turf/open/floor/ms13/concrete,
/area/ms13/town)
-"sSM" = (
-/obj/structure/table/ms13/no_smooth/counter/metal{
- dir = 1
- },
-/obj/effect/spawner/random/ms13/power_armor/parts,
-/turf/open/floor/ms13/concrete,
-/area/ms13/town)
"sSW" = (
/obj/structure/table/ms13/crafting/ammobench,
/obj/structure/ms13/rug/mat/rubber,
@@ -16654,8 +17253,14 @@
},
/turf/open/floor/ms13/tile/large/cafeteria,
/area/ms13/town)
+"sZV" = (
+/obj/structure/table/ms13/metal/grate,
+/obj/effect/spawner/random/ms13/tools/tool,
+/obj/effect/spawner/random/ms13/tools/tool,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"tas" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -17122,6 +17727,11 @@
},
/turf/open/floor/ms13/tile,
/area/ms13/factory)
+"tAg" = (
+/obj/effect/turf_decal/ms13/road/horizontalline,
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13/desert)
"tAh" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating/ms13/ground/desert,
@@ -17276,6 +17886,7 @@
/area/ms13/factory)
"tGG" = (
/obj/structure/ms13/rug/red,
+/obj/structure/ms13/trash/glass/cans,
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/town)
"tGL" = (
@@ -17293,6 +17904,10 @@
/obj/structure/ms13/road_barrier/concrete/alt,
/turf/open/floor/ms13/concrete,
/area/ms13/desert)
+"tHS" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/ceramic,
+/area/ms13/desert)
"tIa" = (
/obj/structure/bonfire/ms13/fire_barrel,
/turf/open/floor/plating/ms13/ground/desert,
@@ -17480,6 +18095,10 @@
/obj/structure/ms13/fence/vertical/wire/west/barb,
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/water_baron)
+"tQY" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13/water_baron)
"tRl" = (
/obj/structure/ms13/storage/vent,
/turf/open/floor/wood/ms13/wide,
@@ -17819,6 +18438,10 @@
/obj/effect/spawner/random/ms13/ammo/highrandom,
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/desert)
+"ulX" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"ums" = (
/obj/structure/railing/ms13/wood{
dir = 1
@@ -17895,10 +18518,9 @@
/turf/open/floor/wood/ms13/carpet/shaggy/blue,
/area/ms13/town)
"uqg" = (
-/obj/machinery/door/poddoor/shutters/ms13/vertical/red/mid{
- id = "car_junk_storage"
- },
-/turf/open/floor/ms13/concrete/industrial,
+/obj/effect/decal/cleanable/blood/tracks,
+/obj/effect/decal/cleanable/blood/gibs/core,
+/turf/open/floor/ms13/concrete,
/area/ms13/town)
"uqu" = (
/obj/structure/chair/office/ms13/green/broken{
@@ -17999,6 +18621,16 @@
/obj/structure/ms13/pipes/horizontal/valve,
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/desert)
+"uxr" = (
+/obj/effect/decal/cleanable/blood/old{
+ pixel_x = 13;
+ pixel_y = 16
+ },
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/mob/living/simple_animal/hostile/ms13/robot/sentrybot/ballistic,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
"uxx" = (
/obj/structure/chair/office/ms13/blue{
dir = 8
@@ -18403,6 +19035,11 @@
/obj/machinery/light/ms13,
/turf/open/floor/ms13/tile/large/cafeteria,
/area/ms13/town)
+"uUx" = (
+/obj/structure/ms13/wall_decor/clock,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"uUV" = (
/obj/machinery/light/ms13/bulb,
/turf/open/floor/ms13/tile/long,
@@ -18466,6 +19103,10 @@
/obj/machinery/iv_drip/ms13,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"uYK" = (
+/mob/living/basic/ms13/robot/handy/saw,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"uYW" = (
/obj/structure/table/ms13/no_smooth/large/wood/stand,
/obj/structure/ms13/tv/tube/small{
@@ -18883,6 +19524,10 @@
/obj/effect/landmark/start/ms13/denizen,
/turf/open/floor/wood/ms13/common,
/area/ms13/water_baron/interior)
+"vsQ" = (
+/obj/structure/filingcabinet/ms13,
+/turf/open/floor/ms13/concrete/small,
+/area/ms13/desert)
"vuj" = (
/obj/structure/bed/ms13/sleepingbag/red,
/obj/structure/ms13/rug/rubber{
@@ -19017,6 +19662,10 @@
/obj/item/ammo_casing/ms13/spent,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"vAv" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/desert)
"vBb" = (
/obj/structure/table/ms13/metal/small,
/obj/effect/spawner/random/ms13/tools/hardware,
@@ -19034,6 +19683,10 @@
/obj/structure/chair/sofa/corp,
/turf/open/floor/ms13/tile/large/cafeteria,
/area/ms13/town)
+"vCA" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/legioncamp)
"vCX" = (
/obj/machinery/vending/ms13/cigarettes{
dir = 8
@@ -19082,6 +19735,10 @@
/obj/structure/bed/ms13/sleepingbag/green,
/turf/open/floor/plating/ms13/ground/mountain/drought,
/area/ms13/underground/mountain)
+"vFE" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/concrete,
+/area/ms13/rangeroutpost/building)
"vGu" = (
/obj/item/ms13_small_flag/usa,
/turf/open/floor/wood/ms13/wide,
@@ -19230,6 +19887,7 @@
pixel_x = 9;
pixel_y = -14
},
+/obj/structure/ms13/trash/food/misc,
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/desert)
"vQM" = (
@@ -19250,7 +19908,6 @@
/turf/open/floor/ms13/tile/full/white,
/area/ms13/town)
"vRG" = (
-/obj/effect/mob_spawn/corpse/human/ms13/nomad,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/desert)
@@ -19426,6 +20083,10 @@
/obj/effect/spawner/random/ms13/drink/soda,
/turf/open/floor/ms13/concrete/small,
/area/ms13/water_baron/interior)
+"wcy" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/ms13/ceramic,
+/area/ms13/desert)
"wcH" = (
/obj/structure/ms13/storage/shelf/wood/alt{
dir = 1
@@ -19584,6 +20245,13 @@
},
/turf/open/floor/ms13/concrete/small,
/area/ms13/water_baron/interior)
+"wrY" = (
+/obj/machinery/light/ms13{
+ dir = 1
+ },
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"wse" = (
/obj/machinery/light/ms13{
dir = 8
@@ -19824,6 +20492,10 @@
},
/turf/open/floor/ms13/tile/large/cafeteria,
/area/ms13/town)
+"wFV" = (
+/obj/structure/ms13/rug/red,
+/turf/open/floor/ms13/concrete/small,
+/area/ms13/desert)
"wGi" = (
/obj/structure/ms13/fence/wire,
/turf/open/floor/plating/ms13/ground/desert,
@@ -20297,6 +20969,21 @@
/obj/structure/ms13/rug/rubber,
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/town)
+"xhK" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
+"xhM" = (
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/obj/item/ammo_casing/ms13/spent,
+/turf/open/floor/ms13/concrete/bricks,
+/area/ms13/town)
"xhO" = (
/obj/structure/closet/crate/ms13/woodcrate/compact/sarsaparilla,
/obj/effect/spawner/random/ms13/food/junkfood_canned,
@@ -20723,6 +21410,13 @@
},
/turf/open/floor/ms13/tile,
/area/ms13/town)
+"xLu" = (
+/obj/structure/ms13/foundation/mosaic/variantone{
+ dir = 8
+ },
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/mountain/drought,
+/area/ms13/town)
"xLG" = (
/obj/effect/turf_decal/ms13/graffiti/guns,
/turf/closed/wall/ms13/concrete,
@@ -20895,6 +21589,10 @@
/obj/effect/spawner/random/ms13/tools/tool,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
+"xYq" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/plating/ms13/ground/desert,
+/area/ms13/desert)
"xYW" = (
/obj/effect/spawner/random/ms13/currency/drought/tier1,
/turf/open/floor/plating/ms13/ground/desert,
@@ -20908,6 +21606,10 @@
},
/turf/open/floor/ms13/tile/full/green,
/area/ms13/town)
+"xZu" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/tile/large/checkered,
+/area/ms13/town)
"xZC" = (
/obj/machinery/door/unpowered/ms13/wood/mirrored{
dir = 1
@@ -21051,6 +21753,11 @@
},
/turf/open/floor/plating/ms13/ground/mountain/drought,
/area/ms13/town)
+"ykz" = (
+/obj/structure/lattice/catwalk/ms13,
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/openspace/ms13,
+/area/ms13/rangeroutpost/building)
"ykK" = (
/obj/structure/table/ms13/no_smooth/counter/metal{
dir = 4
@@ -22797,7 +23504,7 @@ oSs
oSs
dWv
gqm
-crx
+eEm
crx
crx
xHo
@@ -23111,7 +23818,7 @@ ttr
ttr
ngM
clN
-clN
+nde
clN
quJ
fXG
@@ -23187,7 +23894,7 @@ oSs
rFN
mnt
crx
-crx
+lpy
crx
crx
rFN
@@ -23202,7 +23909,7 @@ hgp
rFN
naW
crx
-crx
+kzo
rFN
wRs
rFN
@@ -23323,7 +24030,7 @@ pvw
pvw
pvw
uet
-fXG
+ykz
fXG
mNm
vza
@@ -23353,7 +24060,7 @@ jJD
jJD
wIP
ngK
-ylS
+jrq
ylS
uCM
wIP
@@ -23868,7 +24575,7 @@ oSs
oSs
oSs
oSs
-hgp
+bmk
hgp
hQa
hQa
@@ -24301,7 +25008,7 @@ oSs
iBf
roo
crx
-crx
+xhK
crx
cMD
phq
@@ -24487,7 +25194,7 @@ oSs
oSs
oMe
crx
-crx
+kzo
crx
crx
crx
@@ -25270,7 +25977,7 @@ mnl
mnl
mnl
hgp
-hgp
+vAv
hgp
mnl
mnl
@@ -25404,7 +26111,7 @@ oSs
oSs
hgp
hgp
-hgp
+llL
oSs
oSs
oSs
@@ -25499,7 +26206,7 @@ oSs
oSs
oSs
oSs
-oSs
+mHN
oSs
oSs
oSs
@@ -25615,7 +26322,7 @@ oSs
oSs
oSs
moW
-hgp
+vAv
hgp
hgp
qBq
@@ -25771,7 +26478,7 @@ jJD
hQa
wHx
hQa
-jJD
+ehD
lPJ
naf
naf
@@ -25961,7 +26668,7 @@ ttr
ttr
oPv
uet
-oXk
+djh
clN
uet
uet
@@ -26103,7 +26810,7 @@ bUG
wTp
vdY
gdL
-crx
+eEm
pNA
vBv
oSs
@@ -26727,7 +27434,7 @@ hgp
hgp
hgp
tdG
-crx
+lpy
crx
nit
crx
@@ -26832,7 +27539,7 @@ bYC
oSs
dWv
gAC
-crx
+xhK
crx
lJX
crx
@@ -27051,7 +27758,7 @@ crx
crx
pSM
crx
-crx
+xhK
crx
kLj
rFN
@@ -27521,7 +28228,7 @@ rRz
crx
vBv
hgp
-hgp
+bmk
hgp
uMT
oQC
@@ -27956,7 +28663,7 @@ ttr
ttr
uet
edh
-hNV
+fGf
hNV
hNV
hNV
@@ -28969,7 +29676,7 @@ uet
kwF
hNV
hNV
-hNV
+mqZ
hNV
uet
jsK
@@ -29151,7 +29858,7 @@ kzC
crx
crx
crx
-crx
+eEm
hWo
kLj
iNr
@@ -29339,7 +30046,7 @@ fOx
tZE
ylK
crx
-crx
+xhK
gIV
ePq
vBv
@@ -29790,7 +30497,7 @@ oPv
oPv
oPv
uet
-clN
+vFE
clN
jqB
bvj
@@ -30062,7 +30769,7 @@ vYq
vYq
aKh
gnk
-gnk
+dpR
gnk
blm
blm
@@ -30482,7 +31189,7 @@ oSs
oSs
vBv
tjb
-qQL
+fCg
qQL
xhy
jck
@@ -31110,7 +31817,7 @@ wHx
hQa
jJD
jJD
-jJD
+rlZ
jJD
xmr
jJD
@@ -31684,7 +32391,7 @@ jAt
lAO
cor
cor
-cor
+dSM
iEt
vYq
kZw
@@ -32465,7 +33172,7 @@ jAt
jAt
jAt
jAt
-jAt
+jMn
jAt
vYq
kEl
@@ -33111,7 +33818,7 @@ tsz
vrm
xrK
oSs
-oSs
+mHN
oSs
oSs
oSs
@@ -33675,7 +34382,7 @@ aKJ
aKJ
aKJ
aKJ
-aKJ
+fIx
aKJ
oaX
jAt
@@ -33685,7 +34392,7 @@ ctp
fUv
fUv
fUv
-jAt
+mad
cQu
cLK
cQu
@@ -34193,7 +34900,7 @@ ebP
ebP
ebP
ebP
-hgp
+llL
hgp
hgp
oSs
@@ -34304,7 +35011,7 @@ vYq
wuf
wuf
hgn
-jGl
+qzZ
gnk
oMv
lAO
@@ -34477,7 +35184,7 @@ blm
blm
vYq
wKx
-ekS
+grC
tBV
cor
cor
@@ -34727,7 +35434,7 @@ tNR
wjf
vYq
oSs
-oSs
+dYO
oSs
oSs
oSs
@@ -35302,7 +36009,7 @@ qzs
rpg
low
oAi
-nDJ
+ilc
nDJ
nDJ
swK
@@ -35504,7 +36211,7 @@ eMV
dlW
xQn
oAi
-nDJ
+aKq
nDJ
nDJ
vYq
@@ -35603,7 +36310,7 @@ crx
crx
qTW
hgp
-hgp
+lLH
hgp
hgp
hgp
@@ -35927,7 +36634,7 @@ oMv
aKh
aKh
oMv
-oMv
+tQY
oMv
oMv
oMv
@@ -36347,7 +37054,7 @@ hgp
hgp
oSs
oSs
-hgp
+lLH
qsf
hgp
oSs
@@ -36507,7 +37214,7 @@ uru
xbT
tJC
oaX
-aKh
+aER
cFf
pqg
pqg
@@ -36532,7 +37239,7 @@ oMv
lAO
cor
aKJ
-aKJ
+shh
aKJ
aKJ
gWr
@@ -36589,7 +37296,7 @@ jJD
jJD
jJD
jJD
-jJD
+ehD
jJD
jJD
jJD
@@ -37358,7 +38065,7 @@ oSs
oSs
awU
qQL
-qQL
+bdp
qQL
ihv
awU
@@ -37613,7 +38320,7 @@ hQa
hQa
oSs
hPD
-oSs
+aEQ
oSs
oSs
oSs
@@ -37637,7 +38344,7 @@ oSs
oSs
oSs
oSs
-oSs
+dYO
oSs
blm
blm
@@ -37721,7 +38428,7 @@ cor
lwv
tax
aKh
-aKh
+bit
aKh
aKh
aKh
@@ -38027,7 +38734,7 @@ oRc
iBf
ork
crx
-crx
+eEm
whX
crx
rNF
@@ -38234,7 +38941,7 @@ crx
hHL
qTW
hgp
-hgp
+bmk
qxW
nVz
crx
@@ -38321,7 +39028,7 @@ nAg
oRI
cDt
fRw
-aKJ
+rzv
kME
aKJ
vYq
@@ -38632,7 +39339,7 @@ xfR
hOP
iBf
crx
-crx
+lpy
crx
crx
ewu
@@ -39129,7 +39836,7 @@ wuf
wuf
jAt
udx
-aKh
+bit
aKh
aKh
aKh
@@ -39542,7 +40249,7 @@ aKh
aKh
aKh
aKh
-aKh
+bit
aKh
aKh
jAt
@@ -39589,7 +40296,7 @@ jJD
jJD
jJD
jJD
-hQa
+gfO
wHx
hQa
jJD
@@ -40370,7 +41077,7 @@ jAt
jAt
vYq
eiY
-cor
+fXE
cor
kca
vYq
@@ -41510,7 +42217,7 @@ jJD
hQa
hQa
hQa
-jJD
+ehD
lPJ
pkK
pkK
@@ -41811,7 +42518,7 @@ rtE
chV
crx
oem
-jJD
+jga
jJD
jJD
dOI
@@ -41854,7 +42561,7 @@ hQa
hQa
hQa
oSs
-bKj
+lPJ
aOS
aOS
aOS
@@ -42002,7 +42709,7 @@ hQa
jJD
cFc
psc
-kVB
+xLu
fPM
wdN
mfq
@@ -42180,7 +42887,7 @@ jAt
jAt
jAt
nWH
-jAt
+rFz
gdX
sct
hgn
@@ -42226,7 +42933,7 @@ blm
blm
dFe
wJP
-dFe
+foD
dFe
vBq
dFe
@@ -42264,7 +42971,7 @@ hgp
hgp
hgp
hgp
-hgp
+aJA
oSs
jJD
jJD
@@ -42673,7 +43380,7 @@ oSs
jJD
jJD
dOI
-jJD
+ehD
qPn
oRU
puQ
@@ -42834,7 +43541,7 @@ blm
blm
ehL
vBq
-dFe
+pjX
fqN
blm
blm
@@ -43123,7 +43830,7 @@ gSP
gSP
kap
tHC
-hQa
+hRz
rou
hQa
tHC
@@ -43254,7 +43961,7 @@ cXR
rtE
alf
gNe
-gNe
+igm
cXR
cXR
cXR
@@ -43474,7 +44181,7 @@ iNR
oSs
oSs
oSs
-oSs
+nmS
hgp
hgp
oSs
@@ -43674,7 +44381,7 @@ hQa
oSs
iNR
oSs
-oSs
+dRM
hgp
hgp
hgp
@@ -44070,13 +44777,13 @@ gNe
gav
cXR
oSs
+hRz
hQa
hQa
hQa
hQa
-hQa
-oSs
-bKj
+jJD
+lPJ
oSs
hgp
hgp
@@ -44277,21 +44984,21 @@ hQa
hQa
hQa
hQa
-oSs
-iNR
-oSs
-oSs
-hgp
+jJD
+hgE
+jJD
+jJD
+jJD
hgp
oSs
oSs
-oSs
-jJD
+cvP
jJD
jJD
jJD
jJD
jJD
+alw
jJD
hQa
hQa
@@ -44436,7 +45143,7 @@ aiH
lXA
eyk
ier
-oRc
+mGy
oRc
cXR
lhi
@@ -44479,21 +45186,21 @@ hQa
wHx
hQa
hQa
+jJD
+lPJ
+lPJ
+lPJ
+jJD
oSs
-iNR
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-hgp
+cvP
+cvP
+cvP
hgp
hgp
hgp
hgp
hgp
+pOP
jJD
hQa
hQa
@@ -44665,6 +45372,7 @@ oSs
hQa
hQa
hQa
+hRz
hQa
hQa
hQa
@@ -44680,11 +45388,10 @@ hQa
hQa
hQa
hQa
-hQa
-oSs
-iNR
-hgp
-oSs
+jJD
+jJD
+jJD
+lPJ
jJD
jJD
jJD
@@ -44695,8 +45402,8 @@ hgp
hgp
jJD
jJD
-jJD
-jJD
+alw
+alw
hQa
hQa
hQa
@@ -44707,7 +45414,7 @@ qOn
qOn
ylS
ylS
-ylS
+uYK
chx
pyt
oSs
@@ -44823,7 +45530,7 @@ hgp
oSs
oSs
oSs
-jJD
+rlZ
hQa
wHx
hQa
@@ -44885,8 +45592,8 @@ hQa
hQa
hQa
hQa
-hgp
hQa
+qGm
hQa
hQa
hQa
@@ -45088,7 +45795,7 @@ hQa
hQa
hQa
hQa
-hQa
+sNk
hQa
hQa
hQa
@@ -45109,7 +45816,7 @@ rtE
fMc
oyI
rtE
-xyg
+gvi
ylS
oUr
cXR
@@ -45290,7 +45997,7 @@ hQa
hQa
hQa
hQa
-hQa
+ixH
hQa
hQa
hQa
@@ -45414,7 +46121,7 @@ blm
blm
oSs
oSs
-hgp
+bmk
hgp
hgp
hgp
@@ -45490,11 +46197,11 @@ hQa
hQa
hQa
oSs
-iNR
jJD
jJD
+lPJ
dSw
-jJD
+mON
hgp
mIK
hgp
@@ -45503,9 +46210,9 @@ hgp
oSs
hgp
hgp
+ehD
jJD
-jJD
-hQa
+eeM
hQa
hQa
cjV
@@ -45516,7 +46223,7 @@ qOn
ylS
ylS
ylS
-sSM
+mgh
pyt
oSs
oSs
@@ -45657,7 +46364,7 @@ oSs
oSs
oSs
oSs
-oSs
+joK
oSs
oSs
oSs
@@ -45691,12 +46398,12 @@ hQa
wHx
hQa
hQa
-oSs
-iNR
-oSs
-oSs
-oSs
-oSs
+lPJ
+rXF
+rXF
+lPJ
+lPJ
+jJD
oSs
hgp
hgp
@@ -45707,7 +46414,7 @@ oSs
oSs
hgp
jJD
-hQa
+eeM
hQa
hQa
cjV
@@ -45893,12 +46600,12 @@ hQa
klW
hQa
hQa
-oSs
-iNR
-oSs
-oSs
-oSs
-oSs
+lPJ
+vsQ
+kap
+wFV
+nHD
+jJD
oSs
oSs
oSs
@@ -45909,8 +46616,8 @@ oSs
oSs
hgp
jJD
-hQa
-hQa
+eeM
+eeM
hQa
tsj
ylS
@@ -46095,11 +46802,11 @@ oSs
hQa
hQa
oSs
-oSs
-bKj
-oSs
-oSs
-nmS
+lPJ
+kes
+mMZ
+kap
+lPJ
oSs
oSs
oSs
@@ -46289,19 +46996,19 @@ hQa
hQa
hQa
hQa
-hQa
-oSs
-oSs
+hRz
oSs
oSs
oSs
oSs
oSs
oSs
-iNR
-oSs
-oSs
oSs
+lPJ
+lPJ
+gdd
+nsX
+lPJ
oSs
oSs
oSs
@@ -46324,7 +47031,7 @@ oSs
hgp
hgp
hgp
-oSs
+gah
oSs
oSs
oSs
@@ -46412,14 +47119,14 @@ jJD
xXR
rxJ
aiH
-aiH
+crK
xAA
aiH
aiH
aiH
xAA
aiH
-aiH
+pdn
aiH
nPq
qSj
@@ -46500,10 +47207,10 @@ oSs
oSs
oSs
oSs
-iNR
-oSs
-oSs
-oSs
+lPJ
+lPJ
+lPJ
+lPJ
oSs
oSs
hgp
@@ -46649,19 +47356,19 @@ jJD
oSs
vXM
hXC
-bOa
-pGS
+sZV
+sOj
heg
heg
bOa
pGS
-bOa
+oVb
rVy
-hzC
oSs
-hzC
+bYC
+oSs
+bYC
oSs
-hzC
euF
oSs
oSs
@@ -46707,7 +47414,8 @@ oSs
oSs
oSs
oSs
-nmS
+oSs
+hgp
hgp
hgp
hgp
@@ -46717,7 +47425,6 @@ hgp
hgp
hgp
hgp
-mxc
hgp
hgp
hgp
@@ -46863,7 +47570,7 @@ oSs
oSs
oSs
oSs
-oSs
+rIT
euF
oSs
oSs
@@ -46922,7 +47629,7 @@ hgp
hgp
hgp
hgp
-hgp
+lLH
hgp
oSs
oSs
@@ -47061,11 +47768,11 @@ nit
crx
hyq
rVy
-hzC
-oSs
+rIT
+bYC
oSs
+bYC
oSs
-hzC
euF
oSs
oSs
@@ -47108,7 +47815,7 @@ hQa
oSs
iNR
oSs
-oSs
+nmS
oSs
hgp
hgp
@@ -47122,8 +47829,8 @@ oSs
oSs
hgp
hgp
-hgp
-hgp
+pOP
+pOP
aJA
hgp
hgp
@@ -47266,7 +47973,7 @@ vXM
qQH
oXq
oSs
-oSs
+mHN
aLP
euF
oSs
@@ -47430,7 +48137,7 @@ fYk
sfp
gIV
gIV
-gIV
+xZu
gIV
cXR
oSs
@@ -47689,7 +48396,7 @@ fJE
hYx
kap
lPJ
-jJD
+rlZ
hQa
hQa
hQa
@@ -47914,7 +48621,7 @@ hQa
hQa
hQa
oSs
-bKj
+lPJ
oSs
oSs
nmS
@@ -47923,7 +48630,7 @@ oSs
oSs
oSs
hgp
-mxc
+hgp
hgp
hgp
hgp
@@ -48025,7 +48732,7 @@ hQa
wHx
hQa
jJD
-jJD
+rlZ
jJD
jJD
jJD
@@ -48323,7 +49030,7 @@ oSs
oSs
oSs
hgp
-hgp
+vAv
oSs
hgp
hgp
@@ -48419,7 +49126,7 @@ cXR
pfK
rHi
fGV
-rHi
+kxX
rHi
rHi
bIG
@@ -48463,7 +49170,7 @@ jJD
hQa
wHx
hQa
-jJD
+ehD
oSs
oSs
vXM
@@ -48504,7 +49211,7 @@ hQa
hQa
hQa
oSs
-oSs
+joK
hgp
wIw
qsf
@@ -48844,7 +49551,7 @@ dOI
hgp
oSs
oSs
-hgp
+lLH
myc
kVj
oSs
@@ -49112,7 +49819,7 @@ bAV
hQa
hQa
oSs
-hgp
+llL
pOP
cvP
hQa
@@ -49128,7 +49835,7 @@ hQa
oSs
iNR
oSs
-oSs
+nmS
oSs
oSs
hgp
@@ -49167,7 +49874,7 @@ blm
oSs
wDd
jJD
-jJD
+rlZ
jJD
jJD
jJD
@@ -49343,7 +50050,7 @@ oSs
hgp
oSs
oSs
-oSs
+met
hgp
hgp
wIw
@@ -49547,7 +50254,7 @@ mxc
hgp
hgp
hgp
-aJA
+hgp
hgp
hgp
oSs
@@ -49740,9 +50447,9 @@ qgL
pPd
hgp
aJA
-hgp
-hgp
-hgp
+pOP
+pOP
+spO
hgp
hgp
hgp
@@ -49943,13 +50650,13 @@ wIP
oSs
hgp
hgp
+pOP
hgp
hgp
hgp
hgp
hgp
-hgp
-hgp
+lLH
hgp
oSs
oSs
@@ -50145,15 +50852,15 @@ wIP
oSs
hgp
hgp
+pOP
hgp
-aJA
hgp
hgp
hgp
hgp
hgp
hgp
-met
+oSs
oSs
oSs
oSs
@@ -50347,19 +51054,19 @@ dsf
oSs
oSs
oSs
+wIP
+wIP
+wIP
+wIP
+wIP
+wIP
+wIP
hgp
-hgp
-hgp
-hgp
-hgp
-hgp
-hgp
-hgp
-oSs
oSs
oSs
oSs
oSs
+cvP
hgp
hgp
hgp
@@ -50486,7 +51193,7 @@ hQa
jJD
oSs
euF
-oSs
+aEQ
hgp
hgp
cXR
@@ -50526,7 +51233,7 @@ tPB
fYk
jkp
nQf
-cKM
+rOD
cKM
cKM
pAy
@@ -50549,20 +51256,20 @@ swn
oSs
oSs
oSs
-hgp
-hgp
-oSs
-ngF
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
+wIP
+pKn
+ylS
+sSF
+qJa
+xXV
+wIP
+paI
+sPr
+lPJ
oSs
hgp
-hgp
-hgp
+pOP
+pOP
hgp
hgp
hgp
@@ -50611,7 +51318,7 @@ qIn
crx
crx
crx
-crx
+lpy
crx
crx
tPj
@@ -50748,20 +51455,20 @@ rzA
tmC
lrH
wIP
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-dRM
-oSs
-oSs
-oSs
-oSs
+kap
+kap
+kap
+wIP
+bBA
+ulX
+oMj
+oaK
+aeP
+jXF
+afD
+afD
+afD
+dZd
hgp
pwF
hgp
@@ -50807,7 +51514,7 @@ oSs
bEh
svE
crx
-crx
+dqv
wxq
crx
crx
@@ -50933,7 +51640,7 @@ cKM
cKM
cKM
cKM
-cKM
+axv
eSF
cXR
oSs
@@ -50951,19 +51658,19 @@ eGh
wIP
wIP
wIP
-uqg
-uqg
wIP
wIP
-oSs
-oSs
-wDd
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
+wIP
+wIP
+ivP
+cAI
+oMj
+aeP
+kdf
+cBy
+afD
+afD
+alX
dRM
hgp
hgp
@@ -51153,19 +51860,19 @@ tmC
jae
wIP
dqZ
-tmC
-tmC
-jae
+ylS
+nhD
+sqo
wIP
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
+fuf
+hss
+rrr
+dJX
+wIP
+oID
+kap
+kap
+alX
oSs
hgp
hgp
@@ -51355,19 +52062,19 @@ tmC
tmC
wIP
eSq
-tmC
-tmC
-tmC
-wIP
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
+ylS
+fUd
+rQK
+uqg
+rQK
+uxr
+xhM
+aeP
+oKY
+afD
+dgB
+afD
+alX
oSs
oSs
hgp
@@ -51412,7 +52119,7 @@ jJD
hgp
qnx
kap
-kap
+psj
kap
ern
crx
@@ -51538,7 +52245,7 @@ cKM
cKM
cKM
cKM
-cKM
+rOD
iuP
cXR
oSs
@@ -51556,21 +52263,21 @@ aoO
tmC
tmC
wIP
-gRy
-gRy
-tmC
-rnT
-wIP
-oSs
-oSs
+sqV
+jqn
+ylS
+ylS
+ylS
+iQq
+aeP
gQA
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
+aeP
+sPm
+qJI
+cBr
+cBr
+bJN
+cvP
oSs
oSs
hgp
@@ -51713,7 +52420,7 @@ cXR
cXR
oSs
oSs
-oSs
+dYO
oSs
oSs
oSs
@@ -51758,21 +52465,21 @@ rXk
tmC
gwc
wIP
-qOn
-qOn
-tmC
-tmC
+jUS
+beT
+nWQ
+xDc
wIP
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
-oSs
+pra
+hRl
+pvx
+hsu
+wIP
+sPr
+sPr
+lPJ
+cvP
+cvP
oSs
oSs
oSs
@@ -51965,6 +52672,11 @@ wIP
wIP
wIP
wIP
+wIP
+wIP
+wIP
+wIP
+wIP
aOS
aOS
aOS
@@ -51974,11 +52686,6 @@ aOS
aOS
aOS
aOS
-bKj
-aOS
-aOS
-aOS
-aOS
aOS
aOS
blm
@@ -52043,7 +52750,7 @@ jJD
jJD
jJD
jJD
-jJD
+rlZ
jJD
jJD
jJD
@@ -52339,7 +53046,7 @@ hQa
hQa
hQa
hQa
-hQa
+hRz
hQa
hQa
hQa
@@ -52897,7 +53604,7 @@ jJD
jJD
jJD
jJD
-jJD
+rlZ
jJD
jJD
jJD
@@ -52911,7 +53618,7 @@ jJD
jJD
jJD
jJD
-jJD
+mON
jJD
jJD
jJD
@@ -52989,7 +53696,7 @@ oSs
oSs
oSs
oSs
-oSs
+dYO
oSs
oSs
oSs
@@ -53133,7 +53840,7 @@ oSs
oSs
oSs
oSs
-oSs
+dYO
oSs
oSs
oSs
@@ -53252,7 +53959,7 @@ rHi
quB
nmM
rHi
-rHi
+jzZ
dUU
gtX
kZy
@@ -53515,7 +54222,7 @@ jJD
fYk
ygy
vXj
-cKM
+fQt
cKM
mLd
fGh
@@ -53904,7 +54611,7 @@ oSs
jVU
xCd
crx
-ruN
+hzR
crx
crx
crx
@@ -53929,7 +54636,7 @@ vGu
dGk
tyI
fYk
-fNC
+uUx
hDb
hDb
hDb
@@ -54089,7 +54796,7 @@ cXR
jJD
hQa
wHx
-hQa
+gfO
jJD
kqA
qdA
@@ -54259,7 +54966,7 @@ hgp
hgp
dUU
edX
-lTB
+dKh
xIn
rHi
rHi
@@ -55452,7 +56159,7 @@ hnZ
hnZ
iSs
snQ
-egw
+gba
egw
eNE
onG
@@ -55843,7 +56550,7 @@ wGi
pnO
qvL
pXy
-pnO
+vCA
iSs
iSs
cuW
@@ -55939,7 +56646,7 @@ jJD
hQa
wHx
hQa
-wHx
+tAg
hQa
wHx
hQa
@@ -56322,7 +57029,7 @@ nVf
cXR
bYw
moW
-hgp
+snW
iEY
hgU
oSs
@@ -56485,7 +57192,7 @@ oRc
awg
aXf
rHi
-rHi
+hPo
rHi
rHi
rHi
@@ -56697,7 +57404,7 @@ jJD
hQa
hQa
hQa
-jJD
+ehD
jJD
jJD
jJD
@@ -57526,7 +58233,7 @@ hQa
hQa
jJD
wXX
-tmC
+hVJ
tmC
kFC
tmC
@@ -57546,7 +58253,7 @@ mNa
kDi
crx
cXR
-jJD
+ehD
hQa
hQa
hQa
@@ -57612,7 +58319,7 @@ hQa
oSs
hgp
oSs
-hgp
+llL
oSs
hgp
hgp
@@ -57916,7 +58623,7 @@ pcR
cKM
cKM
cKM
-cKM
+jXa
tqe
xdh
rtE
@@ -58115,7 +58822,7 @@ xmr
tSm
vCh
pAy
-cKM
+fQt
cKM
cKM
cKM
@@ -58147,7 +58854,7 @@ bxt
uui
qjA
crx
-crx
+eEm
iOX
crx
crx
@@ -58406,7 +59113,7 @@ bkd
crx
sAf
gEp
-crx
+dqv
rTK
bas
lsm
@@ -59275,7 +59982,7 @@ pnO
hnZ
hnZ
pnO
-pnO
+kiy
uqv
cQL
cQL
@@ -59490,7 +60197,7 @@ kaR
pBr
txq
cQL
-mzM
+qas
mzM
mzM
oVV
@@ -59529,7 +60236,7 @@ hQa
hQa
hQa
hQa
-hQa
+hRz
hQa
hQa
hQa
@@ -59613,12 +60320,12 @@ crx
crx
lXA
tRW
-crx
+xhK
iAo
crx
-aOy
+fwO
cXR
-jvs
+wcy
jvs
jvs
bGX
@@ -59634,7 +60341,7 @@ hgp
hgp
hgp
bEz
-jvs
+tHS
jvs
bgm
aXf
@@ -59709,7 +60416,7 @@ uXm
uXm
tIa
oSs
-hgp
+bmk
hgp
hgp
hgp
@@ -60552,7 +61259,7 @@ mOB
crx
sgp
aGB
-wTp
+ioA
pBt
aFF
mQz
@@ -60988,7 +61695,7 @@ jJD
cXR
cXR
lXA
-crx
+lpy
crx
cXR
cXR
@@ -61173,7 +61880,7 @@ crx
crx
swp
crx
-crx
+eEm
ewu
tPj
wTp
@@ -61395,7 +62102,7 @@ crx
sKH
sKH
crx
-crx
+xhK
lXA
gAC
crx
@@ -61553,13 +62260,13 @@ hqN
hQa
hQa
ftT
-hQa
+pFq
hQa
hqN
hqN
lJX
crx
-crx
+eEm
crx
auv
gLF
@@ -61707,7 +62414,7 @@ mzM
mzM
mzM
kbJ
-oVV
+ocK
tkV
uXm
uXm
@@ -62572,7 +63279,7 @@ fIe
fIe
lKY
xIf
-hqN
+stg
hqN
pPl
hgp
@@ -63270,7 +63977,7 @@ oSs
oSs
oSs
fIF
-crx
+lpy
crx
oxI
dUU
@@ -63398,7 +64105,7 @@ eRO
qIn
kle
tPR
-jFW
+wrY
crx
pSM
whX
@@ -63477,7 +64184,7 @@ wRs
cXR
dUU
cyM
-crx
+kzo
crx
diO
eHk
@@ -63575,7 +64282,7 @@ sgp
loj
wWE
cvL
-crx
+dqv
crx
cvL
tFJ
@@ -65079,7 +65786,7 @@ qFl
oSs
oSs
oSs
-oSs
+xYq
iNC
hQa
hQa
@@ -65092,7 +65799,7 @@ hgp
hgp
hgp
qFl
-hzC
+oSs
oSs
oSs
oSs
@@ -65698,7 +66405,7 @@ oSs
blm
blm
blm
-hzC
+oSs
oSs
oSs
oSs
diff --git a/_maps/map_files/Drought/Drought_above.dmm b/_maps/map_files/Drought/Drought_above.dmm
index ecfd0943020..6f254c7eb1b 100644
--- a/_maps/map_files/Drought/Drought_above.dmm
+++ b/_maps/map_files/Drought/Drought_above.dmm
@@ -1175,6 +1175,11 @@
/obj/effect/spawner/random/ms13/food/packaged,
/turf/open/floor/ms13/concrete/small,
/area/ms13/water_baron/interior)
+"dY" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/mosaic,
+/area/ms13/town)
"dZ" = (
/obj/structure/table/ms13/no_smooth/wood,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -4011,8 +4016,18 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"nK" = (
-/obj/machinery/ms13/agriculture,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/closet/crate/ms13/footlocker,
+/obj/item/card/id/ms13/drought_visa,
+/obj/item/card/id/ms13/drought_visa,
+/obj/item/card/id/ms13/drought_visa,
+/obj/item/card/id/ms13/drought_visa,
+/obj/item/card/id/ms13/drought_visa,
+/obj/item/card/id/ms13/drought_visa,
+/obj/item/card/id/ms13/drought_medical,
+/obj/item/card/id/ms13/drought_medical,
+/obj/item/card/id/ms13/drought_visa,
+/obj/item/card/id/ms13/drought_visa,
/turf/open/floor/ms13/concrete,
/area/ms13/water_baron)
"nL" = (
@@ -4108,7 +4123,7 @@
/area/ms13/town)
"ob" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -4704,7 +4719,7 @@
/area/ms13/town)
"qd" = (
/obj/effect/turf_decal/ms13/showerdrains/small,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -4845,13 +4860,10 @@
/obj/structure/table/ms13/no_smooth/large/metal/desk{
dir = 1
},
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/machinery/ms13/terminal{
- dir = 1;
- remote_capability = 1;
- signal_id_1 = "car_junk_storage";
- signal_title_1 = "Storage Shutters"
+ dir = 1
},
-/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"qK" = (
@@ -5506,7 +5518,7 @@
/area/ms13/water_baron/interior)
"sW" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -5600,6 +5612,8 @@
pixel_y = 26
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/table/ms13/metal/constructed,
+/obj/structure/ms13/chem_set,
/turf/open/floor/wood/ms13/mosaic,
/area/ms13/town)
"to" = (
@@ -5815,7 +5829,7 @@
"uc" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -6007,6 +6021,7 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/medical/lowrandom,
/obj/effect/spawner/random/ms13/medical/lowrandom,
+/obj/effect/spawner/random/ms13/guaranteed/medical/lowrandom,
/turf/open/floor/ms13/tile/long,
/area/ms13/rangeroutpost/building)
"uL" = (
@@ -6066,6 +6081,7 @@
/obj/structure/table/ms13/metal/grate,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/medical/lowrandom,
+/obj/effect/spawner/random/ms13/guaranteed/medical/lowrandom,
/turf/open/floor/ms13/tile/long,
/area/ms13/rangeroutpost/building)
"uW" = (
@@ -6327,7 +6343,7 @@
/turf/open/floor/wood/ms13/carpet/shaggy,
/area/ms13/town)
"vJ" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -6449,6 +6465,10 @@
/obj/effect/spawner/random/ms13/medical/lowrandom,
/turf/open/floor/plating/ms13/roof/metal,
/area/ms13/town)
+"wc" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/plating/ms13/roof/metal,
+/area/ms13/desert)
"wd" = (
/turf/open/floor/plating/ms13/roof/wood,
/area/ms13/desert)
@@ -6914,6 +6934,7 @@
"xP" = (
/obj/effect/decal/cleanable/blood/old,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/glass,
/turf/open/floor/ms13/tile/full/black,
/area/ms13/town)
"xQ" = (
@@ -7638,12 +7659,17 @@
/area/ms13/town)
"Au" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
/turf/open/floor/ms13/tile,
/area/ms13/town)
+"Av" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/plating/ms13/roof/metal/rusty,
+/area/ms13/town)
"Aw" = (
/obj/structure/ms13/storage/bookshelf{
dir = 4
@@ -7669,6 +7695,11 @@
/obj/effect/turf_decal/ms13/covering/paint/green,
/turf/closed/wall/ms13/siding,
/area/ms13/town)
+"Az" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"AC" = (
/obj/structure/table/ms13/metal/grate,
/obj/effect/spawner/random/ms13/tools/tool,
@@ -7853,7 +7884,7 @@
/turf/open/floor/ms13/concrete,
/area/ms13/water_baron/interior)
"Bh" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -8369,7 +8400,7 @@
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/drylanders)
"CX" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -8385,6 +8416,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"Da" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/tile/large/checkered,
+/area/ms13/town)
"Db" = (
/obj/structure/lattice/catwalk/ms13,
/obj/structure/chair/ms13/overlaypickup/plastic,
@@ -9777,6 +9813,10 @@
},
/turf/open/floor/ms13/concrete,
/area/ms13/town)
+"HY" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/roof/metal,
+/area/ms13/desert)
"HZ" = (
/obj/structure/railing/ms13/solo{
dir = 4
@@ -10680,7 +10720,7 @@
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"KU" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -11192,6 +11232,11 @@
},
/turf/open/floor/plating/ms13/ground/desert,
/area/ms13/water_baron)
+"MI" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/concrete/small,
+/area/ms13/water_baron/interior)
"MJ" = (
/obj/structure/railing/ms13/wood{
dir = 1
@@ -11679,6 +11724,11 @@
/obj/effect/spawner/random/ms13/locked/random/lowchance,
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
+"Ot" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/roof/metal,
+/area/ms13/town)
"Ou" = (
/obj/structure/table/ms13/wood/constructed,
/obj/structure/closet/crate/ms13/vault_tec/compact{
@@ -12438,7 +12488,7 @@
/area/ms13/town)
"QV" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -12497,7 +12547,7 @@
/turf/open/openspace/ms13,
/area/ms13/town)
"Re" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -12775,7 +12825,7 @@
/turf/open/openspace/ms13,
/area/ms13/water_baron)
"Se" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -12962,6 +13012,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/closed/wall/ms13/siding,
/area/ms13/town)
+"SP" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/wood/ms13/mosaic,
+/area/ms13/rangeroutpost/building)
"SQ" = (
/obj/structure/ms13/storage/large/shelf/wood/drawers,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -13230,7 +13285,7 @@
/turf/open/floor/ms13/concrete,
/area/ms13/water_baron/interior)
"TJ" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
pixel_y = 17
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -13389,7 +13444,7 @@
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"Uk" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -13676,8 +13731,7 @@
"Vi" = (
/obj/structure/table/ms13/metal/grate,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/effect/spawner/random/ms13/guaranteed/medical/lowrandom,
-/obj/effect/spawner/random/ms13/guaranteed/medical/lowrandom,
+/obj/structure/ms13/chem_set,
/turf/open/floor/ms13/tile/long,
/area/ms13/rangeroutpost/building)
"Vj" = (
@@ -20866,7 +20920,7 @@ qi
qi
qu
OP
-GJ
+Av
GJ
GJ
ua
@@ -21290,7 +21344,7 @@ qi
qi
qi
qi
-cF
+HY
cF
dD
vF
@@ -23699,7 +23753,7 @@ cF
cF
OY
OY
-OY
+Ot
OY
OY
cF
@@ -24159,7 +24213,7 @@ Sg
qt
qt
qt
-qt
+SP
OF
AE
ip
@@ -30382,7 +30436,7 @@ qi
qi
qi
jk
-cF
+wc
cF
cF
cF
@@ -33317,7 +33371,7 @@ sa
sa
si
Vc
-pe
+MI
lB
pb
uY
@@ -35961,7 +36015,7 @@ qi
ip
ip
RD
-AZ
+dY
AZ
cr
XK
@@ -37379,7 +37433,7 @@ pZ
ba
lt
bp
-ZZ
+Da
FV
XF
ip
@@ -44305,13 +44359,13 @@ ip
qi
qi
qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
+ip
+ip
+ip
+ip
+ip
+ip
+ip
qi
qi
qi
@@ -44507,16 +44561,16 @@ ip
qi
qi
qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
qi
qi
qi
@@ -44709,16 +44763,16 @@ ip
qi
qi
qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
qi
qi
qi
@@ -44913,14 +44967,14 @@ ip
ip
ip
ip
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
qi
qi
qi
@@ -45115,14 +45169,14 @@ ip
uE
ip
ip
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
qi
qi
qi
@@ -45317,14 +45371,14 @@ ip
ip
ip
ip
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
qi
qi
qi
@@ -45519,14 +45573,14 @@ ip
uE
ip
Za
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
qi
qi
qi
@@ -45721,14 +45775,14 @@ uE
ip
ar
Za
-qi
-qi
-qi
-qi
-qi
-qi
-qi
-qi
+ip
+ip
+ip
+ip
+ip
+ip
+ip
+ip
qi
qi
qi
@@ -45923,11 +45977,11 @@ ip
Za
Za
Za
-qi
-qi
-qi
-qi
-qi
+ip
+ip
+ip
+ip
+ip
qi
qi
qi
@@ -56627,7 +56681,7 @@ QT
BK
Vz
Fo
-SC
+Az
SC
Wo
BB
diff --git a/_maps/map_files/Drought/Drought_below.dmm b/_maps/map_files/Drought/Drought_below.dmm
index 5e2c3572974..16e923fee6b 100644
--- a/_maps/map_files/Drought/Drought_below.dmm
+++ b/_maps/map_files/Drought/Drought_below.dmm
@@ -136,6 +136,7 @@
/obj/item/pen/ms13{
pixel_y = 8
},
+/obj/item/ms13/fluff/chems,
/turf/open/floor/ms13/tile/full/navy,
/area/ms13/town)
"bc" = (
@@ -207,7 +208,7 @@
/turf/open/floor/plating/ms13/ground/mountain/drought,
/area/ms13/underground/mountain)
"bI" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -503,7 +504,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"dP" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/turf/open/floor/ms13/tile,
@@ -579,7 +580,7 @@
/turf/open/floor/ms13/metal/pipe,
/area/ms13/underground/mountain_bunker)
"en" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/machinery/light/ms13/bulb/industrial{
@@ -847,7 +848,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"fQ" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/turf/open/floor/ms13/tile,
@@ -873,6 +874,10 @@
/obj/item/grenade/ms13/molotov,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"ga" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"gb" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = 3;
@@ -1186,6 +1191,11 @@
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"hX" = (
+/obj/structure/noticeboard/ms13/cork,
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"hY" = (
/obj/structure/table/ms13/metal/alt,
/obj/item/folder/ms13/brown{
@@ -1208,6 +1218,13 @@
/obj/structure/stairs/north,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"ij" = (
+/obj/structure/closet/crate/ms13/woodcrate,
+/obj/effect/spawner/random/ms13/melee/highrandom,
+/obj/effect/spawner/random/ms13/melee/highrandom,
+/obj/effect/spawner/random/ms13/melee/tier3,
+/turf/open/floor/ms13/concrete/industrial,
+/area/ms13/town)
"im" = (
/obj/structure/bed/roller/ms13,
/obj/structure/ms13/wall_decor/cross,
@@ -1457,6 +1474,10 @@
/obj/structure/bonfire/ms13/fire_barrel/prelit,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"kf" = (
+/obj/effect/spawner/random/ms13/power_armor/parts,
+/turf/open/floor/ms13/concrete/industrial,
+/area/ms13/town)
"kg" = (
/obj/effect/decal/cleanable/blood/old{
pixel_x = -2;
@@ -1507,7 +1528,10 @@
/area/ms13/town)
"ku" = (
/obj/structure/closet/crate/ms13/woodcrate,
-/obj/effect/spawner/random/ms13/guaranteed/crafting/highrandom,
+/obj/effect/spawner/random/ms13/armor/highrandom,
+/obj/effect/spawner/random/ms13/armor/tier3,
+/obj/effect/spawner/random/ms13/guaranteed/armor/headgear,
+/obj/effect/spawner/random/ms13/armor/headgear,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"kw" = (
@@ -1568,12 +1592,13 @@
"kJ" = (
/obj/structure/table/ms13/metal/alt,
/obj/structure/ms13/storage/vent,
-/obj/item/ms13/fluff/microscope{
- pixel_y = 9
- },
-/obj/item/ms13/fluff/chems,
+/obj/structure/ms13/chem_set,
/turf/open/floor/ms13/tile/full/white,
/area/ms13/town)
+"kL" = (
+/mob/living/simple_animal/hostile/ms13/robot/protectron/builder,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"kO" = (
/obj/structure/table/ms13/metal/heavy,
/turf/open/floor/ms13/concrete/industrial,
@@ -1583,6 +1608,10 @@
/obj/effect/spawner/random/ms13/tools/hardware,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"kQ" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/town)
"kS" = (
/obj/structure/ms13/cave_decor/support/wall,
/obj/structure/ms13/turfdecor/drought,
@@ -1663,6 +1692,7 @@
"lK" = (
/obj/structure/closet/crate/ms13/woodcrate/compact/army,
/obj/effect/spawner/random/ms13/melee/highrandom,
+/obj/effect/spawner/random/ms13/gun/tier3,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"lL" = (
@@ -1809,7 +1839,7 @@
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"mN" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/structure/ms13/storage/vent,
@@ -2436,6 +2466,13 @@
/obj/effect/spawner/random/ms13/power_armor/lowrandom,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"qS" = (
+/obj/structure/closet/crate/ms13/woodcrate/compact/army,
+/obj/effect/spawner/random/ms13/gun/highrandom,
+/obj/effect/spawner/random/ms13/gun/highunique,
+/obj/effect/spawner/random/ms13/ammo/highrandom,
+/turf/open/floor/ms13/concrete/industrial,
+/area/ms13/town)
"qT" = (
/obj/structure/ms13/storage/shelf{
dir = 1
@@ -2635,7 +2672,7 @@
/turf/open/floor/ms13/concrete,
/area/ms13/underground/mountain_bunker)
"sf" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
pixel_y = 24
},
/turf/open/floor/ms13/tile,
@@ -2800,7 +2837,7 @@
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/town)
"tn" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -3070,6 +3107,11 @@
/obj/effect/spawner/random/ms13/crafting/precious,
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/town)
+"uU" = (
+/obj/structure/ms13/storage/shelf,
+/obj/effect/spawner/random/ms13/tools/tool,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"uV" = (
/obj/machinery/door/unpowered/ms13/metal/red{
dir = 4
@@ -3254,6 +3296,10 @@
/obj/effect/spawner/random/ms13/clothing/under,
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/town)
+"wg" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"wh" = (
/obj/structure/table/ms13/metal/grate,
/obj/machinery/light/ms13/bulb{
@@ -4183,6 +4229,7 @@
/obj/machinery/light/ms13{
dir = 1
},
+/obj/structure/ms13/chem_set,
/turf/open/floor/ms13/tile/long/blue,
/area/ms13/town)
"CF" = (
@@ -4662,6 +4709,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"Gd" = (
+/obj/structure/ladder/ms13,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"Ge" = (
/obj/structure/ms13/storage/large/shelf/wood{
dir = 4
@@ -4861,7 +4912,7 @@
/turf/open/floor/ms13/metal/pipe/corner,
/area/ms13/town)
"HE" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/structure/ms13/storage/vent,
@@ -5082,6 +5133,12 @@
},
/turf/open/floor/plating/ms13/ground/desertalt,
/area/ms13/town)
+"Jc" = (
+/obj/structure/table/ms13/metal/grate,
+/obj/effect/spawner/random/ms13/tools/tool,
+/obj/effect/spawner/random/ms13/tools/lights,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"Jf" = (
/obj/structure/ms13/tank/pipe,
/turf/open/floor/ms13/metal/grate,
@@ -5160,6 +5217,12 @@
/obj/structure/ms13/cave_decor/stalagmite,
/turf/open/floor/plating/ms13/ground/mountain/drought,
/area/ms13/underground/mountain)
+"JG" = (
+/obj/structure/table/ms13/metal/grate,
+/obj/effect/spawner/random/ms13/crafting/electrical,
+/obj/effect/spawner/random/ms13/crafting/highrandom,
+/turf/open/floor/ms13/concrete/industrial,
+/area/ms13/town)
"JH" = (
/obj/structure/chair/ms13/metal/blue/unfinished{
dir = 1
@@ -5230,7 +5293,7 @@
/obj/machinery/door/unpowered/ms13/metal{
dir = 8
},
-/turf/open/floor/ms13/concrete/industrial,
+/turf/open/floor/ms13/concrete,
/area/ms13/town)
"Ki" = (
/obj/structure/table/ms13/metal/grate,
@@ -5529,6 +5592,10 @@
},
/turf/open/floor/ms13/tile/long/blue,
/area/ms13/town)
+"Mj" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/town)
"Mm" = (
/obj/structure/ms13/barrel/double/red/two,
/turf/open/floor/plating/ms13/ground/desertalt,
@@ -6220,6 +6287,10 @@
/obj/structure/table/ms13/crafting/armorbench,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"QT" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/town)
"QV" = (
/obj/structure/ms13/barrel/single/grey/three,
/turf/open/floor/ms13/concrete,
@@ -6417,10 +6488,8 @@
/turf/open/floor/ms13/concrete,
/area/ms13/underground/mountain_bunker)
"Ss" = (
-/obj/machinery/ms13/terminal/wall{
- id = "car_junk_storage1"
- },
-/turf/open/floor/ms13/concrete/industrial,
+/obj/structure/ms13/pipes/piped,
+/turf/open/floor/ms13/concrete,
/area/ms13/town)
"St" = (
/mob/living/basic/ms13/ghoul/brown,
@@ -6878,6 +6947,13 @@
/obj/structure/noticeboard/ms13/cork,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
+"Vo" = (
+/obj/machinery/light/ms13{
+ dir = 8
+ },
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"Vq" = (
/obj/structure/closet/crate/ms13/woodcrate,
/obj/effect/spawner/random/ms13/guaranteed/crafting/electrical,
@@ -7305,6 +7381,10 @@
/obj/effect/spawner/random/ms13/locked/random/lowchance,
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/town)
+"YH" = (
+/obj/effect/spawner/random/ms13/guaranteed/tools/tool,
+/turf/open/floor/ms13/concrete/industrial,
+/area/ms13/town)
"YI" = (
/mob/living/basic/ms13/robot/handy,
/turf/open/floor/ms13/tile/long/blue,
@@ -7364,8 +7444,11 @@
/area/ms13/town)
"Zc" = (
/obj/structure/table/ms13/metal/grate,
-/obj/effect/spawner/random/ms13/tools/lights,
-/turf/open/floor/ms13/concrete/industrial,
+/obj/effect/spawner/random/ms13/melee/tier3,
+/obj/machinery/button/ms13{
+ id = "car_junk_storage1"
+ },
+/turf/open/floor/ms13/concrete,
/area/ms13/town)
"Ze" = (
/obj/machinery/ms13/fusion_generator,
@@ -7396,6 +7479,11 @@
/mob/living/basic/ms13/hostile_animal/radroach,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
+"Zt" = (
+/obj/structure/ms13/turfdecor/drought,
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/desertalt,
+/area/ms13/town)
"Zv" = (
/obj/structure/closet/crate/ms13/woodcrate,
/obj/effect/spawner/random/ms13/tools/farming,
@@ -8719,7 +8807,7 @@ uD
uD
iD
ea
-GN
+wg
TC
iD
GN
@@ -9332,7 +9420,7 @@ GN
GN
GN
GN
-Fe
+Vo
GN
iD
zV
@@ -10942,7 +11030,7 @@ Qf
GN
LK
GN
-Fe
+UU
GN
GN
GN
@@ -31840,7 +31928,7 @@ nq
HW
pm
ql
-nq
+Mj
qJ
sd
HW
@@ -32439,7 +32527,7 @@ nq
iS
nq
nq
-nq
+kQ
Ex
HW
nq
@@ -32846,7 +32934,7 @@ nq
GH
ok
HW
-nq
+QT
KC
nq
uT
@@ -36555,14 +36643,14 @@ uD
uD
vu
vO
+ij
VU
VU
-VU
-VU
+YH
zs
VU
VU
-VU
+YH
wK
vu
uD
@@ -36763,8 +36851,8 @@ Vl
VU
VU
VU
-VU
-VU
+Vl
+qS
Bm
vu
uD
@@ -37160,7 +37248,7 @@ uD
uD
uD
vu
-ms
+JG
ki
VU
VU
@@ -37566,13 +37654,13 @@ uD
uD
vu
Zc
-VU
-VU
-jG
+GN
+GN
+GN
vu
-gI
-VU
-kU
+Ss
+GN
+Jc
vu
uD
uD
@@ -37767,14 +37855,14 @@ uD
uD
uD
vu
-Ss
-VU
-VU
-VU
-VU
-VU
-VU
-NW
+GN
+GN
+GN
+GN
+GN
+GN
+GN
+Rd
vu
uD
uD
@@ -37971,12 +38059,12 @@ uD
vu
jJ
jJ
-VU
-VU
-VU
-Vl
-VU
-hS
+GN
+GN
+GN
+kL
+GN
+TC
vu
uD
uD
@@ -38173,12 +38261,12 @@ uD
vu
nQ
nQ
-kq
-VU
+UU
+Gd
vu
-jV
-VU
-rN
+FW
+GN
+uU
vu
uD
uD
@@ -38777,7 +38865,7 @@ uD
uD
vu
GZ
-VU
+kf
VU
VU
VU
@@ -38980,7 +39068,7 @@ uD
vu
vK
VU
-VU
+SN
VU
VU
oY
@@ -39182,7 +39270,7 @@ uD
vu
Wh
DU
-VU
+kf
VU
VU
vu
@@ -43537,7 +43625,7 @@ uD
vu
UP
zG
-VU
+SN
uc
vu
vu
@@ -44803,7 +44891,7 @@ uD
wo
pC
fP
-fP
+ga
fP
wo
fP
@@ -45210,7 +45298,7 @@ fP
fP
fP
wo
-cH
+hX
fP
fP
fP
@@ -50656,7 +50744,7 @@ eN
Tw
iW
mY
-nq
+Mj
nq
WE
iW
@@ -51107,7 +51195,7 @@ wo
EV
EV
fP
-fP
+ga
wo
uD
uD
@@ -51866,7 +51954,7 @@ uD
uD
HW
Nl
-qJ
+Zt
nq
nq
Se
diff --git a/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm b/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm
index 1ff20756476..aebccea12bd 100644
--- a/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm
+++ b/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm
@@ -38,6 +38,10 @@
/obj/structure/ms13/departure,
/turf/open/floor/plating/ms13/ground/road,
/area/ms13)
+"aaS" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/tile/long,
+/area/ms13/town)
"aaZ" = (
/obj/effect/landmark/start/ms13/wastelander,
/turf/open/floor/plating/ms13/ground/snow,
@@ -459,6 +463,7 @@
/area/ms13/town)
"aqP" = (
/obj/structure/ms13/rug/red,
+/obj/structure/ms13/trash/food/misc,
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/snowcrest)
"arb" = (
@@ -476,7 +481,7 @@
/turf/open/floor/plating/ms13/ground/mountain,
/area/ms13/town)
"arz" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -565,6 +570,10 @@
/obj/effect/spawner/random/ms13/food/junkfood_canned,
/turf/open/floor/ms13/tile/large/white,
/area/ms13/town)
+"auw" = (
+/obj/structure/ms13/trash/books,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"auE" = (
/obj/structure/chair/sofa/corp/right{
dir = 4
@@ -644,7 +653,7 @@
/area/ms13/town)
"axt" = (
/obj/effect/turf_decal/ms13/showerdrains/long,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/turf/open/floor/ms13/concrete,
@@ -992,6 +1001,11 @@
},
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13)
+"aPk" = (
+/obj/structure/table/ms13/wood,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"aPo" = (
/obj/structure/chair/pew{
dir = 1
@@ -1036,6 +1050,10 @@
/obj/structure/ms13/wall_decor/clock,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"aQT" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"aQU" = (
/obj/structure/chair/ms13/wood{
dir = 1
@@ -1291,7 +1309,7 @@
/turf/open/floor/ms13/tile/large/navy,
/area/ms13/town)
"bau" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -1444,6 +1462,11 @@
},
/turf/open/floor/plating/ms13/ground/mountain,
/area/ms13/underground/mountain)
+"bin" = (
+/obj/structure/ms13/trash/papers/three,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13)
"bjg" = (
/obj/machinery/door/poddoor/shutters/ms13/horizontal/indestructible/red/mid,
/turf/open/floor/plating/ms13/ground/road,
@@ -1644,6 +1667,10 @@
/obj/effect/spawner/random/ms13/drink/soda,
/turf/open/floor/ms13/tile/large/cafeteria,
/area/ms13/town)
+"btH" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/wood/ms13/carpet,
+/area/ms13/town)
"btM" = (
/obj/effect/turf_decal/trimline/yellow/line{
dir = 4
@@ -2120,6 +2147,10 @@
/obj/structure/ms13/storage/large/shelf,
/turf/open/floor/ms13/tile/large/white,
/area/ms13/town)
+"bPI" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13)
"bQa" = (
/obj/structure/table/ms13/no_smooth/counter/metal{
dir = 4
@@ -2383,6 +2414,10 @@
/obj/effect/spawner/random/ms13/tools/lights,
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13)
+"cfn" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/town)
"cfp" = (
/obj/structure/stairs/east,
/obj/machinery/light/ms13,
@@ -3374,6 +3409,10 @@
/obj/structure/ms13/wall_decor/clock,
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
+"dbq" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/tile,
+/area/ms13/town)
"dby" = (
/obj/structure/table/ms13/no_smooth/counter/wood{
dir = 1
@@ -3411,7 +3450,7 @@
/area/ms13/town)
"dcA" = (
/obj/effect/turf_decal/ms13/showerdrains/small,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/decal/cleanable/blood/old{
@@ -3529,6 +3568,10 @@
/obj/effect/ai_node/wait,
/turf/open/floor/plating/ms13/ground/road,
/area/ms13)
+"dgx" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/supermarket)
"dgB" = (
/obj/structure/bed/ms13/bedframe/wood,
/turf/open/floor/plating/ms13/ground/sidewalk,
@@ -3587,6 +3630,10 @@
/obj/structure/ms13/wall_decor/clock,
/turf/open/floor/wood/ms13/mosaic,
/area/ms13/town)
+"djj" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/town)
"djs" = (
/obj/structure/table/ms13/no_smooth/counter/metal/bend{
dir = 4
@@ -3608,6 +3655,7 @@
/obj/machinery/light/ms13{
dir = 8
},
+/obj/structure/ms13/trash/food/dinner,
/turf/open/floor/ms13/tile/brown,
/area/ms13/supermarket)
"dkS" = (
@@ -3659,6 +3707,13 @@
/obj/effect/spawner/random/ms13/tools/farming,
/turf/open/floor/wood/ms13/wide,
/area/ms13/tribal_abandoned)
+"dnV" = (
+/obj/machinery/light/ms13{
+ dir = 1
+ },
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"dov" = (
/obj/effect/spawner/random/ms13/medical/lowrandom,
/obj/structure/ms13/storage/large/medical{
@@ -3727,7 +3782,7 @@
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
"dsj" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/long,
@@ -4296,6 +4351,13 @@
/obj/effect/spawner/random/ms13/guaranteed/tools/tool,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
+"dSN" = (
+/obj/structure/ms13/pipes/horizontal/down/single{
+ dir = 1
+ },
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13)
"dSZ" = (
/obj/structure/ms13/trash/papers{
dir = 5
@@ -4312,6 +4374,10 @@
},
/turf/open/floor/ms13/tile/full/white,
/area/ms13/town)
+"dTO" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/plating/ms13/ground/snow,
+/area/ms13/snow/lightforest)
"dTW" = (
/obj/structure/table/ms13/metal/alt,
/turf/open/floor/ms13/metal{
@@ -5053,10 +5119,18 @@
},
/turf/open/floor/wood/ms13/common,
/area/ms13/snowcrest/building)
+"eBs" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/supermarket)
"eBA" = (
/obj/machinery/door/airlock/ms13,
/turf/open/floor/ms13/concrete,
/area/ms13/underground/tunnel/maintenance)
+"eBH" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/town)
"eBR" = (
/obj/machinery/light/ms13{
dir = 4
@@ -5184,6 +5258,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"eGz" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"eGP" = (
/obj/machinery/light/ms13{
dir = 1
@@ -5292,12 +5370,16 @@
/turf/closed/wall/ms13/brick,
/area/ms13/town)
"eMJ" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
/turf/open/floor/ms13/tile,
/area/ms13/town)
+"eNk" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/tile/large/black,
+/area/ms13/town)
"eOd" = (
/obj/structure/table/ms13/low_wall/concrete,
/obj/structure/window/fulltile/ms13/glass,
@@ -5685,6 +5767,10 @@
/obj/effect/spawner/random/ms13/tools/tool,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/underground/tunnel/maintenance)
+"ffl" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/tile,
+/area/ms13/town)
"ffv" = (
/obj/structure/ms13/storage/large/shelf{
dir = 1
@@ -5775,6 +5861,10 @@
/obj/effect/spawner/random/ms13/smokeable/mammoth/general,
/turf/open/floor/ms13/tile/full/green,
/area/ms13/army_base/building)
+"fjj" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13)
"fjD" = (
/obj/structure/noticeboard/ms13/cork,
/turf/open/floor/wood/ms13/mosaic,
@@ -6199,6 +6289,10 @@
/obj/machinery/door/airlock/ms13,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/underground/tunnel/maintenance)
+"fDR" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/concrete/industrial,
+/area/ms13/town)
"fFg" = (
/obj/effect/turf_decal/ms13/covering/paint/gray,
/obj/effect/turf_decal/ms13/graffiti/ncr,
@@ -6767,6 +6861,10 @@
/obj/structure/ms13/storage/bookshelf,
/turf/open/floor/ms13/concrete,
/area/ms13/underground/tunnel/maintenance)
+"fYt" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"fYT" = (
/obj/structure/sink/ms13/functional{
dir = 4
@@ -7169,7 +7267,7 @@
},
/area/ms13/underground/tunnel/maintenance)
"gmI" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 1
},
/obj/structure/ms13/storage/vent,
@@ -7613,6 +7711,10 @@
},
/turf/open/floor/plating/ms13/ground/snow,
/area/ms13/snow/lightforest)
+"gBt" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/snow,
+/area/ms13/snow/lightforest)
"gBx" = (
/obj/structure/chair/ms13/metal{
dir = 4
@@ -7764,6 +7866,10 @@
/obj/structure/ms13/wall_decor/flag/bos,
/turf/open/floor/ms13/metal,
/area/ms13/underground/bos)
+"gHL" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/plating/ms13/ground/mountain,
+/area/ms13/underground/mountain)
"gHM" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 6
@@ -7910,6 +8016,7 @@
/area/ms13/snowcrest/republic)
"gLY" = (
/obj/effect/decal/cleanable/blood/old,
+/obj/structure/ms13/trash/food/misc,
/turf/open/floor/ms13/tile/large/cafeteria,
/area/ms13/town)
"gMb" = (
@@ -8137,6 +8244,7 @@
"gQW" = (
/obj/structure/ms13/trash/papers/one,
/obj/machinery/light/ms13,
+/obj/structure/ms13/trash/food/misc,
/turf/open/floor/wood/ms13/carpet,
/area/ms13/town)
"gQX" = (
@@ -8311,7 +8419,7 @@
/area/ms13/underground/bos)
"gVJ" = (
/obj/effect/turf_decal/ms13/showerdrains/square,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
pixel_y = 15
},
/turf/open/floor/ms13/tile/large/white,
@@ -8365,6 +8473,10 @@
},
/turf/open/floor/ms13/tile/large/cafeteria,
/area/ms13/town)
+"gYQ" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13)
"gYY" = (
/obj/structure/ms13/barrel/quadruple/yellow/one,
/turf/open/floor/ms13/metal/grate/border,
@@ -8385,6 +8497,10 @@
/obj/effect/spawner/random/ms13/medical/herbal,
/turf/open/floor/plating/ms13/ground/mountain,
/area/ms13/underground/mountain)
+"gZe" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/supermarket)
"gZi" = (
/obj/structure/stairs/east,
/turf/open/floor/ms13/tile/full/navy,
@@ -9084,6 +9200,11 @@
/obj/effect/spawner/random/ms13/drink/soda,
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
+"hwJ" = (
+/obj/structure/table/ms13/wood/constructed,
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"hwM" = (
/obj/structure/table/ms13/metal/grate,
/obj/effect/spawner/random/ms13/tools/tool,
@@ -9700,6 +9821,10 @@
},
/turf/open/floor/ms13/tile/large/checkered,
/area/ms13/town)
+"hPT" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/wood/ms13/mosaic,
+/area/ms13/town)
"hPX" = (
/turf/open/floor/iron/stairs/medium,
/area/ms13/town)
@@ -9991,6 +10116,11 @@
},
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"hZR" = (
+/obj/machinery/light/ms13/bulb,
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/tile,
+/area/ms13/town)
"hZW" = (
/obj/structure/table/ms13/metal/small,
/obj/item/ms13/fluff/ashtray,
@@ -10665,6 +10795,10 @@
/obj/structure/ms13/phone,
/turf/open/floor/ms13/concrete,
/area/ms13/underground/tunnel/maintenance)
+"iuq" = (
+/obj/structure/ms13/trash/books,
+/turf/open/floor/wood/ms13/carpet,
+/area/ms13/town)
"iuw" = (
/obj/structure/closet/crate/ms13/footlocker{
dir = 4
@@ -11225,6 +11359,10 @@
/obj/structure/chair/ms13/metal/broken,
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
+"iKW" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13)
"iLa" = (
/obj/effect/turf_decal/ms13/covering/paint/gray,
/turf/closed/wall/ms13/metal,
@@ -11385,6 +11523,7 @@
/obj/effect/decal/cleanable/blood/tracks{
dir = 5
},
+/obj/structure/ms13/trash/food/misc,
/turf/open/floor/plating/ms13/ground/mountain,
/area/ms13/underground/mountain)
"iQD" = (
@@ -11566,6 +11705,7 @@
/obj/effect/decal/cleanable/blood/tracks{
dir = 9
},
+/obj/structure/ms13/trash/food/misc,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"iWu" = (
@@ -12227,7 +12367,7 @@
/area/ms13/town)
"jpX" = (
/obj/effect/turf_decal/ms13/showerdrains/small,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/turf/open/floor/ms13/tile,
@@ -12577,7 +12717,7 @@
/area/ms13/town)
"jzA" = (
/obj/effect/turf_decal/ms13/showerdrains/small,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/structure/closet/ms13/wall/firstaid,
@@ -12970,6 +13110,10 @@
/mob/living/basic/ms13/robot/handy/saw,
/turf/open/floor/ms13/tile/long/blue,
/area/ms13/town)
+"jKC" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/ms13/tile/brown,
+/area/ms13/supermarket)
"jKK" = (
/obj/machinery/light/ms13,
/obj/structure/ms13/trash/papers/one,
@@ -13019,14 +13163,14 @@
/turf/open/floor/ms13/tile/long,
/area/ms13/town)
"jMA" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
/turf/open/floor/ms13/tile/long,
/area/ms13/town)
"jMB" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -13042,6 +13186,10 @@
},
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
+"jMI" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/wood/ms13/carpet,
+/area/ms13/town)
"jMJ" = (
/obj/structure/ms13/storage/vent,
/obj/structure/ms13/wall_decor/flag,
@@ -14028,6 +14176,10 @@
},
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/town)
+"kod" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/town)
"koy" = (
/obj/structure/closet/crate/ms13/footlocker,
/obj/effect/spawner/random/ms13/ammo/lowrandom,
@@ -14746,7 +14898,7 @@
/area/ms13/town)
"kKh" = (
/obj/effect/turf_decal/ms13/showerdrains/square,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/structure/ms13/storage/vent,
@@ -15004,12 +15156,16 @@
/turf/open/floor/ms13/tile/brown,
/area/ms13/supermarket)
"kSP" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
pixel_y = 15
},
/obj/effect/turf_decal/ms13/showerdrains/long,
/turf/open/floor/ms13/tile/long,
/area/ms13/town)
+"kST" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/tile/full/navy,
+/area/ms13/town)
"kTe" = (
/obj/structure/chair/comfy/ms13/ergo,
/turf/open/floor/ms13/concrete/industrial,
@@ -15036,6 +15192,10 @@
},
/turf/open/floor/plating/ms13/ground/mountain,
/area/ms13/town)
+"kTG" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13)
"kTN" = (
/obj/structure/ms13/pipes/horizontal/down,
/turf/open/floor/plating/ms13/ground/sidewalk,
@@ -15567,12 +15727,16 @@
/turf/open/floor/ms13/tile/full/navy,
/area/ms13/town)
"lkR" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
/turf/open/floor/ms13/tile,
/area/ms13/town)
+"llE" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/fancy,
+/area/ms13/town)
"llN" = (
/obj/item/chair/ms13/metal/blue,
/turf/open/floor/ms13/tile/large/white,
@@ -15709,7 +15873,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"lqc" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -15723,6 +15887,10 @@
},
/turf/open/floor/ms13/tile/full/navy,
/area/ms13/town)
+"lqG" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/tile/brown,
+/area/ms13/town)
"lqQ" = (
/obj/machinery/button/ms13{
id = "wh_private2"
@@ -15812,7 +15980,7 @@
/turf/open/openspace/ms13,
/area/ms13/town)
"lur" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -16035,6 +16203,10 @@
},
/turf/open/floor/wood/ms13/carpet,
/area/ms13/town)
+"lAk" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"lAE" = (
/obj/machinery/light/ms13/bulb/broken{
dir = 4
@@ -16134,6 +16306,10 @@
},
/turf/open/floor/ms13/tile/brown,
/area/ms13/town)
+"lFa" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/concrete/industrial,
+/area/ms13/town)
"lFf" = (
/obj/structure/stairs/west,
/turf/open/floor/ms13/tile/large/white,
@@ -16896,6 +17072,11 @@
/obj/structure/window/fulltile/ms13/glass,
/turf/open/floor/plating,
/area/ms13/town)
+"mfD" = (
+/obj/effect/spawner/random/ms13/food/trash,
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/town)
"mfJ" = (
/obj/effect/spawner/random/ms13/guaranteed/drink/soda,
/obj/structure/ms13/storage/store{
@@ -17102,6 +17283,10 @@
/obj/effect/spawner/random/ms13/smokeable/mammoth/lowrandom,
/turf/open/floor/ms13/tile/brown,
/area/ms13/town)
+"mlY" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/plating/ms13/ground/snow,
+/area/ms13)
"mmd" = (
/obj/structure/closet/crate/ms13/woodcrate,
/obj/effect/spawner/random/ms13/crafting/lowrandom,
@@ -17109,6 +17294,10 @@
/obj/effect/spawner/random/ms13/crafting/electrical,
/turf/open/floor/ms13/concrete,
/area/ms13/supermarket)
+"mmj" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/town)
"mmk" = (
/obj/effect/turf_decal/ms13/road/verticalline,
/obj/effect/spawner/random/ms13/food/trash,
@@ -17210,6 +17399,11 @@
},
/turf/open/floor/ms13/tile/full/white,
/area/ms13/town)
+"mpQ" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/tribal_abandoned)
"mqM" = (
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/ms13/tile/large/white,
@@ -17279,6 +17473,14 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"muf" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/snow,
+/area/ms13/snow/lightforest)
+"muj" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"muH" = (
/obj/structure/table/ms13/no_smooth/counter/metal{
dir = 1
@@ -17469,6 +17671,7 @@
/obj/effect/decal/cleanable/blood/footprints{
dir = 1
},
+/obj/structure/ms13/trash/food/glass,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/underground/tunnel/maintenance)
"mAi" = (
@@ -18366,6 +18569,10 @@
/mob/living/simple_animal/hostile/ms13/robot/protectron/fire,
/turf/open/floor/ms13/tile/large/black,
/area/ms13/town)
+"ngJ" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"ngW" = (
/obj/structure/chair/comfy/ms13/ergo{
dir = 4
@@ -19232,6 +19439,10 @@
/obj/effect/spawner/random/ms13/tools/tool,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"nIC" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"nIE" = (
/obj/effect/decal/cleanable/blood/gibs/old,
/obj/effect/spawner/random/ms13/gun/lowrandom,
@@ -19584,7 +19795,7 @@
/turf/open/floor/plating/ms13/ground/road,
/area/ms13)
"nYj" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -20037,6 +20248,10 @@
/obj/item/ammo_casing/ms13/spent,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"ooQ" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/town)
"ooY" = (
/obj/structure/closet/crate/ms13/woodcrate,
/obj/effect/spawner/random/ms13/tools/hardware,
@@ -20750,6 +20965,10 @@
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
+"oTs" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/road,
+/area/ms13)
"oTM" = (
/obj/structure/table/ms13/metal,
/obj/effect/spawner/random/ms13/tools/tool,
@@ -20940,6 +21159,10 @@
/obj/structure/ms13/trash/papers/one,
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13)
+"pfN" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/snowcrest/building)
"pgb" = (
/obj/structure/chair/ms13/metal/unfinished,
/turf/open/floor/ms13/concrete/industrial,
@@ -21533,6 +21756,10 @@
},
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/snowcrest)
+"pLG" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/closed/indestructible/rock/ms13/mammoth,
+/area/ms13/underground/mountain)
"pMp" = (
/turf/open/floor/plating/ms13/ground/road,
/area/ms13/snowcrest/republic)
@@ -21546,6 +21773,10 @@
},
/turf/open/floor/plating/ms13/ground/snow,
/area/ms13/snow/lightforest)
+"pNB" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/mountain,
+/area/ms13/underground/mountain)
"pNE" = (
/obj/structure/ms13/jukebox,
/turf/open/floor/wood/ms13/common,
@@ -21562,6 +21793,10 @@
/obj/structure/window/fulltile/ms13/glass,
/turf/open/floor/ms13/tile/full/white,
/area/ms13/town)
+"pPh" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/ms13/tile/brown,
+/area/ms13/supermarket)
"pPw" = (
/obj/machinery/griddle/ms13,
/obj/structure/ms13/pipes/horizontal/box,
@@ -21720,6 +21955,10 @@
/obj/structure/stairs/east,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"qam" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/plating/ms13/ground/snow,
+/area/ms13/snowcrest)
"qcm" = (
/obj/structure/closet/ms13/fridge,
/obj/effect/spawner/random/ms13/food/junkfood_canned,
@@ -21730,6 +21969,10 @@
/obj/structure/filingcabinet/ms13,
/turf/open/floor/ms13/tile/full/green,
/area/ms13/army_base/building)
+"qcJ" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/town)
"qdd" = (
/obj/structure/table/ms13/no_smooth/counter/metal{
dir = 4
@@ -22193,6 +22436,10 @@
/obj/machinery/light/ms13/bulb/industrial,
/turf/open/openspace/ms13,
/area/ms13/town)
+"qCa" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/wood/ms13/mosaic,
+/area/ms13/town)
"qCo" = (
/obj/structure/ms13/sign/snowcrest,
/turf/open/floor/plating/ms13/ground/snow,
@@ -22469,6 +22716,10 @@
},
/turf/open/floor/wood/ms13/mosaic,
/area/ms13/snowcrest/building)
+"qOG" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"qOT" = (
/obj/structure/table/ms13/no_smooth/counter/metal{
dir = 1
@@ -22509,7 +22760,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"qQW" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -22609,6 +22860,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/tribal_abandoned)
+"qVr" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"qVC" = (
/obj/machinery/door/unpowered/ms13/wood{
dir = 8
@@ -22644,7 +22899,7 @@
/area/ms13/town)
"qWx" = (
/obj/effect/turf_decal/ms13/showerdrains/square,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/structure/ms13/storage/vent,
@@ -22776,6 +23031,11 @@
/obj/effect/turf_decal/ms13/road/horizontalline,
/turf/open/floor/plating/ms13/ground/road,
/area/ms13)
+"rey" = (
+/obj/structure/ms13/trash/papers/one,
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/town)
"reA" = (
/obj/structure/chair/ms13/wood{
dir = 8
@@ -23010,6 +23270,10 @@
/obj/structure/ms13/lamp/makeshift,
/turf/open/floor/wood/ms13/carpet/shaggy/green,
/area/ms13/tribal_abandoned)
+"rrb" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/mosaic,
+/area/ms13/town)
"rrl" = (
/obj/item/ms13/fluff/ruined_book{
pixel_y = 1
@@ -23078,6 +23342,11 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"rui" = (
+/obj/structure/table/ms13/wood/constructed,
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/tribal_abandoned)
"run" = (
/obj/structure/closet/ms13/fridge,
/obj/effect/spawner/random/ms13/food/packaged,
@@ -23286,6 +23555,7 @@
/obj/structure/ms13/trash/papers/one{
dir = 1
},
+/obj/structure/ms13/trash/food/glass,
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13)
"rEP" = (
@@ -23299,6 +23569,10 @@
/obj/item/knife/butcher/ms13,
/turf/open/floor/wood/ms13/wide,
/area/ms13/snowcrest/building)
+"rFl" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/ms13/tile/long/blue,
+/area/ms13/town)
"rFt" = (
/obj/structure/table/ms13/metal/heavy,
/obj/structure/ms13/storage/vent,
@@ -23376,7 +23650,7 @@
/obj/structure/sink/ms13{
pixel_y = 14
},
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/turf/open/floor/ms13/metal/grate,
@@ -23473,6 +23747,7 @@
"rPJ" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/machinery/light/ms13/bulb,
+/obj/structure/ms13/trash/glass/plate,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"rPV" = (
@@ -23572,6 +23847,7 @@
/obj/machinery/light/ms13{
dir = 4
},
+/obj/structure/ms13/trash/food/dinner,
/turf/open/floor/ms13/tile/long,
/area/ms13/town)
"rUm" = (
@@ -23636,6 +23912,10 @@
/obj/machinery/light/ms13,
/turf/open/floor/wood/ms13/carpet/green,
/area/ms13/town)
+"rWU" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/ms13/concrete,
+/area/ms13/supermarket)
"rXy" = (
/obj/machinery/vending/ms13/nuka/pristine,
/turf/open/floor/plating/ms13/ground/sidewalk,
@@ -24022,6 +24302,10 @@
/obj/structure/bed/ms13/sleepingbag/red,
/turf/open/floor/plating/ms13/ground/road,
/area/ms13/snowcrest)
+"spx" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/tribal_abandoned)
"spE" = (
/obj/machinery/door/poddoor/shutters/ms13/horizontal/red/right{
id = "ore_wh4"
@@ -24029,7 +24313,7 @@
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"sqm" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/long,
@@ -24062,6 +24346,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"sqW" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/tribal_abandoned)
"srl" = (
/obj/effect/turf_decal/ms13/road/horizontalline,
/obj/effect/landmark/start/ms13/mon_grunt,
@@ -24409,6 +24697,10 @@
},
/turf/open/floor/plating/ms13/ground/road,
/area/ms13/town)
+"sMq" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13)
"sMW" = (
/obj/structure/ms13/wall_decor/clock,
/obj/structure/ms13/pot/plant{
@@ -24448,6 +24740,10 @@
/obj/machinery/griddle/ms13,
/turf/open/floor/ms13/tile,
/area/ms13/town)
+"sOe" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/concrete,
+/area/ms13/underground/tunnel/maintenance)
"sOp" = (
/turf/open/floor/wood/ms13/wide,
/area/ms13/army_base/building)
@@ -24474,6 +24770,10 @@
/obj/machinery/light/ms13,
/turf/open/floor/wood/ms13/wide,
/area/ms13/snowcrest/building)
+"sPX" = (
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/tile/large/white,
+/area/ms13/town)
"sQd" = (
/obj/structure/table/ms13/low_wall/brick,
/obj/structure/ms13/bars/rusty{
@@ -24825,6 +25125,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"tjL" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/tile/brown,
+/area/ms13/town)
"tjQ" = (
/obj/machinery/door/airlock/ms13,
/turf/open/floor/plating/ms13/ground/sidewalk,
@@ -25838,6 +26142,11 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"uhw" = (
+/obj/effect/turf_decal/ms13/road/drain,
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13)
"uhF" = (
/obj/machinery/door/poddoor/shutters/ms13/horizontal/red/left{
id = "ore_wh2"
@@ -25892,6 +26201,11 @@
/obj/machinery/griddle/ms13,
/turf/open/floor/ms13/tile/brown,
/area/ms13/town)
+"umt" = (
+/obj/structure/ms13/storage/vent,
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/tile/full/navy,
+/area/ms13/town)
"umF" = (
/obj/structure/table/ms13/wood,
/obj/effect/spawner/random/ms13/currency/mammoth/highrandom,
@@ -26248,6 +26562,10 @@
/obj/structure/ms13/bars/rusty,
/turf/open/floor/ms13/concrete,
/area/ms13/army_base/building)
+"uGE" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/supermarket)
"uGJ" = (
/obj/structure/ms13/storage/shelf{
dir = 4
@@ -26307,6 +26625,10 @@
/obj/structure/table/ms13/metal,
/turf/open/floor/ms13/concrete,
/area/ms13/underground/tunnel/maintenance)
+"uKV" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/concrete,
+/area/ms13/underground/tunnel/maintenance)
"uMc" = (
/obj/structure/table/ms13/no_smooth/large/wood/desk,
/obj/effect/spawner/random/ms13/currency/mammoth/prewar/lowrandom,
@@ -26891,6 +27213,11 @@
/obj/structure/ms13/rug/fancy,
/turf/open/floor/plating/ms13/ground/road,
/area/ms13/snowcrest)
+"vsc" = (
+/obj/structure/ms13/storage/vent,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"vsn" = (
/obj/structure/table/ms13/no_smooth/counter/wood{
dir = 4
@@ -27193,6 +27520,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"vGv" = (
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"vHh" = (
/turf/closed/wall/ms13/concrete/alt,
/area/ms13/supermarket)
@@ -27286,6 +27617,10 @@
/obj/item/pen/ms13/pencil,
/turf/open/floor/wood/ms13/wide,
/area/ms13/snowcrest/building)
+"vKU" = (
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/town)
"vLq" = (
/obj/item/paper_bin/ms13,
/turf/open/floor/wood/ms13/mosaic,
@@ -27335,6 +27670,10 @@
/obj/effect/spawner/random/ms13/melee/tier1,
/turf/open/floor/ms13/tile/long,
/area/ms13/supermarket)
+"vNV" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13/town)
"vOd" = (
/obj/structure/bed/ms13/bedframe/cot,
/obj/structure/bed/ms13/mattress/dirty,
@@ -27543,6 +27882,10 @@
},
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"vZA" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/carpet,
+/area/ms13/town)
"war" = (
/obj/effect/landmark/start/ms13/slick_cook,
/turf/open/floor/plating/ms13/ground/road,
@@ -27620,7 +27963,7 @@
/turf/open/floor/wood/ms13/mosaic,
/area/ms13/town)
"whY" = (
-/obj/structure/ms13/trash/glass,
+/obj/structure/ms13/trash/glass/basic,
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/snowcrest)
"win" = (
@@ -27686,6 +28029,10 @@
/obj/structure/ms13/pay_phone/withthephone,
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13)
+"wkN" = (
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/wood/ms13/carpet,
+/area/ms13/town)
"wlc" = (
/obj/structure/stairs/north,
/turf/open/floor/ms13/concrete,
@@ -27827,12 +28174,21 @@
/obj/structure/ms13/trash/papers/three,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"wrb" = (
+/obj/structure/table/ms13/wood,
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/wood/ms13/carpet/shaggy/green,
+/area/ms13/tribal_abandoned)
"wrV" = (
/obj/machinery/power/ms13/streetlamp{
dir = 4
},
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/snowcrest)
+"wtb" = (
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/mosaic,
+/area/ms13/town)
"wtg" = (
/turf/open/floor/plating/ms13/ground/snow,
/area/ms13)
@@ -29060,7 +29416,7 @@
/obj/structure/sink/ms13{
pixel_y = 14
},
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/turf/open/floor/ms13/metal/grate,
@@ -29181,6 +29537,11 @@
/obj/structure/ms13/wall_decor/calendar,
/turf/open/floor/wood/ms13/carpet/blue,
/area/ms13/town)
+"xTp" = (
+/obj/structure/ms13/trash/papers/two,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13)
"xTB" = (
/obj/effect/spawner/random/ms13/clothing/mask,
/obj/effect/spawner/random/ms13/clothing/mask,
@@ -29327,6 +29688,10 @@
/obj/machinery/light/ms13,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"ybe" = (
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/plating/ms13/ground/sidewalk,
+/area/ms13)
"ybm" = (
/obj/structure/ms13/storage/shelf{
dir = 1
@@ -30567,7 +30932,7 @@ ykZ
axO
axO
axO
-axO
+vGv
ykZ
pyY
xmo
@@ -31101,7 +31466,7 @@ eht
iva
nEg
axO
-axO
+fYt
axO
ykZ
khQ
@@ -31250,7 +31615,7 @@ axO
kuc
ykZ
ykZ
-xmo
+gHL
kCn
xmo
xmo
@@ -31324,7 +31689,7 @@ ykZ
khQ
khQ
ykZ
-iva
+hwJ
kdA
axO
axO
@@ -32462,7 +32827,7 @@ xmo
xmo
xmo
xmo
-xmo
+pNB
xmo
xmo
xmo
@@ -33419,7 +33784,7 @@ dqN
xPT
usY
red
-red
+fDR
xPT
xPT
eOd
@@ -33687,7 +34052,7 @@ wtg
wtg
fol
nyt
-eIr
+qcJ
dxM
axO
afU
@@ -33881,7 +34246,7 @@ red
red
hxV
eOd
-xZD
+iKW
ykT
rew
ykT
@@ -34377,7 +34742,7 @@ wqF
bWM
vFT
axO
-axO
+nIC
dxM
axO
hFW
@@ -35063,7 +35428,7 @@ jIO
qak
qak
grT
-xZD
+iKW
xZD
jcY
eMJ
@@ -35142,7 +35507,7 @@ boU
pwP
pwP
xZD
-xZD
+fjj
khQ
khQ
khQ
@@ -35280,7 +35645,7 @@ wOu
wTi
dxM
iQS
-axO
+auw
iqx
aFL
kcu
@@ -35301,7 +35666,7 @@ mUC
hxG
fol
hhh
-eIr
+qcJ
jKK
jIO
wtg
@@ -35521,7 +35886,7 @@ xZD
xZD
lcg
rUs
-oXG
+rey
bfC
axO
axO
@@ -35733,7 +36098,7 @@ lzw
rrW
dgT
gfe
-ndp
+mfD
qcm
iqx
abY
@@ -36214,7 +36579,7 @@ fpr
yas
gQW
jIO
-snd
+dSN
xZD
gad
luy
@@ -37089,9 +37454,9 @@ khQ
khQ
fTv
iNP
-xZD
+ybe
jTJ
-omh
+xTp
xZD
daK
tkz
@@ -37108,7 +37473,7 @@ ykT
dMO
pPW
rsJ
-ykT
+kTG
ykT
xZD
xZD
@@ -37340,7 +37705,7 @@ ykT
xZD
xZD
jIO
-qLW
+vsc
xkH
jIO
jIO
@@ -37393,7 +37758,7 @@ fol
cfT
gDx
jIO
-xZD
+iKW
xZD
ykT
ykT
@@ -38002,7 +38367,7 @@ jIO
jIO
fol
sGl
-eIr
+qcJ
ack
jIO
jIO
@@ -38094,7 +38459,7 @@ xZD
xZD
xZD
xZD
-xZD
+fjj
xPT
kkN
red
@@ -38184,7 +38549,7 @@ cbe
cbe
cFU
xPT
-xZD
+iKW
xZD
xZD
xZD
@@ -38256,7 +38621,7 @@ xZD
xZD
xZD
czQ
-xZD
+iKW
xZD
xZD
ylG
@@ -38267,7 +38632,7 @@ gad
jIO
jIO
jIO
-ylG
+muf
ylG
xZD
xZD
@@ -38457,13 +38822,13 @@ iMh
iqx
gtK
tLZ
-axO
+auw
dFf
fiX
jIO
xZD
xZD
-xZD
+iKW
xZD
hOl
xZD
@@ -38674,7 +39039,7 @@ wtg
vgj
ulg
sms
-axO
+fYt
vsn
jWd
axO
@@ -39426,7 +39791,7 @@ ylG
ylG
ylG
ylG
-ylG
+dTO
ylG
ylG
ylG
@@ -39622,7 +39987,7 @@ jIO
xxf
afd
dZD
-axO
+muj
pQB
jIO
iXk
@@ -39904,7 +40269,7 @@ xZD
xZD
vxv
vvF
-vvF
+vKU
vvF
vvF
vvF
@@ -40366,7 +40731,7 @@ vvF
iSK
iVf
vvF
-vvF
+mmj
ghP
pwP
khQ
@@ -40587,7 +40952,7 @@ eMr
lhg
pRu
htH
-vvF
+ooQ
nLc
sfd
fGu
@@ -40725,7 +41090,7 @@ kuO
fol
dmT
ffM
-eIr
+qcJ
axO
jzy
jIO
@@ -40801,7 +41166,7 @@ xPT
xPT
xPT
xPT
-xZD
+iKW
xZD
ykT
ykT
@@ -40957,7 +41322,7 @@ axO
dFx
jIO
hrs
-xZD
+fjj
iQa
xZD
xZD
@@ -40985,10 +41350,10 @@ iqx
qli
roF
kCe
-eIr
+qcJ
ack
qRw
-xZD
+sMq
omh
tGo
mxr
@@ -41427,7 +41792,7 @@ oOi
xZD
xZD
xZD
-xZD
+fjj
jIO
jIO
jIO
@@ -41722,7 +42087,7 @@ ykT
ykT
vxG
iLs
-eIr
+sPX
tbI
flN
eMr
@@ -41859,7 +42224,7 @@ jIO
gad
jIO
jIO
-pBH
+bin
xZD
wPy
xZD
@@ -41887,7 +42252,7 @@ xZD
xZD
xZD
xZD
-xZD
+gYQ
xZD
kIz
xrT
@@ -42573,7 +42938,7 @@ xZD
xZD
xZD
xZD
-xZD
+sMq
jTJ
ylG
ylG
@@ -42624,7 +42989,7 @@ ykT
rew
ykT
ykT
-xZD
+gYQ
xZD
pwP
xZD
@@ -43189,7 +43554,7 @@ ylG
ylG
tqN
xZD
-ykT
+bPI
ykT
ykT
xZD
@@ -43686,7 +44051,7 @@ jIO
mYg
uxr
xZD
-xZD
+gYQ
kdr
kmT
jGM
@@ -43700,7 +44065,7 @@ jWv
ecD
gFY
eIm
-eIr
+qcJ
nGM
gad
xZD
@@ -43934,7 +44299,7 @@ sWT
wmF
aeV
isz
-red
+lFa
aSj
jIO
ylG
@@ -44530,7 +44895,7 @@ vpf
fdI
fdI
pcM
-ylG
+dTO
ylG
ylG
ylG
@@ -44590,7 +44955,7 @@ xZD
xZD
xZD
xZD
-xZD
+sMq
xZD
xZD
xZD
@@ -45311,7 +45676,7 @@ moU
rRC
rRC
nhs
-eIr
+sPX
hqo
eIr
eIr
@@ -45772,7 +46137,7 @@ eIr
eIr
hqo
eIr
-eIr
+eBH
dFB
eIr
eIr
@@ -46229,7 +46594,7 @@ rkR
rkR
rRC
rRC
-eIr
+cfn
eIr
rRC
dJP
@@ -46622,7 +46987,7 @@ hkW
axO
axO
axO
-axO
+vGv
axO
gUn
xZD
@@ -47071,7 +47436,7 @@ ylG
xxf
voz
axO
-axO
+nIC
hlw
axO
xLS
@@ -47173,13 +47538,13 @@ xZD
xZD
jIO
vvF
-vvF
+vKU
vvF
vvF
gYJ
vvF
vvF
-vvF
+vKU
vvF
cxj
tCN
@@ -47552,7 +47917,7 @@ xZD
iBg
iMm
iMm
-aLq
+rFl
gmc
aLq
aLq
@@ -48205,7 +48570,7 @@ ylG
jIO
wVh
red
-red
+fDR
red
red
red
@@ -48214,7 +48579,7 @@ red
red
red
hQw
-xZD
+gYQ
xBj
xBj
ykT
@@ -48541,7 +48906,7 @@ vvF
hyH
vvF
vvF
-vvF
+kod
hbX
vfs
tCN
@@ -48923,7 +49288,7 @@ xZD
xZD
xZD
xZD
-xZD
+iKW
xZD
xZD
xZD
@@ -49214,7 +49579,7 @@ ykT
ykT
ykT
ykT
-ykT
+bPI
ykT
ykT
ykT
@@ -49413,7 +49778,7 @@ ykT
ykT
ykT
ykT
-ykT
+oTs
ykT
ykT
ykT
@@ -50983,7 +51348,7 @@ xih
jzk
jzk
xGW
-xih
+hPT
wos
smU
kDI
@@ -51163,7 +51528,7 @@ xPT
xPT
xPT
rII
-axO
+muj
oyJ
mhc
xPT
@@ -51192,7 +51557,7 @@ rew
ykT
rew
eeB
-xZD
+fjj
xZD
ykT
ykT
@@ -51235,7 +51600,7 @@ umj
oJO
oJO
jIO
-axO
+vGv
axO
jvW
axO
@@ -51261,7 +51626,7 @@ wSc
eje
jIO
mMQ
-mMQ
+eNk
mMQ
ngA
mMQ
@@ -51605,7 +51970,7 @@ ylG
ylG
ylG
ylG
-xZD
+iKW
ykT
rew
ykT
@@ -51687,7 +52052,7 @@ xZD
jIO
kMJ
oJO
-oJO
+tjL
hhL
axO
axO
@@ -51867,7 +52232,7 @@ ykT
ykT
ykT
ykT
-ykT
+oTs
ykT
ykT
ykT
@@ -52075,7 +52440,7 @@ gUb
hwv
hLA
xPT
-aDo
+aPk
gQX
axO
ydI
@@ -52341,7 +52706,7 @@ jIO
vgj
bvP
arP
-xGW
+btH
xGW
xih
arP
@@ -52351,7 +52716,7 @@ xih
gga
eIr
gga
-eIr
+djj
iGA
fol
jZu
@@ -52360,7 +52725,7 @@ cYp
scA
scA
lWL
-scA
+dbq
ahF
jIO
xZD
@@ -52833,7 +53198,7 @@ bJs
bJs
jIO
jIO
-xZD
+ybe
ykT
ykT
rew
@@ -52925,7 +53290,7 @@ khQ
khQ
khQ
khQ
-khQ
+pLG
khQ
khQ
khQ
@@ -53025,7 +53390,7 @@ xih
xih
xih
xih
-xih
+rrb
xih
xih
xih
@@ -53082,7 +53447,7 @@ wSc
azh
wSc
wSc
-fiE
+aaS
fiE
fiE
uNg
@@ -53501,17 +53866,17 @@ xZD
xZD
xZD
kNq
-xZD
+iKW
kPF
xZD
jIO
laS
ibN
+muj
axO
axO
axO
-axO
-axO
+fYt
aDi
bJs
xZD
@@ -53613,7 +53978,7 @@ khQ
khQ
fWq
nZR
-vQh
+qam
vQh
anp
gEz
@@ -53758,7 +54123,7 @@ ylG
ylG
jIO
owq
-wSc
+lAk
xKs
fSW
sgu
@@ -54118,7 +54483,7 @@ xZD
xZD
xZD
xZD
-xZD
+fjj
xZD
xZD
xZD
@@ -54516,7 +54881,7 @@ wyP
rQK
sPG
wyP
-kyt
+pfN
kyt
kyt
fiM
@@ -54769,7 +55134,7 @@ vQh
vQh
fjF
vQh
-vQh
+cID
fXC
fXC
fsy
@@ -55255,7 +55620,7 @@ xPT
oPL
cbe
cbe
-cbe
+qOG
xPT
aPt
xZD
@@ -55263,7 +55628,7 @@ xZD
ykT
ykT
rew
-ykT
+bPI
ykT
xZD
mxp
@@ -55323,10 +55688,10 @@ kSu
kSu
xZD
jIO
-eGP
-wSc
+dnV
wSc
wSc
+aQT
lxg
lxg
mxp
@@ -55378,7 +55743,7 @@ jIO
jIO
jIO
xih
-xih
+qCa
jIO
fjD
xih
@@ -55543,7 +55908,7 @@ jIO
jIO
kGI
jIO
-xZD
+gYQ
xZD
kNq
rSx
@@ -55746,7 +56111,7 @@ xZD
xZD
xZD
xZD
-xZD
+iKW
xZD
vgj
iWB
@@ -56404,7 +56769,7 @@ xZD
xZD
kNq
xZD
-xZD
+sMq
xZD
xZD
xZD
@@ -56682,7 +57047,7 @@ lzq
xZD
jIO
umj
-oJO
+lqG
oJO
aUt
wSc
@@ -56868,7 +57233,7 @@ bfC
lTz
jIO
kAW
-giV
+uhw
ykT
ykT
rew
@@ -56904,7 +57269,7 @@ xvc
jIO
kAW
xZD
-xZD
+ybe
xZD
xZD
jIO
@@ -57141,7 +57506,7 @@ oJO
htH
wSc
wSc
-wSc
+qVr
wSc
ydG
lwT
@@ -57421,7 +57786,7 @@ ykT
ykT
ykT
ykT
-ykT
+bPI
ykT
ykT
ykT
@@ -57569,7 +57934,7 @@ rsO
csH
wSc
smU
-xGW
+wkN
xih
amC
amC
@@ -58406,7 +58771,7 @@ iSr
fVo
baY
anp
-anp
+nVR
anp
jmd
riN
@@ -58437,7 +58802,7 @@ xZD
xZD
xZD
alL
-xZD
+sMq
ykT
ykT
rew
@@ -58447,7 +58812,7 @@ xZD
mxp
bFW
dJs
-wSc
+qVr
mRd
ioc
xxf
@@ -58473,7 +58838,7 @@ lcz
xih
xih
xih
-xih
+wtb
xih
xih
xih
@@ -58597,7 +58962,7 @@ dzP
oJD
oJD
oJD
-anp
+nVR
anp
anp
wrV
@@ -58907,7 +59272,7 @@ iod
wSc
wSc
lfF
-wSc
+qVr
bgY
jIO
xZD
@@ -59150,7 +59515,7 @@ xZD
xZD
mxp
hDX
-xGW
+vZA
kmK
ibI
xih
@@ -59564,7 +59929,7 @@ xZD
xZD
xZD
xZD
-xZD
+fjj
xZD
xZD
xZD
@@ -59661,7 +60026,7 @@ xih
xih
xih
xih
-xGW
+jMI
xGW
mIz
hWB
@@ -59780,7 +60145,7 @@ mXT
xZD
xZD
xZD
-xZD
+gYQ
xZD
xZD
kvK
@@ -59870,7 +60235,7 @@ jIO
jIO
jIO
jIO
-xZD
+gYQ
ykT
ykT
rew
@@ -59881,7 +60246,7 @@ mxp
umF
maD
umF
-rpC
+llE
jIO
deQ
xih
@@ -60041,7 +60406,7 @@ aXt
nHn
xxf
kHk
-wSc
+eGz
wSc
iGT
jIO
@@ -60577,7 +60942,7 @@ ykT
ykT
ykT
ykT
-ykT
+oTs
rew
ykT
ykT
@@ -60793,7 +61158,7 @@ scA
jIO
xih
xih
-xih
+hPT
nrC
mxp
xZD
@@ -61014,7 +61379,7 @@ ykT
xZD
jIO
boV
-scA
+ffl
scA
scA
oBY
@@ -61531,7 +61896,7 @@ xZD
xZD
xZD
xZD
-ykT
+bPI
rew
ykT
rew
@@ -61581,7 +61946,7 @@ ogC
ogC
nGT
wyP
-anp
+tSM
anp
anp
anp
@@ -61991,7 +62356,7 @@ xZD
xZD
kAz
xZD
-xZD
+ybe
wtg
wtg
khQ
@@ -62290,7 +62655,7 @@ xZD
xZD
xZD
xZD
-xZD
+gYQ
xZD
xZD
xZD
@@ -63062,7 +63427,7 @@ hTR
hTR
gSf
kAW
-xZD
+sMq
gSf
mvR
mvR
@@ -63127,7 +63492,7 @@ xCr
xCr
jIO
gRy
-wtg
+mlY
wtg
wtg
khQ
@@ -63335,7 +63700,7 @@ jIO
fol
wgf
fol
-pqT
+umt
xCr
neJ
xCr
@@ -63608,7 +63973,7 @@ wyP
nMW
kEN
czk
-whY
+nVR
vQh
vQh
anp
@@ -64507,7 +64872,7 @@ khQ
khQ
khQ
drB
-anp
+tSM
anp
vQh
vQh
@@ -64840,7 +65205,7 @@ fol
sOa
khH
cwa
-nLd
+hZR
jIO
ayi
scA
@@ -65109,7 +65474,7 @@ lSS
wSc
qTT
jIO
-xZD
+gYQ
ykT
ykT
rew
@@ -66653,7 +67018,7 @@ xZD
txT
jWf
xTQ
-axO
+fYt
axO
axO
axO
@@ -66932,7 +67297,7 @@ rew
ykT
ykT
xZD
-xZD
+gYQ
xZD
xZD
kNq
@@ -66982,7 +67347,7 @@ ylG
wtg
wtg
ykZ
-wSc
+ngJ
anG
ykZ
khQ
@@ -67284,7 +67649,7 @@ xCr
xCr
jIO
iGv
-xCr
+kST
xCr
xCr
jIO
@@ -67752,7 +68117,7 @@ ykT
ykT
xZD
hVl
-xGW
+iuq
lsV
xih
xGW
@@ -67793,7 +68158,7 @@ ewx
jIO
knJ
sUu
-sUu
+vNV
sUu
kwu
xZD
@@ -67815,7 +68180,7 @@ uQV
klm
lBS
xZD
-xZD
+iKW
ykT
ykT
rew
@@ -68513,7 +68878,7 @@ xZD
xZD
xZD
xZD
-xZD
+gYQ
xZD
xZD
xZD
@@ -69576,7 +69941,7 @@ xih
msj
xGW
lsV
-xGW
+iuq
rsp
ckD
xZD
@@ -69771,7 +70136,7 @@ aKG
aKG
aKG
aKG
-xZD
+ybe
xZD
xZD
xZD
@@ -70018,7 +70383,7 @@ ykT
ykT
ykT
rew
-ykT
+kTG
ykT
xZD
jIO
@@ -70035,7 +70400,7 @@ jIO
jIO
xZD
xZD
-xZD
+iKW
xZD
xZD
xZD
@@ -70074,7 +70439,7 @@ xZD
xZD
xZD
xZD
-xZD
+sMq
xZD
xZD
xZD
@@ -71002,7 +71367,7 @@ url
tvf
xgN
oXt
-tod
+uGE
tod
tod
tod
@@ -71674,7 +72039,7 @@ sEp
sEp
sEp
sEp
-sEp
+eBs
sEp
sEp
sEp
@@ -71911,7 +72276,7 @@ sEp
uDf
lrP
quG
-lrP
+rWU
lrP
lrP
lrP
@@ -72577,7 +72942,7 @@ sEp
sEp
lzS
sEp
-sEp
+gZe
bnP
tkh
sEp
@@ -72699,7 +73064,7 @@ kVc
tkl
wMk
wMk
-eso
+uKV
mQN
aIk
eso
@@ -73839,7 +74204,7 @@ uKQ
eso
eso
eso
-eso
+sOe
erO
tkl
khQ
@@ -74149,7 +74514,7 @@ ykT
ykT
ykT
ykT
-ykT
+oTs
xZD
xZD
kyX
@@ -74912,7 +75277,7 @@ omM
aLk
omM
vSg
-nVy
+rui
nKM
ozW
omM
@@ -75135,7 +75500,7 @@ nMk
mZU
nVy
fcQ
-omM
+spx
omM
omM
nqE
@@ -75296,7 +75661,7 @@ sEp
sEp
sEp
sEp
-sEp
+dgx
kpy
sEp
xgN
@@ -75538,7 +75903,7 @@ ovj
ovj
ovj
sEp
-sEp
+eBs
ovj
xgN
bYA
@@ -75601,7 +75966,7 @@ ylG
ylG
nKM
cXP
-kLJ
+mpQ
omM
omM
nKM
@@ -75937,7 +76302,7 @@ ylG
ylG
ylG
ylG
-ylG
+muf
ylG
ylG
ylG
@@ -76054,7 +76419,7 @@ ylG
ylG
nMk
omM
-omM
+sqW
taT
taT
taT
@@ -76509,7 +76874,7 @@ wtg
nKM
omM
wRd
-omE
+wrb
omE
aQU
kfJ
@@ -77110,7 +77475,7 @@ xgN
bXu
ovj
bXu
-ovj
+jKC
kMg
lqV
mZY
@@ -78215,7 +78580,7 @@ xZD
ykT
ykT
ykT
-xZD
+ybe
xZD
xZD
xZD
@@ -78244,7 +78609,7 @@ xZD
xgN
mcn
ovj
-ovj
+pPh
ovj
xgN
ovj
@@ -78438,7 +78803,7 @@ iWu
eIr
eIr
jIO
-xZD
+gYQ
ykT
ykT
ykT
@@ -80034,7 +80399,7 @@ xZD
xZD
gSf
hjj
-xZD
+fjj
ykT
ykT
rew
@@ -80360,7 +80725,7 @@ ylG
ylG
ylG
ylG
-ylG
+gBt
ylG
seD
wtg
diff --git a/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm b/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm
index ce1e2463d45..c00cee5071a 100644
--- a/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm
+++ b/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm
@@ -224,7 +224,7 @@
/area/ms13/town)
"abG" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -326,7 +326,7 @@
/area/ms13)
"acp" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -834,7 +834,7 @@
"afM" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -1427,7 +1427,7 @@
/turf/open/floor/wood/ms13/fancy,
/area/ms13/town)
"ajF" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -4982,7 +4982,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"aJB" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -5036,7 +5036,7 @@
/area/ms13/town)
"aJY" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -5601,7 +5601,7 @@
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"aNS" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -5823,7 +5823,7 @@
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
"aPs" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -7451,7 +7451,7 @@
/turf/open/floor/wood/ms13/carpet/shaggy/green,
/area/ms13/supermarket)
"bop" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -7589,7 +7589,7 @@
/turf/open/floor/wood/ms13/carpet/violet,
/area/ms13/town)
"bFl" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
pixel_y = 15
},
/obj/effect/turf_decal/ms13/showerdrains/long,
@@ -8065,6 +8065,11 @@
/obj/structure/flora/grass/jungle/b,
/turf/open/floor/plating/ms13/ground/mountain,
/area/ms13/underground/mountain)
+"cwf" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/wood/ms13/fancy,
+/area/ms13/town)
"cyk" = (
/obj/structure/table/ms13/no_smooth/large/pool,
/obj/effect/spawner/random/ms13/drink/alcohol_beer,
@@ -8397,7 +8402,7 @@
/area/ms13/town)
"dbv" = (
/obj/effect/turf_decal/ms13/showerdrains/small,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/structure/closet/ms13/wall/firstaid,
@@ -8411,6 +8416,11 @@
/obj/structure/ms13/barricade,
/turf/open/floor/plating/ms13/roof,
/area/ms13)
+"dcJ" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/plate,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"dcO" = (
/obj/structure/railing/ms13/sewer{
dir = 1
@@ -8675,6 +8685,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/ms13/tile/long,
/area/ms13/town)
+"dxk" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/carpet,
+/area/ms13/town)
"dxH" = (
/obj/structure/table/ms13/metal/grate,
/obj/effect/spawner/random/ms13/crafting/highrandom,
@@ -9181,6 +9196,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"ekH" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/town)
"emP" = (
/obj/structure/flora/grass/jungle/b,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/mountain,
@@ -9292,6 +9312,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/ms13/tile,
/area/ms13/town)
+"euI" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/glass,
+/turf/open/floor/wood/ms13/mosaic,
+/area/ms13/town)
"euO" = (
/turf/open/floor/plating/ms13/roof/wood,
/area/ms13/snowcrest)
@@ -10060,7 +10085,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"fzx" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -10466,7 +10491,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/underground/mountain)
"giu" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -11474,7 +11499,7 @@
/turf/open/floor/ms13/tile/brown,
/area/ms13)
"hSG" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -11760,7 +11785,7 @@
/area/ms13/town)
"irG" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -11999,7 +12024,7 @@
/turf/open/floor/ms13/concrete,
/area/ms13/snowcrest/building)
"iKr" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -13297,6 +13322,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/mountain,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"kua" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/wood/ms13/mosaic,
+/area/ms13/town)
"kuh" = (
/obj/machinery/door/unpowered/ms13/metal/alt,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -14429,6 +14459,11 @@
},
/turf/open/floor/wood/ms13/carpet/shaggy,
/area/ms13/town)
+"lVb" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"lVw" = (
/mob/living/basic/ms13/hostile_animal/radroach,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -14523,6 +14558,12 @@
/obj/effect/spawner/random/ms13/locked/random/lowchance,
/turf/open/floor/wood/ms13/fancy,
/area/ms13/town)
+"mbk" = (
+/obj/structure/table/ms13/no_smooth/wood/stand,
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"mcr" = (
/obj/structure/ms13/pallet/stack{
dir = 1
@@ -14875,7 +14916,7 @@
/turf/open/floor/ms13/tile/fancy,
/area/ms13/town)
"mFo" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -15712,6 +15753,7 @@
/obj/structure/ms13/rug/fancy,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/decal/cleanable/glass,
+/obj/structure/ms13/trash/glass/basic,
/turf/open/floor/wood/ms13/wide,
/area/ms13)
"nWS" = (
@@ -16066,7 +16108,7 @@
/turf/open/floor/ms13/tile/long,
/area/ms13/town)
"oxn" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -16166,7 +16208,7 @@
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
"oGJ" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -16572,7 +16614,7 @@
/area/ms13/snowcrest/building)
"ppd" = (
/obj/effect/turf_decal/ms13/showerdrains/small,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -17260,7 +17302,7 @@
/turf/closed/wall/ms13/brick/alt,
/area/ms13/town)
"qyN" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
pixel_y = 15
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -17386,7 +17428,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"qJA" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
pixel_y = 15
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -17533,7 +17575,7 @@
/turf/open/floor/plating/ms13/roof/metal/rusty,
/area/ms13)
"qWI" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
pixel_y = 15
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -17884,7 +17926,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"rxm" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -17933,6 +17975,11 @@
/obj/effect/spawner/random/ms13/smokeable/mammoth/general,
/turf/open/floor/plating/ms13/roof/metal/rusty,
/area/ms13)
+"rAn" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/mountain,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"rBR" = (
/obj/effect/spawner/random/ms13/food/trash,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -18841,7 +18888,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"sXf" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -18867,7 +18914,7 @@
/area/ms13/town)
"sZi" = (
/obj/effect/turf_decal/ms13/showerdrains/small,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -18898,7 +18945,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"tcY" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -19016,7 +19063,7 @@
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/town)
"tlX" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/structure/closet/ms13/wall/firstaid,
@@ -19033,7 +19080,7 @@
/obj/structure/sink/ms13{
pixel_y = 14
},
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -19234,6 +19281,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/wood/ms13/carpet/green,
/area/ms13/town)
+"tFR" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/books,
+/turf/open/floor/wood/ms13/carpet,
+/area/ms13/town)
"tFZ" = (
/obj/machinery/ms13/terminal{
dir = 1;
@@ -19742,6 +19794,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/ms13/tile/large/white,
/area/ms13/town)
+"umh" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/dinner,
+/turf/open/floor/wood/ms13/mosaic,
+/area/ms13/town)
"umJ" = (
/obj/structure/chair/ms13/metal{
dir = 4
@@ -19858,6 +19915,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
+"uxO" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/ms13/concrete,
+/area/ms13/town)
"uzk" = (
/obj/structure/table/ms13/no_smooth/counter/metal{
dir = 4
@@ -21232,6 +21294,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/wood/ms13/fancy,
/area/ms13/town)
+"wMM" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/cans,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"wMY" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/structure/table/ms13/metal,
@@ -21279,7 +21346,7 @@
/turf/open/floor/ms13/tile/large/white,
/area/ms13/town)
"wQb" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/square,
@@ -21370,7 +21437,7 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"wYo" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -21382,6 +21449,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/wood/ms13/wide,
/area/ms13/snowcrest/building)
+"wZK" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/ms13/tile/large/cafeteria,
+/area/ms13/town)
"xaj" = (
/obj/structure/table/ms13/no_smooth/large/wood/desk{
dir = 8
@@ -21910,6 +21982,12 @@
/obj/effect/spawner/random/ms13/smokeable/mammoth/general,
/turf/open/floor/wood/ms13/fancy,
/area/ms13/town)
+"xMS" = (
+/obj/structure/table/ms13/no_smooth/wood/low,
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/glass/basic,
+/turf/open/floor/wood/ms13/wide,
+/area/ms13/town)
"xOk" = (
/obj/structure/bed/ms13/bedframe/metal,
/obj/structure/bed/ms13/mattress/yellowed,
@@ -21991,7 +22069,7 @@
/turf/open/floor/ms13/brick,
/area/ms13/town)
"xWx" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/obj/effect/turf_decal/ms13/showerdrains/small,
@@ -22059,6 +22137,11 @@
},
/turf/open/floor/wood/ms13/carpet,
/area/ms13/town)
+"ybY" = (
+/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
+/obj/structure/ms13/trash/food/misc,
+/turf/open/floor/wood/ms13/common,
+/area/ms13/town)
"yet" = (
/obj/structure/railing/ms13/sewer,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -25119,7 +25202,7 @@ ltX
nMB
nMB
yka
-wXj
+rAn
jOF
gfP
ucR
@@ -28216,7 +28299,7 @@ aPY
aLH
aLH
aCj
-aTj
+xMS
agv
aCj
ati
@@ -35473,7 +35556,7 @@ aRX
aRX
aXy
lxA
-rDH
+wZK
rDH
aXy
aXy
@@ -36836,7 +36919,7 @@ twn
ipu
aXy
gLy
-rDH
+ekH
rDH
aXy
hhd
@@ -39109,7 +39192,7 @@ aTA
aTA
aPM
aAP
-aAP
+ybY
aAP
aAP
aXy
@@ -40925,7 +41008,7 @@ aAP
axV
aAP
aXy
-aAP
+dcJ
aAP
aAP
adt
@@ -44539,7 +44622,7 @@ aAq
aCj
aCj
aCj
-ahd
+euI
ahd
iKF
xRL
@@ -44547,7 +44630,7 @@ anJ
mrl
iKF
bRH
-ahd
+umh
aCS
fNW
aXt
@@ -45628,7 +45711,7 @@ aYA
aYa
aYa
aYA
-ahd
+kua
azA
ahd
aYA
@@ -45683,7 +45766,7 @@ dhD
bzh
wCF
aHG
-itY
+mbk
agG
apW
apW
@@ -46351,7 +46434,7 @@ aLH
aok
ojm
anJ
-anJ
+cwf
kCE
qfj
fNW
@@ -48637,7 +48720,7 @@ apW
fNW
tiy
apW
-apW
+lVb
aCj
aCj
kBF
@@ -48937,7 +49020,7 @@ awn
awn
awn
awn
-awn
+uxO
use
aCj
aSL
@@ -50215,7 +50298,7 @@ plD
mrl
fNW
apW
-apW
+wMM
aIL
aHe
aHe
@@ -50908,7 +50991,7 @@ apW
gYm
apW
apW
-aEf
+dxk
brc
fiX
why
@@ -52950,7 +53033,7 @@ jXe
aVz
iKF
cCZ
-ahd
+kua
ahd
qfS
aLp
@@ -62225,7 +62308,7 @@ aFF
aEf
aEf
ahd
-aEf
+tFR
aEf
ain
aLH
diff --git a/_maps/map_files/Mammoth_Mini/Mammoth_mini_below.dmm b/_maps/map_files/Mammoth_Mini/Mammoth_mini_below.dmm
index a00690c9848..50d9b8f49ea 100644
--- a/_maps/map_files/Mammoth_Mini/Mammoth_mini_below.dmm
+++ b/_maps/map_files/Mammoth_Mini/Mammoth_mini_below.dmm
@@ -1722,7 +1722,7 @@
/turf/open/floor/ms13/metal/grate,
/area/ms13/underground/sewer)
"amL" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/turf/open/floor/ms13/metal/grate,
@@ -2764,7 +2764,7 @@
},
/area/ms13/underground/sewer)
"avL" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
pixel_y = 15
},
/turf/open/floor/ms13/tile/navy,
@@ -4276,7 +4276,7 @@
/turf/open/floor/ms13/concrete,
/area/ms13/underground/underground_town)
"aJn" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 1
},
/turf/open/floor/ms13/metal/grate,
@@ -4764,7 +4764,7 @@
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"aOf" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8
},
/turf/open/floor/ms13/metal/grate,
@@ -5226,7 +5226,7 @@
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
"aSp" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 8;
pixel_x = -6
},
@@ -8817,7 +8817,7 @@
/turf/open/floor/ms13/sewer,
/area/ms13/underground/sewer)
"ioP" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
dir = 4
},
/obj/structure/ms13/rug/mat/rubber/single,
@@ -9970,6 +9970,7 @@
/area/ms13/underground/sewer)
"ltS" = (
/obj/effect/spawner/random/ms13/gun/lowrandom,
+/obj/structure/ms13/trash/food/misc,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"luy" = (
diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm
index 029230f532d..d63da538c09 100644
--- a/code/controllers/subsystem/explosions.dm
+++ b/code/controllers/subsystem/explosions.dm
@@ -515,7 +515,7 @@ SUBSYSTEM_DEF(explosions)
* - [creaking_sound][/sound]: The sound that plays when the station creaks during the explosion.
* - [hull_creaking_sound][/sound]: The sound that plays when the station creaks after the explosion.
*/
-/datum/controller/subsystem/explosions/proc/shake_the_room(turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx("explosion")), sound/far_sound = sound('sound/effects/explosionfar.ogg'), sound/echo_sound = sound('sound/effects/explosion_distant.ogg'), sound/creaking_sound = sound(get_sfx("explosion_creaking")), hull_creaking_sound = sound(get_sfx("hull_creaking")))
+/datum/controller/subsystem/explosions/proc/shake_the_room(turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx("explosion")), sound/far_sound = sound(get_sfx("explosion_distant")), sound/echo_sound = sound(get_sfx("explosion_far")), sound/creaking_sound = sound(get_sfx("explosion_far")), hull_creaking_sound = sound(get_sfx("explosion_far"))) // MOJAVE SUN EDIT - ORIGINAL IS (turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx("explosion")), sound/far_sound = sound('sound/effects/explosionfar.ogg'), sound/echo_sound = sound('sound/effects/explosion_distant.ogg'), sound/creaking_sound = sound(get_sfx("explosion_creaking")), hull_creaking_sound = sound(get_sfx("hull_creaking")))
var/frequency = get_rand_frequency()
var/blast_z = epicenter.z
if(isnull(creaking)) // Autoset creaking.
@@ -535,7 +535,7 @@ SUBSYSTEM_DEF(explosions)
distance = 0
var/base_shake_amount = sqrt(near_distance / (distance + 1))
- if(distance <= round(near_distance + world.view - 2, 1)) // If you are close enough to see the effects of the explosion first-hand (ignoring walls)
+ if(distance <= round(near_distance + world.view + 2, 1)) // If you are close enough to see the effects of the explosion first-hand (ignoring walls) // MOJAVE SUN EDIT - ORIGINAL IS if(distance <= round(near_distance + world.view - 2, 1)) // If you are close enough to see the effects of the explosion first-hand (ignoring walls)
listener.playsound_local(epicenter, null, 100, TRUE, frequency, S = near_sound)
if(base_shake_amount > 0)
shake_camera(listener, NEAR_SHAKE_DURATION, clamp(base_shake_amount, 0, NEAR_SHAKE_CAP))
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 84b5e8d037b..b5d9f773f66 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -210,8 +210,16 @@ distance_multiplier - Can be used to multiply the distance at which the sound is
switch(soundin)
if ("shatter")
soundin = pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg')
+ // MOJAVE SUN EDIT BEGIN
if ("explosion")
- soundin = pick('sound/effects/explosion1.ogg','sound/effects/explosion2.ogg')
+ soundin = pick('mojave/sound/ms13effects/explosion_1.ogg', 'mojave/sound/ms13effects/explosion_2.ogg', 'mojave/sound/ms13effects/explosion_3.ogg')
+ //soundin = pick('sound/effects/explosion1.ogg','sound/effects/explosion2.ogg')
+ if ("explosion_distant")
+ soundin = pick('mojave/sound/ms13effects/explosion_distant_1.ogg', 'mojave/sound/ms13effects/explosion_distant_2.ogg', 'mojave/sound/ms13effects/explosion_distant_3.ogg')
+ if ("explosion_far")
+ soundin = pick('mojave/sound/ms13effects/explosion_far_1.ogg', 'mojave/sound/ms13effects/explosion_far_2.ogg', 'mojave/sound/ms13effects/explosion_far_3.ogg')
+ // soundin = pick('sound/effects/explosioncreak1.ogg', 'sound/effects/explosioncreak2.ogg')
+ // MOJAVE SUN EDIT END
if ("explosion_creaking")
soundin = pick('sound/effects/explosioncreak1.ogg', 'sound/effects/explosioncreak2.ogg')
if ("hull_creaking")
diff --git a/mojave/code/datums/documents.dm b/mojave/code/datums/documents.dm
index 3259a0baece..2b8cc34f591 100644
--- a/mojave/code/datums/documents.dm
+++ b/mojave/code/datums/documents.dm
@@ -329,3 +329,15 @@
Unfortunately, that entails we'll have to pull you back a shift and you'll do opening. Nothing too drastic should change, other than it being sun-up when you arrive. When we next see each other, I can give you the keys for lockup. There's a few of them, actually. That was also mandated...\
\
So... Yeah. If you do end up coming in on the twenty-third and see this before I can snag you up or Rich got to you first, just hang around and work as usual, we'll get together to talk a bit more about the new protocol. -Rebecca."
+
+//// DROUGHT SPECIFIC ////
+
+/datum/terminal/document/drought_junkyard_warn //Drought junkyard sentry warning
+ title = "DO NOT ENTER"
+ content = "Jacobsen fucked it up big time. That giant hunk of prewar kickass was hardly on the hoist for all of five fucking minutes before the moron pressed on the wrong part of it. I didn't even get to see him before he disappeared into a cloud of red mist.\
+
\
+ I managed to contain it, but Nick took some shots and I don't think he's going to make it. The sentry bot is active in there- If you end up making it back, I pray to god you read this message. We can't stay here.\
+
\
+ We'll be meeting up in the old Sheriff's station. You need to come over with us, take a right when you exit the junkyard, hang a left at the first road and keep walking. We'll probably be out front waiting once we've cleared it out a bit. It's just us two, now.\
+
\
+ Moral of the story is... Don't play around with military tech. It's not worth it."
diff --git a/mojave/code/modules/jobs/job_types/rangers/doctor.dm b/mojave/code/modules/jobs/job_types/rangers/doctor.dm
index 2840bfefc44..0ad44c624a9 100644
--- a/mojave/code/modules/jobs/job_types/rangers/doctor.dm
+++ b/mojave/code/modules/jobs/job_types/rangers/doctor.dm
@@ -9,6 +9,8 @@
display_order = JOB_DISPLAY_ORDER_MS13_RANGERDOCTOR
+ mind_traits = list(TRAIT_MEDICAL_TRAINING)
+
/datum/outfit/job/ms13/ranger/doctor
name = "_Desert Ranger Doctor"
jobtype = /datum/job/ms13/ranger/rdoctor
diff --git a/mojave/code/modules/jobs/job_types/town_drought/clinician.dm b/mojave/code/modules/jobs/job_types/town_drought/clinician.dm
index 4d3518e5d78..7e9bc5c2b25 100644
--- a/mojave/code/modules/jobs/job_types/town_drought/clinician.dm
+++ b/mojave/code/modules/jobs/job_types/town_drought/clinician.dm
@@ -11,7 +11,7 @@
display_order = JOB_DISPLAY_ORDER_MS13_CLINICIAN
- mind_traits = list(TRAIT_MEDICAL_TRAINING)
+ mind_traits = list(TRAIT_MEDICAL_TRAINING, TRAIT_DRUGGIE)
/datum/outfit/job/ms13/town_drought/clinician
name = "_Barony Clinician"
@@ -25,6 +25,8 @@
r_hand = /obj/item/storage/firstaid/ms13/bag/filled
r_pocket = /obj/item/stack/ms13/currency/cap/hunnedtwentyfive
back = /obj/item/storage/ms13/satchel
+ backpack_contents = list(
+ /obj/item/card/id/ms13/drought_medical=1)
/datum/outfit/job/ms13/town_drought/clinician/pre_equip(mob/living/carbon/human/H)
..()
diff --git a/mojave/code/modules/mob/robots/handies.dm b/mojave/code/modules/mob/robots/handies.dm
index 0e4231733a5..3a1151cf662 100644
--- a/mojave/code/modules/mob/robots/handies.dm
+++ b/mojave/code/modules/mob/robots/handies.dm
@@ -77,3 +77,4 @@
ranged_cooldown = 2 SECONDS
casingtype = /obj/item/ammo_casing/energy/ms13/plasma/gutsy
projectilesound = 'mojave/sound/ms13weapons/gunsounds/plasrifle/plasma_3.ogg'
+ attack_sound = list('mojave/sound/ms13weapons/meleesounds/ripper_hit1.ogg', 'mojave/sound/ms13weapons/meleesounds/ripper_hit2.ogg')
diff --git a/mojave/effects/ms13_decals.dm b/mojave/effects/ms13_decals.dm
index d86a59d30c4..a6d4b452216 100644
--- a/mojave/effects/ms13_decals.dm
+++ b/mojave/effects/ms13_decals.dm
@@ -229,6 +229,24 @@
/obj/effect/turf_decal/ms13/graffiti/ncr
icon_state = "ncr"
+/obj/effect/turf_decal/ms13/graffiti/do_not
+ icon_state = "donot"
+
+/obj/effect/turf_decal/ms13/graffiti/death
+ icon_state = "death"
+
+/obj/effect/turf_decal/ms13/graffiti/die_young
+ icon_state = "dieyoung"
+
+/obj/effect/turf_decal/ms13/graffiti/reaper
+ icon_state = "reaper"
+
+/obj/effect/turf_decal/ms13/graffiti/mark
+ icon_state = "mark"
+
+/obj/effect/turf_decal/ms13/graffiti/slumbers
+ icon_state = "slumbers"
+
/obj/effect/turf_decal/ms13/graffiti/large
icon = 'mojave/icons/decals/graffiti64x64.dmi'
diff --git a/mojave/icons/decals/graffiti.dmi b/mojave/icons/decals/graffiti.dmi
index 4c3e840bb41..ecab1bde483 100644
Binary files a/mojave/icons/decals/graffiti.dmi and b/mojave/icons/decals/graffiti.dmi differ
diff --git a/mojave/icons/structure/miscellaneous.dmi b/mojave/icons/structure/miscellaneous.dmi
index 3d9a435c497..e9f1248eb33 100644
Binary files a/mojave/icons/structure/miscellaneous.dmi and b/mojave/icons/structure/miscellaneous.dmi differ
diff --git a/mojave/icons/structure/storage.dmi b/mojave/icons/structure/storage.dmi
index 810b178d35c..d30d7ca2c05 100644
Binary files a/mojave/icons/structure/storage.dmi and b/mojave/icons/structure/storage.dmi differ
diff --git a/mojave/items/cards_ids.dm b/mojave/items/cards_ids.dm
index 3a22e2944b5..0fa38a6d5bb 100644
--- a/mojave/items/cards_ids.dm
+++ b/mojave/items/cards_ids.dm
@@ -306,22 +306,52 @@
icon_state = "drought_town"
assignment = "Barony Denizen"
+/obj/item/card/id/ms13/drought_visa
+ name = "\improper Barony identification papers"
+ desc = "Freshly stamped identification papers for a new citizen of the Barony. The freshness of these papers likely indicate these are for a recent arrival to the Barony."
+ icon_state = "drought_town"
+ assignment = "Barony Migrant"
+
+/obj/item/card/id/ms13/drought_visa/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/card/id/ms13/drought_baron))
+ registered_name = stripped_input(user, "Who do you want to grant these papers to?", , "", MAX_NAME_LEN)
+ to_chat(user, "You scribble [registered_name] for the name on the papers.")
+ update_label()
+ return ..()
+
/obj/item/card/id/ms13/drought_slave
+ name = "\improper Barony identification papers"
desc = "Stamped identification papers for a citizen of the Barony. This has special clearance for labor and maintenance duties included."
assignment = "Barony Laborer"
icon_state = "drought_town"
/obj/item/card/id/ms13/drought_barkeep
+ name = "\improper Barony identification papers"
desc = "Stamped identification papers for a citizen of the Barony. This has special clearance for operation of a dining and drinking establishment within the Barony."
assignment = "Barony Barkeep"
icon_state = "drought_town"
/obj/item/card/id/ms13/drought_doctor
+ name = "\improper Barony identification papers"
desc = "Stamped identification papers for a citizen of the Barony. This has special clearance for operation of a clinic and medical duties within the Barony."
assignment = "Barony Clinician"
icon_state = "drought_town"
access = list(ACCESS_BARONY_DOCTOR)
+/obj/item/card/id/ms13/drought_medical
+ name = "\improper Barony identification papers"
+ desc = "Freshly stamped identification papers for a citizen of the Barony. This is specifically designated for individuals assisting the operation of the Barony's clinic."
+ assignment = "Barony Medical Support"
+ icon_state = "drought_town"
+ access = list(ACCESS_BARONY_DOCTOR)
+
+/obj/item/card/id/ms13/drought_medical/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/card/id/ms13/drought_doctor))
+ registered_name = stripped_input(user, "Who do you want to grant these papers to?", , "", MAX_NAME_LEN)
+ to_chat(user, "You scribble [registered_name] for the name on the papers.")
+ update_label()
+ return ..()
+
/obj/item/card/id/ms13/drought_enforcer
name = "enforcer's golden pin"
desc = "A gold talon pin, worn by Enforcers of the Baron. An intimidating sight."
diff --git a/mojave/sound/ms13effects/explosion_1.ogg b/mojave/sound/ms13effects/explosion_1.ogg
index 5eb09bad58e..cea4b1aba4b 100644
Binary files a/mojave/sound/ms13effects/explosion_1.ogg and b/mojave/sound/ms13effects/explosion_1.ogg differ
diff --git a/mojave/sound/ms13effects/explosion_2.ogg b/mojave/sound/ms13effects/explosion_2.ogg
index 20ead5d7d57..daa30ee367b 100644
Binary files a/mojave/sound/ms13effects/explosion_2.ogg and b/mojave/sound/ms13effects/explosion_2.ogg differ
diff --git a/mojave/sound/ms13effects/explosion_3.ogg b/mojave/sound/ms13effects/explosion_3.ogg
new file mode 100644
index 00000000000..c0c844f7217
Binary files /dev/null and b/mojave/sound/ms13effects/explosion_3.ogg differ
diff --git a/mojave/sound/ms13effects/explosion_distant_1.ogg b/mojave/sound/ms13effects/explosion_distant_1.ogg
index 8d47a4ae07f..86a10d7527b 100644
Binary files a/mojave/sound/ms13effects/explosion_distant_1.ogg and b/mojave/sound/ms13effects/explosion_distant_1.ogg differ
diff --git a/mojave/sound/ms13effects/explosion_distant_2.ogg b/mojave/sound/ms13effects/explosion_distant_2.ogg
index 5df5eb44292..a043c06f56b 100644
Binary files a/mojave/sound/ms13effects/explosion_distant_2.ogg and b/mojave/sound/ms13effects/explosion_distant_2.ogg differ
diff --git a/mojave/sound/ms13effects/explosion_distant_3.ogg b/mojave/sound/ms13effects/explosion_distant_3.ogg
index 95d33ea954e..b0a7cb718cf 100644
Binary files a/mojave/sound/ms13effects/explosion_distant_3.ogg and b/mojave/sound/ms13effects/explosion_distant_3.ogg differ
diff --git a/mojave/sound/ms13effects/explosion_distant_4.ogg b/mojave/sound/ms13effects/explosion_distant_4.ogg
deleted file mode 100644
index 8afa6958f8e..00000000000
Binary files a/mojave/sound/ms13effects/explosion_distant_4.ogg and /dev/null differ
diff --git a/mojave/sound/ms13effects/explosion_far_1.ogg b/mojave/sound/ms13effects/explosion_far_1.ogg
new file mode 100644
index 00000000000..8d47a4ae07f
Binary files /dev/null and b/mojave/sound/ms13effects/explosion_far_1.ogg differ
diff --git a/mojave/sound/ms13effects/explosion_far_2.ogg b/mojave/sound/ms13effects/explosion_far_2.ogg
new file mode 100644
index 00000000000..5df5eb44292
Binary files /dev/null and b/mojave/sound/ms13effects/explosion_far_2.ogg differ
diff --git a/mojave/sound/ms13effects/explosion_far_3.ogg b/mojave/sound/ms13effects/explosion_far_3.ogg
new file mode 100644
index 00000000000..95d33ea954e
Binary files /dev/null and b/mojave/sound/ms13effects/explosion_far_3.ogg differ
diff --git a/mojave/structures/decorative.dm b/mojave/structures/decorative.dm
index 33092ecda02..1a53fd97db0 100644
--- a/mojave/structures/decorative.dm
+++ b/mojave/structures/decorative.dm
@@ -844,7 +844,7 @@
/obj/structure/ms13/trash/glass/cans
name = "empty bottles and cans"
desc = "Some empty glass bottles and aluminum cans. You just might be able to make something out of this."
- icon_state = "foodstuff_1"
+ icon_state = "glass_1"
/obj/structure/ms13/trash/glass/cans/Initialize(mapload)
. = ..()
diff --git a/mojave/structures/plumbing_decorations.dm b/mojave/structures/plumbing_decorations.dm
index 4a690321845..ab9dbd1b1a0 100644
--- a/mojave/structures/plumbing_decorations.dm
+++ b/mojave/structures/plumbing_decorations.dm
@@ -47,3 +47,9 @@
icon_state = "sink"
desc = "A sink. This one seems to function well, but there's a gross buildup around the faucet end."
dispensedreagent = /datum/reagent/consumable/ms13/water/unfiltered
+
+/obj/machinery/shower/ms13
+ name = "shower"
+ desc = "An old shower, there must still be some water in the tank since it works, but you probably shouldn't leave your mouth open whilst using it."
+ icon = 'mojave/icons/structure/miscellaneous.dmi'
+ icon_state = "shower"