From 7a22b9767c811452871baab0de4308d2042e3028 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 27 Nov 2018 15:01:07 -0500 Subject: [PATCH 1/5] Adds Ascian's Shelter Capsule - Adds Silver-trimmed shelter capsule, a luxury capsule that has a redecorated interior and some extra food, drink, and emergency supplies. - Fixes issue where Shelter capsule pod beds started with no padding --- code/game/machinery/computer3/laptop_vr.dm | 9 + code/modules/mining/shelter_atoms.dm | 8 + code/modules/mining/shelters.dm | 15 + config/custom_items.txt | 18 +- maps/submaps/shelters/shelter_3.dmm | 345 +++++++++++++++++++++ vorestation.dme | 1 + 6 files changed, 390 insertions(+), 6 deletions(-) create mode 100644 code/game/machinery/computer3/laptop_vr.dm create mode 100644 maps/submaps/shelters/shelter_3.dmm diff --git a/code/game/machinery/computer3/laptop_vr.dm b/code/game/machinery/computer3/laptop_vr.dm new file mode 100644 index 0000000000..ac421b7f50 --- /dev/null +++ b/code/game/machinery/computer3/laptop_vr.dm @@ -0,0 +1,9 @@ +/obj/machinery/computer3/laptop/survival + name = "Survival Laptop" + desc = "A clamshell portable computer. It is open. This one is a more durable survival model, with longer battery life." + default_prog = /datum/file/program/welcome + +/obj/machinery/computer3/laptop/survival/New(var/L, var/built = 0) + if(!built && !battery) + battery = new /obj/item/weapon/cell/apc(src) + ..(L,built) 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 ae84998507..58996e1e4e 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -852,6 +852,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 +882,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..e166e98ac0 --- /dev/null +++ b/maps/submaps/shelters/shelter_3.dmm @@ -0,0 +1,345 @@ +//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/crowbar/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; + step_x = 0 + }, +/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) +"B" = ( +/obj/structure/table/steel, +/obj/machinery/computer3/laptop/survival{ + spawn_files = list(/datum/file/program/arcade,/datum/file/program/security,/datum/file/camnet_key/entertainment); + spawn_parts = list(/obj/item/part/computer/storage/hdd/big,/obj/item/part/computer/cardslot/dual,/obj/item/part/computer/storage/removable,/obj/item/part/computer/networking/radio,/obj/item/part/computer/networking/cameras,/obj/item/part/computer/networking/area) + }, +/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 +B +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 +h +c +o +v +A +a +"} +(6,1,1) = {" +b +i +n +r +w +y +E +"} +(7,1,1) = {" +a +j +a +j +a +j +a +"} diff --git a/vorestation.dme b/vorestation.dme index 4544ceecac..123a63cf2d 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -784,6 +784,7 @@ #include "code\game\machinery\computer3\computer3_notes.dm" #include "code\game\machinery\computer3\file.dm" #include "code\game\machinery\computer3\laptop.dm" +#include "code\game\machinery\computer3\laptop_vr.dm" #include "code\game\machinery\computer3\lapvend.dm" #include "code\game\machinery\computer3\networking.dm" #include "code\game\machinery\computer3\NTOS.dm" From 5e58423b29487116a38d70e4ecab2f7764522bbf Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 27 Nov 2018 22:57:23 -0500 Subject: [PATCH 2/5] Fixes #4111 --- config/custom_items.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config/custom_items.txt b/config/custom_items.txt index 58996e1e4e..93456eab98 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 From 85ea1387b7db4c079c9515bb11137a63d53e5f6f Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 8 Dec 2018 12:29:42 -0500 Subject: [PATCH 3/5] Update to newest master branch --- config/custom_items.txt | 4 ++-- maps/submaps/shelters/shelter_3.dmm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/custom_items.txt b/config/custom_items.txt index 93456eab98..ec10bac669 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -178,13 +178,13 @@ item_path: /obj/item/clothing/head/fluff/pink_tiara } { -ckey: Cross_exonar +ckey: cross_exonar character_name: Sari-U item_path: /obj/item/weapon/disk/limb/eggnerdltd } { -ckey: Cross_exonar +ckey: cross_exonar character_name: Sari-E item_path: /obj/item/weapon/disk/limb/eggnerdltd } diff --git a/maps/submaps/shelters/shelter_3.dmm b/maps/submaps/shelters/shelter_3.dmm index e166e98ac0..23a917bee5 100644 --- a/maps/submaps/shelters/shelter_3.dmm +++ b/maps/submaps/shelters/shelter_3.dmm @@ -51,7 +51,7 @@ /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/crowbar/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) + 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{ @@ -318,7 +318,7 @@ D "} (5,1,1) = {" a -h +i c o v @@ -327,7 +327,7 @@ a "} (6,1,1) = {" b -i +h n r w From edc75369bd184bed82494afb1ca9b95cebadea9a Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 8 Dec 2018 12:48:25 -0500 Subject: [PATCH 4/5] Fixes Travis Error --- maps/submaps/shelters/shelter_3.dmm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maps/submaps/shelters/shelter_3.dmm b/maps/submaps/shelters/shelter_3.dmm index 23a917bee5..d1bcf8687b 100644 --- a/maps/submaps/shelters/shelter_3.dmm +++ b/maps/submaps/shelters/shelter_3.dmm @@ -174,8 +174,7 @@ "p" = ( /obj/structure/table/survival_pod, /obj/machinery/microwave{ - pixel_y = 6; - step_x = 0 + pixel_y = 6 }, /obj/structure/sink/kitchen{ icon_state = "sink_alt"; From 32c3103f4aa03d0a61942cbf0c140c8f05483c82 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 8 Dec 2018 13:15:00 -0500 Subject: [PATCH 5/5] Removing Laptop Laptops kind of do not work well at the moment, so just going to remove it. --- code/game/machinery/computer3/laptop_vr.dm | 9 --------- maps/submaps/shelters/shelter_3.dmm | 10 +--------- vorestation.dme | 1 - 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 code/game/machinery/computer3/laptop_vr.dm diff --git a/code/game/machinery/computer3/laptop_vr.dm b/code/game/machinery/computer3/laptop_vr.dm deleted file mode 100644 index ac421b7f50..0000000000 --- a/code/game/machinery/computer3/laptop_vr.dm +++ /dev/null @@ -1,9 +0,0 @@ -/obj/machinery/computer3/laptop/survival - name = "Survival Laptop" - desc = "A clamshell portable computer. It is open. This one is a more durable survival model, with longer battery life." - default_prog = /datum/file/program/welcome - -/obj/machinery/computer3/laptop/survival/New(var/L, var/built = 0) - if(!built && !battery) - battery = new /obj/item/weapon/cell/apc(src) - ..(L,built) diff --git a/maps/submaps/shelters/shelter_3.dmm b/maps/submaps/shelters/shelter_3.dmm index d1bcf8687b..4b7e36706f 100644 --- a/maps/submaps/shelters/shelter_3.dmm +++ b/maps/submaps/shelters/shelter_3.dmm @@ -255,14 +255,6 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/survivalpod) -"B" = ( -/obj/structure/table/steel, -/obj/machinery/computer3/laptop/survival{ - spawn_files = list(/datum/file/program/arcade,/datum/file/program/security,/datum/file/camnet_key/entertainment); - spawn_parts = list(/obj/item/part/computer/storage/hdd/big,/obj/item/part/computer/cardslot/dual,/obj/item/part/computer/storage/removable,/obj/item/part/computer/networking/radio,/obj/item/part/computer/networking/cameras,/obj/item/part/computer/networking/area) - }, -/turf/simulated/floor/carpet/sblucarpet, -/area/survivalpod) "C" = ( /obj/structure/sign/mining/survival, /turf/simulated/shuttle/wall/voidcraft/survival, @@ -294,7 +286,7 @@ e k p s -B +y C "} (3,1,1) = {" diff --git a/vorestation.dme b/vorestation.dme index 123a63cf2d..4544ceecac 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -784,7 +784,6 @@ #include "code\game\machinery\computer3\computer3_notes.dm" #include "code\game\machinery\computer3\file.dm" #include "code\game\machinery\computer3\laptop.dm" -#include "code\game\machinery\computer3\laptop_vr.dm" #include "code\game\machinery\computer3\lapvend.dm" #include "code\game\machinery\computer3\networking.dm" #include "code\game\machinery\computer3\NTOS.dm"