diff --git a/code/modules/mining/shelter_atoms.dm b/code/modules/mining/shelter_atoms.dm index 4348ae442e..51b61cd5b1 100644 --- a/code/modules/mining/shelter_atoms.dm +++ b/code/modules/mining/shelter_atoms.dm @@ -87,6 +87,11 @@ desc = "An exorbitantly expensive luxury suite programmed into construction nanomachines. There's a license for use printed on the bottom." template_id = "shelter_beta" +/obj/item/device/survivalcapsule/tabiranth + name = "silver-trimmed surfluid shelter capsule" + desc = "An exorbitantly expensive luxury suite programmed into construction nanomachines. This one is a particularly rare and expensive model. There's a license for use printed on the bottom." + template_id = "shelter_gamma" + //Pod objects //Walls /turf/simulated/shuttle/wall/voidcraft/survival @@ -197,6 +202,9 @@ icon = 'icons/obj/survival_pod.dmi' icon_state = "bed" +/obj/structure/bed/pod/New(var/newloc) + ..(newloc,DEFAULT_WALL_MATERIAL,"cotton") + //Survival Storage Unit /obj/machinery/smartfridge/survival_pod name = "survival pod storage" diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index 5ac1a7f6cd..b68606f914 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -70,3 +70,18 @@ whitelisted_turfs = typecacheof(/turf/simulated/mineral) banned_objects = list() +/datum/map_template/shelter/gamma + name = "Shelter Gamma" + shelter_id = "shelter_gamma" + description = "An heavily modified variant of the luxury shelter, \ + this particular model has extra food, drinks, and other supplies. \ + Originally designed for use by colonists on worlds with little to \ + to no contact, the expense of these shelters have prevented them \ + from seeing common use." + mappath = "maps/submaps/shelters/shelter_3.dmm" + roof = "roof_beta" + +/datum/map_template/shelter/gamma/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/simulated/mineral) + banned_objects = list() diff --git a/config/custom_items.txt b/config/custom_items.txt index 5f03d4b205..dd83a67c10 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -177,6 +177,18 @@ character_name: Diana Kuznetsova item_path: /obj/item/clothing/head/fluff/pink_tiara } +{ +ckey: cross_exonar +character_name: Sari-U +item_path: /obj/item/weapon/disk/limb/eggnerdltd +} + +{ +ckey: cross_exonar +character_name: Sari-E +item_path: /obj/item/weapon/disk/limb/eggnerdltd +} + # ######## D CKEYS { ckey: deepindigo @@ -852,6 +864,18 @@ character_name: Ascian item_path: /obj/item/clothing/accessory/medal/silver/unity } +{ +ckey: tabiranth +character_name: Ascian +item_path: /obj/item/weapon/grenade/spawnergrenade/spirit +} + +{ +ckey: tabiranth +character_name: Ascian +item_path: /obj/item/device/survivalcapsule/tabiranth +} + { ckey: techtypes character_name: Lasshseeki Korss @@ -870,12 +894,6 @@ character_name: Tony Bingham item_path: /obj/item/clothing/head/fluff/runac } -{ -ckey: tabiranth -character_name: Ascian -item_path: /obj/item/weapon/grenade/spawnergrenade/spirit -} - # ######## U CKEYS # ######## V CKEYS { diff --git a/maps/submaps/shelters/shelter_3.dmm b/maps/submaps/shelters/shelter_3.dmm new file mode 100644 index 0000000000..4b7e36706f --- /dev/null +++ b/maps/submaps/shelters/shelter_3.dmm @@ -0,0 +1,336 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/shuttle/wall/voidcraft/survival, +/area/survivalpod) +"b" = ( +/obj/structure/sign/mining/survival{ + dir = 1 + }, +/turf/simulated/shuttle/wall/voidcraft/survival, +/area/survivalpod) +"c" = ( +/obj/structure/window/reinforced/survival_pod{ + dir = 8; + layer = 2.6 + }, +/obj/machinery/door/window/survival_pod{ + dir = 1; + icon_state = "windoor" + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"d" = ( +/obj/structure/sign/mining/survival{ + dir = 8 + }, +/turf/simulated/shuttle/wall/voidcraft/survival, +/area/survivalpod) +"e" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"f" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/device/fbp_backup_cell, +/obj/item/device/fbp_backup_cell, +/obj/item/device/fbp_backup_cell, +/obj/item/device/fbp_backup_cell, +/obj/item/device/fbp_backup_cell, +/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/weapon/storage/pill_bottle/antitox, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, +/obj/item/weapon/extinguisher/mini, +/obj/item/device/radio{ + icon_state = "walkietalkieOLD"; + name = "emergency radio" + }, +/obj/item/weapon/towel{ + color = "#800080" + }, +/obj/item/weapon/towel{ + color = "#800080" + }, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/weapon/reagent_containers/food/snacks/candy, +/obj/item/weapon/reagent_containers/food/snacks/candy, +/obj/item/weapon/reagent_containers/food/drinks/dry_ramen, +/obj/item/weapon/reagent_containers/food/drinks/dry_ramen, +/obj/item/weapon/reagent_containers/food/drinks/dry_ramen, +/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/weapon/reagent_containers/food/snacks/sosjerky, +/obj/item/weapon/reagent_containers/food/snacks/sosjerky, +/obj/item/weapon/reagent_containers/food/snacks/no_raisin, +/obj/item/weapon/reagent_containers/food/snacks/no_raisin, +/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie, +/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie, +/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/weapon/reagent_containers/food/snacks/tastybread, +/obj/item/weapon/reagent_containers/food/snacks/tastybread, +/obj/item/weapon/reagent_containers/food/snacks/tastybread, +/obj/item/weapon/reagent_containers/food/snacks/syndicake, +/obj/item/weapon/reagent_containers/food/snacks/unajerky, +/obj/item/weapon/storage/box/mixedglasses, +/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice, +/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice, +/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice, +/obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice, +/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, +/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, +/obj/item/weapon/reagent_containers/food/drinks/bottle/cola, +/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up, +/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind, +/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice, +/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice, +/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater, +/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater, +/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale, +/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale, +/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/weapon/reagent_containers/food/drinks/ice, +/obj/item/weapon/reagent_containers/food/drinks/ice, +/obj/item/weapon/reagent_containers/food/drinks/tea, +/obj/item/weapon/reagent_containers/food/drinks/tea, +/obj/item/weapon/reagent_containers/food/drinks/h_chocolate, +/obj/item/weapon/reagent_containers/food/drinks/h_chocolate, +/obj/item/weapon/reagent_containers/food/drinks/h_chocolate, +/obj/item/toy/plushie/kitten, +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"g" = ( +/obj/item/device/gps/computer, +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"h" = ( +/obj/machinery/shower, +/obj/item/weapon/soap/deluxe, +/obj/structure/curtain, +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"i" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"j" = ( +/obj/structure/sign/mining/survival{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft/survival, +/area/survivalpod) +"k" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"l" = ( +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"m" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/hos, +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"n" = ( +/obj/structure/window/reinforced/survival_pod{ + icon_state = "pwindow"; + dir = 1 + }, +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/hop, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"o" = ( +/obj/structure/window/reinforced/survival_pod{ + dir = 8; + icon_state = "pwindow" + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"p" = ( +/obj/structure/table/survival_pod, +/obj/machinery/microwave{ + pixel_y = 6 + }, +/obj/structure/sink/kitchen{ + icon_state = "sink_alt"; + dir = 4; + pixel_x = -13 + }, +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"q" = ( +/obj/structure/tubes, +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"r" = ( +/obj/machinery/light{ + dir = 4; + light_color = "#DDFFD3" + }, +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"s" = ( +/obj/structure/window/reinforced/survival_pod{ + icon_state = "pwindow"; + dir = 1 + }, +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"t" = ( +/obj/machinery/door/window/survival_pod{ + icon_state = "windoor"; + dir = 1 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"u" = ( +/obj/structure/window/reinforced/survival_pod{ + icon_state = "pwindow"; + dir = 1 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"v" = ( +/obj/structure/window/reinforced/survival_pod{ + density = 0; + dir = 9; + icon_state = "pwindow" + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"w" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"x" = ( +/obj/machinery/light, +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"y" = ( +/obj/structure/table/steel, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"z" = ( +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"A" = ( +/obj/machinery/button/remote/airlock/survival_pod{ + dir = 10; + id = "shelter_gamma"; + pixel_y = -24 + }, +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/survivalpod) +"C" = ( +/obj/structure/sign/mining/survival, +/turf/simulated/shuttle/wall/voidcraft/survival, +/area/survivalpod) +"D" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/voidcraft/survival_pod{ + id_tag = "shelter_gamma" + }, +/turf/simulated/shuttle/floor/voidcraft, +/area/survivalpod) +"E" = ( +/obj/structure/sign/mining, +/turf/simulated/shuttle/wall/voidcraft/survival, +/area/survivalpod) + +(1,1,1) = {" +a +d +a +d +a +d +a +"} +(2,1,1) = {" +b +e +k +p +s +y +C +"} +(3,1,1) = {" +a +f +l +l +t +x +a +"} +(4,1,1) = {" +b +g +m +q +u +z +D +"} +(5,1,1) = {" +a +i +c +o +v +A +a +"} +(6,1,1) = {" +b +h +n +r +w +y +E +"} +(7,1,1) = {" +a +j +a +j +a +j +a +"}