From f030d0038fdabdb847f0fe9b8fb8cff14c314385 Mon Sep 17 00:00:00 2001 From: shellspeed1 Date: Sun, 21 Aug 2022 05:00:26 -0700 Subject: [PATCH] New garden pod --- _maps/templates/shelter_6.dmm | 492 ++++++++++++++++++ code/modules/mining/equipment/survival_pod.dm | 8 +- code/modules/mining/machine_vending.dm | 3 +- code/modules/mining/shelters.dm | 11 + 4 files changed, 511 insertions(+), 3 deletions(-) create mode 100644 _maps/templates/shelter_6.dmm diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm new file mode 100644 index 0000000000..941535bb3b --- /dev/null +++ b/_maps/templates/shelter_6.dmm @@ -0,0 +1,492 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"bn" = ( +/obj/machinery/vending/dinnerware, +/turf/open/floor/plasteel/freezer, +/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/structure/table/reinforced, +/obj/item/stack/sheet/mineral/coal/ten, +/obj/item/stack/sheet/mineral/coal/ten, +/turf/open/floor/mineral/titanium/white, +/area/survivalpod/nonpowered) +"cA" = ( +/obj/machinery/computer/arcade/orion_trail{ + dir = 4 + }, +/turf/open/floor/festive/wooden/wooden2, +/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/brass{ + dir = 4 + }, +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) +"hM" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/kitchen/knife, +/obj/item/kitchen/knife/scimitar, +/obj/item/kitchen/knife/butcher, +/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, +/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 = 1 + }, +/turf/open/floor/festive/wooden/wooden2, +/area/survivalpod/nonpowered) +"no" = ( +/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, +/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) +"AN" = ( +/turf/open/floor/plasteel/freezer, +/area/survivalpod/nonpowered) +"AO" = ( +/obj/structure/table/reinforced/brass, +/obj/item/reagent_containers/food/snacks/soup/wingfangchu, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) +"AW" = ( +/obj/machinery/grill, +/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, +/turf/open/floor/pod/dark, +/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, +/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 + }, +/turf/open/floor/festive/wooden/wooden2, +/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" = ( +/turf/open/floor/pod/dark, +/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) +"Tl" = ( +/obj/machinery/door/airlock/survival_pod, +/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/item/storage/toolbox/electrical, +/obj/item/clothing/gloves/color/yellow, +/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/reinforced/brass, +/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/structure/table/reinforced/brass, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/survivalpod/nonpowered) + +(1,1,1) = {" +vb +Gn +Gn +Gn +Gn +vb +Ue +vb +Gn +Gn +Gn +Gn +vb +"} +(2,1,1) = {" +Gn +Nl +mv +MX +cA +LV +OV +Oq +ue +ue +ue +ue +Gn +"} +(3,1,1) = {" +Gn +wB +Cq +Cq +Cq +WU +OV +Ys +Ys +Ys +Ys +Bk +Gn +"} +(4,1,1) = {" +Gn +WU +Cq +Cq +Cq +WU +OV +ru +Ys +JP +Ys +uk +Gn +"} +(5,1,1) = {" +Gn +eP +eP +eP +eP +WU +OV +Ys +Ys +Ys +Ys +iB +Gn +"} +(6,1,1) = {" +vb +ZU +We +We +AO +uC +OV +Bk +ru +Ys +Oi +Bk +Gn +"} +(7,1,1) = {" +Ue +UW +UW +UW +UW +UW +OV +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 +KL +UW +OV +Tl +AN +AN +UK +HZ +vb +"} +(10,1,1) = {" +vb +hM +UW +KL +KL +UW +OV +vb +kX +AN +AN +HZ +vb +"} +(11,1,1) = {" +vb +Qv +UW +UW +UW +UW +OV +vb +ei +no +JL +AN +vb +"} +(12,1,1) = {" +vb +TA +KL +VM +iU +dV +CP +vb +Ci +Gt +by +bn +vb +"} +(13,1,1) = {" +vb +vb +vb +vb +vb +vb +Ue +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 ba4b02fcf4..d4c4b581d8 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 c7ddaebe2d..3d19a769a6 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..2b1aa968da 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. Used wildly 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)