From 7ecba8432ff712666466ec6a2a28345e011835d0 Mon Sep 17 00:00:00 2001 From: GDLW Date: Sun, 7 May 2023 20:41:06 +0200 Subject: [PATCH] snackstore fix + feeder den shutters fixed snackstore area power + added shutters to feeder's den --- .../lavaland_surface_snack_store.dmm | 249 +++++++++--------- _maps/RandomRuins/SpaceRuins/feeders_den.dmm | 10 +- code/game/area/areas/ruins/lavaland.dm | 6 +- code/game/area/areas/ruins/space.dm | 7 - 4 files changed, 139 insertions(+), 133 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_snack_store.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_snack_store.dmm index a9c5c78e..43067dab 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_snack_store.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_snack_store.dmm @@ -5,7 +5,7 @@ }, /obj/item/trash/popcorn, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ab" = ( /obj/machinery/vending/gato, /obj/structure/sign/poster/contraband/robust_softdrinks{ @@ -13,7 +13,7 @@ }, /obj/machinery/light, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ac" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -22,7 +22,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ad" = ( /obj/structure/table, /obj/item/stack/spacecash/c1, @@ -39,19 +39,19 @@ dir = 1 }, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ae" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "af" = ( /turf/open/floor/concrete, /area/lavaland/surface/outdoors) "ag" = ( /obj/machinery/smartfridge/food, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ah" = ( /obj/item/cardboard_cutout{ icon_state = "cutout_viva"; @@ -62,17 +62,17 @@ pixel_x = -10 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aj" = ( /obj/structure/chair/stool/brass, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ak" = ( /obj/item/cardboard_cutout{ icon_state = "cutout_lusty" }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "al" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -80,29 +80,29 @@ /obj/structure/filingcabinet, /obj/structure/fluff/paper, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "an" = ( /obj/machinery/computer/slot_machine, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ap" = ( /obj/machinery/vending/kink, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aq" = ( /obj/machinery/vending/snack/random, /obj/structure/sign/poster/contraband/shamblers_juice{ pixel_y = -32 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "as" = ( /obj/structure/sign/poster/contraband/energy_swords{ pixel_x = 32 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "au" = ( /obj/structure/closet, /obj/item/gun/ballistic/shotgun, @@ -117,14 +117,14 @@ dir = 1 }, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aw" = ( /obj/machinery/vending/coffee, /obj/structure/sign/poster/contraband/eat{ pixel_x = -32 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ax" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -132,28 +132,28 @@ /obj/structure/table, /obj/item/flashlight/lamp, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "az" = ( /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aF" = ( /obj/machinery/door/airlock/public, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aJ" = ( /obj/machinery/vending/games, /obj/structure/sign/poster/contraband/space_cola{ pixel_y = -32 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aK" = ( /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aL" = ( /obj/machinery/computer/arcade/orion_trail{ dir = 4 @@ -162,14 +162,14 @@ dir = 1 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aO" = ( /turf/template_noop, /area/template_noop) "aP" = ( /obj/structure/ore_box, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aS" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -182,11 +182,11 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/freezer, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aT" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aU" = ( /obj/machinery/computer/arcade/amputation{ dir = 4 @@ -198,25 +198,25 @@ dir = 8 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aV" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aX" = ( /obj/structure/sign/poster/contraband/eat{ pixel_x = 32 }, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "aY" = ( /turf/closed/wall, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bb" = ( /obj/machinery/door/window/southright, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bc" = ( /obj/machinery/vending/mealdor, /obj/structure/sign/poster/contraband/donut_corp{ @@ -226,10 +226,10 @@ dir = 8 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "be" = ( /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bg" = ( /obj/structure/rack/shelf, /obj/structure/rack/shelf, @@ -237,11 +237,11 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bh" = ( /obj/structure/closet/crate/large, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bi" = ( /obj/item/cigbutt{ pixel_x = -10; @@ -249,11 +249,11 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bk" = ( /obj/structure/closet/crate/freezer, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bl" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/food/snacks/popcorn, @@ -265,7 +265,7 @@ }, /obj/machinery/light, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bm" = ( /obj/structure/rack/shelf, /obj/structure/sign/poster/contraband/corn_oil{ @@ -279,34 +279,34 @@ pixel_x = 4 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bn" = ( /turf/open/floor/plasteel/freezer, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bp" = ( /obj/item/cardboard_cutout{ icon_state = "cutout_clown" }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bq" = ( /obj/structure/rack, /obj/item/camera, /obj/item/camera_film, /obj/item/camera_film, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bu" = ( /obj/structure/sign/poster/contraband/pwr_game{ pixel_x = 32 }, /obj/item/trash/raisins, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bx" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/food/snacks/soyfood, @@ -317,14 +317,14 @@ pixel_x = 6 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bA" = ( /obj/structure/sign/poster/official/cohiba_robusto_ad{ pixel_x = 32 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bB" = ( /obj/machinery/light/small{ dir = 8 @@ -334,7 +334,7 @@ pixel_y = -7 }, /turf/open/floor/plasteel/freezer, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bF" = ( /obj/structure/rack/shelf, /obj/item/vending_refill/kink, @@ -346,18 +346,18 @@ }, /obj/item/vending_refill/boozeomat, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bG" = ( /obj/structure/window/reinforced/survival_pod{ dir = 9 }, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bH" = ( /obj/structure/table, /obj/machinery/microwave, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bI" = ( /obj/structure/rack/shelf, /obj/structure/rack/shelf, @@ -374,38 +374,38 @@ pixel_x = 8 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bM" = ( /obj/structure/closet/crate/secure/loot, /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bT" = ( /obj/structure/table, /obj/machinery/chem_dispenser/drinks/fullupgrade{ dir = 1 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bW" = ( /obj/machinery/vending/cola/shamblers, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bX" = ( /obj/structure/chair/office/light{ dir = 1 }, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "bZ" = ( /obj/machinery/vending/boozeomat/all_access, /obj/structure/sign/poster/contraband/red_rum{ pixel_y = 32 }, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ca" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/food/snacks/cheesiehonkers, @@ -416,7 +416,7 @@ pixel_x = 4 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ci" = ( /obj/item/trash/boritos, /obj/effect/decal/cleanable/dirt, @@ -432,11 +432,11 @@ /obj/item/stack/sheet/cardboard, /obj/item/stack/sheet/cardboard, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "cl" = ( /obj/structure/fluff/paper/stack, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "cp" = ( /obj/machinery/door/window/survival_pod{ dir = 8 @@ -449,11 +449,11 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "cs" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "cx" = ( /obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -461,16 +461,16 @@ "cC" = ( /obj/machinery/vending/cola/starkist, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "cD" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/public, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "cG" = ( /obj/machinery/vending/cigarette, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "cH" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -482,7 +482,7 @@ pixel_y = 8 }, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "eo" = ( /obj/structure/mirror{ icon_state = "mirror_broke"; @@ -492,7 +492,7 @@ pixel_y = 22 }, /turf/open/floor/plasteel/freezer, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "eE" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -500,45 +500,50 @@ /obj/effect/turf_decal/tile/brown, /obj/item/trash/pistachios, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "eF" = ( /obj/machinery/door/airlock/public, /turf/open/floor/plasteel/freezer, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "fI" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 }, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) +"fP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/off, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/snackstore) "ga" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "gU" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 }, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ha" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ix" = ( /obj/structure/closet/crate/trashcart, /obj/item/seeds/cannabis/rainbow, /obj/effect/decal/cleanable/dirt, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "iL" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/sillycup/smallcarton, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "iO" = ( /obj/structure/rack, /obj/item/storage/fancy/candle_box, @@ -546,14 +551,14 @@ /obj/item/lighter, /obj/item/storage/fancy/cigarettes/smokekins, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "jn" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "mG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/concrete, @@ -562,7 +567,7 @@ /obj/structure/fans/tiny, /obj/machinery/door/poddoor/shutters, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "np" = ( /obj/item/radio{ pixel_x = 8 @@ -572,11 +577,11 @@ "oC" = ( /obj/structure/closet/crate/large, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "pb" = ( /obj/structure/closet/emcloset, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "pg" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen, @@ -584,7 +589,7 @@ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "pQ" = ( /obj/structure/table, /obj/item/reagent_containers/food/snacks/carneburrito{ @@ -595,25 +600,25 @@ pixel_x = 5 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "qt" = ( /obj/machinery/camera{ c_tag = "Courtroom - Aft"; dir = 8 }, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "qD" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 }, /obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "sq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/freezer, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "tc" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/food/snacks/chips, @@ -625,7 +630,7 @@ }, /obj/machinery/camera, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "uq" = ( /obj/structure/toilet{ dir = 1 @@ -634,7 +639,7 @@ dir = 8 }, /turf/open/floor/plasteel/freezer, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "uC" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/food/snacks/syndicake, @@ -645,18 +650,18 @@ pixel_y = 4 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "uO" = ( /obj/structure/closet/crate/trashcart, /obj/effect/decal/cleanable/dirt, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "vf" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "xX" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/food/drinks/soda_cans/cola{ @@ -672,22 +677,22 @@ pixel_x = 8 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "yU" = ( /obj/machinery/computer/security/telescreen/entertainment, /turf/closed/wall, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "zP" = ( /obj/item/cigbutt, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Al" = ( /obj/item/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 8 }, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "AT" = ( /obj/structure/safe, /obj/machinery/light/small{ @@ -701,11 +706,11 @@ /obj/item/clothing/mask/chameleon, /obj/item/clothing/head/chameleon, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Bp" = ( /obj/machinery/door/airlock/public, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "BC" = ( /obj/structure/rack, /obj/item/toy/cards/deck/syndicate{ @@ -718,7 +723,7 @@ pixel_x = -4 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Dz" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{ @@ -734,7 +739,7 @@ pixel_x = -8 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "EY" = ( /obj/structure/rack/shelf, /obj/structure/rack/shelf, @@ -751,7 +756,7 @@ pixel_x = 8 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Ff" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/food/snacks/cornchips, @@ -762,17 +767,17 @@ pixel_x = 4 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "HD" = ( /obj/item/trash/semki, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "HK" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen, /obj/item/storage/fancy/cigarettes/cigpack_robust, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Jq" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -781,14 +786,14 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Kz" = ( /obj/machinery/smartfridge/chemistry/preloaded, /obj/machinery/light{ dir = 1 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Lx" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen, @@ -800,7 +805,7 @@ pixel_x = -8 }, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Nj" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -810,13 +815,13 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Nm" = ( /obj/machinery/light{ dir = 1 }, /turf/open/floor/plasteel/freezer, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "NQ" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/food/snacks/candy, @@ -830,7 +835,7 @@ dir = 1 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "OH" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -840,7 +845,7 @@ "Po" = ( /obj/item/trash/candy, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Qg" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -848,7 +853,7 @@ /obj/effect/turf_decal/tile/brown, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "QR" = ( /obj/machinery/door/window/survival_pod{ dir = 8 @@ -860,7 +865,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Rg" = ( /obj/effect/mapping_helpers/no_lava, /obj/effect/mapping_helpers/no_lava, @@ -872,7 +877,7 @@ }, /obj/item/trash/fatoray_scrap1, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "RA" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -884,7 +889,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/trash/plate, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Ux" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -892,15 +897,17 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "VJ" = ( /obj/structure/toilet{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mob_spawn/human/skeleton/alive, +/obj/effect/mob_spawn/human/skeleton/alive{ + name = "Bob" + }, /turf/open/floor/plasteel/freezer, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "VL" = ( /obj/item/cigbutt{ pixel_x = -1 @@ -918,17 +925,17 @@ pixel_y = -6 }, /turf/open/floor/concrete, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Wy" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/sosjerky, /turf/open/floor/plasteel, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Zb" = ( /obj/structure/closet/firecloset/full, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "Zi" = ( /obj/structure/rack/shelf, /obj/item/reagent_containers/food/snacks/no_raisin, @@ -939,12 +946,12 @@ pixel_x = 9 }, /turf/open/floor/mineral/titanium, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) "ZG" = ( /obj/structure/closet/crate/freezer, /obj/machinery/light/small, /turf/open/floor/plasteel/dark, -/area/lavaland/surface/snackstore) +/area/ruin/powered/snackstore) (1,1,1) = {" aO @@ -1375,7 +1382,7 @@ cx cx aY pb -aB +fP aY oC Al diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index 2873326b..8bec1d4a 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -3,7 +3,7 @@ "aM" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/structure/reagent_dispensers/keg/mead,/obj/machinery/light{dir = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "aQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal{dir = 4},/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "ba" = (/obj/structure/rack/shelf,/obj/item/storage/fancy/donut_box{pixel_y = -4},/obj/item/storage/fancy/donut_box,/obj/item/storage/fancy/donut_box{pixel_y = 4},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"bj" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"bj" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/preopen{id = "feederden_north"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "bo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "bx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/public/glass{name = "Cell 4"; id_tag = "feederden_cell4"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "bU" = (/obj/structure/chair/sofa/left,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) @@ -56,6 +56,7 @@ "jS" = (/obj/structure/rack/shelf,/obj/item/electropack/shockcollar,/obj/item/clothing/neck/petcollar,/obj/item/melee/baton/stunsword,/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs/cable/zipties,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "ka" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red,/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "kd" = (/obj/structure/table,/obj/item/kitchen/rollingpin,/obj/item/kitchen/knife/butcher,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"kg" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/preopen{id = "feederden_south"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "ko" = (/obj/machinery/space_heater,/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "kC" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "kK" = (/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) @@ -181,7 +182,7 @@ "Hp" = (/obj/structure/closet/crate/secure/loot,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "HQ" = (/obj/structure/sign/poster/contraband/chonk,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "Iq" = (/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"It" = (/obj/machinery/cryopod{dir = 8},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) +"It" = (/obj/machinery/cryopod{dir = 8},/obj/machinery/button{pixel_y = 28; id = "feederden_north"},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "IC" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "IS" = (/obj/structure/flora/junglebush/large,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) "Jh" = (/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) @@ -199,6 +200,7 @@ "LM" = (/obj/vehicle/ridden/wheelchair,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "LN" = (/obj/machinery/processor,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Ma" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -24},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) +"Md" = (/obj/structure/table,/obj/machinery/microwave,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/machinery/button{pixel_y = -28; id = "feederden_south"; name = "Shutters Control"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Mi" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/closed/wall/r_wall/syndicate/nodiagonal,/area/ruin/space/has_grav/feedersden) "Mq" = (/obj/structure/lattice/catwalk,/obj/machinery/light/small{brightness = 2; dir = 8},/turf/template_noop,/area/ruin/space/has_grav/feedersden) "MV" = (/obj/item/trash/boritos,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) @@ -276,8 +278,8 @@ FEFEFEFEFEfmfmBrBrBrDcDcNJNJDcnrnrnrnrnrnrnrnrnrnrDxvYNxgUSsgUuXvYvYnrnrnrgqnrnr FEFEFEFEBrZCfmISBrBrBrnrMaEqnrxGNgHpnrWNYEfncnbanrDxvYFDLNvYsRiNvYsanrrJZOWrkoPgnrridlkCnrfNginrBrBrBrFEFEFEFE FEFEFEFEBrBrfmfmBrBrBrnrtyEqnrikJhJhWsDOlslslslsvtDxvYSyIqvYrjtIvYmUnrcWmaICrscxtVbXJhJhnrfNdAnrBrBrBrFEFEFEFE FEFEFEFEFEBrwwfmeEBrBrDcnrnrnrnrxGHpNksNtHguboygaQoYvYvYvYvYvYvwvYkdnrxCTYFHYpDBnrzlkMDcnrnrnrDcBrBrBrFEFEFEFE -FEFEFEFEFEBrxZfmfmBrBrBrBrBrBrDcnrnrDcqtlsucaEBPnrvYDKMYRhRhWtjhANYUnrnrnrTPJhYXnrnrnrDcBrBrfmYNBrBrBrBrFEFEFE -FEFEFEFEFEFEfmfmBrBrBrBrBrBrBrBrBrBrnrqhlslslsVFDczAnrnrnrbjnrnrnrnrDcAgcwddRCuFnrBrBrBrBrBrVefmxZqFBrBrFEFEFE +FEFEFEFEFEBrxZfmfmBrBrBrBrBrBrDcnrnrDcqtlsucaEBPnrvYDKMYMdRhWtjhANYUnrnrnrTPJhYXnrnrnrDcBrBrfmYNBrBrBrBrFEFEFE +FEFEFEFEFEFEfmfmBrBrBrBrBrBrBrBrBrBrnrqhlslslsVFDczAnrnrnrkgnrnrnrnrDcAgcwddRCuFnrBrBrBrBrBrVefmxZqFBrBrFEFEFE FEFEFEFEFEFEFEfmBrBrBrBrBrBrBrBrBrBrnrcVlslslsdzPItjfhnroHoHoHdrJhnwAalslsfKJhvHnrBrBrBrBrBrfmFEFEebFEFEFEFEFE FEFEFEFEFEFEFEFEBrBrBrBrBrBrBrBrBrBrnrqMyqzJjSTUbWtjsunrMqoHoHdrJhJhAalslscdzoFmEsieieieieRwfmFEFEebFEFEFEFEFE FEFEFEFEFEFEFEFEFEBrBrBrBrBrBrBrBrBrnrnrnrnrnrnrnrnrnrDcoHoHoHDcnrnrnrnrnrzEvLvLMiRuRuRuRuUZFEFEFEebFEFEFEFEFE diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index 5d327f3d..33c47a69 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -101,4 +101,8 @@ /area/ruin/unpowered/caloriteshrine name = "Calorite Shrine" - icon_state = "away" \ No newline at end of file + icon_state = "away" + +/area/ruin/powered/snackstore + name = "Snack Store" + icon_state = "away" diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 7480d9d6..c7c2f5f6 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -495,13 +495,6 @@ name = "Restaurant Employee Area" has_gravity = TRUE -/area/lavaland/surface/snackstore - name = "Snack Store" - icon_state = "mining" - power_light = TRUE - power_equip = TRUE - power_environ = TRUE - /area/ruin/space/has_grav/feedersden name = "Unknown Outpost" has_gravity = TRUE