diff --git a/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm b/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm index fabc8b053b0..d2ba7aef2a1 100644 --- a/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm +++ b/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm @@ -154,6 +154,11 @@ /obj/structure/ms13/wall_decor/flag, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"adv" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/power_armor/parts, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "ady" = ( /obj/structure/ms13/fence/wire, /obj/structure/ms13/pallet/stack, @@ -280,6 +285,7 @@ /area/ms13) "agU" = ( /obj/structure/table/ms13/metal/grate, +/obj/effect/spawner/random/ms13/currency/mammoth/lowrandom, /turf/open/floor/wood/ms13/carpet/blue, /area/ms13/town) "ahz" = ( @@ -1140,6 +1146,12 @@ /obj/effect/spawner/random/ms13/drink/soda, /turf/open/floor/ms13/tile/brown, /area/ms13/town) +"aRP" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "aRQ" = ( /obj/structure/ms13/pipes/horizontal/brown, /obj/structure/bonfire/ms13/fire_barrel, @@ -1353,6 +1365,13 @@ /obj/effect/decal/cleanable/vomit, /turf/open/floor/ms13/tile, /area/ms13/town) +"aXi" = ( +/obj/structure/closet/ms13/metal, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/shoe, +/obj/effect/spawner/random/ms13/clothing/hat, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "aXq" = ( /obj/machinery/light/ms13/bulb{ dir = 4 @@ -1734,6 +1753,11 @@ }, /turf/open/floor/ms13/concrete/industrial, /area/ms13/town) +"bqH" = ( +/obj/structure/lattice/catwalk/ms13, +/obj/effect/spawner/random/ms13/power_armor/lowrandom, +/turf/open/floor/ms13/metal/plate, +/area/ms13/town) "bre" = ( /obj/machinery/button/ms13{ id = "ncr-bay-door-2" @@ -2269,6 +2293,10 @@ /obj/structure/ms13/trash/cardboard, /turf/open/floor/ms13/tile/large/white, /area/ms13/town) +"bMW" = ( +/mob/living/simple_animal/hostile/ms13/robot/handy/gun, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "bNy" = ( /obj/machinery/light/ms13/bulb{ dir = 4 @@ -3558,6 +3586,7 @@ /area/ms13) "cVC" = ( /obj/structure/ms13/pa_jack, +/obj/effect/spawner/random/ms13/power_armor/lowrandom, /turf/open/floor/ms13/metal/grate, /area/ms13/town) "cVP" = ( @@ -4036,8 +4065,10 @@ /turf/open/floor/wood/ms13/common, /area/ms13/town) "doQ" = ( -/obj/structure/noticeboard/ms13/cork, -/obj/structure/ms13/storage/trashcan, +/obj/machinery/light/ms13{ + dir = 4 + }, +/obj/structure/table/ms13/metal/heavy, /turf/open/floor/ms13/concrete, /area/ms13/town) "dpq" = ( @@ -5240,6 +5271,10 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"eqc" = ( +/obj/effect/spawner/random/ms13/tools/tool, +/turf/open/floor/ms13/metal/grate, +/area/ms13/town) "eqj" = ( /obj/structure/ms13/storage/vent, /obj/effect/decal/cleanable/blood/tracks{ @@ -5372,6 +5407,11 @@ }, /turf/open/floor/ms13/concrete/industrial, /area/ms13/snowcrest/republic) +"evy" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/crafting/highrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "evK" = ( /obj/structure/closet/ms13/metal, /turf/open/floor/ms13/concrete, @@ -6021,6 +6061,7 @@ "eYo" = ( /obj/structure/table/ms13/metal/alt, /obj/structure/ms13/trash/food, +/obj/effect/spawner/random/ms13/food/junkfood_canned, /turf/open/floor/ms13/concrete, /area/ms13/town) "eYS" = ( @@ -6549,6 +6590,11 @@ /obj/structure/ms13/toilet, /turf/open/floor/ms13/tile/fancy, /area/ms13/town) +"fuC" = ( +/obj/structure/table/ms13/metal/alt, +/obj/effect/spawner/random/ms13/currency/mammoth/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "fuX" = ( /obj/effect/turf_decal/ms13/road/verticalline, /mob/living/simple_animal/hostile/retaliate/ms13/robot/eyebot, @@ -7932,6 +7978,11 @@ /obj/effect/turf_decal/ms13/graffiti/deadinside, /turf/closed/wall/ms13/brick/alt, /area/ms13/town) +"gsr" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/tools/tool, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "gsF" = ( /obj/structure/table/ms13/no_smooth/counter/wood, /obj/effect/spawner/random/ms13/clothing/under, @@ -8144,7 +8195,7 @@ /obj/machinery/door/poddoor/shutters/ms13/horizontal/red/left{ id = "atlas_scrapyard" }, -/turf/open/floor/ms13/concrete, +/turf/open/floor/plating/ms13/ground/road, /area/ms13/town) "gzp" = ( /obj/machinery/door/unpowered/ms13/metal{ @@ -8310,6 +8361,10 @@ /obj/effect/spawner/random/ms13/clothing/hat, /turf/open/floor/wood/ms13/common, /area/ms13/town) +"gEW" = ( +/mob/living/simple_animal/hostile/ms13/robot/protectron/reinforced, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "gFc" = ( /obj/machinery/door/unpowered/ms13/metal, /obj/effect/spawner/random/ms13/locked/random/medchance, @@ -8485,7 +8540,7 @@ /area/ms13/town) "gKO" = ( /obj/structure/ms13/skeleton, -/obj/effect/spawner/random/ms13/drugs/tier1, +/obj/effect/spawner/random/ms13/drugs/lowrandom, /turf/open/floor/plating/ms13/ground/mountain, /area/ms13/underground/mountain) "gKQ" = ( @@ -8508,6 +8563,10 @@ /obj/structure/ms13/barrel/single/red/two, /turf/open/floor/plating/ms13/ground/snow, /area/ms13/snow/lightforest) +"gLj" = ( +/mob/living/simple_animal/hostile/ms13/robot/handy/saw, +/turf/open/floor/ms13/tile/long/blue, +/area/ms13/town) "gLp" = ( /obj/structure/chair/ms13/metal/broken{ dir = 4 @@ -8701,6 +8760,11 @@ /area/ms13/underground/mountain) "gPR" = ( /obj/structure/closet/crate/ms13/medical, +/obj/effect/spawner/random/ms13/medical/bloodbag, +/obj/effect/spawner/random/ms13/medical/bloodbag, +/obj/effect/spawner/random/ms13/medical/bloodbag, +/obj/effect/spawner/random/ms13/medical/bloodbag, +/obj/effect/spawner/random/ms13/medical/bloodbag, /turf/open/floor/ms13/tile/long/blue, /area/ms13/town) "gPU" = ( @@ -8712,6 +8776,12 @@ /area/ms13/town) "gPW" = ( /obj/structure/closet/ms13/fridge, +/obj/effect/spawner/random/ms13/food/random, +/obj/effect/spawner/random/ms13/food/random, +/obj/effect/spawner/random/ms13/food/random, +/obj/effect/spawner/random/ms13/food/random, +/obj/effect/spawner/random/ms13/food/random, +/obj/effect/spawner/random/ms13/food/random, /turf/open/floor/ms13/concrete, /area/ms13/town) "gQb" = ( @@ -8950,6 +9020,11 @@ /obj/structure/bed/ms13/mattress/old, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"gXu" = ( +/obj/structure/closet/ms13/metal, +/obj/effect/spawner/random/ms13/drugs/highrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "gXx" = ( /obj/structure/table/ms13/no_smooth/wood/low, /obj/item/ms13/fluff/ashtray, @@ -9049,7 +9124,7 @@ id = "atlas_scrapyard"; dir = 4 }, -/turf/open/floor/plating/ms13/ground/sidewalk, +/turf/open/floor/plating/ms13/ground/road, /area/ms13/town) "gZJ" = ( /obj/structure/table/ms13/no_smooth/cable_reel, @@ -9139,9 +9214,17 @@ /obj/effect/spawner/random/ms13/locked/random/highchance, /turf/open/floor/ms13/tile/large/white, /area/ms13/supermarket) +"hcs" = ( +/obj/effect/spawner/random/ms13/crafting/electrical, +/obj/effect/spawner/random/ms13/crafting/electrical, +/obj/effect/spawner/random/ms13/crafting/electrical, +/obj/structure/table/ms13/metal/heavy, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "hcT" = ( /obj/structure/table/ms13/metal/heavy, /obj/machinery/light/ms13, +/obj/effect/spawner/random/ms13/melee/highrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "hcW" = ( @@ -9539,9 +9622,6 @@ /obj/structure/table/ms13/no_smooth/large/metal/desk{ dir = 1 }, -/obj/machinery/ms13/terminal{ - dir = 1 - }, /turf/open/floor/ms13/concrete, /area/ms13/town) "hpr" = ( @@ -10089,6 +10169,13 @@ /obj/structure/ms13/trash/papers/two, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"hGh" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/machinery/light/ms13, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "hGy" = ( /obj/structure/ms13/storage/store{ dir = 8 @@ -10220,6 +10307,7 @@ /obj/structure/ms13/rug/rubber{ dir = 4 }, +/obj/effect/spawner/random/ms13/tools/tool, /turf/open/floor/ms13/concrete, /area/ms13/town) "hJv" = ( @@ -11052,6 +11140,10 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"iho" = ( +/obj/effect/spawner/random/ms13/minefield, +/turf/open/floor/plating/ms13/ground/sidewalk, +/area/ms13/town) "ihp" = ( /obj/structure/closet/crate/ms13/woodcrate/compact, /obj/effect/spawner/random/ms13/crafting/highrandom, @@ -12035,6 +12127,7 @@ /obj/machinery/light/ms13{ dir = 4 }, +/obj/effect/spawner/random/ms13/drink/soda, /turf/open/floor/ms13/concrete, /area/ms13/town) "iJi" = ( @@ -12224,6 +12317,7 @@ "iPO" = ( /obj/structure/table/ms13/no_smooth/counter/metal, /obj/machinery/door/poddoor/shutters/ms13/horizontal/indestructible/red/left/pre_open, +/obj/effect/spawner/random/ms13/gun/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "iQa" = ( @@ -12261,6 +12355,8 @@ "iRy" = ( /obj/structure/closet/ms13/metal, /obj/structure/ms13/wall_decor/calendar/blank, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/shoe, /turf/open/floor/ms13/concrete, /area/ms13/town) "iRS" = ( @@ -12425,6 +12521,9 @@ /area/ms13/town) "iWu" = ( /obj/structure/table/ms13/metal/alt, +/obj/effect/spawner/random/ms13/medical/lowrandom, +/obj/effect/spawner/random/ms13/medical/lowrandom, +/obj/effect/spawner/random/ms13/medical/medkit, /turf/open/floor/ms13/tile/long/blue, /area/ms13/town) "iWB" = ( @@ -12632,6 +12731,12 @@ /obj/effect/spawner/random/ms13/tools/hardware, /turf/open/floor/wood/ms13/carpet/green, /area/ms13/town) +"jbI" = ( +/obj/effect/spawner/random/ms13/crafting/highrandom, +/obj/effect/spawner/random/ms13/crafting/highrandom, +/obj/structure/table/ms13/metal/heavy, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "jbL" = ( /obj/structure/table/ms13/no_smooth/large/wood/desk, /obj/machinery/ms13/terminal/wasteland, @@ -13378,6 +13483,9 @@ "jwr" = ( /obj/structure/closet/ms13/metal, /obj/structure/ms13/wall_decor/sign, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/shoe, +/obj/effect/spawner/random/ms13/clothing/glasses, /turf/open/floor/ms13/concrete, /area/ms13/town) "jww" = ( @@ -13777,6 +13885,10 @@ /obj/structure/ms13/sign/hotel, /turf/open/floor/plating/ms13/ground/sidewalk, /area/ms13/snowcrest) +"jGk" = ( +/obj/structure/ms13/wall_decor/sign/mine, +/turf/open/floor/plating/ms13/ground/sidewalk, +/area/ms13) "jGn" = ( /obj/structure/ms13/pot/plant, /obj/machinery/light/ms13{ @@ -14124,6 +14236,12 @@ }, /turf/open/floor/ms13/tile/long/blue, /area/ms13/town) +"jRl" = ( +/obj/effect/turf_decal/ms13/covering/paint/red, +/obj/structure/window/fulltile/ms13/glass, +/obj/structure/table/ms13/low_wall/brick/alt, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "jRt" = ( /obj/structure/table/ms13/no_smooth/counter/wood{ dir = 1 @@ -16975,6 +17093,11 @@ }, /turf/open/floor/wood/ms13/carpet/shaggy, /area/ms13/town) +"lvW" = ( +/obj/structure/table/ms13/metal/alt, +/obj/effect/spawner/random/ms13/medical/lowrandom, +/turf/open/floor/ms13/tile/long/blue, +/area/ms13/town) "lwu" = ( /mob/living/basic/ms13/hostile_animal/radroach, /obj/structure/ms13/rug{ @@ -17735,6 +17858,10 @@ /obj/structure/ms13/barricade, /turf/open/floor/wood/ms13/common, /area/ms13/town) +"lUt" = ( +/mob/living/simple_animal/hostile/ms13/robot/protectron, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "lUw" = ( /obj/structure/ms13/storage/vent, /obj/structure/closet/ms13/metal, @@ -17930,6 +18057,11 @@ }, /turf/open/floor/wood/ms13/carpet, /area/ms13/town) +"map" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/armor/highrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "maz" = ( /obj/structure/ms13/trash/cardboard{ dir = 6 @@ -18101,6 +18233,7 @@ /area/ms13/town) "mfJ" = ( /obj/structure/table/ms13/metal/small, +/obj/effect/spawner/random/ms13/crafting/refined, /turf/open/floor/ms13/concrete/industrial, /area/ms13/town) "mfV" = ( @@ -18130,6 +18263,10 @@ /obj/structure/stairs/east, /turf/open/floor/plating/ms13/ground/sidewalk, /area/ms13) +"mgQ" = ( +/mob/living/basic/ms13/ghoul, +/turf/open/floor/plating/ms13/ground/road, +/area/ms13) "mgW" = ( /obj/structure/table/ms13/no_smooth/counter/metal{ dir = 4 @@ -20242,6 +20379,10 @@ }, /turf/open/floor/wood/ms13/common, /area/ms13/town) +"nxc" = ( +/mob/living/basic/ms13/ghoul, +/turf/open/floor/plating/ms13/ground/snow, +/area/ms13/snow/lightforest) "nxu" = ( /obj/effect/spawner/random/ms13/tools/tool, /obj/structure/table/ms13/no_smooth/counter/metal{ @@ -20361,6 +20502,10 @@ /obj/effect/spawner/random/ms13/locked/random/lowchance, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"nBz" = ( +/obj/effect/spawner/random/ms13/minefield, +/turf/open/floor/plating/ms13/ground/road, +/area/ms13) "nBE" = ( /obj/machinery/door/unpowered/ms13/metal{ dir = 1 @@ -20711,6 +20856,14 @@ /obj/effect/turf_decal/ms13/covering/tiles/blue, /turf/closed/wall/ms13/metal, /area/ms13/snowcrest/building) +"nOr" = ( +/obj/structure/closet/ms13/metal, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/shoe, +/obj/effect/spawner/random/ms13/clothing/backpack, +/obj/effect/spawner/random/ms13/clothing/hat, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "nOx" = ( /obj/structure/ms13/trash/papers/one, /obj/machinery/light/ms13/bulb{ @@ -20990,6 +21143,12 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"oaF" = ( +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "obI" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 10 @@ -21730,6 +21889,9 @@ /obj/machinery/button/ms13{ id = "atlas_scrapyard" }, +/obj/structure/railing/ms13/solo/industrial{ + dir = 4 + }, /turf/open/floor/ms13/concrete, /area/ms13/town) "ozW" = ( @@ -22320,6 +22482,8 @@ "paH" = ( /obj/structure/closet/ms13/metal, /obj/structure/ms13/wall_decor/clock, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/shoe, /turf/open/floor/ms13/concrete, /area/ms13/town) "paK" = ( @@ -22359,7 +22523,7 @@ /obj/machinery/door/poddoor/shutters/ms13/horizontal/red/right{ id = "atlas_scrapyard" }, -/turf/open/floor/ms13/concrete, +/turf/open/floor/plating/ms13/ground/road, /area/ms13/town) "pdE" = ( /turf/closed/wall/ms13/sewer, @@ -23063,6 +23227,10 @@ }, /turf/open/floor/plating/ms13/ground/road, /area/ms13) +"pQr" = ( +/mob/living/basic/ms13/ghoul/frozen, +/turf/open/floor/plating/ms13/ground/snow, +/area/ms13/snow/forest) "pQz" = ( /obj/structure/closet/ms13/wall/firstaid, /obj/effect/spawner/random/ms13/medical/lowrandom, @@ -23388,6 +23556,10 @@ /obj/structure/railing/ms13/sewer, /turf/open/floor/plating/ms13/ground/snow, /area/ms13/army_base) +"qht" = ( +/obj/effect/spawner/random/ms13/minefield, +/turf/open/floor/plating/ms13/ground/sidewalk, +/area/ms13) "qhA" = ( /obj/machinery/light/ms13, /obj/structure/ms13/trash/papers/two{ @@ -24490,7 +24662,7 @@ /obj/machinery/door/poddoor/shutters/ms13/horizontal/red/mid{ id = "atlas_scrapyard" }, -/turf/open/floor/ms13/concrete, +/turf/open/floor/plating/ms13/ground/road, /area/ms13/town) "rhh" = ( /obj/structure/closet/ms13/fridge, @@ -25317,6 +25489,11 @@ }, /turf/open/floor/ms13/tile/large/cafeteria, /area/ms13/supermarket) +"rWm" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/clothing/glasses, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "rWy" = ( /obj/machinery/power/ms13/streetlamp/double, /turf/open/floor/plating/ms13/ground/sidewalk, @@ -26537,6 +26714,10 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/tribal_abandoned) +"tdT" = ( +/obj/effect/turf_decal/ms13/graffiti/mines, +/turf/open/floor/plating/ms13/ground/road, +/area/ms13) "tek" = ( /obj/structure/table/ms13/wood/bar, /obj/structure/ms13/trash/glass/plate, @@ -28304,6 +28485,10 @@ }, /turf/open/floor/ms13/tile/large/white, /area/ms13/town) +"uIw" = ( +/mob/living/simple_animal/hostile/ms13/robot/handy, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "uIE" = ( /obj/machinery/light/ms13/bulb{ dir = 8 @@ -28768,6 +28953,10 @@ }, /turf/open/floor/wood/ms13/carpet/shaggy, /area/ms13/town) +"vjP" = ( +/obj/structure/ms13/pot/plant, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "vkj" = ( /obj/effect/turf_decal/ms13/graffiti/no_way, /turf/closed/wall/ms13/brick, @@ -28852,6 +29041,7 @@ /area/ms13/town) "vmW" = ( /obj/structure/noticeboard/ms13/cork, +/obj/effect/turf_decal/ms13/graffiti/gohome, /turf/open/floor/plating/ms13/ground/sidewalk, /area/ms13/town) "vnR" = ( @@ -30011,6 +30201,10 @@ /obj/structure/stairs/north, /turf/open/floor/wood/ms13/common, /area/ms13/snowcrest/building) +"wpU" = ( +/obj/effect/turf_decal/ms13/graffiti/fuckyou, +/turf/open/floor/plating/ms13/ground/sidewalk, +/area/ms13) "wqa" = ( /obj/structure/ms13/trash/papers/one, /obj/structure/ms13/pipes/piped, @@ -30288,6 +30482,10 @@ /obj/effect/landmark/start/ms13/bodyguard, /turf/open/floor/wood/ms13/wide, /area/ms13/snowcrest/building) +"wET" = ( +/obj/structure/table/ms13/no_smooth/cable_reel, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "wEU" = ( /obj/structure/closet/ms13/fridge, /obj/effect/spawner/random/ms13/food/produce_random, @@ -30660,6 +30858,11 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"wXL" = ( +/obj/structure/table/ms13/metal/alt, +/obj/effect/spawner/random/ms13/drink/alcohol_beer, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "wYs" = ( /obj/structure/ms13/storage/vent, /obj/structure/table/ms13/no_smooth/counter/wood{ @@ -30839,6 +31042,11 @@ /obj/structure/ms13/lamp/makeshift, /turf/open/floor/plating/ms13/ground/mountain, /area/ms13/underground/mountain) +"xjp" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/armor/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "xjs" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = 5; @@ -30890,6 +31098,13 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/tribal_abandoned) +"xlm" = ( +/obj/structure/ms13/rug/rubber{ + dir = 4 + }, +/obj/effect/spawner/random/ms13/medical/dbag, +/turf/open/floor/ms13/tile/long/blue, +/area/ms13/town) "xlv" = ( /turf/closed/wall/ms13/scrap/red, /area/ms13/town) @@ -74377,7 +74592,7 @@ gVh dFG gJY cbe -kyI +jbI jIO jIO jIO @@ -74387,9 +74602,9 @@ lcg aka hQo opv -cKc -cKc -cKc +adv +gsr +adv uGJ lcg mIJ @@ -74604,14 +74819,14 @@ nwj cbe cbe cbe -cKc +aRP lcg gVx cbe iVF iVF lcg -ffe +eqc jbg cbe cbe @@ -74623,7 +74838,7 @@ cbe cbe uOV gyS -cKc +xjp jIO wtg wtg @@ -74831,7 +75046,7 @@ ahM dFG cbe cbe -hcT +hGh lcg yhP cbe @@ -74841,13 +75056,13 @@ lcg cVC jbg cbe -cbe +gEW cbe cbe cbe bjp cbe -cKc +gsr hJk cbe hcT @@ -75058,7 +75273,7 @@ iSV cbe cbe cbe -kyI +hcs lcg iLu cbe @@ -75067,7 +75282,7 @@ jwl lcg ffe jbg -cbe +amM cbe cbe cbe @@ -75077,7 +75292,7 @@ nwj cbe cbe cbe -cKc +map jIO wtg wtg @@ -75505,15 +75720,15 @@ xZD ylG jaz jIO -cbe +wET qdD cbe cbe cbe cbe qdD -cbe -cbe +cKc +cKc cbe cbe qdD @@ -75745,7 +75960,7 @@ cbe cbe cbe cbe -lcg +jRl gGL aef cbe @@ -75955,10 +76170,12 @@ xZD ykT ykT ykT -xZD +ykT gZA -sUu +mBi gzm +mBi +oaF cbe cbe cbe @@ -75970,9 +76187,7 @@ cbe cbe cbe cbe -cbe -cbe -rcK +jIO iIE gKk cbe @@ -76179,19 +76394,22 @@ khQ ylG ylG xZD +mgQ ykT ykT ykT -xZD -sUu -sUu +mBi +mBi rhc +mBi +oaF cbe cbe cbe cbe cbe cbe +bMW cbe cbe cbe @@ -76199,9 +76417,6 @@ cbe cbe cbe cbe -rcK -cbe -cbe cbe cbe cbe @@ -76409,10 +76624,12 @@ xZD ykT ykT ykT -xZD -sUu -sUu +ykT +mBi +mBi pdx +mBi +oaF cbe cbe cbe @@ -76426,8 +76643,6 @@ cbe cbe cbe cbe -lcg -doQ cbe gUr jdw @@ -76640,10 +76855,10 @@ xZD jIO jIO jIO +gBK cbe cbe -cbe -cbe +bMW cbe cbe cbe @@ -76654,7 +76869,7 @@ cbe cbe cbe jIO -lcg +jIO gzp jIO jWv @@ -76665,7 +76880,7 @@ oNR gvU cbe cbe -cbe +lUt wTi wTi heb @@ -76879,11 +77094,11 @@ cbe cbe cbe cbe -cbe +qqt jIO -sUu -sUu -sUu +xZD +xZD +xZD jWv iOT vJo @@ -77102,15 +77317,15 @@ cbe cbe cbe cbe -cbe +uIw cbe cbe cbe cbe jIO -sUu -sUu -sUu +xZD +xZD +xZD jWv qNx nLd @@ -77333,11 +77548,11 @@ cbe cbe cbe cbe -cbe +adv jIO -sUu -sUu -sUu +xZD +xZD +xZD jIO jIO jIO @@ -77548,7 +77763,7 @@ ylG fvK ylG jIO -pDz +bqH pDz pDz hmi @@ -77560,7 +77775,7 @@ cbe cbe cbe cbe -cbe +cKc jIO xZD xZD @@ -77571,7 +77786,7 @@ xZD xZD xZD xZD -xZD +qht xZD xZD xZD @@ -77780,14 +77995,14 @@ iZV pDz gOx cbe -cbe +cDn bcE cbe cbe cbe cbe -bcE -cbe +doQ +cKc jIO xZD xZD @@ -77795,7 +78010,7 @@ xZD xZD xZD xZD -xZD +qht xZD xZD xZD @@ -78028,7 +78243,7 @@ ykT ykT ykT ykT -ykT +nBz ykT ykT ykT @@ -78246,7 +78461,7 @@ syJ xZD giV ykT -ykT +nBz ykT ykT ykT @@ -78256,7 +78471,7 @@ ykT ykT lzM ykT -ykT +tdT ykT ykT tXh @@ -78458,7 +78673,7 @@ xsE ylG ylG rcK -hLt +aXi los iZk gVu @@ -78468,7 +78683,7 @@ cbe cbe rcK sUu -sUu +iho sUu xZD xZD @@ -78685,7 +78900,7 @@ xsE xsE ylG rcK -jwr +nOr iZk iZk qUg @@ -78907,7 +79122,7 @@ ylG ylG xsE xsE -xsE +pQr xsE xsE ylG @@ -79157,7 +79372,7 @@ ykT iWC nYi ykT -ykT +nBz ykT ykT ykT @@ -79391,7 +79606,7 @@ xBj xZD ydI cbe -cbe +lUt cbe rcK giV @@ -79593,7 +79808,7 @@ xsE ylG ylG rcK -paH +aXi gSB iZk cbe @@ -79619,7 +79834,7 @@ xZD jIO cbe cbe -kyI +vjP rcK xZD ykT @@ -79818,7 +80033,7 @@ ylG xsE ylG ylG -ylG +mSh lcg cbe kyI @@ -79833,7 +80048,7 @@ sUu sUu xom xZD -xZD +qht ykT ykT nYi @@ -79848,7 +80063,7 @@ jIO jIO jIO jIO -xZD +jGk ykT ykT rew @@ -80072,10 +80287,10 @@ xBj xZD xZD xZD +qht xZD xZD -xZD -xZD +wpU ykT ykT rew @@ -80278,7 +80493,7 @@ jch iOt jch shw -xgp +eRe cbe qdD cbe @@ -80500,12 +80715,12 @@ ylG haK rcK hxx -gTQ +xlm +aLq aLq aLq aLq aLq -eRe cbe cbe cbe @@ -80516,7 +80731,7 @@ jIO xZD giV ykT -ykT +nBz ykT ykT ykT @@ -80728,11 +80943,11 @@ ylG rcK jgh gTQ +gLj aLq aLq aLq aLq -dBy cbe cbe cbe @@ -80751,7 +80966,7 @@ ykT ykT ykT ykT -ykT +nBz ykT ykT ykT @@ -81183,16 +81398,16 @@ txT gPR gHf aLq -iWu -iWu +jDc +lvW iWu xgp cbe cbe iSg gJY -cKc -cKc +rWm +evy jIO xZD xZD @@ -81200,7 +81415,7 @@ xZD ykT ykT ykT -xZD +qht xZD jIO jIO @@ -81634,7 +81849,7 @@ ylG xsE xsE txT -hLt +gXu dFG gyS xlv @@ -81879,7 +82094,7 @@ xZD xZD xZD ykT -ykT +nBz ykT xZD xZD @@ -82104,7 +82319,7 @@ gOW jIO xZD xZD -xZD +qht ykT ykT ykT @@ -82560,8 +82775,8 @@ ykT ykT ykT ykT -ykT -ykT +mgQ +nBz xZD xZD jIO @@ -82757,7 +82972,7 @@ khQ khQ khQ khQ -ylG +nxc ylG ylG ylG @@ -82780,7 +82995,7 @@ gXX cbe cbe rNG -adF +fuC gVu gHE ykT @@ -83460,7 +83675,7 @@ xlv eUC fPb gQb -adF +wXL eYo adF jIO @@ -83901,7 +84116,7 @@ khQ khQ khQ ylG -ylG +nxc iBp khQ khQ diff --git a/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm b/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm index bfb4f756f3e..62e556bb559 100644 --- a/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm +++ b/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm @@ -542,6 +542,9 @@ dir = 4 }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/drugs/lowrandom, +/obj/effect/spawner/random/ms13/medical/lowrandom, +/obj/effect/spawner/random/ms13/medical/lowrandom, /turf/open/floor/ms13/tile/long/blue, /area/ms13/town) "adH" = ( @@ -823,6 +826,7 @@ dir = 1 }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "afz" = ( @@ -3383,6 +3387,7 @@ /obj/structure/table/ms13/metal/small, /obj/structure/noticeboard/ms13/cork, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/medical/medkit, /turf/open/floor/wood/ms13/mosaic, /area/ms13/town) "awM" = ( @@ -4648,6 +4653,7 @@ /obj/structure/table/ms13/metal/grate, /obj/machinery/light/ms13, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/tools/radio, /turf/open/floor/ms13/concrete, /area/ms13/town) "aGd" = ( @@ -7199,6 +7205,10 @@ "aXK" = ( /obj/structure/closet/crate/ms13/woodcrate/compact/army, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/gun/lowrandom, +/obj/effect/spawner/random/ms13/gun/lowrandom, +/obj/effect/spawner/random/ms13/gun/lowrandom, +/obj/effect/spawner/random/ms13/gun/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "aXN" = ( @@ -9346,6 +9356,11 @@ "dRT" = ( /obj/structure/closet/ms13/metal, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/hat, +/obj/effect/spawner/random/ms13/clothing/shoe, +/obj/effect/spawner/random/ms13/smokeable/general, +/obj/effect/spawner/random/ms13/smokeable/general, /turf/open/floor/wood/ms13/mosaic, /area/ms13/town) "dRZ" = ( @@ -9650,11 +9665,9 @@ /turf/open/floor/wood/ms13/carpet, /area/ms13/town) "erL" = ( -/obj/structure/closet/crate/ms13/woodcrate, -/obj/machinery/light/ms13{ - dir = 4 - }, +/obj/structure/table/ms13/metal/grate, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/currency/mammoth/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "erT" = ( @@ -10740,6 +10753,7 @@ /obj/structure/table/ms13/metal/grate, /obj/structure/ms13/storage/vent, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/power_armor/parts, /turf/open/floor/ms13/concrete/small, /area/ms13/town) "fLF" = ( @@ -10996,6 +11010,8 @@ dir = 4 }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/obj/effect/spawner/random/ms13/crafting/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "gev" = ( @@ -11775,6 +11791,11 @@ /obj/structure/table/ms13/crafting/workbench, /turf/open/floor/ms13/concrete/industrial, /area/ms13/town) +"hno" = ( +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/turf/open/floor/ms13/concrete/industrial/walkway, +/area/ms13/town) "hnp" = ( /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /obj/structure/ms13/trash/papers{ @@ -11877,8 +11898,8 @@ /turf/open/floor/wood/ms13/wide, /area/ms13) "hwG" = ( -/obj/structure/closet/crate/ms13/woodcrate/compact, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/mob/living/simple_animal/hostile/ms13/robot/protectron, /turf/open/floor/ms13/concrete, /area/ms13/town) "hwT" = ( @@ -12216,6 +12237,12 @@ /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /turf/open/floor/ms13/concrete/industrial, /area/ms13/town) +"hXs" = ( +/obj/structure/table/ms13/metal/grate, +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/refined, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "hXV" = ( /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /obj/structure/table/rolling/ms13, @@ -12533,6 +12560,7 @@ }, /obj/structure/table/ms13/no_smooth/metal, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/tools/lights, /turf/open/floor/ms13/concrete, /area/ms13/town) "iwv" = ( @@ -12575,6 +12603,11 @@ /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"iyQ" = ( +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/mob/living/simple_animal/hostile/ms13/robot/protectron/builder, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "iAx" = ( /obj/structure/table/ms13/wood/constructed, /obj/effect/spawner/random/ms13/tools/farming, @@ -13001,6 +13034,7 @@ }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /obj/structure/closet/crate/ms13/woodcrate, +/obj/effect/spawner/random/ms13/gun/military, /turf/open/floor/ms13/concrete, /area/ms13/town) "jav" = ( @@ -14720,9 +14754,9 @@ /obj/structure/railing/ms13/solo/industrial{ dir = 4 }, -/obj/structure/closet/crate/ms13/woodcrate, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /obj/structure/lattice/catwalk/ms13, +/obj/effect/spawner/random/ms13/clothing/backpack/high, /turf/open/openspace/ms13, /area/ms13/town) "lbX" = ( @@ -16894,6 +16928,14 @@ }, /turf/open/floor/wood/ms13/mosaic, /area/ms13/town) +"nTL" = ( +/obj/structure/ms13/storage/vent, +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/turf/open/floor/ms13/metal/grate/border{ + dir = 1 + }, +/area/ms13/town) "nVn" = ( /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /obj/effect/spawner/random/ms13/tools/hardware, @@ -17184,7 +17226,6 @@ /turf/open/floor/wood/ms13/common, /area/ms13/town) "orU" = ( -/obj/structure/closet/crate/ms13/woodcrate/compact/army, /obj/structure/ms13/pipes/horizontal/box, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /turf/open/floor/ms13/concrete, @@ -17426,6 +17467,7 @@ /obj/machinery/light/ms13{ dir = 8 }, +/obj/effect/spawner/random/ms13/ammo/lowrandom, /turf/open/floor/plating/ms13/ground/sidewalk, /area/ms13/town) "oGu" = ( @@ -17951,6 +17993,7 @@ }, /obj/machinery/light/ms13, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/smokeable/lowrandom, /turf/open/floor/wood/ms13/carpet/blue, /area/ms13/town) "pqr" = ( @@ -19383,6 +19426,9 @@ dir = 1 }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/armor/lowrandom, +/obj/effect/spawner/random/ms13/armor/lowrandom, +/obj/effect/spawner/random/ms13/armor/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "rum" = ( @@ -20257,6 +20303,11 @@ /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/mountain, /turf/open/floor/plating/ms13/ground/mountain, /area/ms13/underground/mountain) +"sBv" = ( +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "sCj" = ( /obj/effect/decal/cleanable/blood/old{ pixel_x = -5; @@ -20437,6 +20488,12 @@ /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/mountain, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"sPI" = ( +/obj/structure/table/ms13/metal/grate, +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/ammo/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "sQo" = ( /obj/machinery/light/ms13/bulb{ dir = 4 @@ -20658,6 +20715,9 @@ "tgM" = ( /obj/structure/table/ms13/metal/small, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/highrandom, +/obj/effect/spawner/random/ms13/crafting/electrical, +/obj/effect/spawner/random/ms13/crafting/electrical, /turf/open/floor/ms13/concrete/industrial, /area/ms13/town) "tiv" = ( @@ -21304,6 +21364,7 @@ dir = 4 }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/highrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "tYI" = ( @@ -67056,7 +67117,7 @@ kES ohc oXt oXt -ami +erL ujL aHe aHe @@ -68205,7 +68266,7 @@ ave aCj awg awn -awn +hwG awn nzT awn @@ -70689,7 +70750,7 @@ alR oXt oXt oXt -ami +hXs awR abJ abJ @@ -70916,7 +70977,7 @@ awn oXt oXt oXt -ami +hXs awR abJ abJ @@ -71591,7 +71652,7 @@ aLH aCj amj aPy -hwG +awn aCj aCj aCj @@ -71826,7 +71887,7 @@ ujL rQB awn alI -ami +sPI oEO lqZ aCj @@ -72278,7 +72339,7 @@ aCj aCj ujL gsG -awn +hwG awn aol awn @@ -73416,7 +73477,7 @@ awn awn awn awn -awn +iyQ atJ awR aLH @@ -73633,7 +73694,7 @@ aLH aLH aCj awn -erL +aRV aAz adI awn @@ -73867,7 +73928,7 @@ kEZ awn aHZ uAK -tET +hno awm aWW hOH @@ -74318,7 +74379,7 @@ akw awn hkJ awn -awn +iyQ aKG esO tET @@ -74772,7 +74833,7 @@ agA gVh adC oGX -awn +sBv awn awn aRV @@ -75698,7 +75759,7 @@ apv apv apv aCj -uKv +nTL swi lib svX diff --git a/_maps/map_files/generic/MojaveCom.dmm b/_maps/map_files/generic/MojaveCom.dmm index 7801c4adbec..e61e4d04a25 100644 --- a/_maps/map_files/generic/MojaveCom.dmm +++ b/_maps/map_files/generic/MojaveCom.dmm @@ -3,102 +3,387 @@ /obj/machinery/door/unpowered/ms13/seethrough/metal, /obj/structure/ms13/rug/rubber, /turf/open/floor/ms13/tile/large/black, -/area/space) +/area/ms13/start_area) +"ai" = ( +/obj/item/clothing/suit/armor/ms13/firesuit, +/obj/item/clothing/head/helmet/ms13/firehood, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "aV" = ( /obj/structure/bed/ms13/bedframe/wire, /obj/structure/bed/ms13/mattress/filthy, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"bk" = ( +/turf/open/floor/ms13/ceramic/sierra, +/area/ms13/start_area/museum) "bs" = ( /obj/structure/table/ms13/no_smooth/cable_reel, /turf/open/floor/plating/ms13/ground/sidewalk, -/area/space) +/area/ms13/start_area) +"cv" = ( +/obj/structure/ms13/developer_credit/gomble, +/obj/structure/ms13/pot{ + pixel_y = -15 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) "cw" = ( /turf/closed/indestructible/rock/ms13, -/area/space) +/area/ms13/start_area) +"cK" = ( +/obj/structure/ms13/developer_credit/mrpibb, +/obj/item/gun/ballistic/automatic/ms13/full/assaultrifle/proto_service{ + pixel_y = -8 + }, +/obj/item/storage/fancy/ms13/cigarettes/kools{ + pixel_x = 8; + pixel_y = 11 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) +"dV" = ( +/obj/item/organ/tongue{ + pixel_y = 17 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "dZ" = ( /obj/machinery/door/unpowered/ms13/metal, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"gq" = ( +/obj/item/ms13/nonsense/hammer{ + pixel_y = 14 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) +"gw" = ( +/obj/structure/ms13/developer_credit/minegriss, +/obj/structure/bed/ms13/mattress/filthy{ + pixel_y = -10 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) "gR" = ( /obj/structure/ms13/storage/trashcan, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) "ic" = ( /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"iY" = ( +/obj/item/toy/plush/ms13/koban{ + pixel_y = 7 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "jq" = ( /obj/structure/ms13/wall_decor/calendar, /obj/structure/table/ms13/no_smooth/counter/metal/bend{ dir = 1 }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"lx" = ( +/obj/item/toy/plush/ms13/reaper{ + pixel_y = 20 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) +"lX" = ( +/obj/machinery/power/ms13/trafficlight{ + pixel_x = -23; + pixel_y = -14 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) "md" = ( /obj/effect/turf_decal/ms13/covering/paint/gray, /turf/closed/wall/ms13/metal, -/area/space) +/area/ms13/start_area) "mw" = ( /obj/structure/sink/ms13/functional{ dir = 4 }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) "nZ" = ( /obj/structure/dresser/ms13/orange/tall, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"ob" = ( +/obj/structure/ms13/developer_credit/thatguythere, +/obj/item/clothing/mask/ms13/legion/speculatore{ + pixel_y = -12; + pixel_x = 13 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) +"oi" = ( +/turf/open/floor/ms13/concrete, +/area/ms13/start_area) "ot" = ( /obj/structure/table/ms13/no_smooth/counter/metal{ dir = 8 }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"oz" = ( +/obj/structure/ms13/developer_credit/technobug, +/obj/item/clothing/head/helmet/ms13/fisher/technobug{ + pixel_x = 9; + pixel_y = 8 + }, +/obj/item/ms13/tools/fishing_rod/telescopic{ + pixel_y = -10; + pixel_x = -1 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "oM" = ( /obj/structure/chair/comfy/ms13/diner{ dir = 4 }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"qb" = ( +/obj/structure/railing/ms13/solo, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"qY" = ( +/obj/item/clothing/head/hooded/ms13/hazmat{ + pixel_y = 20; + pixel_x = -2 + }, +/obj/item/clothing/mask/gas/ms13{ + pixel_y = 20; + pixel_x = -2 + }, +/obj/structure/ms13/skeleton{ + pixel_y = 12; + name = "literally Koshenko" + }, +/turf/open/floor/ms13/ceramic/sierra, +/area/ms13/start_area/museum) +"sk" = ( +/obj/structure/ms13/developer_credit/memager, +/obj/structure/table/ms13/no_smooth/large/pool{ + pixel_x = -9; + pixel_y = 24; + density = 0 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) "su" = ( /obj/machinery/light/ms13/bulb{ dir = 1 }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"sQ" = ( +/obj/structure/ms13/developer_credit/hyperio, +/obj/structure/ms13/tombstone/cairn{ + pixel_x = -6; + pixel_y = 15 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "tk" = ( /turf/open/floor/plating/ms13/ground/sidewalk, -/area/space) +/area/ms13/start_area) +"tF" = ( +/obj/structure/ms13/developer_credit/spookywastaken, +/obj/item/card/id/ms13/goldman/ringleader{ + pixel_x = 7; + pixel_y = -10 + }, +/obj/item/clothing/mask/gas/ms13/mon_city{ + pixel_x = -8; + pixel_y = 11 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"uj" = ( +/turf/open/floor/wood/ms13/carpet, +/area/ms13/start_area/museum) +"uT" = ( +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"uX" = ( +/obj/effect/mob_spawn/corpse/human/ms13/wastelander, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) "vh" = ( /turf/closed/wall/ms13/concrete, -/area/space) +/area/ms13/start_area) "vT" = ( /turf/closed/indestructible/rock/ms13, /area/start) +"wz" = ( +/obj/structure/ms13/developer_credit/fattybunbah, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"xa" = ( +/obj/item/toy/plush/ms13/hellpig{ + pixel_y = 18; + pixel_x = 14 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"xO" = ( +/obj/machinery/light/ms13{ + dir = 8 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "zg" = ( /turf/closed/wall/ms13/metal/reinforced, -/area/space) +/area/ms13/start_area) +"BK" = ( +/obj/structure/ms13/developer_credit/keks, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"BR" = ( +/obj/machinery/light/ms13{ + dir = 4 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) +"BS" = ( +/obj/item/clothing/head/helmet/ms13/metal/baron{ + pixel_y = 17 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"Cw" = ( +/obj/structure/ms13/developer_credit/killa, +/obj/structure/ms13/pa_jack{ + pixel_y = 2 + }, +/obj/item/wrench/ms13{ + pixel_x = -8; + pixel_y = -18 + }, +/obj/item/ms13/power_armor/leg/left/advanced{ + pixel_x = 15; + pixel_y = -14 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) "CC" = ( /obj/structure/closet/ms13/fridge, /obj/structure/ms13/storage/vent, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"Dc" = ( +/obj/structure/ms13/developer_credit/lord_of_cringe, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) +"Dd" = ( +/obj/structure/ms13/developer_credit/therealscarhomie, +/obj/item/storage/fancy/ms13/cigarettes/luckystrike/random{ + pixel_x = -9; + pixel_y = -11 + }, +/obj/item/lighter/ms13/zippo{ + pixel_x = 7; + pixel_y = -8 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"Dx" = ( +/obj/structure/ms13/developer_credit/koshenko, +/turf/open/floor/wood/ms13/carpet, +/area/ms13/start_area/museum) +"Ed" = ( +/obj/structure/ms13/skeleton{ + pixel_y = 12; + name = "literally infrared_baron" + }, +/obj/item/ms13/nonsense/nuke, +/turf/open/floor/ms13/ceramic/sierra, +/area/ms13/start_area/museum) "Eh" = ( /turf/open/floor/plating/ms13/ground/desertalt, -/area/space) +/area/ms13/start_area) +"EY" = ( +/obj/item/reagent_containers/ms13/lighterfluid{ + pixel_x = 14 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) "FF" = ( /turf/open/floor/plating/ms13/ground/road, -/area/space) +/area/ms13/start_area) +"Ga" = ( +/obj/structure/ms13/developer_credit/sparrowbird611, +/obj/item/gun/ballistic/revolver/ms13/caravan/sawed{ + pixel_x = 9; + pixel_y = -12 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) +"Gz" = ( +/obj/item/ms13/nonsense/fridge{ + pixel_x = 9 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"HB" = ( +/obj/structure/ms13/developer_credit/ma44, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) +"IQ" = ( +/obj/structure/ms13/rug/mat/vulgar/fuckoff{ + pixel_y = 5 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"IT" = ( +/obj/structure/ms13/developer_credit/badatthisgame, +/obj/item/ms13/twohanded/fireaxe{ + pixel_x = 9; + pixel_y = -10 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) +"JY" = ( +/obj/structure/window/fulltile/ms13/glass, +/obj/structure/table/ms13/low_wall/metal, +/turf/open/floor/wood/ms13/carpet, +/area/ms13/start_area/museum) "Kq" = ( /obj/structure/ms13/wall_decor/flag{ icon_state = "flag_trans" }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"Kv" = ( +/obj/structure/ms13/developer_credit/infrared_baron{ + pixel_y = 16 + }, +/turf/open/floor/wood/ms13/carpet, +/area/ms13/start_area/museum) +"Nc" = ( +/obj/structure/ms13/developer_credit/rapird, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) +"NE" = ( +/obj/structure/ms13/developer_credit/oneglitchycent, +/obj/item/toy/plush/ms13/severance{ + pixel_x = 11; + pixel_y = 18 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "Op" = ( /obj/structure/ms13/rug/red, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"Os" = ( +/turf/closed/wall/ms13/metal, +/area/ms13/start_area/museum) "Pk" = ( /obj/structure/table/ms13/no_smooth/wood, /obj/structure/ms13/tv/tube/small{ @@ -106,32 +391,63 @@ pixel_y = 9 }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) "PI" = ( /turf/closed/indestructible/splashscreen, /area/start) +"PQ" = ( +/obj/structure/ms13/developer_credit/therest, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "PW" = ( /turf/open/floor/ms13/concrete, -/area/space) +/area/ms13/start_area/museum) "Qq" = ( /obj/structure/chair/comfy/ms13/diner{ dir = 8 }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) "QV" = ( /obj/structure/table/ms13/wood/bar, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) "St" = ( /turf/closed/wall/ms13/craftable/scrap, -/area/space) +/area/ms13/start_area) +"Sy" = ( +/obj/structure/ms13/developer_credit/originalidea, +/obj/item/ms13/component/sulfurpearl{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) "SW" = ( /obj/machinery/button/ms13{ id = "mojavecom-transhouse-windows" }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"Tj" = ( +/obj/structure/ms13/developer_credit/polyzonial, +/obj/structure/sink/ms13/vile{ + pixel_y = 17 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"TD" = ( +/obj/structure/ms13/developer_credit/uzbekdime, +/obj/item/ms13/fluff/bible{ + pixel_x = 7; + pixel_y = 13 + }, +/obj/structure/ms13/toilet{ + pixel_x = -8; + pixel_y = 14 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "TR" = ( /obj/structure/ms13/wall_decor/flag{ desc = "A faded flag depicting vertical stripes. Depicting pride and power remaining in a once dead world."; @@ -139,7 +455,7 @@ }, /obj/machinery/griddle/ms13, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) "TS" = ( /turf/closed/indestructible/riveted, /area/start) @@ -150,18 +466,41 @@ id = "mojavecom-transhouse-windows" }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) "UC" = ( /turf/closed/wall/ms13/metal, -/area/space) +/area/ms13/start_area) "Vj" = ( /obj/effect/landmark/start/new_player, /turf/open/floor/plating, /area/start) +"Vk" = ( +/obj/machinery/door/airlock/ms13/vault_door, +/turf/open/floor/wood/ms13/carpet, +/area/ms13/start_area/museum) +"VT" = ( +/obj/structure/ms13/developer_credit/bobjoga, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "VX" = ( /obj/machinery/door/unpowered/ms13/seethrough/mirrored/metal, /turf/open/floor/ms13/tile/large/black, -/area/space) +/area/ms13/start_area) +"Wg" = ( +/obj/structure/ms13/developer_credit/hekzder, +/obj/item/gun/ballistic/automatic/ms13/full/smg22{ + pixel_y = -9 + }, +/obj/item/gun/ballistic/automatic/ms13/full/smg45{ + pixel_y = 17; + pixel_x = 14 + }, +/obj/item/clothing/head/helmet/ms13/eliteriot/ranger{ + pixel_x = -8; + pixel_y = 12 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area/museum) "Wi" = ( /obj/structure/table/ms13/no_smooth/counter/metal{ dir = 4 @@ -170,11 +509,28 @@ dir = 4 }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"Wr" = ( +/obj/item/ms13/nonsense/lubeman{ + pixel_x = 10; + pixel_y = -4 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) "WC" = ( /obj/machinery/light/ms13/bulb, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"WU" = ( +/obj/structure/ms13/developer_credit/starlesshorizon, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"Xu" = ( +/obj/machinery/button/ms13/vault_door{ + pixel_y = 19 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/start_area) "XL" = ( /obj/structure/table/ms13/low_wall/metal, /obj/structure/window/fulltile/ms13/glass, @@ -182,10 +538,32 @@ id = "mojavecom-transhouse-windows" }, /turf/open/floor/wood/ms13/wide, -/area/space) +/area/ms13/start_area) +"Yb" = ( +/obj/structure/ms13/developer_credit/theriddler, +/obj/item/reagent_containers/food/drinks/bottle/ms13/vodka{ + pixel_x = -18; + pixel_y = -16 + }, +/obj/item/food/meat/slab/ms13/carcass/large/hellpig/leg{ + pixel_x = 12; + pixel_y = 14 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) +"ZQ" = ( +/obj/item/knife/butcher/ms13/unique{ + pixel_x = 12; + pixel_y = 17 + }, +/obj/item/food/meat/slab/ms13/bodypart/ribs{ + pixel_y = 21 + }, +/turf/open/floor/ms13/concrete/bricks, +/area/ms13/start_area/museum) "ZW" = ( /turf/open/floor/plating/ms13/ground/desert, -/area/space) +/area/ms13/start_area) (1,1,1) = {" cw @@ -2047,14 +2425,14 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW md @@ -2070,26 +2448,26 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -2144,14 +2522,14 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW md @@ -2167,26 +2545,26 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -2241,14 +2619,14 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW md @@ -2264,26 +2642,26 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -2338,14 +2716,14 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW UC @@ -2361,26 +2739,26 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -2435,10 +2813,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC UC UC @@ -2458,26 +2836,26 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -2532,10 +2910,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -2555,26 +2933,26 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -2629,10 +3007,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -2726,10 +3104,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -2823,10 +3201,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -2920,10 +3298,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -2943,11 +3321,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW ZW @@ -3017,10 +3395,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -3040,11 +3418,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW ZW @@ -3114,10 +3492,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -3125,11 +3503,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -3137,11 +3515,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW ZW @@ -3150,13 +3528,13 @@ ZW Eh ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -3211,10 +3589,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -3222,11 +3600,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -3234,11 +3612,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW ZW @@ -3247,13 +3625,13 @@ ZW Eh ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -3308,10 +3686,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -3319,11 +3697,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -3331,11 +3709,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW ZW @@ -3344,13 +3722,13 @@ Eh Eh ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -3416,11 +3794,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -3428,11 +3806,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW ZW @@ -3441,13 +3819,13 @@ Eh ZW ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -3455,24 +3833,24 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW vh @@ -3513,11 +3891,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -3525,11 +3903,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW ZW @@ -3538,13 +3916,13 @@ Eh ZW ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -3552,24 +3930,24 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW vh @@ -3610,11 +3988,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -3622,11 +4000,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW Eh @@ -3635,13 +4013,13 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -3649,24 +4027,24 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi UC ZW vh @@ -3707,11 +4085,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -3732,13 +4110,13 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -3759,11 +4137,11 @@ UC UC UC UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -3804,11 +4182,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -3829,13 +4207,13 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -3856,11 +4234,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -3901,11 +4279,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -3926,13 +4304,13 @@ Eh ZW ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -3998,11 +4376,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -4010,10 +4388,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -4023,13 +4401,13 @@ Eh Eh ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -4050,11 +4428,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -4095,11 +4473,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -4107,10 +4485,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -4120,13 +4498,13 @@ Eh Eh Eh UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -4147,11 +4525,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -4181,10 +4559,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -4204,10 +4582,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -4217,13 +4595,13 @@ Eh Eh Eh UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW @@ -4244,11 +4622,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -4278,10 +4656,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -4301,10 +4679,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -4314,13 +4692,13 @@ ZW Eh Eh UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC UC UC @@ -4341,11 +4719,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -4375,10 +4753,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC ZW ZW @@ -4398,10 +4776,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC UC UC @@ -4411,22 +4789,22 @@ UC UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW ZW @@ -4438,11 +4816,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -4472,10 +4850,10 @@ FF FF ZW UC -PW -PW -PW -PW +oi +oi +oi +oi UC UC UC @@ -4495,35 +4873,35 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW ZW @@ -4535,11 +4913,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -4569,13 +4947,13 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW @@ -4592,35 +4970,35 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW ZW @@ -4632,11 +5010,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -4666,22 +5044,22 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -4689,35 +5067,35 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW ZW @@ -4729,11 +5107,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -4763,22 +5141,22 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -4786,16 +5164,16 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC Eh UC @@ -4826,11 +5204,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -4860,22 +5238,22 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -4883,16 +5261,16 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC Eh Eh @@ -4923,11 +5301,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -4957,22 +5335,22 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -5054,22 +5432,22 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -5151,22 +5529,22 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -5248,22 +5626,22 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -5271,12 +5649,12 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC ZW Eh @@ -5311,11 +5689,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -5345,22 +5723,22 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -5368,12 +5746,12 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC ZW Eh @@ -5408,11 +5786,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -5427,7 +5805,7 @@ cw "} (55,1,1) = {" cw -cw +ZW ZW ZW ZW @@ -5442,22 +5820,22 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi UC ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW FF @@ -5465,12 +5843,12 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC ZW Eh @@ -5483,21 +5861,21 @@ UC UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -5505,11 +5883,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -5524,7 +5902,7 @@ cw "} (56,1,1) = {" cw -cw +ZW ZW ZW ZW @@ -5562,39 +5940,39 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC Eh Eh UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -5602,11 +5980,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -5621,13 +5999,13 @@ cw "} (57,1,1) = {" cw -cw ZW ZW ZW vh vh vh +vh ZW ZW ZW @@ -5659,39 +6037,39 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC Eh Eh UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -5699,11 +6077,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -5718,13 +6096,13 @@ cw "} (58,1,1) = {" cw -cw -ZW ZW ZW vh vh vh +vh +vh ZW ZW ZW @@ -5756,39 +6134,39 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC Eh Eh UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -5815,13 +6193,13 @@ cw "} (59,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh +vh +vh +ZW ZW ZW ZW @@ -5853,39 +6231,39 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC Eh Eh UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -5912,13 +6290,13 @@ cw "} (60,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh +vh +ZW +ZW ZW ZW ZW @@ -5950,39 +6328,39 @@ FF FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC Eh Eh UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -6009,77 +6387,77 @@ cw "} (61,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh ZW ZW +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +oi ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -FF -FF -FF +FF +FF +FF ZW UC -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi UC Eh Eh UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -6087,11 +6465,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -6106,77 +6484,77 @@ cw "} (62,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh ZW ZW -ZW -UC -UC -UC -UC -UC -UC -UC -UC -UC -UC -UC -UC -UC -UC -ZW -UC -UC -UC -UC -UC -UC -UC -ZW -FF -FF -FF -ZW -UC +Os +PW +xO +PW PW +xO +IT PW +xO +sQ PW +Os PW +cK PW +xO +NE +gq +xO +oz PW +xO +ob +PW +Os +oi +ZW +FF +FF +FF +ZW +UC +oi +oi +oi +oi +oi +oi UC Eh Eh UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC Eh UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi +oi UC ZW FF @@ -6184,11 +6562,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -6203,39 +6581,39 @@ cw "} (63,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh ZW ZW -ZW -UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -UC -ZW -UC +Os PW PW +uT +VT +ZQ +uT +uT +uT +Gz PW +Os PW +uT +uT +uT +Wr +uT +uT +lX +uT +uT +EY PW -UC -ZW +Os +oi +oi FF FF FF @@ -6281,11 +6659,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW St @@ -6300,39 +6678,39 @@ cw "} (64,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh ZW -ZW -ZW -UC -PW -PW -PW -PW +Os +Os +Os PW +uT +uX +uT +wz +BS +uT +BK PW +Os PW +gw +uT +uT +Sy +IQ +qb +WU +uT +uT +Dd PW -PW -PW -PW -PW -UC -ZW -UC -PW -PW -PW -PW -PW -UC -ZW +Os +Os +Xu FF FF FF @@ -6378,11 +6756,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW St @@ -6397,39 +6775,39 @@ cw "} (65,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh ZW -ZW -ZW -UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -UC -ZW -UC -PW -PW -PW -PW -PW -UC -ZW +Os +qY +JY +Dx +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +oi +oi FF FF FF @@ -6475,11 +6853,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW St @@ -6494,39 +6872,39 @@ cw "} (66,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh ZW -ZW -ZW -UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -UC -ZW -UC -PW -PW -PW -PW -PW -UC -ZW +Os +bk +JY +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +Vk +oi +oi FF FF FF @@ -6572,11 +6950,11 @@ FF FF ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW St @@ -6591,39 +6969,39 @@ cw "} (67,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh ZW -ZW -ZW -UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -UC -ZW -UC -PW -PW -PW -PW -PW -UC -ZW +Os +Ed +JY +Kv +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +uj +oi +oi FF FF FF @@ -6667,13 +7045,13 @@ FF FF FF FF -ZW -UC -PW -PW -PW -PW -PW +ZW +UC +oi +oi +oi +oi +oi UC ZW vh @@ -6688,39 +7066,39 @@ cw "} (68,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh ZW -ZW -ZW -UC -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -UC -ZW -UC -PW +Os +Os +Os PW +uT +uT +uT +cv +uT +uT +Cw PW +Os PW +sk +uT +uT +Tj +uT +uT +tF +uT +uT +Yb +iY PW -UC -ZW +oi +oi FF FF FF @@ -6766,11 +7144,11 @@ ZW ZW ZW UC -PW -PW -PW -PW -PW +oi +oi +oi +oi +oi UC ZW vh @@ -6785,39 +7163,39 @@ cw "} (69,1,1) = {" cw -cw -ZW -ZW ZW vh vh vh ZW ZW -ZW -UC -UC -UC -UC -UC -UC -UC -UC -UC -UC -UC -UC -UC -UC -ZW -UC +Os PW PW +uT +PQ +uT +uT +uT +uT +uT PW +Os PW +uT +uT +uT +uT +xa +uT +uT +uT +uT +uT PW -UC -ZW +Os +Os +oi FF FF FF @@ -6883,14 +7261,63 @@ cw (70,1,1) = {" cw ZW -ZW -ZW -ZW vh vh vh ZW ZW +Os +PW +BR +PW +PW +BR +Wg +PW +BR +Dc +dV +Os +PW +HB +lx +BR +Nc +PW +BR +Ga +ai +BR +TD +PW +Os +oi +ZW +FF +FF +FF +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW ZW ZW ZW @@ -6907,13 +7334,61 @@ ZW ZW ZW ZW -UC -UC -UC -UC -UC -UC -UC +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +vh +vh +vh +ZW +ZW +ZW +ZW +ZW +cw +"} +(71,1,1) = {" +cw +ZW +vh +vh +vh +ZW +ZW +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +oi ZW FF FF @@ -6977,12 +7452,9 @@ ZW ZW cw "} -(71,1,1) = {" +(72,1,1) = {" cw ZW -ZW -ZW -ZW vh vh vh @@ -7012,6 +7484,9 @@ ZW ZW ZW ZW +ZW +ZW +ZW FF FF FF @@ -7074,12 +7549,12 @@ ZW ZW cw "} -(72,1,1) = {" +(73,1,1) = {" cw ZW -ZW -ZW -ZW +vh +vh +vh vh vh vh @@ -7171,12 +7646,12 @@ ZW ZW cw "} -(73,1,1) = {" -cw +(74,1,1) = {" cw ZW -ZW -ZW +vh +vh +vh vh vh vh @@ -7265,15 +7740,15 @@ ZW ZW ZW ZW -ZW cw -"} -(74,1,1) = {" cw +"} +(75,1,1) = {" cw ZW ZW -ZW +vh +vh vh vh vh @@ -7365,106 +7840,9 @@ ZW cw cw "} -(75,1,1) = {" -cw -cw -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -FF -FF -FF -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -ZW -cw -cw -"} (76,1,1) = {" cw -cw +ZW ZW ZW ZW diff --git a/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm b/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm index b0a0a129662..e8dfc7bf195 100644 --- a/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm +++ b/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm @@ -49,7 +49,7 @@ // department_experience_type = EXP_TYPE_RANGERS // department_full_name = "Desert Rangers" - +/*// There. I made it easy for you to un-fix the server. Just remove the commenting out. /datum/job_department/bos department_name = DEPARTMENT_BOS department_bitflags = DEPARTMENT_BITFLAG_BOS @@ -59,6 +59,7 @@ //display_order = 0 //label_class = "BOS" //latejoin_color = "#ffddf0" +*/ /datum/job_department/raiders department_name = DEPARTMENT_RAIDERS diff --git a/mojave/code/modules/jobs/job_types/bos/_bos.dm b/mojave/code/modules/jobs/job_types/bos/_bos.dm index 8065256194a..d6530923ffa 100644 --- a/mojave/code/modules/jobs/job_types/bos/_bos.dm +++ b/mojave/code/modules/jobs/job_types/bos/_bos.dm @@ -1,4 +1,4 @@ -/datum/job/ms13/bos +/datum/job/ms13/bos // File is unticked. Tick it to re-enable a major reason why Fallout servers are mid lol. selection_color = "#737592" departments_list = list( /datum/job_department/bos, diff --git a/mojave/code/modules/jobs/job_types/bos/head_paladin.dm b/mojave/code/modules/jobs/job_types/bos/head_paladin.dm index b84a44476a7..bea786ba389 100644 --- a/mojave/code/modules/jobs/job_types/bos/head_paladin.dm +++ b/mojave/code/modules/jobs/job_types/bos/head_paladin.dm @@ -1,8 +1,8 @@ /datum/job/ms13/bos/head_paladin title = "BoS Head Paladin" department_head = list("Brotherhood High Command") - total_positions = 1 - spawn_positions = 1 + total_positions = 0 + spawn_positions = 0 supervisors = "The Elder (if present) and Brotherhood High Command" req_admin_notify = 1 description = "Give orders to your Paladin and ensure the Knights are working properly in the region. Work with the Head Scribe to coordinate efforts for the Brotherhood's mission in the region. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/job_types/bos/head_scribe.dm b/mojave/code/modules/jobs/job_types/bos/head_scribe.dm index 76c91ed6687..555c3bb0471 100644 --- a/mojave/code/modules/jobs/job_types/bos/head_scribe.dm +++ b/mojave/code/modules/jobs/job_types/bos/head_scribe.dm @@ -1,8 +1,8 @@ /datum/job/ms13/bos/head_scribe title = "BoS Head Scribe" department_head = list("Brotherhood High Command") - total_positions = 1 - spawn_positions = 1 + total_positions = 0 + spawn_positions = 0 supervisors = "The Elder (if present) and Brotherhood High Command" req_admin_notify = 1 description = "Lead and organize your team of scribes. Ensure that the technology and overall workings of the bunker are in order. Provide medical assistance to Brotherhood operations as needed. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/job_types/bos/initiate.dm b/mojave/code/modules/jobs/job_types/bos/initiate.dm index c84e5d6f843..107af0375da 100644 --- a/mojave/code/modules/jobs/job_types/bos/initiate.dm +++ b/mojave/code/modules/jobs/job_types/bos/initiate.dm @@ -1,7 +1,7 @@ /datum/job/ms13/bos/initiate title = "BoS Initiate" - total_positions = 3 - spawn_positions = 3 + total_positions = 0 + spawn_positions = 0 supervisors = "Knights, Scribes, and above" description = "You are an inexperienced Brotherhood recruit. Learn what it means to be a member of the Brotherhood and execute orders given to you by anyone that is not a fellow Initiate. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/job_types/bos/knight.dm b/mojave/code/modules/jobs/job_types/bos/knight.dm index 280f16091ff..61d71cfd61a 100644 --- a/mojave/code/modules/jobs/job_types/bos/knight.dm +++ b/mojave/code/modules/jobs/job_types/bos/knight.dm @@ -1,8 +1,8 @@ /datum/job/ms13/bos/knight title = "BoS Knight" department_head = list("Head Paladin") - total_positions = 2 - spawn_positions = 2 + total_positions = 0 + spawn_positions = 0 supervisors = "The Paladin and Head Paladin" description = "Follow the orders of your superiors and ensure weaponized technology in the wastes is kept contained and in check. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/job_types/bos/paladin.dm b/mojave/code/modules/jobs/job_types/bos/paladin.dm index 467526d9924..dc1cc81d70d 100644 --- a/mojave/code/modules/jobs/job_types/bos/paladin.dm +++ b/mojave/code/modules/jobs/job_types/bos/paladin.dm @@ -1,8 +1,8 @@ /datum/job/ms13/bos/paladin title = "BoS Paladin" department_head = list("Head Paladin") - total_positions = 1 - spawn_positions = 1 + total_positions = 0 + spawn_positions = 0 supervisors = "The Head Paladin" req_admin_notify = 1 description = "Lead and coordinate the Knights while following and relaying the orders of the Head Paladin. Cooperate with the Scribes to ensure smooth operations in the region and the safety of your bunker. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/job_types/bos/scribe.dm b/mojave/code/modules/jobs/job_types/bos/scribe.dm index 906b83bda4f..9ffa3e384b1 100644 --- a/mojave/code/modules/jobs/job_types/bos/scribe.dm +++ b/mojave/code/modules/jobs/job_types/bos/scribe.dm @@ -1,8 +1,8 @@ /datum/job/ms13/bos/scribe title = "BoS Scribe" department_head = list("Head Scribe") - total_positions = 2 - spawn_positions = 2 + total_positions = 0 + spawn_positions = 0 supervisors = "The Head Scribe" description = "Ensure the bunker is up to standards, ensure everyone is in good health, and ensure the technology of the Brotherhood is well maintained. Obey orders from the Head Scribe. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/jobs.dm b/mojave/code/modules/jobs/jobs.dm index 21032ff1be5..25d58536813 100644 --- a/mojave/code/modules/jobs/jobs.dm +++ b/mojave/code/modules/jobs/jobs.dm @@ -27,13 +27,15 @@ GLOBAL_LIST_INIT(ncr_positions, list( "NCR Staff Sergeant", "NCR Lieutenant")) +/* // There. I made it easy for you to un-fix the server. Just remove the commenting out. GLOBAL_LIST_INIT(bos_positions, list( "BoS Initiate", "BoS Knight", "BoS Paladin", "BoS Head Paladin", "BoS Scribe", - "BoS Head Scribe")) + "BoS Head Scribe")) +*/ GLOBAL_LIST_INIT(raiders_positions, list( "Raider", @@ -101,7 +103,7 @@ GLOBAL_LIST_INIT(ms13_position_categories, list( EXP_TYPE_WASTELAND = list("jobs" = wasteland_positions, "color" = "#eec66f"), EXP_TYPE_TOWN= list("jobs" = town_positions, "color" = "#4feb64"), EXP_TYPE_NCR = list("jobs" = ncr_positions, "color" = "#cfd1ba"), - EXP_TYPE_BOS = list("jobs" = bos_positions, "color" = "#737592"), + //EXP_TYPE_BOS = list("jobs" = bos_positions, "color" = "#737592"), EXP_TYPE_RAIDERS = list("jobs" = raiders_positions, "color" = "#30389c"), EXP_TYPE_RANGERS = list("jobs" = ranger_positions, "color" = "#bdbc76"), EXP_TYPE_DROUGHTTOWN = list("jobs" = drought_town_positions, "color" = "#12491a"), @@ -114,7 +116,7 @@ GLOBAL_LIST_INIT(ms13_exp_jobsmap, list( EXP_TYPE_WASTELAND = list("titles" = wasteland_positions), EXP_TYPE_TOWN = list("titles" = town_positions), EXP_TYPE_NCR = list("titles" = ncr_positions), - EXP_TYPE_BOS = list("titles" = bos_positions), + //EXP_TYPE_BOS = list("titles" = bos_positions), EXP_TYPE_RAIDERS = list("titles" = raiders_positions), EXP_TYPE_RANGERS = list("titles" = ranger_positions), EXP_TYPE_DROUGHTTOWN = list("titles" = drought_town_positions), diff --git a/mojave/icons/structure/ms_devs.dmi b/mojave/icons/structure/ms_devs.dmi new file mode 100644 index 00000000000..b9b98b946f8 Binary files /dev/null and b/mojave/icons/structure/ms_devs.dmi differ diff --git a/mojave/icons/turf/areas.dmi b/mojave/icons/turf/areas.dmi index 423cf4c2702..43768dcd3aa 100644 Binary files a/mojave/icons/turf/areas.dmi and b/mojave/icons/turf/areas.dmi differ diff --git a/mojave/sound/ms13music/lobby/desert_theme.ogg b/mojave/sound/ms13music/lobby/desert_theme.ogg deleted file mode 100644 index 15bbc520b6d..00000000000 Binary files a/mojave/sound/ms13music/lobby/desert_theme.ogg and /dev/null differ diff --git a/mojave/sound/ms13music/lobby/highwayman.ogg b/mojave/sound/ms13music/lobby/highwayman.ogg deleted file mode 100644 index a7c7a91300a..00000000000 Binary files a/mojave/sound/ms13music/lobby/highwayman.ogg and /dev/null differ diff --git a/mojave/sound/ms13music/lobby/main_theme.ogg b/mojave/sound/ms13music/lobby/the_underground.ogg similarity index 53% rename from mojave/sound/ms13music/lobby/main_theme.ogg rename to mojave/sound/ms13music/lobby/the_underground.ogg index 97b93b3cf53..7c3c1703b80 100644 Binary files a/mojave/sound/ms13music/lobby/main_theme.ogg and b/mojave/sound/ms13music/lobby/the_underground.ogg differ diff --git a/mojave/structures/dev_credits.dm b/mojave/structures/dev_credits.dm new file mode 100644 index 00000000000..1787d065d9a --- /dev/null +++ b/mojave/structures/dev_credits.dm @@ -0,0 +1,314 @@ +/// THIS FILE HOSTS THE SNOWFLAKE STRUCTURES USED TO CREDITING DEVS. /// +/// NOT TO BE USED ANYWHERE BUT MOJAVECOM /// +/// TO WHOMEVER IT MAY CONCERN- IF YOU REMOVE THESE YOU'RE NOT A VERY GOOD PERSON. /// + +/obj/structure/ms13/developer_credit + icon = 'mojave/icons/structure/ms_devs.dmi' + var/cause_of_death + var/known_for + +/obj/structure/ms13/developer_credit/examine(mob/user) + . = ..() + . += span_notice("Known for: [known_for]") + . += span_danger("Root of Demise: [cause_of_death]") + +/obj/structure/ms13/developer_credit/infrared_baron + name = "INFRARED_BARON" + icon_state = "INFRARED_BARON" + desc = "A master artist, responsible for 95% of the assets seen within the MS13's staggering roster of sprites." + cause_of_death = "Overspriting" + known_for = "Over-over-spriting" + +/obj/structure/ms13/developer_credit/bobjoga + name = "Bob Joga" + icon_state = "Bobjoga" + desc = "A high octane coder, the creator of many of our beloved systems. Namely- Tetris inventory and DT armour. Also revolutionized Roleplay via the Guestbook system, ensuring people can't meta-know names. A brave individual with brave takes- and incredible capabilities." + cause_of_death = "Mental rot" + known_for = "Epic coding" + +/obj/structure/ms13/developer_credit/fattybunbah + name = "Fattybunbah" + icon_state = "Fattybunbah" + desc = "Talented Music producer, responsible for our three unique titlescreen themes." + cause_of_death = "Got too dry" + known_for = "Fantastic lobby music" + +/obj/structure/ms13/developer_credit/badatthisgame + name = "badatthisgame" + icon_state = "BadAtThisGame" + desc = "A fun face and a good mapper! Helped us when we needed it. For that we owe a thanks." + cause_of_death = "Murdered by Riddler" + known_for = "Crossing into Riddler's mapping territory" + +/obj/structure/ms13/developer_credit/sparrowbird611 + name = "Sparrowbird611" + icon_state = "Sparrowbird611" + desc = "Took matters into their own hands and pulled up the bootstraps, aiding in some balancing issues/oversights and adding silly features." + cause_of_death = "Poked a shotgun with a screwdriver while it was loaded" + known_for = "Aspiring balancetainer" + +/obj/structure/ms13/developer_credit/uzbekdime + name = "{Uzbek}Dime" + icon_state = "Dime" + desc = "Second in command of mapping soul. Make excellent californian shitholes- added a lot of soul to our maps where it lacked." + cause_of_death = "Too many PFP changes" + known_for = "Turning empty buildings into californian paradises and winning PVP events" + +/obj/structure/ms13/developer_credit/mrpibb + name = "Mr Pibb" + icon_state = "MrPibb" + desc = "Everyone's favourite blogger. A good friend and occasional mapper. Added in some inspired locations when nobody else would. Also contributed his voice towards our Mumbleboop system- thanks for it all." + cause_of_death = "Shared his political views" + known_for = "mr-pibbs-site.neocities" + +/obj/structure/ms13/developer_credit/hyperio + name = "Hyperio" + icon_state = "Hyperio" + desc = "Atlas personified. A noble coder who held up our github during the beginning of the end. Added numerous soulful features with lots of character. Many thanks for all he did in such a short time." + cause_of_death = "Fell into a grave and landed on their internal organs, mortally wounding them after building their bridge" + known_for = "Digging graves and building bridges" + +/obj/structure/ms13/developer_credit/thatguythere + name = "Thatguythere03" + icon_state = "ThatGuyThere" + desc = "A pioneer of the Legion on MS13. A faction that unfortunately didn't see much light of day, they gave us a good semi-unique aesthetic and wonderful sprites." + cause_of_death = "Crossed" + known_for = "Witnessing the fall of the west" + +/obj/structure/ms13/developer_credit/keks + name = "Kekskruemelkittey" + icon_state = "Kekskruemelkittey" + desc = "A talented spriter and mapper. Helped us towards the beginning while we built up and made an incredible amount of buildings when Mammoth was still in its baby stage. Provided their voice for the Mumbleboop system." + cause_of_death = "Stabbed to death at 3am in downtown New York by rapscallions" + known_for = "Superb fridge sprites" + +/obj/structure/ms13/developer_credit/starlesshorizon + name = "StarlessHorizon" + icon_state = "StarlessHorizon" + desc = "A wonderful spriter that gave us many iconic assets that are used pretty much everywhere." + cause_of_death = "Tripped over a railing that didn't get coded right, snapping their neck in 5 places." + known_for = "Railing us" + +/obj/structure/ms13/developer_credit/rapird + name = "Rapird" + icon_state = "Rapird" + desc = "Top bloke that gave us many inspired sprites. Creator of the Hellpig. Good spriter and a voice donor for the Mumbleboop system." + cause_of_death = "Killed for janitor inactivity" + known_for = "Revolutionizing fear of walking in a forest alone" + +/obj/structure/ms13/developer_credit/memager + name = "Memager" + icon_state = "Memager" + desc = "Top tier spriter that helped us upon occasion- namely during the earlier stages of MS13. Made epic pool tables that we used to set anything but pool cues or balls on." + cause_of_death = "died of natural causes at the ripe age of 82" + known_for = "Masterfully crafted pool tables and fixing 1glitchycent's drawings" + +/obj/structure/ms13/developer_credit/spookywastaken + name = "Spookywastaken" + icon_state = "SpookyWasTaken" + desc = "Insanely good spriter. Very fun to work with and had incredibly inspired designs. Responsible for making even our worst faction additions look fucking awesome." + cause_of_death = "Robbed by Goldmen" + known_for = "Making bad men look good" + +/obj/structure/ms13/developer_credit/gomble + name = "Gomble" + icon_state = "Gomble" + desc = "Very fun guy and a good coder. Potentially could have revolutionized us at least 20 times over and is the inventor of PartiCool! Made our day/night cycles, weather, and many more additions. Inspired us to try to be the best." + cause_of_death = "Veganism-induced nutrient deficiency while hiding in a hut during a radstorm" + known_for = "Sadistic veganism (killed animals and farmed them on vintage story)" + +/obj/structure/ms13/developer_credit/hekzder + name = "Hekzder" + icon_state = "Hekzder" + desc = "Head balancetainer. Nobody runs numbers like this guy- essentially the sole reason our game's balance was near perfect the first time around every time. Added an ungodly amount of assets and was a pillar of our dev team." + cause_of_death = "Mingus jones" + known_for = "Mingus jones and balancing" + +/obj/structure/ms13/developer_credit/killa + name = "Killa" + icon_state = "Killa" + desc = "Insanely good coder. Gave us many good features. Power armour modularity was wonderful- even if we didn't utilize it to its fullest. We let him down by not getting PERSON functional." + cause_of_death = "Body torn in half while operating a faulty T51B power armour set" + known_for = "Inventing power armor" + +/obj/structure/ms13/developer_credit/polyzonial + name = "Polyzonial" + icon_state = "Polyzonial" + desc = "The Baron's head Water technician. Established pipelines within the Barony, as well as ensured the people of Drought would never get a sip of water again as long as it wasn't by His command. Helped us a lot in earlier stages too- including giving NCR radio backpack soul." + cause_of_death = "Fell into a water resevoir and drowned" + known_for = "Plumbing, radio technology, and more." + +/obj/structure/ms13/developer_credit/minegriss + name = "Minegriss" + icon_state = "Minegriss" + desc = "An OG admin. During our earlier stages, added a bunch of assets in for us. Many of their additions are still used to this day. Helped us when everyone else didn't have the balls to- Godspeed, soldier." + cause_of_death = "Suffocated while between a bedframe and a mattress" + known_for = "Being a gross janitor... and a good friend." + +/obj/structure/ms13/developer_credit/technobug + name = "Technobug" + icon_state = "Technobug" + desc = "The king of fishing. Added many things that he deemed fun and gave ideas for ten-fold that. Stealthboys were never this cool..." + cause_of_death = "Beaten to death by a Sturgeon while fishing under Snowcrest in a small sewer outelt." + known_for = "Fishing, ideas, and fishing ideas." + +/obj/structure/ms13/developer_credit/therealscarhomie + name = "TheRealScarHomie" + icon_state = "TheRealScarHomie" + desc = "A real homie. Sprited the grand majority of our clothing at one point. Added lots of soul features including porting numerous insanely useful systems. A pillar of our development and a fun guy. Growing tobacco and rolling cigarettes were revolutionized by this man." + cause_of_death = "Found the tobaccer. It was laced." + known_for = "SOUL!!!" + +/obj/structure/ms13/developer_credit/theriddler + name = "The Riddler" + icon_state = "TheRiddler" + desc = "The best mapper SS13 will ever know. Crafted incredibly complex environments and is the king of making great looking bad places. #1 above all- hire this man. Inventor of KOBAN as we know it today. Overall a great dude and basically made the majority of our two maps." + cause_of_death = "Impaled by KOBAN" + known_for = "Making entire countries worth of quality buildings" + +/obj/structure/ms13/developer_credit/koshenko + name = "Koshenko" + icon_state = "Koshenko" + desc = "The father of teaching. Guided all of the brainless little whelps back even when we were just trading files over DMs. Huge props to him for reaching and working with us. Would have been literally impossible to make it this far without him." + cause_of_death = "Executed for usurping Host role via stoning." + known_for = "Teaching morons and hosting the server/maintaining the box." + +/obj/structure/ms13/developer_credit/originalidea + name = "Original Idea" + icon_state = "Original_Idea" + desc = "Unwilling developer who just wanted a fun game to play- didn't actually play a single round. Maptainer and unfortunate head janitor." + cause_of_death = "Burned at the stake for being a janitor" + known_for = "Killing what you all loved" + +/obj/structure/ms13/developer_credit/lord_of_cringe + name = "ChLorine" + icon_state = "Chlorine" + desc = "Pioneer of the mumbleboop aesthetic. Helped us invent a format to make the coolest pseudo-TTS system there is around. Did numerous mapping PRs and is overall a great big brother to MrPibb." + cause_of_death = "Choked on a microphone while experimenting with mumbleboops" + known_for = "Being the father to mumbleboops" + +/obj/structure/ms13/developer_credit/oneglitchycent + name = "1glitchycent" + icon_state = "1glitchycent" + desc = "A strong personality and the spriter of Atlas Ironworks. Even though they never got coded- were easily one of the more inspired faction concepts we've had and could have saved us all. Many thanks for putting in the effort." + cause_of_death = "Caught taking a break- executed by Severance Administrator" + known_for = "Founding the most efficient company in northern California." + +/obj/structure/ms13/developer_credit/ma44 + name = "ma44 (Doughe)" + icon_state = "ma44" + desc = "Dough. Incredibly helpful during the beginning stages and even later on provided incredibly helpful things. Boss mobs were incredible and a great source of entertainment for us all." + cause_of_death = "Filled with lead from Reaper" + known_for = "Terrorizing dungeon runners" + +/obj/structure/ms13/developer_credit/therest + name = "And Everyone Else" + icon_state = "therest" + desc = "Tomb of the unknown dev: Many people have contributed to our success, no matter how 'little' or few times they'd come forward. \ + Putting in an amount of effort towards something you want to see succeed is the only way to ensure that such a place thrives. \ + This is a blanket apology and thanks for even one-off contributors that simply wanted a thing or two fixed. You helped us more than you know." + cause_of_death = "Hit by a nuke" + known_for = "Taking initiative to make something 'okay' feel great." + +/// BONUS CONTENT: little versions of things we like /// + +/obj/item/toy/plush/ms13 + icon = 'mojave/icons/structure/ms_devs.dmi' + +/obj/item/toy/plush/ms13/reaper + name = "Reaper" + icon_state = "sentry_plush" + desc = "A very menacing creature full of malice and hatred. do NOT mess with this thing." + +/obj/item/toy/plush/ms13/hellpig + name = "hellpig plush" + icon_state = "hellpig_plush" + desc = "The original hogwild beast." + +/obj/item/toy/plush/ms13/severance + name = "Severance Administrator" + icon_state = "severance" + desc = "A very large and mighty administrator! Beware!" + +/obj/item/toy/plush/ms13/koban + name = "KOBAN" + icon_state = "KOBAN" + desc = "The terror of the streets. This beast shook Snowcrest countless times- and it never got old. Not once." + +/obj/item/toy/plush/ms13/koban/use(used) + to_chat(usr, span_notice("You squeeze the [src]")) + playsound(src, 'mojave/sound/ms13npc/hellpig_attack1.ogg', 90, TRUE) + +/obj/item/ms13/nonsense + desc = "Random bullshit dev references." + icon = 'mojave/icons/structure/ms_devs.dmi' + +/obj/item/ms13/nonsense/lubeman + name = "Lubeman bodypillow" + icon_state = "lubeman" + desc = "An honest to-scale replica of Lubeman! Original never even watched watchmen. He just thought the pfp was funny." + +/// fridge +/obj/item/ms13/nonsense/fridge + name = "fridge" + icon_state = "fridge" + desc = "fridge" + +/obj/item/ms13/nonsense/hammer + name = "Atlas' Hammer" + icon_state = "atlas_hammer" + desc = "A mighty sledge used to destroy the most unefficient workers of Atlas Ironworks" + +/obj/item/ms13/nonsense/nuke + name = "fatman" + icon_state = "mininuke" + desc = "A totally real mininuke launcher." + +/obj/item/ms13/nonsense/nuke/pickup(mob/living/carbon/user) + . = ..() + to_chat(usr, span_narsie("NOT WORTHY.")) + user.gib() + +/// MOJAVECOM AREAS/TRACKS /// + +#define FATTY_ATMOSPHERE list('mojave/sound/ms13music/lobby/droughtsong.ogg', \ + 'mojave/sound/ms13music/lobby/the_west.ogg', \ + 'mojave/sound/ms13music/lobby/the_underground.ogg') + +/area/ms13/start_area + name = "Mojavecom" + icon_state = "mojavecom" + requires_power = FALSE + power_environ = FALSE + power_equip = FALSE + power_light = FALSE + outdoors = TRUE + atmosphere_sound = BUILDING_ATMOSPHERE + +/area/ms13/start_area/museum + name = "Museum of the Fallen" + icon_state = "mojavemuseum" + outdoors = FALSE + atmosphere_sound = FATTY_ATMOSPHERE + +#undef FATTY_ATMOSPHERE + +/// NOTES BY ORIGINAL IDEA: TO WHOMEVER IT MAY CONCERN /// + +/* + +This server started with basically nothing. It's possible to make anything you want to- you just need to do it. +Pull up those bootstraps and make what you want to, other people aren't going to just make all of your ideas for you. +If we did it, you can too. Make the server of your dreams and truly care for it and put in effort. +So little people care for quality not. Not to say we shat sunshine but our community was one that truly cared about making something we all liked and cared for. +Be whatever change you want to be. Don't take shit seriously. Go have whatever fun you can muster- it's just a game. + +Smile because it happened. + +P.S: Don't descecrate these graves. These are all people that put in vast amounts of efforts and deserve to be recognized. Include this shit, dummy. + +P.P.S: Sorry about the runtimes if you're trying to host this shit. We know. It's not incredible. The proc errors especially- shoutout to upstream changes am i right? + +P.P.P.S: On the same hand, i'm not sharing any of the shortcomings we discoverered or the ultra-niche intricacies we had to work around. Good fkin luck lmao. + +*/ diff --git a/mojave/structures/powerlines.dm b/mojave/structures/powerlines.dm index 28c37225788..f8ce92285fc 100644 --- a/mojave/structures/powerlines.dm +++ b/mojave/structures/powerlines.dm @@ -73,7 +73,7 @@ // Power line junctions /obj/structure/ms13/powerlines/junction/Initialize(mapload) - + . = ..() // Adjacent connections will be spawned as overlays icon_state = "plinejunction" diff --git a/strings/round_start_sounds.txt b/strings/round_start_sounds.txt index bce2651ac31..35c5e8deeec 100644 --- a/strings/round_start_sounds.txt +++ b/strings/round_start_sounds.txt @@ -1,2 +1,3 @@ mojave/sound/ms13music/lobby/droughtsong.ogg mojave/sound/ms13music/lobby/the_west.ogg +mojave/sound/ms13music/lobby/the_underground.ogg diff --git a/tgstation.dme b/tgstation.dme index 68f40a4e547..d292277bdc6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4440,7 +4440,6 @@ #include "mojave\code\modules\jobs\departments\mojave\jobs\departments\departments.dm" #include "mojave\code\modules\jobs\job_types\_job.dm" #include "mojave\code\modules\jobs\job_types\ms13.dm" -#include "mojave\code\modules\jobs\job_types\bos\_bos.dm" #include "mojave\code\modules\jobs\job_types\bos\head_paladin.dm" #include "mojave\code\modules\jobs\job_types\bos\head_scribe.dm" #include "mojave\code\modules\jobs\job_types\bos\initiate.dm" @@ -4757,6 +4756,7 @@ #include "mojave\structures\cross.dm" #include "mojave\structures\decorative.dm" #include "mojave\structures\departure_area.dm" +#include "mojave\structures\dev_credits.dm" #include "mojave\structures\doors.dm" #include "mojave\structures\fires.dm" #include "mojave\structures\furniture.dm"