diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm index 643f744fb9..1826682834 100644 --- a/_maps/templates/shelter_5.dmm +++ b/_maps/templates/shelter_5.dmm @@ -1,242 +1,360 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"bG" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) "cc" = ( -/obj/machinery/vending/boozeomat, -/turf/open/floor/pod/dark, +/obj/machinery/vending/games{ + pixel_y = 29; + density = 0 + }, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "dH" = ( -/obj/structure/chair/sofa/corp, -/obj/machinery/light{ - dir = 1 +/obj/machinery/chem_dispenser/drinks/beer{ + pixel_y = 30; + density = 0 }, -/turf/open/floor/pod/dark, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "fp" = ( -/obj/machinery/smartfridge, -/turf/closed/wall/mineral/titanium/survival/pod, +/obj/structure/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/carpet/royalblue, /area/survivalpod/nonpowered) "fC" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks, -/turf/open/floor/pod/dark, +/obj/structure/bookcase/random{ + pixel_y = 32; + density = 0 + }, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "fM" = ( -/obj/structure/table/survival_pod, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/storage/bag/plants/portaseeder, -/obj/item/shovel/spade, -/obj/item/cultivator, -/obj/item/reagent_containers/spray/weedspray, +/obj/machinery/recharge_station/fullupgrade, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) "fN" = ( -/obj/structure/table/reinforced, -/obj/item/kitchen/knife, -/obj/item/kitchen/rollingpin, -/obj/machinery/reagentgrinder, -/turf/open/floor/pod/dark, +/obj/machinery/door/airlock/survival_pod/glass, +/turf/open/floor/noslip, /area/survivalpod/nonpowered) "gr" = ( -/obj/machinery/vending/wallmed, -/turf/closed/wall/mineral/titanium/survival/pod, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/power/rtg/advanced/fullupgrade, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"gC" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) +"gG" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "hr" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks/beer, +/obj/machinery/door/airlock/survival_pod/glass, +/obj/machinery/poweredfans, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) "iu" = ( /obj/structure/curtain, -/obj/machinery/poweredfans, -/turf/open/floor/pod/dark, +/obj/machinery/door/window/survival_pod{ + dir = 4 + }, +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/turf/open/floor/noslip, /area/survivalpod/nonpowered) "iD" = ( /obj/item/gps/computer, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) "iY" = ( -/obj/structure/bed/pod, -/obj/item/bedsheet/nanotrasen, -/turf/open/floor/pod/dark, +/obj/structure/bed/double/pod{ + dir = 4 + }, +/obj/item/bedsheet/cosmos/double{ + dir = 1 + }, +/obj/item/toy/plush/mothplushie, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) +"jA" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) +"ko" = ( +/obj/machinery/vending/boozeomat{ + density = 0; + pixel_y = 32 + }, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "lO" = ( /obj/machinery/poweredfans, /obj/machinery/door/airlock/survival_pod/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) "lW" = ( /obj/structure/chair/sofa/corp{ dir = 1 }, -/turf/open/floor/pod/dark, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "mC" = ( -/obj/structure/chair/sofa/corp{ +/obj/structure/chair/sofa/corp/right{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/pod/dark, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "mN" = ( /obj/machinery/power/rtg/advanced/fullupgrade, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) "oo" = ( -/obj/machinery/vending/dinnerware, -/turf/open/floor/pod/dark, +/obj/structure/table/plasmaglass{ + density = 1 + }, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "pg" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/open/floor/noslip, +/obj/structure/chair/comfy/black, +/turf/open/floor/carpet/royalblue, /area/survivalpod/nonpowered) "pF" = ( -/obj/machinery/modular_computer/console/preset/civilian{ - dir = 8 - }, -/turf/open/floor/pod/dark, +/obj/structure/closet/cabinet, +/obj/item/clothing/under/misc/bathrobe, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "qE" = ( -/obj/machinery/washing_machine, -/turf/open/floor/pod/dark, -/area/survivalpod/nonpowered) -"rL" = ( -/obj/structure/mirror, -/turf/closed/wall/mineral/titanium/survival/pod, +/obj/structure/sink{ + pixel_y = 24 + }, +/obj/structure/mirror{ + pixel_y = 34 + }, +/turf/open/floor/mineral/silver, /area/survivalpod/nonpowered) "rM" = ( /obj/structure/chair/sofa/corp/corner{ dir = 8 }, -/turf/open/floor/pod/dark, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "rZ" = ( -/obj/structure/sink{ - pixel_y = 18 - }, -/turf/open/floor/pod/dark, +/obj/machinery/washing_machine, +/turf/open/floor/mineral/silver, /area/survivalpod/nonpowered) -"sN" = ( -/obj/machinery/light{ - dir = 8 +"sD" = ( +/obj/machinery/camera{ + dir = 5 }, -/obj/structure/sink/kitchen{ - dir = 4; - pixel_x = -10 - }, -/turf/open/floor/pod/dark, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "td" = ( -/obj/machinery/hydroponics/constructable/automagic, -/turf/open/floor/pod/dark, -/area/survivalpod/nonpowered) -"um" = ( -/obj/structure/table/wood/fancy/monochrome, -/turf/open/floor/pod/dark, -/area/survivalpod/nonpowered) -"uR" = ( -/obj/machinery/light, -/turf/open/floor/pod/dark, -/area/survivalpod/nonpowered) -"vU" = ( -/obj/machinery/sleeper/survival_pod, -/turf/open/floor/pod/dark, -/area/survivalpod/nonpowered) -"wv" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave, -/turf/open/floor/pod/dark, -/area/survivalpod/nonpowered) -"wI" = ( -/obj/item/storage/fancy/candle_box, -/obj/structure/table/wood/fancy/blackred, /obj/machinery/light{ dir = 4 }, +/obj/structure/easel, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/storage/crayons, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) +"um" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/reagent_containers/food/drinks/bottle/lizardwine, +/turf/open/floor/carpet/royalblue, +/area/survivalpod/nonpowered) +"uR" = ( +/obj/machinery/light, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) +"vU" = ( +/obj/machinery/sleeper/survival_pod, +/obj/machinery/vending/wallmed{ + pixel_x = -26 + }, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) +"wv" = ( +/obj/machinery/holopad, +/turf/open/floor/carpet/royalblue, +/area/survivalpod/nonpowered) +"wI" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) "xC" = ( /obj/machinery/light{ dir = 4 }, +/obj/structure/table/plasmaglass, +/obj/structure/bedsheetbin/towel, +/turf/open/floor/mineral/silver, +/area/survivalpod/nonpowered) +"zo" = ( +/obj/structure/dresser, +/turf/open/floor/carpet/royalblue, +/area/survivalpod/nonpowered) +"zp" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) "zW" = ( -/obj/machinery/vending/hydroseeds, -/turf/open/floor/pod/dark, +/obj/structure/sign/painting/library, +/turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod/nonpowered) "BI" = ( -/obj/structure/chair/sofa/corp/corner{ - dir = 4 +/obj/machinery/chem_dispenser/drinks{ + pixel_y = 30 }, -/turf/open/floor/pod/dark, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "Cj" = ( -/obj/structure/chair/sofa/corp/right{ - dir = 8 - }, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) +"Cq" = ( +/obj/machinery/poweredfans, +/obj/structure/window/shuttle/survival_pod, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) +"Ec" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/misc/bathrobe, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) "EV" = ( -/obj/structure/bed/pod, -/obj/item/bedsheet/nanotrasen, -/obj/item/toy/plush/mothplushie, -/turf/open/floor/pod/dark, +/obj/structure/table/plasmaglass, +/obj/item/modular_computer/laptop/preset/civilian, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "Fo" = ( /obj/machinery/smartfridge/survival_pod, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) "Fw" = ( -/obj/structure/chair/sofa/corp{ +/obj/structure/chair/sofa/corp/left{ dir = 4 }, -/turf/open/floor/pod/dark, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "FE" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/light, +/turf/open/floor/noslip, +/area/survivalpod/nonpowered) +"FT" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/pod/dark, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "FZ" = ( /turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod/nonpowered) -"JL" = ( -/obj/machinery/door/window/survival_pod{ - dir = 8 +"Gd" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/pod/dark, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) +"JE" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/turf/open/floor/carpet/royalblue, +/area/survivalpod/nonpowered) +"JL" = ( +/turf/open/floor/mineral/silver, /area/survivalpod/nonpowered) "Lv" = ( /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) "Ng" = ( -/obj/structure/chair/wood/normal, -/turf/open/floor/pod/dark, +/obj/machinery/modular_computer/console/preset/civilian{ + dir = 8 + }, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "Qr" = ( -/obj/effect/spawner/structure/window/hollow/survival_pod, +/obj/structure/window/shuttle/survival_pod, +/obj/machinery/poweredfans, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) +"QT" = ( +/obj/structure/rack, +/obj/item/clothing/shoes/sandal, +/obj/machinery/light, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) "Ro" = ( /obj/structure/chair/comfy/black{ dir = 4 }, -/turf/open/floor/pod/dark, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "Ry" = ( -/obj/structure/chair/sofa/corp/left, -/turf/open/floor/pod/dark, +/obj/structure/fireplace, +/obj/item/stack/sheet/mineral/wood/fifty, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) +"RD" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) +"RH" = ( +/obj/machinery/shower{ + pixel_y = 18 + }, +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/turf/open/floor/noslip, /area/survivalpod/nonpowered) "Tc" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/toilet{ + dir = 4 }, -/turf/open/floor/pod/dark, +/turf/open/floor/mineral/silver, /area/survivalpod/nonpowered) "TQ" = ( /obj/structure/fans, @@ -246,20 +364,37 @@ /obj/structure/chair/sofa/corp/corner{ dir = 1 }, -/turf/open/floor/pod/dark, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "Vp" = ( -/obj/structure/table/reinforced, -/obj/machinery/dish_drive, -/turf/open/floor/pod/dark, +/turf/open/floor/carpet/royalblue, /area/survivalpod/nonpowered) "Vv" = ( -/obj/machinery/biogenerator, -/turf/open/floor/pod/dark, +/obj/structure/table/plasmaglass, +/obj/machinery/newscaster{ + pixel_x = 26 + }, +/obj/item/paper_bin, +/obj/item/pen/fountain, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) +"VJ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/carpet/royalblue, +/area/survivalpod/nonpowered) +"Wk" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "Ws" = ( -/obj/structure/dresser, -/turf/open/floor/pod/dark, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/festive/wooden/wooden1, /area/survivalpod/nonpowered) "Xh" = ( /obj/machinery/door/airlock/survival_pod/glass, @@ -267,19 +402,32 @@ /area/survivalpod/nonpowered) "Xr" = ( /obj/machinery/door/airlock/survival_pod, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) "Xy" = ( /obj/machinery/light, /obj/machinery/power/apc/auto_name/south, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) +"YC" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/telecomms/relay/preset/station, +/obj/item/multitool, +/turf/open/floor/festive/wooden/wooden1, +/area/survivalpod/nonpowered) "YH" = ( -/obj/structure/table/survival_pod, -/obj/item/shovel, -/obj/item/pickaxe, -/obj/item/storage/toolbox/electrical, -/obj/item/clothing/gloves/color/yellow, +/obj/machinery/mineral/equipment_vendor, /turf/open/floor/pod/dark, /area/survivalpod/nonpowered) @@ -300,31 +448,31 @@ FZ "} (2,1,1) = {" FZ -pg +RH FE FZ -EV -Ws +iY +FZ iY FZ BI -Fw +Cj Fw Ub -Qr +Cq "} (3,1,1) = {" FZ -FZ -iu -FZ Tc -Lv +iu +zW +Wk +zo uR FZ dH -um -um +pg +JE lW Qr "} @@ -332,27 +480,27 @@ Qr FZ qE JL -FZ -Lv -Lv -Ro +fN +Cj +Vp +Cj FZ Ry -um +pg um lW Qr "} (5,1,1) = {" -rL +FZ rZ xC -Xh -Lv -Lv +FZ +Ec +Cj pF FZ -Lv +ko Cj mC rM @@ -367,37 +515,37 @@ FZ Xh FZ FZ -Xh -FZ -FZ -FZ +cc +Cj +Cj +QT FZ "} (7,1,1) = {" -FZ -wv -sN -Lv -Xh -Lv -Lv -xC -Lv -FE -Lv -Lv +lO +gC +gC +gC +bG +gC +Gd +gC +gC +FT +gC +jA lO "} (8,1,1) = {" FZ -fN -Lv -oo FZ FZ -Xh FZ FZ +YC +RD +Cj +FZ FZ FZ Xr @@ -406,56 +554,56 @@ FZ (9,1,1) = {" FZ fC -Lv -cc -FZ -fM -Lv -td +sD +Cj +Ws +Cj +RD +Ro FZ TQ vU -Lv +zp FZ "} (10,1,1) = {" FZ -hr -Lv +fC Vp +Vp +wv +Vp +VJ +EV FZ -zW -Lv -td -gr YH -Lv +fM Xy FZ "} (11,1,1) = {" FZ -Lv -Lv -Lv +fC +Vp +Vp fp -Lv -Lv -td +Vp +VJ +gG FZ Fo Lv -Lv +gr FZ "} (12,1,1) = {" FZ -Ng +fC wI Ng Vv -Lv -xC +oo +RD td FZ iD @@ -469,8 +617,8 @@ Qr FZ Qr FZ -FZ -FZ +Qr +hr FZ FZ FZ diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm new file mode 100644 index 0000000000..4297652286 --- /dev/null +++ b/_maps/templates/shelter_6.dmm @@ -0,0 +1,595 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"bn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"by" = ( +/obj/machinery/power/rtg/advanced/fullupgrade, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"cp" = ( +/obj/machinery/vending/dinnerware, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"cA" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"dV" = ( +/obj/machinery/processor, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"ei" = ( +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"eP" = ( +/obj/structure/chair/bronze{ + dir = 4 + }, +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) +"eS" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"fM" = ( +/obj/structure/cable{ + icon_state = "4-9" + }, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"gO" = ( +/obj/machinery/door/airlock/survival_pod, +/obj/machinery/poweredfans, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"hv" = ( +/obj/machinery/seed_extractor, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"hM" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/kitchen/knife, +/obj/item/kitchen/knife/butcher, +/obj/item/kitchen/rollingpin, +/obj/item/stack/sheet/mineral/coal/ten, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"iB" = ( +/obj/structure/table/plasmaglass, +/obj/machinery/smartfridge/disks, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"iU" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/head/chefhat, +/obj/machinery/reagentgrinder, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"kX" = ( +/obj/machinery/icecream_vat, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"mv" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) +"no" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"oW" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"ru" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"tg" = ( +/obj/structure/closet/secure_closet/hydroponics{ + req_access = null + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"ue" = ( +/obj/machinery/hydroponics/constructable/automagic, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"uk" = ( +/obj/structure/table/plasmaglass, +/obj/machinery/plantgenes, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"uC" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"vb" = ( +/turf/closed/wall/mineral/titanium/survival, +/area/survivalpod/nonpowered) +"wB" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) +"zq" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/beakers/bluespace, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"AN" = ( +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"AO" = ( +/obj/item/reagent_containers/food/snacks/soup/wingfangchu, +/obj/structure/table/bronze, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"AW" = ( +/obj/machinery/grill, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"Bk" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"Ci" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"Cq" = ( +/turf/open/floor/glass/reinforced, +/area/survivalpod/nonpowered) +"CP" = ( +/obj/machinery/light, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"DU" = ( +/obj/machinery/door/airlock/survival_pod, +/obj/machinery/poweredfans, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"ET" = ( +/obj/structure/cable{ + icon_state = "1-6" + }, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"Gc" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"Gn" = ( +/obj/structure/window/shuttle/survival_pod, +/obj/machinery/poweredfans, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"Gt" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"HZ" = ( +/obj/structure/kitchenspike, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"JL" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"JP" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"Kp" = ( +/obj/machinery/vending/hydroseeds, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"KL" = ( +/obj/structure/table/reinforced, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"LV" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/computer/arcade/orion_trail{ + dir = 4 + }, +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) +"Ma" = ( +/obj/structure/table/reinforced, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"MX" = ( +/obj/machinery/computer/arcade/battle{ + dir = 4 + }, +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) +"Nl" = ( +/obj/structure/table/wood/fancy/black, +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) +"Oi" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"Oq" = ( +/obj/machinery/hydroponics/constructable/automagic, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"OV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"Pi" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"Pw" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -11 + }, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"Qv" = ( +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"QY" = ( +/obj/machinery/smartfridge/food, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"Ss" = ( +/obj/machinery/telecomms/relay/preset/station, +/obj/item/multitool, +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) +"Tl" = ( +/obj/machinery/door/airlock/survival_pod, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/mineral/plastitanium, +/area/survivalpod/nonpowered) +"Tv" = ( +/obj/structure/table/reinforced, +/obj/item/storage/bag/tray/bluespace, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"TA" = ( +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/drinks/fullupgrade, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"Ue" = ( +/obj/machinery/door/airlock/survival_pod, +/obj/machinery/poweredfans, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"Uv" = ( +/obj/machinery/vending/hydronutrients, +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"UK" = ( +/obj/structure/rack, +/obj/item/storage/box/ingredients/wildcard, +/obj/item/storage/box/ingredients/wildcard, +/obj/item/storage/box/ingredients/wildcard, +/obj/item/storage/box/ingredients/vegetarian, +/obj/item/storage/box/ingredients/exotic, +/obj/item/storage/box/ingredients/delights, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"UW" = ( +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"Vt" = ( +/obj/machinery/biogenerator, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"VM" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/autolathe, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"We" = ( +/obj/structure/table/bronze, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"WU" = ( +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) +"XT" = ( +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/wiki/cooking_to_serve_man{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/structure/table/reinforced, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"Ys" = ( +/turf/open/floor/grass, +/area/survivalpod/nonpowered) +"ZU" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) + +(1,1,1) = {" +vb +Gn +Gn +Gn +Gn +vb +Ue +vb +Gn +Gn +Gn +Gn +vb +"} +(2,1,1) = {" +Gn +mv +WU +Ss +MX +LV +OV +Oq +ue +ue +ue +ue +Gn +"} +(3,1,1) = {" +Gn +Nl +Cq +Cq +Cq +WU +OV +Ys +Ys +Ys +Ys +cA +Gn +"} +(4,1,1) = {" +Gn +wB +Cq +Cq +Cq +WU +OV +ru +Ys +JP +Ys +uk +Gn +"} +(5,1,1) = {" +Gn +ZU +eP +eP +eP +WU +OV +Ys +Ys +hv +Ys +iB +Gn +"} +(6,1,1) = {" +vb +vb +We +We +AO +uC +OV +Bk +ru +Ys +Oi +Bk +Gn +"} +(7,1,1) = {" +gO +Pw +bn +bn +bn +bn +Pi +tg +Ys +Ys +Uv +Kp +vb +"} +(8,1,1) = {" +vb +AW +UW +XT +Tv +UW +CP +vb +QY +Vt +vb +vb +vb +"} +(9,1,1) = {" +vb +cp +UW +Gc +zq +UW +eS +Tl +ET +AN +UK +HZ +vb +"} +(10,1,1) = {" +vb +hM +UW +KL +KL +UW +OV +vb +kX +fM +AN +HZ +vb +"} +(11,1,1) = {" +vb +Qv +UW +UW +UW +UW +OV +vb +ei +no +oW +JL +vb +"} +(12,1,1) = {" +vb +TA +Ma +VM +iU +dV +CP +vb +Ci +Gt +by +by +vb +"} +(13,1,1) = {" +vb +vb +vb +vb +vb +vb +DU +vb +vb +vb +vb +vb +vb +"} diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 033b6dd884..29d3bd7868 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -91,9 +91,13 @@ template_id = "shelter_delta" /obj/item/survivalcapsule/luxury/penthouse - name = "penthouse bluespace sheler capsule" - desc = "The absolute pinnacle of luxury in terms of survival capsules. While exuberantly expensive it has everything needed to make a small home in lavaland." + name = "penthouse bluespace shelter capsule" + desc = "The absolute pinnacle of luxury in terms of survival capsules. While exuberantly expensive it has everything needed to survive in luxury." template_id = "shelter_epsilon" +/obj/item/survivalcapsule/luxury/garden + name = "garden & kitchen bluespace shelter capsule" + desc = "Everything someone needs to make a home cooked meal while surviving the depths of hell... or space." + template_id = "shelter_zeta" //Pod objects //Window diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 491d647c37..530dad03db 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -57,7 +57,8 @@ new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000), new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxury/elitebar, 10000), new /datum/data/mining_equipment("Empty Capsule", /obj/item/survivalcapsule/luxury/empty, 5000), - new /datum/data/mining_equipment("Penthouse Capsule", /obj/item/survivalcapsule/luxury/penthouse, 15000), + new /datum/data/mining_equipment("Penthouse Capsule", /obj/item/survivalcapsule/luxury/penthouse, 7500), + new /datum/data/mining_equipment("Garden & Kitchen Capsule", /obj/item/survivalcapsule/luxury/garden, 7500), new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800), new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400), new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400), diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index 83a8412ca8..3da0c0a2c7 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -96,3 +96,14 @@ . = ..() whitelisted_turfs = typecacheof(/turf/closed/mineral) banned_objects = typecacheof(/obj/structure/stone_tile) + +/datum/map_template/shelter/zeta + name = "Shelter zeta" + shelter_id = "shelter_zeta" + description = "A survival capsule with a garden and kitchen. Commonly used by space fast food joints everywhere." + mappath = "_maps/templates/shelter_6.dmm" + +/datum/map_template/shelter/zeta/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile)