From c32294195380b8edc956385c40848bc5b60aa6e9 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 15:01:40 -0400 Subject: [PATCH 01/11] Assault Dropship, NDV Daedalus, and more! - Adds an adminbus archeotech military dropship - Renames the cruiser to the NDV Daedalus - Removes the Daedalus' Vault, replaces with a engine room consisting of four nuclear reactors. 800 kw safe output - Replaces the hull material of the Daedalus with something destructable - Thickens the frontal hull of the Daedalus - Combines shelter_atoms.dm and shelter_atoms_vr.dm into shelter_atoms_vr.dm (Polaris never ported Shelter capsules from us) - Moves shelters.dm to shelters_vr.dm - Fixes scanner readout of the Escape Pod --- code/modules/mining/shelter_atoms.dm | 318 --- code/modules/mining/shelter_atoms_vr.dm | 328 ++- .../mining/{shelters.dm => shelters_vr.dm} | 10 + maps/tether/submaps/_tether_submaps.dm | 3 +- maps/tether/submaps/om_ships/cruiser.dm | 80 +- maps/tether/submaps/om_ships/cruiser.dmm | 1557 ++++--------- maps/tether/submaps/om_ships/shelter_5.dm | 14 +- maps/tether/submaps/om_ships/shelter_6.dm | 53 + maps/tether/submaps/om_ships/shelter_6.dmm | 2018 +++++++++++++++++ vorestation.dme | 3 +- 10 files changed, 2910 insertions(+), 1474 deletions(-) delete mode 100644 code/modules/mining/shelter_atoms.dm rename code/modules/mining/{shelters.dm => shelters_vr.dm} (89%) create mode 100644 maps/tether/submaps/om_ships/shelter_6.dm create mode 100644 maps/tether/submaps/om_ships/shelter_6.dmm diff --git a/code/modules/mining/shelter_atoms.dm b/code/modules/mining/shelter_atoms.dm deleted file mode 100644 index cde54e5baf3..00000000000 --- a/code/modules/mining/shelter_atoms.dm +++ /dev/null @@ -1,318 +0,0 @@ -GLOBAL_LIST_EMPTY(unique_deployable) -/*****************************Survival Pod********************************/ -/area/survivalpod - name = "\improper Emergency Shelter" - icon_state = "away" - dynamic_lighting = TRUE - requires_power = FALSE - has_gravity = TRUE - -//Survival Capsule -/obj/item/device/survivalcapsule - name = "surfluid shelter capsule" - desc = "An emergency shelter programmed into construction nanomachines. It has a license for use printed on the bottom." - icon_state = "houseball" - icon = 'icons/obj/device_alt.dmi' - w_class = ITEMSIZE_TINY - var/template_id = "shelter_alpha" - var/datum/map_template/shelter/template - var/used = FALSE - var/unique_id = null - -/obj/item/device/survivalcapsule/proc/get_template() - if(template) - return - template = SSmapping.shelter_templates[template_id] - if(!template) - throw EXCEPTION("Shelter template ([template_id]) not found!") - qdel(src) - -/obj/item/device/survivalcapsule/Destroy() - template = null // without this, capsules would be one use. per round. - . = ..() - -/obj/item/device/survivalcapsule/examine(mob/user) - . = ..() - get_template() - to_chat(user, "This capsule has the [template.name] stored.") - to_chat(user, template.description) - -/obj/item/device/survivalcapsule/attack_self() - //Can't grab when capsule is New() because templates aren't loaded then - get_template() - if(!used) - loc.visible_message("\The [src] begins to shake. Stand back!") - used = TRUE - - sleep(5 SECONDS) - - var/turf/deploy_location = get_turf(src) - var/status = template.check_deploy(deploy_location) - var/turf/above_location = GetAbove(deploy_location) - - switch(status) - //Not allowed due to /area technical reasons - if(SHELTER_DEPLOY_BAD_AREA) - src.loc.visible_message("\The [src] will not function in this area.") - - //Anchored objects or no space - if(SHELTER_DEPLOY_BAD_TURFS, SHELTER_DEPLOY_ANCHORED_OBJECTS) - var/width = template.width - var/height = template.height - src.loc.visible_message("\The [src] doesn't have room to deploy! You need to clear a [width]x[height] area!") - - if(status != SHELTER_DEPLOY_ALLOWED) - used = FALSE - return - - if(unique_id) - if(unique_id in GLOB.unique_deployable) - loc.visible_message("There can only be one [src] deployed at a time.") - used = FALSE - return - GLOB.unique_deployable += unique_id - - var/turf/T = deploy_location - var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread() - smoke.attach(T) - smoke.set_up(10, 0, T) - smoke.start() - sleep(4 SECONDS) - - playsound(get_turf(src), 'sound/effects/phasein.ogg', 100, 1) - - log_and_message_admins("[key_name_admin(usr)] activated a bluespace capsule at [get_area(T)]!") - if(above_location) - template.add_roof(above_location) - template.annihilate_plants(deploy_location) - template.load(deploy_location, centered = TRUE) - template.update_lighting(deploy_location) - qdel(src) - -/obj/item/device/survivalcapsule/luxury - name = "luxury surfluid shelter capsule" - 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/luxurybar - name = "luxury surfluid bar capsule" - desc = "A luxury bar in a capsule. Bartender required and not included. There's a license for use printed on the bottom." - template_id = "shelter_gamma" - -/obj/item/device/survivalcapsule/military - name = "military surfluid shelter capsule" - desc = "A prefabricated firebase in a capsule. Contains basic weapons, building materials, and combat suits. There's a license for use printed on the bottom." - template_id = "shelter_delta" - -/obj/item/device/survivalcapsule/escapepod - name = "escape surfluid shelter capsule" - desc = "A prefabricated escape pod in a capsule. Contains a basic escape pod for survival purposes. There's a license for use printed on the bottom." - template_id = "shelter_epsilon" - unique_id = "shelter_5" - -//Custom Shelter Capsules -/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_phi" - unique_id = "shelter_a" - -//Pod objects -//Walls -/turf/simulated/shuttle/wall/voidcraft/survival - name = "survival shelter" - stripe_color = "#efbc3b" - -/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner - hard_corner = 1 - -//Doors -/obj/machinery/door/airlock/voidcraft/survival_pod - name = "survival airlock" - block_air_zones = 1 - -//Door access setter button -/obj/machinery/button/remote/airlock/survival_pod - name = "shelter privacy control" - desc = "You can secure yourself inside the shelter here." - specialfunctions = 4 // 4 is bolts - id = "placeholder_id_do_not_use" //This has to be this way, otherwise it will control ALL doors if left blank. - var/obj/machinery/door/airlock/voidcraft/survival_pod/door - -/obj/machinery/button/remote/airlock/survival_pod/attack_hand(obj/item/weapon/W, mob/user as mob) - if(..()) return 1 //1 is failure on machines (for whatever reason) - if(!door) - var/turf/dT = get_step(src,dir) - door = locate() in dT - if(door) - door.glass = !door.glass - door.opacity = !door.opacity - -//Windows -/obj/structure/window/reinforced/survival_pod - name = "pod window" - icon = 'icons/obj/survival_pod.dmi' - icon_state = "pwindow" - basestate = "pwindow" - -//The windows have diagonal versions, and will never be a full window -/obj/structure/window/reinforced/survival_pod/is_fulltile() - return FALSE - -/obj/structure/window/reinforced/survival_pod/update_icon() - icon_state = basestate - -//Windoor -/obj/machinery/door/window/survival_pod - icon = 'icons/obj/survival_pod.dmi' - icon_state = "windoor" - base_state = "windoor" - -//Table -/obj/structure/table/survival_pod - name = "table" - icon = 'icons/obj/survival_pod.dmi' - icon_state = "table" - can_reinforce = FALSE - can_plate = FALSE - -/obj/structure/table/survival_pod/update_icon() - icon_state = "table" - -/obj/structure/table/survival_pod/New() - material = get_material_by_name(DEFAULT_WALL_MATERIAL) - verbs -= /obj/structure/table/verb/do_flip - verbs -= /obj/structure/table/proc/do_put - ..() - -/obj/structure/table/survival_pod/dismantle(obj/item/weapon/wrench/W, mob/user) - to_chat(user, "You cannot dismantle \the [src].") - return - -//Sleeper -/obj/machinery/sleeper/survival_pod - desc = "A limited functionality sleeper, all it can do is put patients into stasis. It lacks the medication and configuration of the larger units." - icon = 'icons/obj/survival_pod.dmi' - icon_state = "sleeper" - stasis_level = 100 //Just one setting - -/obj/machinery/sleeper/survival_pod/update_icon() - if(occupant) - add_overlay("sleeper_cover") - else - cut_overlays() - -//Computer -/obj/item/device/gps/computer - name = "pod computer" - icon_state = "pod_computer" - icon = 'icons/obj/survival_pod_comp.dmi' - anchored = TRUE - density = TRUE - pixel_y = -32 - -/obj/item/device/gps/computer/attackby(obj/item/I, mob/living/user) - if(I.is_wrench()) - user.visible_message("[user] disassembles [src].", - "You start to disassemble [src]...", "You hear clanking and banging noises.") - if(do_after(user,4 SECONDS,src)) - new /obj/item/device/gps(loc) - qdel(src) - return TRUE - - return FALSE - -/obj/item/device/gps/computer/attack_hand(mob/user) - attack_self(user) - -//Bed -/obj/structure/bed/pod - 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" - desc = "A heated storage unit." - icon_state = "donkvendor" - icon_base = "donkvendor" - icon_contents = null - icon = 'icons/obj/survival_pod_vend.dmi' - light_range = 5 - light_power = 1.2 - light_color = "#DDFFD3" - pixel_y = -4 - max_n_of_items = 100 - -/obj/machinery/smartfridge/survival_pod/Initialize() - . = ..() - for(var/obj/item/O in loc) - if(accept_check(O)) - stock(O) - -/obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O) - return isitem(O) - -/obj/machinery/smartfridge/survival_pod/empty - name = "dusty survival pod storage" - desc = "A heated storage unit. This one's seen better days." - -//Fans -/obj/structure/fans - icon = 'icons/obj/survival_pod.dmi' - icon_state = "fans" - name = "environmental regulation system" - desc = "A large machine releasing a constant gust of air." - anchored = TRUE - density = TRUE - can_atmos_pass = ATMOS_PASS_NO - var/buildstacktype = /obj/item/stack/material/steel - var/buildstackamount = 5 - -/obj/structure/fans/proc/deconstruct() - new buildstacktype(loc,buildstackamount) - qdel(src) - -/obj/structure/fans/attackby(obj/item/I, mob/living/user) - if(I.is_wrench()) - user.visible_message("[user] disassembles [src].", - "You start to disassemble [src]...", "You hear clanking and banging noises.") - if(do_after(user,4 SECONDS,src)) - deconstruct() - return TRUE - - return TRUE - -/obj/structure/fans/tiny - name = "tiny fan" - desc = "A tiny fan, releasing a thin gust of air." - plane = TURF_PLANE - layer = ABOVE_TURF_LAYER - density = FALSE - icon_state = "fan_tiny" - buildstackamount = 2 - -//Signs -/obj/structure/sign/mining - name = "nanotrasen mining corps sign" - desc = "A sign of relief for weary miners, and a warning for would-be competitors to Nanotrasen's mining claims." - icon = 'icons/obj/survival_pod.dmi' - icon_state = "ntpod" - -/obj/structure/sign/mining/survival - name = "shelter sign" - desc = "A high visibility sign designating a safe shelter." - icon = 'icons/obj/survival_pod.dmi' - icon_state = "survival" - -//Fluff -/obj/structure/tubes - icon_state = "tubes" - icon = 'icons/obj/survival_pod.dmi' - name = "tubes" - anchored = TRUE - layer = BELOW_MOB_LAYER - density = FALSE diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm index 664b0cff51b..c44ca2ed97a 100644 --- a/code/modules/mining/shelter_atoms_vr.dm +++ b/code/modules/mining/shelter_atoms_vr.dm @@ -1,3 +1,307 @@ +GLOBAL_LIST_EMPTY(unique_deployable) +/*****************************Survival Pod********************************/ +/area/survivalpod + name = "\improper Emergency Shelter" + icon_state = "away" + dynamic_lighting = TRUE + requires_power = FALSE + has_gravity = TRUE + +//Survival Capsule +/obj/item/device/survivalcapsule + name = "surfluid shelter capsule" + desc = "An emergency shelter programmed into construction nanomachines. It has a license for use printed on the bottom." + icon_state = "houseball" + icon = 'icons/obj/device_alt.dmi' + w_class = ITEMSIZE_TINY + var/template_id = "shelter_alpha" + var/datum/map_template/shelter/template + var/used = FALSE + var/unique_id = null + +/obj/item/device/survivalcapsule/proc/get_template() + if(template) + return + template = SSmapping.shelter_templates[template_id] + if(!template) + throw EXCEPTION("Shelter template ([template_id]) not found!") + qdel(src) + +/obj/item/device/survivalcapsule/Destroy() + template = null // without this, capsules would be one use. per round. + . = ..() + +/obj/item/device/survivalcapsule/examine(mob/user) + . = ..() + get_template() + to_chat(user, "This capsule has the [template.name] stored.") + to_chat(user, template.description) + +/obj/item/device/survivalcapsule/attack_self() + //Can't grab when capsule is New() because templates aren't loaded then + get_template() + if(!used) + loc.visible_message("\The [src] begins to shake. Stand back!") + used = TRUE + + sleep(5 SECONDS) + + var/turf/deploy_location = get_turf(src) + var/status = template.check_deploy(deploy_location) + var/turf/above_location = GetAbove(deploy_location) + + switch(status) + //Not allowed due to /area technical reasons + if(SHELTER_DEPLOY_BAD_AREA) + src.loc.visible_message("\The [src] will not function in this area.") + + //Anchored objects or no space + if(SHELTER_DEPLOY_BAD_TURFS, SHELTER_DEPLOY_ANCHORED_OBJECTS) + var/width = template.width + var/height = template.height + src.loc.visible_message("\The [src] doesn't have room to deploy! You need to clear a [width]x[height] area!") + + if(status != SHELTER_DEPLOY_ALLOWED) + used = FALSE + return + + if(unique_id) + if(unique_id in GLOB.unique_deployable) + loc.visible_message("There can only be one [src] deployed at a time.") + used = FALSE + return + GLOB.unique_deployable += unique_id + + var/turf/T = deploy_location + var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread() + smoke.attach(T) + smoke.set_up(10, 0, T) + smoke.start() + sleep(4 SECONDS) + + playsound(get_turf(src), 'sound/effects/phasein.ogg', 100, 1) + + log_and_message_admins("[key_name_admin(usr)] activated a bluespace capsule at [get_area(T)]!") + if(above_location) + template.add_roof(above_location) + template.annihilate_plants(deploy_location) + template.load(deploy_location, centered = TRUE) + template.update_lighting(deploy_location) + qdel(src) + +/obj/item/device/survivalcapsule/luxury + name = "luxury surfluid shelter capsule" + 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/luxurybar + name = "luxury surfluid bar capsule" + desc = "A luxury bar in a capsule. Bartender required and not included. There's a license for use printed on the bottom." + template_id = "shelter_gamma" + +/obj/item/device/survivalcapsule/military + name = "military surfluid shelter capsule" + desc = "A prefabricated firebase in a capsule. Contains basic weapons, building materials, and combat suits. There's a license for use printed on the bottom." + template_id = "shelter_delta" + +/obj/item/device/survivalcapsule/escapepod + name = "escape surfluid shelter capsule" + desc = "A prefabricated escape pod in a capsule. Contains a basic escape pod for survival purposes. There's a license for use printed on the bottom." + template_id = "shelter_epsilon" + unique_id = "shelter_5" + +/obj/item/device/survivalcapsule/dropship + name = "dropship surfluid shelter capsule" + desc = "A military dropship in a capsule. Contains everything an assault squad would need, minus the squad itself. This capsule is significantly larger than most. There's a license for use printed on the bottom." + template_id = "shelter_zeta" + unique_id = "shelter_6" + w_class = ITEMSIZE_SMALL + +//Custom Shelter Capsules +/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_phi" + unique_id = "shelter_a" + +//Pod objects +//Walls +/turf/simulated/shuttle/wall/voidcraft/survival + name = "survival shelter" + stripe_color = "#efbc3b" + +/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner + hard_corner = 1 + +//Doors +/obj/machinery/door/airlock/voidcraft/survival_pod + name = "survival airlock" + block_air_zones = 1 + +//Door access setter button +/obj/machinery/button/remote/airlock/survival_pod + name = "shelter privacy control" + desc = "You can secure yourself inside the shelter here." + specialfunctions = 4 // 4 is bolts + id = "placeholder_id_do_not_use" //This has to be this way, otherwise it will control ALL doors if left blank. + var/obj/machinery/door/airlock/voidcraft/survival_pod/door + +/obj/machinery/button/remote/airlock/survival_pod/attack_hand(obj/item/weapon/W, mob/user as mob) + if(..()) return 1 //1 is failure on machines (for whatever reason) + if(!door) + var/turf/dT = get_step(src,dir) + door = locate() in dT + if(door) + door.glass = !door.glass + door.opacity = !door.opacity + +//Windows +/obj/structure/window/reinforced/survival_pod + name = "pod window" + icon = 'icons/obj/survival_pod.dmi' + icon_state = "pwindow" + basestate = "pwindow" + +//The windows have diagonal versions, and will never be a full window +/obj/structure/window/reinforced/survival_pod/is_fulltile() + return FALSE + +/obj/structure/window/reinforced/survival_pod/update_icon() + icon_state = basestate + +//Windoor +/obj/machinery/door/window/survival_pod + icon = 'icons/obj/survival_pod.dmi' + icon_state = "windoor" + base_state = "windoor" + +//Table +/obj/structure/table/survival_pod + name = "table" + icon = 'icons/obj/survival_pod.dmi' + icon_state = "table" + can_reinforce = FALSE + can_plate = FALSE + +/obj/structure/table/survival_pod/update_icon() + icon_state = "table" + +/obj/structure/table/survival_pod/New() + material = get_material_by_name(DEFAULT_WALL_MATERIAL) + verbs -= /obj/structure/table/verb/do_flip + verbs -= /obj/structure/table/proc/do_put + ..() + +/obj/structure/table/survival_pod/dismantle(obj/item/weapon/wrench/W, mob/user) + to_chat(user, "You cannot dismantle \the [src].") + return + +//Sleeper +/obj/machinery/sleeper/survival_pod + desc = "A limited functionality sleeper, all it can do is put patients into stasis. It lacks the medication and configuration of the larger units." + icon = 'icons/obj/survival_pod.dmi' + icon_state = "sleeper" + stasis_level = 100 //Just one setting + +/obj/machinery/sleeper/survival_pod/update_icon() + if(occupant) + add_overlay("sleeper_cover") + else + cut_overlays() + +//Computer +/obj/item/device/gps/computer + name = "pod computer" + icon_state = "pod_computer" + icon = 'icons/obj/survival_pod_comp.dmi' + anchored = TRUE + density = TRUE + pixel_y = -32 + +/obj/item/device/gps/computer/attackby(obj/item/I, mob/living/user) + if(I.is_wrench()) + user.visible_message("[user] disassembles [src].", + "You start to disassemble [src]...", "You hear clanking and banging noises.") + if(do_after(user,4 SECONDS,src)) + new /obj/item/device/gps(loc) + qdel(src) + return TRUE + + return FALSE + +/obj/item/device/gps/computer/attack_hand(mob/user) + attack_self(user) + +//Bed +/obj/structure/bed/pod + 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" + desc = "A heated storage unit." + icon_state = "donkvendor" + icon_base = "donkvendor" + icon_contents = null + icon = 'icons/obj/survival_pod_vend.dmi' + light_range = 5 + light_power = 1.2 + light_color = "#DDFFD3" + pixel_y = -4 + max_n_of_items = 100 + +/obj/machinery/smartfridge/survival_pod/Initialize() + . = ..() + for(var/obj/item/O in loc) + if(accept_check(O)) + stock(O) + +/obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O) + return isitem(O) + +/obj/machinery/smartfridge/survival_pod/empty + name = "dusty survival pod storage" + desc = "A heated storage unit. This one's seen better days." + +//Fans +/obj/structure/fans + icon = 'icons/obj/survival_pod.dmi' + icon_state = "fans" + name = "environmental regulation system" + desc = "A large machine releasing a constant gust of air." + anchored = TRUE + density = TRUE + can_atmos_pass = ATMOS_PASS_NO + var/buildstacktype = /obj/item/stack/material/steel + var/buildstackamount = 5 + +/obj/structure/fans/proc/deconstruct() + new buildstacktype(loc,buildstackamount) + qdel(src) + +/obj/structure/fans/attackby(obj/item/I, mob/living/user) + if(I.is_wrench()) + user.visible_message("[user] disassembles [src].", + "You start to disassemble [src]...", "You hear clanking and banging noises.") + if(do_after(user,4 SECONDS,src)) + deconstruct() + return TRUE + + return TRUE + +/obj/structure/fans/tiny + name = "tiny fan" + desc = "A tiny fan, releasing a thin gust of air." + plane = TURF_PLANE + layer = ABOVE_TURF_LAYER + density = FALSE + icon_state = "fan_tiny" + buildstackamount = 2 + /obj/structure/fans/hardlight name = "hardlight shield" desc = "Retains air, allows passage." @@ -10,4 +314,26 @@ light_range = 3 light_power = 1 - light_color = "#FFFFFF" \ No newline at end of file + light_color = "#FFFFFF" + +//Signs +/obj/structure/sign/mining + name = "nanotrasen mining corps sign" + desc = "A sign of relief for weary miners, and a warning for would-be competitors to Nanotrasen's mining claims." + icon = 'icons/obj/survival_pod.dmi' + icon_state = "ntpod" + +/obj/structure/sign/mining/survival + name = "shelter sign" + desc = "A high visibility sign designating a safe shelter." + icon = 'icons/obj/survival_pod.dmi' + icon_state = "survival" + +//Fluff +/obj/structure/tubes + icon_state = "tubes" + icon = 'icons/obj/survival_pod.dmi' + name = "tubes" + anchored = TRUE + layer = BELOW_MOB_LAYER + density = FALSE diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters_vr.dm similarity index 89% rename from code/modules/mining/shelters.dm rename to code/modules/mining/shelters_vr.dm index bc01cad572a..837ebb1bec3 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters_vr.dm @@ -93,6 +93,16 @@ for escaping a dying ship as soon as possible." mappath = "maps/tether/submaps/om_ships/shelter_5.dmm" +/datum/map_template/shelter/zeta + name = "Shelter Zeta" + shelter_id = "shelter_zeta" + description = "An small dropship with a massive number of equipment, \ + weapons, and supplies. Contains exterior weapons, point defense, \ + a shield generator, and extremely advanced technology. It is \ + unknown who manufactued a vessel like this, as it is beyond the \ + technology level of most contemporary powers." + mappath = "maps/tether/submaps/om_ships/shelter_6.dmm" + /datum/map_template/shelter/phi name = "Shelter Phi" shelter_id = "shelter_phi" diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index f26174006b4..b364103082d 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -496,8 +496,9 @@ #include "om_ships/mercship.dm" ////////////////////////////////////////////////////////////////////////////// -//Shelter Capsules +//Capsule deployed ships #include "om_ships/shelter_5.dm" +#include "om_ships/shelter_6.dm" ////////////////////////////////////////////////////////////////////////////// //Offmap Spawn Locations diff --git a/maps/tether/submaps/om_ships/cruiser.dm b/maps/tether/submaps/om_ships/cruiser.dm index 6500c5455fb..645d5d8341b 100644 --- a/maps/tether/submaps/om_ships/cruiser.dm +++ b/maps/tether/submaps/om_ships/cruiser.dm @@ -8,128 +8,128 @@ requires_power = 1 flags = RAD_SHIELDED base_turf = /turf/space - icon_state = "blue-red2" + icon_state = "blue2" /area/mothership/breakroom - name = "Warship - Breakroom" + name = "Daedalus - Breakroom" /area/mothership/hydroponics - name = "Warship - Hydroponics" + name = "Daedalus - Hydroponics" /area/mothership/kitchen - name = "Warship - Kitchen" + name = "Daedalus - Kitchen" /area/mothership/eva - name = "Warship - EVA" + name = "Daedalus - EVA" /area/mothership/bathroom1 - name = "Warship - Bathroom 1" + name = "Daedalus - Bathroom 1" /area/mothership/bathroom2 - name = "Warship - Bathroom 2" + name = "Daedalus - Bathroom 2" /area/mothership/dorm1 - name = "Warship - Dorm 1" + name = "Daedalus - Dorm 1" /area/mothership/dorm2 - name = "Warship - Dorm 2" + name = "Daedalus - Dorm 2" /area/mothership/dorm3 - name = "Warship - Dorm 3" + name = "Daedalus - Dorm 3" /area/mothership/dorm4 - name = "Warship - Dorm 4" + name = "Daedalus - Dorm 4" /area/mothership/dorm5 - name = "Warship - Dorm 5" + name = "Daedalus - Dorm 5" /area/mothership/dorm6 - name = "Warship - Dorm 6" + name = "Daedalus - Dorm 6" /area/mothership/chemistry - name = "Warship - Chemistry" + name = "Daedalus - Chemistry" /area/mothership/surgery - name = "Warship - Surgery" + name = "Daedalus - Surgery" /area/mothership/vault - name = "Warship - Vault" + name = "Daedalus - Vault" flags = RAD_SHIELDED | BLUE_SHIELDED /area/mothership/teleporter - name = "Warship - Teleporter Room" + name = "Daedalus - Teleporter Room" /area/mothership/security - name = "Warship - Security Equipment" + name = "Daedalus - Security Equipment" /area/mothership/treatment - name = "Warship - Treatment Center" + name = "Daedalus - Treatment Center" /area/mothership/medical - name = "Warship - Medical Equipment" + name = "Daedalus - Medical Equipment" /area/mothership/resleeving - name = "Warship - Resleeving" + name = "Daedalus - Resleeving" /area/mothership/morgue - name = "Warship - Morgue" + name = "Daedalus - Morgue" /area/mothership/rnd - name = "Warship - Research" + name = "Daedalus - Research" /area/mothership/robotics - name = "Warship - Robotics" + name = "Daedalus - Robotics" /area/mothership/sechallway - name = "Warship - Security Hallway" + name = "Daedalus - Security Hallway" /area/mothership/processing - name = "Warship - Processing" + name = "Daedalus - Processing" /area/mothership/warden - name = "Warship - Warden" + name = "Daedalus - Warden" /area/mothership/armory - name = "Warship - Armory" + name = "Daedalus - Armory" flags = RAD_SHIELDED | BLUE_SHIELDED /area/mothership/bridge - name = "Warship - Bridge" + name = "Daedalus - Bridge" /area/mothership/holodeck - name = "Warship - Holodeck Controls" + name = "Daedalus - Holodeck Controls" /area/mothership/holodeck/holo - name = "Warship - Holodeck" + name = "Daedalus - Holodeck" icon_state = "dk_yellow" /area/mothership/cryotube - name = "Warship - Cryo chamber" + name = "Daedalus - Cryo chamber" /area/mothership/engineering - name = "Warship - Engineering" + name = "Daedalus - Engineering" /area/mothership/hallway - name = "Warship - Main Hallway" + name = "Daedalus - Main Hallway" /area/mothership/telecomms1 - name = "Warship - Hangar 1" + name = "Daedalus - Hangar 1" has_gravity = 0 /area/mothership/telecomms2 - name = "Warship - Hangar 2" + name = "Daedalus - Hangar 2" has_gravity = 0 /datum/map_template/om_ships/cruiser - name = "OM Ship - NDV Tabiranth (New Z)" + name = "OM Ship - Daedalus (New Z)" desc = "A large NT cruiser." mappath = 'cruiser.dmm' /obj/effect/overmap/visitable/ship/cruiser name = "spacecraft" desc = "Spacefaring vessel. NanoTrasen IFF detected." - scanner_name = "NDV Tabiranth" - scanner_desc = @{"[i]Registration[/i]: NDV Tabiranth -[i]Class[/i]: Cruiser + scanner_name = "NDV Daedalus" + scanner_desc = @{"[i]Registration[/i]: NDV Daedalus +[i]Class[/i]: Light Cruiser [i]Transponder[/i]: Transmitting (MIL), NanoTrasen IFF [b]Notice[/b]: Military vessel, do not approach"} color = "#0033ff" //Bluey diff --git a/maps/tether/submaps/om_ships/cruiser.dmm b/maps/tether/submaps/om_ships/cruiser.dmm index cdfbf6a4e03..c5c91ee91a9 100644 --- a/maps/tether/submaps/om_ships/cruiser.dmm +++ b/maps/tether/submaps/om_ships/cruiser.dmm @@ -2,18 +2,9 @@ "aa" = ( /turf/space, /area/space) -"ab" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/breakroom) "ac" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/regular{ density = 0; destroy_hits = 1000; @@ -29,7 +20,7 @@ /turf/simulated/floor/plating, /area/mothership/breakroom) "ad" = ( -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_8_outer"; req_one_access = list(101) @@ -151,7 +142,7 @@ /area/mothership/breakroom) "an" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_8_inner"; req_one_access = list(101) @@ -485,18 +476,7 @@ }, /area/mothership/bridge) "bd" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/hydroponics) -"be" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/hydroponics) "bf" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -527,18 +507,10 @@ /area/mothership/hydroponics) "bh" = ( /obj/structure/sign/department/bar, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/kitchen) "bi" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/kitchen) "bj" = ( /obj/machinery/door/window/northleft, @@ -549,14 +521,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/kitchen) -"bk" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/kitchen) "bl" = ( /obj/machinery/biogenerator, /turf/simulated/floor/tiled/steel_grid, @@ -605,12 +569,7 @@ /area/mothership/hydroponics) "bq" = ( /obj/structure/sink/kitchen, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/hydroponics) "br" = ( /obj/structure/cable/cyan{ @@ -671,12 +630,7 @@ /area/mothership/hydroponics) "bv" = ( /obj/structure/sink/kitchen, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/kitchen) "bw" = ( /obj/machinery/chem_master/condimaster, @@ -1123,18 +1077,7 @@ }, /area/mothership/bridge) "cr" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/eva) -"cs" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/eva) "cw" = ( /obj/item/clothing/suit/space/void/security/alt, @@ -1241,7 +1184,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cH" = ( -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_7_outer"; req_one_access = list(101) @@ -1287,7 +1230,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_7_inner"; req_one_access = list(101) @@ -1539,20 +1482,10 @@ /area/mothership/eva) "de" = ( /obj/structure/sign/department/eva, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/eva) "df" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/bathroom1) "dg" = ( /obj/machinery/recharge_station, @@ -1739,12 +1672,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom2) "dr" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/bathroom2) "ds" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -1860,12 +1788,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) -"dF" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/bathroom2) "dG" = ( /obj/structure/toilet{ dir = 1 @@ -1911,10 +1833,7 @@ /turf/simulated/floor/tiled/white, /area/mothership/bathroom2) "dJ" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/surgery) "dK" = ( /obj/structure/grille, @@ -1937,18 +1856,7 @@ /turf/simulated/floor/plating, /area/mothership/surgery) "dL" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/dorm1) -"dM" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/dorm1) "dN" = ( /obj/machinery/light{ @@ -1961,18 +1869,7 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "dO" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/teleporter) -"dP" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/teleporter) "dQ" = ( /obj/machinery/door/airlock/multi_tile/metal, @@ -2010,16 +1907,10 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "dU" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/dorm2) "dV" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/security) "dW" = ( /obj/structure/closet/crate/medical, @@ -2073,12 +1964,6 @@ /turf/simulated/floor/wood, /area/mothership/dorm1) "ec" = ( -/obj/machinery/button/remote/blast_door{ - id = "ship-vault"; - name = "Vault Blast Door Controls"; - pixel_y = 28; - req_one_access = list(108) - }, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ed" = ( @@ -2522,18 +2407,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/mothership/surgery) "eK" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/chemistry) -"eL" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/chemistry) "eM" = ( /obj/structure/cable/cyan{ @@ -2573,7 +2447,7 @@ "eQ" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/item/device/perfect_tele_beacon/stationary{ - tele_name = "Warship"; + tele_name = "Daedalus"; tele_network = "centcom" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -2595,14 +2469,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) -"eT" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/security) "eU" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/security, @@ -2612,12 +2478,7 @@ /area/mothership/security) "eV" = ( /obj/machinery/oxygen_pump/anesthetic, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/surgery) "eW" = ( /obj/structure/medical_stand, @@ -2678,10 +2539,7 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "fd" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/vault) "fe" = ( /obj/structure/cable/cyan{ @@ -2826,162 +2684,52 @@ /area/mothership/chemistry) "fu" = ( /obj/structure/sign/department/chem, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/chemistry) "fv" = ( -/obj/structure/closet/crate/secure/gear{ - req_one_access = list(108) - }, -/obj/item/stack/telecrystal{ - amount = 240 - }, -/obj/item/stack/telecrystal{ - amount = 240 - }, -/obj/item/stack/telecrystal{ - amount = 240 - }, -/obj/item/stack/telecrystal{ - amount = 240 - }, -/obj/item/stack/telecrystal{ - amount = 240 - }, -/obj/item/stack/telecrystal{ - amount = 240 - }, -/obj/item/stack/telecrystal{ - amount = 240 - }, -/obj/item/stack/telecrystal{ - amount = 240 - }, -/obj/item/weapon/card/mining_point_card{ - mine_points = 50000 - }, -/obj/item/weapon/card/mining_point_card{ - mine_points = 50000 - }, -/obj/item/weapon/card/mining_point_card{ - mine_points = 50000 - }, -/obj/item/weapon/card/mining_point_card{ - mine_points = 50000 - }, -/obj/item/weapon/card/mining_point_card{ - mine_points = 50000 - }, -/obj/item/weapon/card/mining_point_card{ - mine_points = 50000 - }, -/obj/item/weapon/card/mining_point_card/survey{ - name = "survey point card"; - survey_points = 5000 - }, -/obj/item/weapon/card/mining_point_card/survey{ - name = "survey point card"; - survey_points = 5000 - }, -/obj/item/weapon/card/mining_point_card/survey{ - name = "survey point card"; - survey_points = 5000 - }, -/obj/item/weapon/card/mining_point_card/survey{ - name = "survey point card"; - survey_points = 5000 - }, -/obj/item/weapon/card/mining_point_card/survey{ - name = "survey point card"; - survey_points = 5000 - }, -/obj/item/weapon/card/mining_point_card/survey{ - name = "survey point card"; - survey_points = 5000 - }, -/obj/item/device/survivalcapsule/military, -/obj/item/device/survivalcapsule/military, -/obj/item/weapon/storage/secure/briefcase/money{ - desc = "An sleek tidy briefcase."; - name = "secure briefcase" - }, -/obj/item/weapon/storage/secure/briefcase/money{ - desc = "An sleek tidy briefcase."; - name = "secure briefcase" - }, -/obj/item/weapon/storage/secure/briefcase/money{ - desc = "An sleek tidy briefcase."; - name = "secure briefcase" - }, -/obj/item/weapon/storage/secure/briefcase/money{ - desc = "An sleek tidy briefcase."; - name = "secure briefcase" - }, -/obj/item/weapon/storage/secure/briefcase/money{ - desc = "An sleek tidy briefcase."; - name = "secure briefcase" - }, -/obj/item/weapon/storage/secure/briefcase/money{ - desc = "An sleek tidy briefcase."; - name = "secure briefcase" - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/obj/item/device/survivalcapsule/escapepod, -/turf/simulated/floor/tiled/techfloor/grid, -/area/mothership/vault) -"fw" = ( -/obj/machinery/syndicate_beacon/virgo{ - charges = 10 +/obj/machinery/light/small{ + icon_state = "bulb1"; + dir = 1 }, +/obj/structure/closet/radiation, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fx" = ( -/obj/machinery/mineral/equipment_vendor, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/machinery/power/port_gen/pacman/super/potato{ + sheets = 100 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 0 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fy" = ( -/obj/structure/cable/cyan{ +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/structure/cable{ d2 = 2; - icon_state = "0-2" + icon_state = "0-2"; + pixel_y = 0 }, -/obj/machinery/power/smes/buildable/hybrid{ - charge = 1e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 1e+006; - output_level = 2e+006; - RCon = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/mothership/vault) -"fz" = ( -/obj/structure/prop/alien/computer/hybrid{ - dir = 1 +/obj/machinery/power/port_gen/pacman/super/potato{ + sheets = 100 }, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fA" = ( -/obj/structure/closet/crate/secure/weapon{ - req_one_access = list(108) - }, -/obj/item/clothing/suit/space/void/merc/fire, -/obj/item/clothing/head/helmet/space/void/merc/fire, -/obj/item/clothing/suit/space/void/merc, -/obj/item/clothing/head/helmet/space/void/merc, -/obj/item/clothing/suit/space/void/merc, -/obj/item/clothing/head/helmet/space/void/merc, -/obj/item/clothing/suit/space/void/merc/odst, -/obj/item/clothing/head/helmet/space/void/merc/odst, -/obj/item/clothing/suit/space/void/security/fluff/hos, -/obj/item/clothing/head/helmet/space/void/security/fluff/hos, -/obj/item/weapon/tank/oxygen/yellow, -/obj/item/weapon/tank/vox, /obj/machinery/power/apc{ alarms_hidden = 1; dir = 1; @@ -2993,12 +2741,17 @@ d2 = 2; icon_state = "0-2" }, -/obj/item/clothing/head/helmet/space/void/merc/prototype, -/obj/item/clothing/head/helmet/space/void/merc/prototype, -/obj/item/clothing/head/helmet/space/void/captain, -/obj/item/clothing/suit/space/void/merc/prototype, -/obj/item/clothing/suit/space/void/merc/prototype, -/obj/item/clothing/suit/space/void/captain, +/obj/machinery/light/small{ + icon_state = "bulb1"; + dir = 1 + }, +/obj/structure/closet/radiation, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, +/obj/fiftyspawner/uranium, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fB" = ( @@ -3143,59 +2896,54 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/vault/bolted{ - id_tag = "ship-vault-door"; - req_one_access = list(109) - }, /obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - destroy_hits = 100; - id = "ship-vault"; - name = "Vault" +/obj/machinery/door/airlock/vault{ + req_one_access = list(101) }, /turf/simulated/floor/tiled/steel_ridged, /area/mothership/vault) "fS" = ( /obj/structure/cable/cyan{ - d1 = 4; + d1 = 2; d2 = 8; - icon_state = "4-8" + icon_state = "2-8" }, +/obj/structure/cable{ + icon_state = "0-4"; + d2 = 4 + }, +/obj/machinery/power/terminal, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fT" = ( -/obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /obj/structure/cable{ - d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/vault) +"fU" = ( +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /obj/structure/cable/cyan{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/cable/cyan{ - d1 = 1; +/obj/structure/cable{ d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/mothership/vault) -"fU" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" + icon_state = "0-8" }, +/obj/machinery/power/terminal, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fV" = ( @@ -3328,145 +3076,37 @@ /turf/simulated/floor/tiled/white, /area/mothership/chemistry) "gh" = ( -/obj/structure/closet/crate/secure/weapon{ - req_one_access = list(108) +/obj/machinery/power/smes/buildable{ + charge = 2e+007; + cur_coils = 4; + input_attempt = 1; + input_level = 500000; + output_level = 1e+006; + RCon_tag = "Power - Main" }, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, -/obj/item/ammo_casing/microbattery/medical/corpse_mend, -/obj/item/ammo_casing/microbattery/medical/corpse_mend, -/obj/item/slime_extract/pink, -/obj/item/slime_extract/pink, -/obj/item/slime_extract/pink, -/obj/item/slime_extract/pink, -/obj/item/slime_extract/pink, -/obj/item/slime_extract/pink, -/obj/item/weapon/cell/slime{ - description_info = "This 'cell' holds a max charge of 20k and self recharges over time."; - icon = 'icons/obj/power.dmi'; - icon_state = "icell"; - maxcharge = 20000; - name = "slime core cell" - }, -/obj/item/weapon/cell/slime{ - description_info = "This 'cell' holds a max charge of 20k and self recharges over time."; - icon = 'icons/obj/power.dmi'; - icon_state = "icell"; - maxcharge = 20000; - name = "slime core cell" - }, -/obj/item/weapon/cell/slime{ - description_info = "This 'cell' holds a max charge of 20k and self recharges over time."; - icon = 'icons/obj/power.dmi'; - icon_state = "icell"; - maxcharge = 20000; - name = "slime core cell" - }, -/obj/item/weapon/cell/slime{ - description_info = "This 'cell' holds a max charge of 20k and self recharges over time."; - icon = 'icons/obj/power.dmi'; - icon_state = "icell"; - maxcharge = 20000; - name = "slime core cell" - }, -/obj/item/slime_extract/pink, -/obj/item/slime_extract/pink, -/obj/item/weapon/deadringer, -/obj/item/weapon/deadringer, +/obj/structure/cable/cyan, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) -"gi" = ( -/obj/structure/closet/crate/secure/weapon{ - req_one_access = list(108) +"gj" = ( +/obj/machinery/light/small{ + dir = 8; + pixel_x = 0 }, -/obj/item/weapon/gun/energy/modular/cannon, -/obj/item/weapon/gun/energy/modular/carbine, -/obj/item/weapon/gun/energy/modular/pistol, -/obj/item/weapon/gun/energy/medigun, -/obj/item/weapon/gun/energy/captain, +/obj/structure/cable, +/obj/machinery/power/port_gen/pacman/super/potato{ + sheets = 100 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/vault) +"gk" = ( /obj/machinery/firealarm{ dir = 1; pixel_x = 0; pixel_y = -25 }, -/obj/item/weapon/technomancer_catalog/universal, -/obj/item/weapon/technomancer_core/universal, -/turf/simulated/floor/tiled/techfloor/grid, -/area/mothership/vault) -"gj" = ( -/obj/machinery/mineral/equipment_vendor/survey, -/turf/simulated/floor/tiled/techfloor/grid, -/area/mothership/vault) -"gk" = ( -/obj/machinery/power/fractal_reactor/fluff/converter{ - mapped_in = 1; - power_generation_rate = 2e+006 - }, /obj/structure/cable, -/turf/simulated/floor/tiled/techfloor/grid, -/area/mothership/vault) -"gl" = ( -/obj/structure/closet/crate/secure/gear{ - req_one_access = list(108) - }, -/obj/item/rig_module/chem_dispenser/injector/advanced, -/obj/item/rig_module/vision/multi, -/obj/item/weapon/rig/military/equipped, -/obj/item/weapon/rig/pmc/commander, -/obj/item/weapon/rig/pmc/medical, -/obj/item/weapon/rig/pmc/engineer, -/obj/item/weapon/rig/pmc/security, -/obj/item/weapon/rig/pmc/security, -/obj/item/weapon/rig/light/ninja, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/mothership/vault) -"gm" = ( -/obj/structure/closet/crate/secure/gear{ - req_one_access = list(108) - }, -/obj/item/device/bluespaceradio, -/obj/item/weapon/storage/firstaid/insiderepair, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/toolbox/syndicate/powertools, -/obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy{ - name = "Super Heavy Demolitions kit" - }, -/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy{ - name = "Heavy Demolitions kit" - }, -/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy{ - name = "Heavy Demolitions kit" - }, -/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy{ - name = "Heavy Demolitions kit" - }, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/storage/box/emps{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/cell/device/weapon/recharge/alien, -/obj/item/weapon/cell/device/weapon/recharge/alien, -/obj/item/weapon/cell/device/weapon/recharge/alien, -/obj/item/weapon/cell/device/weapon/recharge/alien, -/obj/item/weapon/cell/device/weapon/recharge/alien, -/obj/item/weapon/cell/device/weapon/recharge/alien, -/obj/item/weapon/material/knife/machete/deluxe{ - default_material = "durasteel" - }, -/obj/item/clothing/accessory/holster/machete, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" +/obj/machinery/power/port_gen/pacman/super/potato{ + sheets = 100 }, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) @@ -3503,18 +3143,7 @@ /area/mothership/security) "gq" = ( /obj/structure/sign/department/operational, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/surgery) -"gr" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/surgery) "gs" = ( /obj/structure/cable/cyan{ @@ -3546,12 +3175,7 @@ /area/mothership/chemistry) "gv" = ( /obj/structure/sign/department/medbay, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/chemistry) "gw" = ( /obj/machinery/light{ @@ -3561,14 +3185,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) -"gx" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/vault) "gy" = ( /obj/machinery/light{ dir = 4 @@ -3628,10 +3244,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "gG" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/treatment) "gH" = ( /obj/machinery/vending/blood, @@ -4097,46 +3710,13 @@ /turf/simulated/floor/tiled/white, /area/mothership/treatment) "hu" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/dorm3) -"hv" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/dorm3) "hw" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/dorm4) -"hx" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/dorm4) "hy" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/sechallway) -"hz" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/sechallway) "hA" = ( /obj/machinery/door/airlock/security, @@ -4512,10 +4092,7 @@ /area/mothership/sechallway) "il" = ( /obj/structure/sign/department/interrogation, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/processing) "im" = ( /obj/structure/table/steel_reinforced, @@ -4572,18 +4149,10 @@ /turf/simulated/floor/tiled/white, /area/mothership/treatment) "iv" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/morgue) "iw" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/engineering) "ix" = ( /obj/machinery/door_timer/cell_1{ @@ -4676,14 +4245,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) -"iF" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/treatment) "iG" = ( /obj/machinery/door/airlock/medical, /obj/machinery/door/firedoor/glass, @@ -4871,10 +4432,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iV" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/resleeving) "iW" = ( /obj/machinery/computer/transhuman/resleeving{ @@ -4935,14 +4493,6 @@ /obj/machinery/vending/medical, /turf/simulated/floor/tiled/white, /area/mothership/resleeving) -"je" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/morgue) "jf" = ( /obj/machinery/power/apc{ alarms_hidden = 1; @@ -5201,18 +4751,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "jC" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/warden) -"jD" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/warden) "jE" = ( /obj/machinery/door/airlock/security, @@ -5522,10 +5061,7 @@ /area/mothership/resleeving) "kd" = ( /obj/structure/sign/department/morgue, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/morgue) "ke" = ( /obj/structure/table/steel_reinforced, @@ -5589,10 +5125,7 @@ /turf/simulated/floor/plating, /area/mothership/warden) "kl" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/medical) "km" = ( /obj/machinery/door/airlock/medical, @@ -5783,16 +5316,10 @@ /turf/simulated/floor/wood, /area/mothership/dorm5) "kG" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/dorm5) "kH" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/dorm6) "kI" = ( /obj/structure/closet/wardrobe/ert, @@ -6148,30 +5675,9 @@ /obj/structure/cable/cyan, /turf/simulated/floor/tiled/white, /area/mothership/medical) -"lm" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/dorm5) -"ln" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/dorm6) "lo" = ( /obj/structure/sign/department/armory, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/armory) "lp" = ( /obj/machinery/door/airlock/highsecurity{ @@ -6188,18 +5694,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/mothership/armory) "lq" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/armory) -"lr" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/armory) "ls" = ( /obj/machinery/door/airlock/highsecurity{ @@ -6609,24 +6104,10 @@ /area/mothership/medical) "ma" = ( /obj/structure/sign/department/medbay, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/medical) "mb" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/bridge) -"mc" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/bridge) "md" = ( /obj/item/weapon/storage/box/flashshells, @@ -6717,10 +6198,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "mi" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/rnd) "mj" = ( /obj/machinery/r_n_d/destructive_analyzer, @@ -6778,13 +6256,6 @@ /obj/machinery/computer/ship/helm, /turf/simulated/floor/tiled/steel_ridged, /area/mothership/bridge) -"mt" = ( -/obj/structure/sign/department/armory, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/armory) "mu" = ( /obj/item/ammo_magazine/m545/ap, /obj/item/ammo_magazine/m545/ap, @@ -7032,10 +6503,7 @@ /area/mothership/rnd) "mT" = ( /obj/structure/sign/department/rnd, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/rnd) "mU" = ( /obj/machinery/power/apc{ @@ -7247,14 +6715,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) -"nk" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/rnd) "nl" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -7468,12 +6928,7 @@ /area/mothership/hallway) "nF" = ( /obj/structure/sign/department/bridge, -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/bridge) "nG" = ( /obj/machinery/computer/communications{ @@ -7794,6 +7249,7 @@ }, /obj/machinery/turretid/stun{ check_access = 0; + check_records = 0; check_weapons = 1; control_area = /area/mothership/hallway; name = "anti-boarding turret controls"; @@ -7824,14 +7280,6 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "ok" = ( -/obj/machinery/button/remote/airlock{ - id = "ship-vault-door"; - name = "Vault Lock"; - pixel_x = -6; - pixel_y = -26; - req_one_access = list(108); - specialfunctions = 4 - }, /obj/machinery/turretid/lethal{ ailock = 1; check_synth = 0; @@ -7844,18 +7292,10 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "ol" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/holodeck) "om" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/robotics) "on" = ( /obj/structure/closet/toolcloset, @@ -7925,12 +7365,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) -"ow" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/holodeck) "ox" = ( /obj/machinery/alarm{ dir = 4; @@ -7981,7 +7415,6 @@ /turf/simulated/floor/plating, /area/mothership/holodeck) "oB" = ( -/obj/structure/closet/excavation, /obj/machinery/light{ dir = 8; icon_state = "tube1" @@ -8308,27 +7741,13 @@ /turf/simulated/floor/tiled/techfloor, /area/mothership/holodeck) "pe" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/telecomms1) "pk" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/cryotube) -"pq" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/telecomms2) "pr" = ( -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_6_outer"; req_one_access = list(101) @@ -8381,7 +7800,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_6_inner"; req_one_access = list(101) @@ -8524,12 +7943,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) -"pD" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/cryotube) "pE" = ( /obj/machinery/vending/loadout/accessory, /turf/simulated/floor/tiled/steel_grid, @@ -8675,7 +8088,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_3_inner"; req_one_access = list(101) @@ -8711,7 +8124,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/telecomms2) "pU" = ( -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_3_outer"; req_one_access = list(101) @@ -8728,14 +8141,6 @@ /obj/structure/fans/hardlight, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/telecomms2) -"pV" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, -/area/mothership/telecomms1) "pW" = ( /obj/machinery/alarm{ dir = 4; @@ -8775,10 +8180,7 @@ /area/mothership/telecomms1) "qb" = ( /obj/structure/sign/department/telecoms, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/telecomms1) "qc" = ( /obj/structure/closet/crate/bin, @@ -8869,10 +8271,7 @@ /area/mothership/hallway) "qm" = ( /obj/structure/sign/department/telecoms, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/telecomms2) "qn" = ( /obj/machinery/computer/rdservercontrol{ @@ -8923,39 +8322,12 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms2) "qs" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc"; - name = "small craft wall hc"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/telecomms2) "qt" = ( /obj/machinery/telecomms/bus/preset_cent, /turf/simulated/floor/greengrid, /area/mothership/telecomms1) -"qu" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ - icon_state = "corner_techfloor_grid"; - dir = 6 - }, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive, -/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay, -/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay, -/obj/structure/closet/walllocker{ - name = "Equipment Locker"; - pixel_x = -32 - }, -/obj/item/mecha_parts/mecha_equipment/crisis_drone/rad, -/obj/item/mecha_parts/mecha_equipment/crisis_drone/rad, -/obj/item/mecha_parts/mecha_equipment/repair_droid, -/obj/item/mecha_parts/mecha_equipment/repair_droid, -/turf/simulated/floor/tiled/techfloor, -/area/mothership/telecomms1) "qv" = ( /obj/machinery/telecomms/processor/preset_cent, /turf/simulated/floor/greengrid, @@ -8976,10 +8348,7 @@ /area/mothership/telecomms1) "qB" = ( /obj/structure/sign/department/eng, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/engineering) "qC" = ( /obj/machinery/door/airlock/engineeringatmos, @@ -9042,33 +8411,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_ridged, /area/mothership/engineering) -"qJ" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, -/area/mothership/engineering) -"qN" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 9 - }, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/cannon, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/cannon, -/obj/item/mecha_parts/mecha_equipment/crisis_drone, -/obj/item/mecha_parts/mecha_equipment/crisis_drone, -/obj/structure/closet/walllocker{ - name = "Equipment Locker"; - pixel_x = 32 - }, -/obj/item/mecha_parts/mecha_equipment/crisis_drone/rad, -/obj/item/mecha_parts/mecha_equipment/crisis_drone/rad, -/obj/item/mecha_parts/mecha_equipment/repair_droid, -/obj/item/mecha_parts/mecha_equipment/repair_droid, -/turf/simulated/floor/tiled/techfloor, -/area/mothership/telecomms2) "qR" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -9292,28 +8634,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) -"rr" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ - icon_state = "corner_techfloor_grid"; - dir = 6 - }, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive, -/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay, -/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay, -/obj/structure/closet/walllocker{ - name = "Equipment Locker"; - pixel_x = -32 - }, -/obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64, -/obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64, -/obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64, -/obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64, -/turf/simulated/floor/tiled/techfloor, -/area/mothership/telecomms2) "rt" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -9877,7 +9197,7 @@ /area/mothership/engineering) "sD" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_5_inner"; req_one_access = list(101) @@ -9892,14 +9212,11 @@ /area/mothership/engineering) "sF" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/shuttle/wall/voidcraft/blue{ - name = "small craft wall"; - stripe_color = "#45b3d8" - }, +/turf/simulated/wall/rpshull, /area/mothership/engineering) "sG" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_4_inner"; req_one_access = list(101) @@ -9970,7 +9287,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/engineering) "sL" = ( -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_5_outer"; req_one_access = list(101) @@ -10055,6 +9372,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) +"tG" = ( +/turf/simulated/wall/rpshull, +/area/mothership/breakroom) "tK" = ( /obj/item/modular_computer/console/preset/mercenary{ dir = 4 @@ -10107,7 +9427,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_2_inner"; req_one_access = list(101) @@ -10239,7 +9559,7 @@ /area/mothership/hallway) "yi" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_1_inner"; req_one_access = list(101) @@ -10391,6 +9711,19 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/mothership/eva) +"Df" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/vault) "Do" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -10407,27 +9740,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) -"DU" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 9 - }, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/cannon, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/cannon, -/obj/item/mecha_parts/mecha_equipment/crisis_drone, -/obj/item/mecha_parts/mecha_equipment/crisis_drone, -/obj/structure/closet/walllocker{ - name = "Equipment Locker"; - pixel_x = 32 - }, -/obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64, -/obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64, -/obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64, -/obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64, -/turf/simulated/floor/tiled/techfloor, -/area/mothership/telecomms1) "DX" = ( /obj/effect/floor_decal/techfloor/orange{ icon_state = "techfloororange_edges"; @@ -10759,7 +10071,7 @@ /turf/simulated/floor/wood, /area/mothership/breakroom) "PT" = ( -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_4_outer"; req_one_access = list(101) @@ -10938,7 +10250,7 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "SM" = ( -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_1_outer"; req_one_access = list(101) @@ -10995,6 +10307,20 @@ }, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) +"Tr" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/vault{ + req_one_access = list(101) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/mothership/vault) +"TE" = ( +/turf/simulated/wall/rpshull, +/area/mothership/processing) "TK" = ( /obj/effect/floor_decal/techfloor/orange{ icon_state = "techfloororange_edges"; @@ -11040,6 +10366,25 @@ /obj/structure/fans/hardlight, /turf/simulated/floor/tiled/steel_ridged, /area/mothership/telecomms1) +"WN" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/blast/regular{ + density = 0; + destroy_hits = 1000; + dir = 4; + icon_state = "pdoor0"; + id = "ship-lounge"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/fans/hardlight, +/turf/simulated/floor/plating, +/area/mothership/breakroom) "Xh" = ( /obj/item/modular_computer/console/preset/mercenary{ dir = 8 @@ -11119,7 +10464,7 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "ZS" = ( -/obj/machinery/door/airlock/alien/blue/locked{ +/obj/machinery/door/airlock/external{ frequency = 1380; id_tag = "ws_dock_2_outer"; req_one_access = list(101) @@ -18912,7 +18257,7 @@ uh cq cq bc -nk +mi om om om @@ -19058,15 +18403,15 @@ mi on oB oL -pV +pe pt -pV pe pe pe pe pe -pV +pe +pe bc aa aa @@ -19205,7 +18550,7 @@ pu pW Ox BQ -qu +rj rt qw WE @@ -19313,14 +18658,14 @@ eW fp fK gc -gr +dJ gI gW hp hp hY ir -iF +gG iX jq jH @@ -19492,7 +18837,7 @@ wO uV Kd AL -pV +pe uh aa aa @@ -19578,7 +18923,7 @@ aa aa bc Su -be +bd bC bC bd @@ -19588,7 +18933,7 @@ cI cr bc df -ds +df dJ dJ dJ @@ -19597,14 +18942,14 @@ eK eK eK eK -eL +eK gK gY hr hp ia hp -iF +gG iZ js jJ @@ -19714,20 +19059,20 @@ aa aa aa uh -ae +tG au au au -ae +tG +bd bd -be bD bR -bk +bi +cr cr -cs cJ -cs +cr cr df dt @@ -19773,7 +19118,7 @@ py pY DX RE -DU +XQ XQ Ch WE @@ -19854,9 +19199,9 @@ aa aa aa aa -ab -ab -ae +tG +tG +tG ao ao ao @@ -19888,7 +19233,7 @@ hp hp hp is -iF +gG jb ju jJ @@ -19913,17 +19258,17 @@ oQ pe pz pZ -qJ -qJ -qJ -qJ -qJ -qJ -qJ -qJ -qJ -qJ -qJ +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw aa aa aa @@ -20055,7 +19400,7 @@ oR pe pA qv -qJ +iw qT qT qT @@ -20138,9 +19483,9 @@ aa aa aa aa -ae -ab -ae +tG +tG +tG av Do ao @@ -20157,10 +19502,10 @@ cW cr di ds -dM +dL dL eu -eL +eK eK fu fP @@ -20172,7 +19517,7 @@ gG hG id iu -iF +gG jd jw jL @@ -20187,17 +19532,17 @@ ma mi mD mT -nk +mi nD -nk -nk +mi +mi ou oG oS -pV +pe pB qb -qJ +iw qU rk ru @@ -20206,7 +19551,7 @@ sc ss sy iw -qJ +iw iw aa aa @@ -20279,9 +19624,9 @@ aa aa aa aa -aa ag -ab +tG +tG ao ao Do @@ -20293,9 +19638,9 @@ bG bT bo cr -cs +cr cN -cs +cr cr dj dw @@ -20315,9 +19660,9 @@ gG gG gG gG -je +iv jx -je +iv kd iv kl @@ -20421,9 +19766,9 @@ aa aa aa aa -aa Sv -ae +tG +tG ap ao Do @@ -20563,8 +19908,8 @@ aa aa aa aa -aa uh +WN ac ao aw @@ -20584,14 +19929,14 @@ cr dl dy dO -dP -dP -dP +dO +dO +dO fd fd fR fd -gx +fd dz EK hu @@ -20610,22 +19955,22 @@ kG EK dz mb -mc -mc +mb +mb mb nm nF -mc -mc +mb +mb mb dl dy pk -pD +pk qe -pD -pD -pD +pk +pk +pk rx rO sf @@ -20704,28 +20049,28 @@ aa aa aa aa -aa -ab -ab +tG +tG +tG ae aq ax FW aH aR -be +bd bq bH bU -be -cs +bd +cr cB cO cZ cr Ep dz -dP +dO ec ew eN @@ -20751,7 +20096,7 @@ kW kG YP ts -mc +mb mq Ux mV @@ -20759,15 +20104,15 @@ nn mG mE oh -mc +mb EK oV -pD +pk pE qf qD qX -pD +pk ry rP sg @@ -20846,7 +20191,7 @@ aa aa aa aa -aa +WN ac ah aj @@ -20860,25 +20205,25 @@ br bI bT cf -cs +cr cC cO da de EK dA -dP +dO ed ex eO fd -fw -fS -gi +fd +Tr +fd fd Pi KO -hv +hu hK hu iv @@ -20890,10 +20235,10 @@ iv iv kG kX -lm +kG xE Yt -mc +mb mr uI mW @@ -20901,15 +20246,15 @@ no no no oi -mc +mb EK oW -pD +pk pF qg qE qY -pD +pk rz rQ sh @@ -20988,7 +20333,7 @@ aa aa aa aa -aa +WN ac ah ak @@ -20997,7 +20342,7 @@ az aE az aT -be +bd bs bJ bV @@ -21015,7 +20360,7 @@ ey eP fd fx -fS +Df gj fd zd @@ -21035,7 +20380,7 @@ kY dS he dD -mc +mb ms mG uI @@ -21043,21 +20388,21 @@ np nG nT Xh -mc +mb Ep oX -pD +pk pG qh qF qZ -pD +pk rA rR si su sA -qJ +iw cq cq bc @@ -21130,7 +20475,7 @@ aa aa aa aa -aa +WN ac ah ak @@ -21139,7 +20484,7 @@ az az az aU -be +bd bt bK bW @@ -21177,7 +20522,7 @@ dj dy EK FQ -mc +mb wT mG uI @@ -21185,15 +20530,15 @@ nq nH nU tK -mc +mb EK oY -pD +pk pH qh qF ra -pD +pk rB rS sj @@ -21272,7 +20617,7 @@ aa aa aa aa -aa +WN ac ah al @@ -21286,27 +20631,27 @@ bu bL bX ci -cs +cr cF cO dd -cs +cr EK dA -dP +dO eg Hl eR fd -fz -fS -gl +fd +Tr +fd fd gR EK hw hM -hx +hw hy hy hy @@ -21316,10 +20661,10 @@ hy hy kH kZ -ln +kH EK dA -mc +mb Sa uI mX @@ -21327,15 +20672,15 @@ nr nr nr oj -mc +mb ZL oZ -pD +pk pI qi qG rb -pD +pk rB rT sk @@ -21414,9 +20759,9 @@ aa aa aa aa -aa -ab -ab +tG +tG +tG ae aq ax @@ -21428,25 +20773,25 @@ bv bM bY cj -cs +cr cG cO cZ cr QH JJ -dP +dO ex eA eh fd fA fU -gm +gh fd dz EK -hx +hw hN ih hy @@ -21461,7 +20806,7 @@ la kH EK dz -mc +mb Xy QF mY @@ -21469,15 +20814,15 @@ ns mG mH ok -mc +mb YP Kc -pD +pk pJ qj qH rc -pD +pk rC rU sl @@ -21557,8 +20902,8 @@ aa aa aa aa -aa uh +WN ac ao aB @@ -21578,17 +20923,17 @@ cr SV wA dO -dP -dP -dP +dO +dO +dO fd fd fR fd -gx +fd dy dl -hx +hw hO ii hy @@ -21604,22 +20949,22 @@ kH dl dy mb -mc -mc +mb +mb mb nt nF -mc -mc +mb +mb mb SV Yv pk -pD +pk qk -pD -pD -pD +pk +pk +pk rD rV sm @@ -21699,9 +21044,9 @@ aa aa aa aa -aa Sv -ae +tG +tG as ao Do @@ -21730,7 +21075,7 @@ HG yW dx Kr -hx +hw hP ij hy @@ -21841,9 +21186,9 @@ aa aa aa aa -aa ag -ab +tG +tG at ao Do @@ -21855,9 +21200,9 @@ bN ca cm cr -cs +cr cN -cs +cr cr dj dE @@ -21901,7 +21246,7 @@ dj dz EK qc -qJ +iw re ro rF @@ -21984,9 +21329,9 @@ aa aa aa aa -ae -ab -ae +tG +tG +tG av Do ao @@ -22002,11 +21347,11 @@ cR cW cr do -dF +dr dU dU eC -eT +dV dV dV dV @@ -22014,7 +21359,7 @@ dV dV gT hg -hz +hy hQ hQ ix @@ -22030,20 +21375,20 @@ lo lB lS lq -mt -lr -lr -lr +lo +lq +lq +lq lo nW ol -ow +ol ol pb qs pK qm -qJ +iw rf rp rG @@ -22052,7 +21397,7 @@ rX sw sC iw -qJ +iw iw aa aa @@ -22178,14 +21523,14 @@ mZ nv nI nX -lr +lq ox oJ pc -pq +qs pL qn -qJ +iw rg rq rH @@ -22268,9 +21613,9 @@ aa aa aa aa -ab -ab -ae +tG +tG +tG ao ao ao @@ -22298,18 +21643,18 @@ gn gA fY hi -hB -hC +TE +TE il iz -hC -hC +TE +TE +jC +jC jC -jD -jD kp -jD -jD +jC +jC lq lD lU @@ -22320,24 +21665,24 @@ lG lG lG nY -lr +lq oy oK pd -pq +qs pM qo -qJ -qJ -qJ -qJ -qJ -qJ -qJ -qJ -qJ -qJ -qJ +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw aa aa aa @@ -22412,20 +21757,20 @@ aa aa aa uh -ae +tG aC aC aC -ae +tG +bi bi -bk bP cc -bk +bi +cr cr -cs uS -cs +cr cr dr dI @@ -22440,19 +21785,19 @@ fY gB fY hj -hC +TE hS im iA iR jk -jD +jC jS kh kq kL ld -lr +lq lE lV me @@ -22462,16 +21807,16 @@ na nw nJ nZ -lr +lq oz oz oz -pq +qs pN qp TK rh -rr +EV GT rZ sq @@ -22560,7 +21905,7 @@ aa aa bc cq -bk +bi bQ bQ bi @@ -22570,7 +21915,7 @@ cT cr bc dr -dF +dr dV dV dV @@ -22582,7 +21927,7 @@ fY gC fY hk -hB +TE hT in iB @@ -22604,11 +21949,11 @@ nb nx nK oa -lr +lq oz oz oz -pq +qs pO qq tb @@ -22746,11 +22091,11 @@ nc ny nL ob -lr +lq oz oz oz -pq +qs pP Sz Bd @@ -22888,11 +22233,11 @@ lG lG lG oc -lr +lq oz oz oz -pq +qs pQ qq TK @@ -23014,13 +22359,13 @@ ip iE iU jn -jD +jC jW ki ku ki lg -lr +lq lI lX mh @@ -23030,16 +22375,16 @@ nd nz nM od -lr +lq oz oz oz -pq +qs pR qr tb Hs -qN +Ez Ez wm sq @@ -23145,45 +22490,45 @@ dV dV dV dV -eT +dV gp gp gp dV -hC -hC -hC -hC -hC -hC -jD +TE +TE +TE +TE +TE +TE +jC jC kk kk kk -jD -lr -lr -lr -lr -lr -lr -lr -lr -lr -lr -lr +jC +lq +lq +lq +lq +lq +lq +lq +lq +lq +lq +lq oz oz oz qs pS qs -pq -pq -pq -pq -pq +qs +qs +qs +qs +qs qs bc aa @@ -23318,9 +22663,9 @@ lq oA oA oA -pq +qs pT -pq +qs bc cq cq @@ -23460,9 +22805,9 @@ aa aa aa aa -pq +qs pU -pq +qs aa aa aa diff --git a/maps/tether/submaps/om_ships/shelter_5.dm b/maps/tether/submaps/om_ships/shelter_5.dm index 1c81f0f1b85..038c50cbbba 100644 --- a/maps/tether/submaps/om_ships/shelter_5.dm +++ b/maps/tether/submaps/om_ships/shelter_5.dm @@ -40,9 +40,11 @@ // The 'ship' /obj/effect/overmap/visitable/ship/landable/escapepod - name = "Escape Pod" - desc = "An Escape Pod for escaping exploding ships." - color = "#00aaff" //Bluey - vessel_mass = 1000 - vessel_size = SHIP_SIZE_SMALL - shuttle = "Escape Pod" \ No newline at end of file + scanner_name = "Escape Pod" + scanner_desc = @{"[i]Registration[/i]: NOT AVAILABLE +[i]Class[/i]: Escape Pod +[i]Transponder[/i]: Transmitting (CIV), non-hostile +[b]Notice[/b]: Emergency Transponder Active"} + vessel_mass = 500 + vessel_size = SHIP_SIZE_TINY + shuttle = "Escape Pod" diff --git a/maps/tether/submaps/om_ships/shelter_6.dm b/maps/tether/submaps/om_ships/shelter_6.dm new file mode 100644 index 00000000000..c5450ff3502 --- /dev/null +++ b/maps/tether/submaps/om_ships/shelter_6.dm @@ -0,0 +1,53 @@ +// Compile in the map for CI testing if we're testing compileability of all the maps +#if MAP_TEST +#include "shelter_6.dmm" +#endif + +// Map template for spawning the shuttle +/datum/map_template/om_ships/tabiranth + name = "OM Ship - Tabiranth" + desc = "A prototype deployable assault shuttle." + mappath = 'shelter_6.dmm' + annihilate = TRUE + +// The shuttle's area(s) +/area/shuttle/tabiranth + name = "\improper Tabiranth" + icon_state = "blue-red2" + flags = RAD_SHIELDED | BLUE_SHIELDED + requires_power = 1 + +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/tabiranth + name = "short jump console" + shuttle_tag = "XN-29 Prototype Shuttle" + req_one_access = list(access_cent_general) + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/tabiranth + name = "Origin - Tabiranth" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_tabiranth" + shuttle_type = /datum/shuttle/autodock/overmap/tabiranth + +// The 'shuttle' +/datum/shuttle/autodock/overmap/tabiranth + name = "NDV Tabiranth" + current_location = "omship_spawn_tabiranth" + docking_controller_tag = "tabiranth_docker" + shuttle_area = /area/shuttle/tabiranth + fuel_consumption = 0 + defer_initialisation = TRUE //We're not loaded until an admin does it + +// The 'ship' +/obj/effect/overmap/visitable/ship/landable/tabiranth + scanner_name = "Experimental Dropship" + scanner_desc = @{"[i]Registration[/i]: UNKNOWN +[i]Class[/i]: Assault Dropship +[i]Transponder[/i]: Transmitting (MIL), NanoTrasen +[b]Notice[/b]: Experimental vessel"} + color = "#00ffcc" //Bluegreen + vessel_mass = 4500 + vessel_size = SHIP_SIZE_SMALL + shuttle = "NDV Tabiranth" \ No newline at end of file diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm new file mode 100644 index 00000000000..d6add5b89f6 --- /dev/null +++ b/maps/tether/submaps/om_ships/shelter_6.dmm @@ -0,0 +1,2018 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/machinery/porta_turret/industrial/military, +/turf/simulated/floor/reinforced/airless{ + name = "outer hull" + }, +/area/shuttle/tabiranth) +"ab" = ( +/obj/machinery/power/pointdefense{ + id_tag = "tabiranth_pd" + }, +/turf/simulated/floor/reinforced/airless{ + name = "outer hull" + }, +/area/shuttle/tabiranth) +"ac" = ( +/turf/simulated/shuttle/wall/voidcraft/blue{ + hard_corner = 1; + icon_state = "void-hc"; + name = "small craft wall hc"; + stripe_color = "#45b3d8" + }, +/area/shuttle/tabiranth) +"ad" = ( +/turf/simulated/shuttle/wall/voidcraft/blue{ + name = "small craft wall"; + stripe_color = "#45b3d8" + }, +/area/shuttle/tabiranth) +"ae" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/clothing/suit/armor/vest/ert/command, +/obj/item/clothing/head/helmet/ert/command, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/suit/armor/pcarrier/merc, +/obj/item/clothing/suit/armor/pcarrier/merc, +/obj/item/clothing/suit/armor/pcarrier/merc, +/obj/item/clothing/suit/armor/pcarrier/merc, +/obj/item/clothing/head/helmet/merc, +/obj/item/clothing/head/helmet/merc, +/obj/item/clothing/head/helmet/merc, +/obj/item/clothing/head/helmet/merc, +/obj/item/clothing/suit/armor/pcarrier/blue/sol, +/obj/item/clothing/suit/armor/pcarrier/blue/sol, +/obj/item/clothing/suit/armor/pcarrier/blue/sol, +/obj/item/clothing/suit/armor/pcarrier/blue/sol, +/obj/item/clothing/head/helmet/solgov, +/obj/item/clothing/head/helmet/solgov, +/obj/item/clothing/head/helmet/solgov, +/obj/item/clothing/head/helmet/solgov, +/obj/item/clothing/accessory/storage/pouches/large/blue, +/obj/item/clothing/accessory/storage/pouches/large/blue, +/obj/item/clothing/accessory/storage/pouches/large/blue, +/obj/item/clothing/accessory/storage/pouches/large/blue, +/obj/item/weapon/storage/box/syndie_kit/combat_armor, +/obj/item/weapon/storage/box/syndie_kit/combat_armor, +/obj/item/weapon/storage/box/syndie_kit/combat_armor, +/obj/item/weapon/storage/box/syndie_kit/combat_armor, +/obj/item/clothing/accessory/holster/machete, +/obj/item/clothing/accessory/holster/machete, +/obj/item/clothing/accessory/holster/machete, +/obj/item/clothing/accessory/holster/machete, +/obj/item/weapon/material/knife/machete, +/obj/item/weapon/material/knife/machete, +/obj/item/weapon/material/knife/machete, +/obj/item/weapon/material/knife/machete, +/obj/item/weapon/melee/energy/sword, +/obj/item/weapon/melee/energy/sword, +/obj/item/weapon/melee/energy/sword, +/obj/item/weapon/melee/energy/sword, +/obj/item/weapon/melee/energy/sword, +/obj/item/weapon/shield/energy, +/obj/item/weapon/shield/energy, +/obj/item/weapon/shield/energy, +/obj/item/weapon/shield/energy, +/obj/item/weapon/shield/energy, +/obj/item/weapon/melee/baton/loaded, +/obj/item/weapon/melee/baton/loaded, +/obj/item/weapon/melee/baton/loaded, +/obj/item/weapon/melee/baton/loaded, +/obj/item/weapon/rig/ert, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/rig_module/vision/multi, +/obj/item/rig_module/device/drill, +/obj/item/rig_module/device/drill, +/obj/item/rig_module/device/plasmacutter, +/obj/item/rig_module/device/plasmacutter, +/obj/item/rig_module/device/orescanner, +/obj/item/rig_module/device/orescanner, +/obj/item/rig_module/rescue_pharm, +/obj/item/rig_module/rescue_pharm, +/obj/item/rig_module/chem_dispenser/injector, +/obj/item/rig_module/chem_dispenser/injector, +/obj/item/rig_module/chem_dispenser/combat, +/obj/item/rig_module/chem_dispenser/combat, +/obj/item/rig_module/device/healthscanner, +/obj/item/rig_module/device/healthscanner, +/obj/item/rig_module/sprinter, +/obj/item/rig_module/sprinter, +/obj/item/rig_module/sprinter, +/obj/item/rig_module/sprinter, +/obj/item/rig_module/device/anomaly_scanner, +/obj/item/rig_module/device/anomaly_scanner, +/obj/item/rig_module/device/rcd, +/obj/item/rig_module/device/rcd, +/obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted, +/obj/item/rig_module/mounted, +/obj/item/rig_module/grenade_launcher/smoke, +/obj/item/rig_module/cleaner_launcher, +/obj/item/rig_module/grenade_launcher, +/obj/item/weapon/storage/box/handcuffs, +/obj/item/weapon/storage/box/handcuffs, +/obj/item/weapon/storage/box/holobadge, +/obj/item/weapon/storage/box/holowarrants, +/obj/item/weapon/storage/box/flare, +/obj/item/weapon/storage/box/flare, +/obj/item/weapon/storage/box/flare, +/obj/item/weapon/storage/box/flare, +/obj/item/weapon/storage/box/metalfoam, +/obj/item/weapon/storage/box/metalfoam, +/obj/item/weapon/storage/box/metalfoam, +/obj/item/weapon/storage/box/metalfoam, +/obj/item/clothing/suit/space/void/merc/prototype, +/obj/item/clothing/suit/space/void/merc/prototype, +/obj/item/clothing/suit/space/void/merc/prototype, +/obj/item/clothing/suit/space/void/merc/prototype, +/obj/item/clothing/head/helmet/space/void/merc/prototype, +/obj/item/clothing/head/helmet/space/void/merc/prototype, +/obj/item/clothing/head/helmet/space/void/merc/prototype, +/obj/item/clothing/head/helmet/space/void/merc/prototype, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/vox, +/obj/item/weapon/tank/vox, +/obj/item/weapon/tank/vox, +/obj/item/weapon/tank/vox, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/clothing/suit/space/void/pilot, +/obj/item/clothing/suit/space/void/pilot, +/obj/item/clothing/head/helmet/space/void/pilot, +/obj/item/clothing/head/helmet/space/void/pilot, +/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/weapon/storage/belt/utility/full, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"af" = ( +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram{ + desc = "A large machine releasing a constant gust of air."; + icon = 'icons/obj/survival_pod.dmi'; + icon_state = "fans"; + name = "enviornmental regulation system" + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"ag" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/weapon/gun/energy/gun/burst, +/obj/item/weapon/gun/energy/gun/burst, +/obj/item/weapon/gun/energy/xray, +/obj/item/weapon/gun/energy/xray, +/obj/item/weapon/gun/energy/netgun, +/obj/item/weapon/gun/energy/ionrifle, +/obj/item/weapon/gun/energy/ionrifle, +/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, +/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/weapon/gun/launcher/grenade, +/obj/item/weapon/gun/launcher/grenade, +/obj/item/weapon/storage/box/flashbangs, +/obj/item/weapon/storage/box/flashbangs, +/obj/item/weapon/storage/box/smokes, +/obj/item/weapon/storage/box/smokes, +/obj/item/weapon/storage/box/empslite, +/obj/item/weapon/storage/box/empslite, +/obj/item/weapon/storage/box/teargas, +/obj/item/weapon/storage/box/teargas, +/obj/item/weapon/storage/box/frags, +/obj/item/weapon/storage/box/frags, +/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmt/flash, +/obj/item/ammo_magazine/m9mmt/flash, +/obj/item/ammo_magazine/m9mmt/flash, +/obj/item/ammo_magazine/m9mmt/flash, +/obj/item/ammo_magazine/m9mmt/rubber, +/obj/item/ammo_magazine/m9mmt/rubber, +/obj/item/ammo_magazine/m9mmt/rubber, +/obj/item/ammo_magazine/m9mmt/rubber, +/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/weapon/storage/box/shotgunshells/large, +/obj/item/weapon/storage/box/shotgunshells/large, +/obj/item/weapon/storage/box/shotgunshells/large, +/obj/item/weapon/storage/box/shotgunshells/large, +/obj/item/weapon/storage/box/shotgunammo/large, +/obj/item/weapon/storage/box/shotgunammo/large, +/obj/item/weapon/storage/box/shotgunammo/large, +/obj/item/weapon/storage/box/shotgunammo/large, +/obj/item/weapon/storage/box/empshells/large, +/obj/item/weapon/storage/box/empshells/large, +/obj/item/weapon/storage/box/beanbags, +/obj/item/weapon/storage/box/beanbags, +/obj/item/weapon/storage/box/stunshells, +/obj/item/weapon/storage/box/stunshells, +/obj/item/weapon/storage/box/flashshells, +/obj/item/weapon/storage/box/flashshells, +/obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"ah" = ( +/obj/structure/fans/hardlight, +/obj/machinery/door/blast/regular{ + destroy_hits = 1000 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/tabiranth) +"ai" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aj" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"ak" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"al" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1; + icon_state = "map" + }, +/obj/machinery/suit_cycler{ + density = 0; + layer = 2.2 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"am" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"an" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"ao" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"ap" = ( +/obj/machinery/power/shield_generator/charged{ + density = 0; + field_radius = 9; + initial_shield_modes = 2113; + layer = 2.45; + plane = -44 + }, +/obj/structure/cable/cyan{ + icon_state = "0-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/bluegrid, +/area/shuttle/tabiranth) +"aq" = ( +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"ar" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"as" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"at" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"au" = ( +/obj/machinery/autolathe{ + desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; + hacked = 1; + mat_efficiency = 0.5; + name = "Centcom Autolathe" + }, +/turf/simulated/floor/bluegrid, +/area/shuttle/tabiranth) +"av" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/mech_recharger, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aw" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"ax" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"ay" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + icon_state = "warningcorner"; + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"az" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + icon_state = "warningcorner"; + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aA" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air{ + start_pressure = 8559.63 + }, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aB" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air{ + start_pressure = 8559.63 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aC" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/telecomms/relay{ + density = 0; + layer = 2.45; + plane = -44 + }, +/obj/structure/catwalk, +/turf/simulated/floor/bluegrid, +/area/shuttle/tabiranth) +"aD" = ( +/obj/structure/fans/hardlight, +/obj/machinery/door/airlock/alien/blue/locked{ + req_one_access = list(101) + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "tabiranth_airlock"; + name = "exterior access button"; + pixel_x = -5; + pixel_y = -26 + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"aE" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4; + frequency = 1380 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "tabiranth_airlock"; + pixel_y = -32; + req_one_access = list(101) + }, +/obj/machinery/airlock_sensor{ + frequency = 1380; + pixel_y = 25 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/light/small{ + icon_state = "bulb1"; + dir = 1 + }, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"aF" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 8 + }, +/obj/machinery/recharger/wallcharger{ + pixel_y = -32 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/closet/walllocker{ + name = "Janitor Locker"; + pixel_y = -32 + }, +/obj/item/weapon/storage/box/lights/mixed, +/obj/item/weapon/storage/box/lights/mixed, +/obj/item/weapon/mop, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/weapon/soap/nanotrasen, +/obj/item/weapon/soap/deluxe, +/obj/item/weapon/soap, +/obj/item/weapon/rig/ert/janitor, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aH" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/mech_recharger, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/closet/walllocker{ + name = "Internals Locker"; + pixel_y = -32 + }, +/obj/item/weapon/storage/box/survival/space, +/obj/item/weapon/storage/box/survival/space, +/obj/item/weapon/storage/box/survival/space, +/obj/item/weapon/storage/box/survival/space, +/obj/item/weapon/storage/box/survival/space, +/obj/item/weapon/storage/box/survival/space, +/obj/item/weapon/storage/box/survival/space, +/obj/item/weapon/storage/box/survival/space, +/obj/item/weapon/storage/toolbox/emergency, +/obj/item/weapon/storage/toolbox/emergency, +/obj/item/weapon/storage/toolbox/emergency, +/obj/item/weapon/storage/toolbox/emergency, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aJ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/obj/machinery/recharger/wallcharger{ + pixel_y = -32 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/fans/hardlight, +/obj/machinery/door/airlock/alien/blue/locked{ + req_one_access = list(101) + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "tabiranth_airlock"; + pixel_x = 5; + pixel_y = 26 + }, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"aL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/fans/hardlight, +/obj/machinery/door/airlock/alien/blue/locked{ + req_one_access = list(101) + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "tabiranth_docker"; + pixel_x = -5; + pixel_y = 26 + }, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"aM" = ( +/turf/simulated/floor/reinforced/airless{ + name = "outer hull" + }, +/area/shuttle/tabiranth) +"aN" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"aO" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/clothing/under/ert, +/obj/item/clothing/under/ert, +/obj/item/clothing/under/ert, +/obj/item/clothing/under/ert, +/obj/item/clothing/under/ert, +/obj/item/clothing/under/ert, +/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/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/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/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/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/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/storage/belt/utility/chief/full, +/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/weapon/storage/belt/security/tactical, +/obj/item/weapon/storage/belt/security/tactical, +/obj/item/weapon/storage/belt/security/tactical, +/obj/item/weapon/storage/belt/security/tactical, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/backpack/ert/commander, +/obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/weapon/storage/backpack/ert/security, +/obj/item/weapon/storage/backpack/ert/security, +/obj/item/weapon/storage/backpack/ert/security, +/obj/item/weapon/storage/backpack/ert/security, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/projectile/pistol, +/obj/item/weapon/gun/projectile/pistol, +/obj/item/weapon/gun/projectile/pistol, +/obj/item/ammo_magazine/m9mm/compact, +/obj/item/ammo_magazine/m9mm/compact, +/obj/item/ammo_magazine/m9mm/compact, +/obj/item/ammo_magazine/m9mm/compact, +/obj/item/ammo_magazine/m9mm/compact, +/obj/item/ammo_magazine/m9mm/compact, +/obj/item/ammo_magazine/m9mm/compact/flash, +/obj/item/ammo_magazine/m9mm/compact/flash, +/obj/item/ammo_magazine/m9mm/compact/flash, +/obj/item/ammo_magazine/m9mm/compact/rubber, +/obj/item/ammo_magazine/m9mm/compact/rubber, +/obj/item/ammo_magazine/m9mm/compact/rubber, +/obj/item/ammo_magazine/m9mm/compact/practice, +/obj/item/ammo_magazine/m9mm/compact/practice, +/obj/item/ammo_magazine/m9mm/compact/practice, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/modular_computer/tablet/preset/custom_loadout/elite, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule/luxury, +/obj/item/device/survivalcapsule/luxury, +/obj/item/device/survivalcapsule/luxury, +/obj/item/device/survivalcapsule/luxury, +/obj/item/device/survivalcapsule/luxury, +/obj/item/device/survivalcapsule/luxury, +/obj/item/device/survivalcapsule/luxury, +/obj/item/device/survivalcapsule/luxury, +/obj/item/device/survivalcapsule/luxurybar, +/obj/item/device/survivalcapsule/luxurybar, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"aP" = ( +/obj/machinery/telecomms/allinone, +/turf/simulated/floor/bluegrid, +/area/shuttle/tabiranth) +"aQ" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Tabiranth"; + tele_network = "centcom" + }, +/obj/effect/floor_decal/industrial/hatch, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"aR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) +"aS" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/firstaid/clotting, +/obj/item/weapon/storage/firstaid/bonemed, +/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/surgery, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/weapon/storage/box/masks, +/obj/item/weapon/storage/box/gloves, +/obj/item/weapon/storage/box/freezer, +/obj/item/weapon/storage/box/bodybags, +/obj/item/weapon/storage/box/beakers, +/obj/item/weapon/storage/box/PDAs, +/obj/item/weapon/storage/box/ids, +/obj/item/weapon/storage/box/pillbottles, +/obj/item/weapon/storage/box/pillbottles, +/obj/item/weapon/storage/box/syringes, +/obj/item/weapon/storage/box/syringes, +/obj/item/weapon/storage/quickdraw/syringe_case, +/obj/item/weapon/storage/quickdraw/syringe_case, +/obj/item/weapon/storage/quickdraw/syringe_case, +/obj/item/weapon/storage/quickdraw/syringe_case, +/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/reagent_containers/hypospray, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/stack/nanopaste/advanced, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, +/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/glass/beaker/noreact, +/obj/item/weapon/reagent_containers/glass/beaker/noreact, +/obj/item/weapon/reagent_containers/glass/beaker/bluespace, +/obj/item/weapon/reagent_containers/glass/beaker/bluespace, +/obj/item/weapon/reagent_containers/glass/beaker/bluespace, +/obj/item/weapon/reagent_containers/glass/beaker/bluespace, +/obj/item/weapon/reagent_containers/dropper, +/obj/item/weapon/reagent_containers/dropper, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"aT" = ( +/obj/machinery/shipsensors{ + dir = 1; + health = 1000; + heat_reduction = 4.5; + max_health = 1000; + name = "military sensors suite" + }, +/turf/simulated/floor/reinforced/airless{ + name = "outer hull" + }, +/area/shuttle/tabiranth) +"aU" = ( +/obj/machinery/chemical_dispenser/ert{ + dispense_reagents = list("inaprovaline","ryetalyn","paracetamol","tramadol","oxycodone","sterilizine","leporazine","kelotane","dermaline","dexalin","dexalinp","tricordrazine","anti_toxin","synaptizine","hyronalin","arithrazine","alkysine","imidazoline","peridaxon","bicaridine","hyperzine","rezadone","spaceacillin","ethylredoxrazine","stoxin","glucose","cryoxadone","clonexadone") + }, +/obj/structure/table/survival_pod, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"aV" = ( +/obj/machinery/chem_master, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"aW" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"aX" = ( +/obj/machinery/power/apc{ + alarms_hidden = 1; + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"aY" = ( +/obj/machinery/ntnet_relay{ + density = 0; + layer = 2.45; + plane = -44 + }, +/obj/structure/catwalk, +/turf/simulated/floor/bluegrid, +/area/shuttle/tabiranth) +"aZ" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"ba" = ( +/turf/template_noop, +/area/template_noop) +"bb" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bc" = ( +/obj/machinery/sleep_console{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bd" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"be" = ( +/obj/machinery/body_scanconsole{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bf" = ( +/obj/machinery/bodyscanner{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bg" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bh" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/door/airlock/alien/blue{ + req_one_access = list(101) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/tabiranth) +"bi" = ( +/obj/structure/handrail{ + dir = 4 + }, +/obj/machinery/recharge_station{ + density = 0; + layer = 2.2 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"bj" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/clothing/suit/space/void/merc/fire, +/obj/item/clothing/head/helmet/space/void/merc/fire, +/obj/item/clothing/suit/space/void/merc, +/obj/item/clothing/suit/space/void/merc, +/obj/item/clothing/head/helmet/space/void/merc, +/obj/item/clothing/head/helmet/space/void/merc, +/obj/item/clothing/suit/space/void/merc/odst, +/obj/item/clothing/suit/space/void/merc/odst, +/obj/item/clothing/head/helmet/space/void/merc/odst, +/obj/item/clothing/head/helmet/space/void/merc/odst, +/obj/item/clothing/suit/space/void/security/fluff/hos, +/obj/item/clothing/head/helmet/space/void/security/fluff/hos, +/obj/item/clothing/head/helmet/space/void/captain, +/obj/item/clothing/suit/space/void/captain, +/obj/item/weapon/tank/oxygen/yellow, +/obj/item/weapon/tank/oxygen/yellow, +/obj/item/weapon/tank/oxygen/yellow, +/obj/item/weapon/tank/oxygen/yellow, +/obj/item/weapon/tank/vox, +/obj/item/weapon/tank/vox, +/obj/item/rig_module/chem_dispenser/injector/advanced, +/obj/item/rig_module/vision/multi, +/obj/item/weapon/rig/military/equipped, +/obj/item/weapon/rig/pmc/commander, +/obj/item/weapon/rig/pmc/medical, +/obj/item/weapon/rig/pmc/engineer, +/obj/item/weapon/rig/pmc/security, +/obj/item/weapon/rig/pmc/security, +/obj/item/weapon/rig/light/ninja, +/obj/item/weapon/gun/energy/modular/cannon, +/obj/item/weapon/gun/energy/modular/carbine, +/obj/item/weapon/gun/energy/modular/pistol, +/obj/item/weapon/gun/energy/medigun, +/obj/item/weapon/gun/energy/captain, +/obj/item/weapon/material/knife/machete/deluxe{ + default_material = "durasteel" + }, +/obj/item/clothing/accessory/holster/machete, +/obj/item/weapon/storage/firstaid/insiderepair, +/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/toolbox/syndicate/powertools, +/obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy{ + name = "Super Heavy Demolitions kit" + }, +/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy{ + name = "Heavy Demolitions kit" + }, +/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy{ + name = "Heavy Demolitions kit" + }, +/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy{ + name = "Heavy Demolitions kit" + }, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/obj/item/weapon/plastique, +/obj/item/weapon/cell/device/weapon/recharge/alien, +/obj/item/weapon/cell/device/weapon/recharge/alien, +/obj/item/weapon/cell/device/weapon/recharge/alien, +/obj/item/weapon/cell/device/weapon/recharge/alien, +/obj/item/weapon/cell/device/weapon/recharge/alien, +/obj/item/weapon/cell/device/weapon/recharge/alien, +/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, +/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/ammo_casing/microbattery/medical/corpse_mend, +/obj/item/ammo_casing/microbattery/medical/corpse_mend, +/obj/item/weapon/cell/slime{ + description_info = "This 'cell' holds a max charge of 20k and self recharges over time."; + icon = 'icons/obj/power.dmi'; + icon_state = "icell"; + maxcharge = 20000; + name = "slime core cell" + }, +/obj/item/weapon/cell/slime{ + description_info = "This 'cell' holds a max charge of 20k and self recharges over time."; + icon = 'icons/obj/power.dmi'; + icon_state = "icell"; + maxcharge = 20000; + name = "slime core cell" + }, +/obj/item/weapon/cell/slime{ + description_info = "This 'cell' holds a max charge of 20k and self recharges over time."; + icon = 'icons/obj/power.dmi'; + icon_state = "icell"; + maxcharge = 20000; + name = "slime core cell" + }, +/obj/item/weapon/cell/slime{ + description_info = "This 'cell' holds a max charge of 20k and self recharges over time."; + icon = 'icons/obj/power.dmi'; + icon_state = "icell"; + maxcharge = 20000; + name = "slime core cell" + }, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/slime_extract/pink, +/obj/item/weapon/deadringer, +/obj/item/weapon/deadringer, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/weapon/card/mining_point_card{ + mine_points = 50000 + }, +/obj/item/weapon/card/mining_point_card{ + mine_points = 50000 + }, +/obj/item/weapon/card/mining_point_card{ + mine_points = 50000 + }, +/obj/item/weapon/card/mining_point_card{ + mine_points = 50000 + }, +/obj/item/weapon/card/mining_point_card{ + mine_points = 50000 + }, +/obj/item/weapon/card/mining_point_card{ + mine_points = 50000 + }, +/obj/item/weapon/card/mining_point_card/survey{ + name = "survey point card"; + survey_points = 5000 + }, +/obj/item/weapon/card/mining_point_card/survey{ + name = "survey point card"; + survey_points = 5000 + }, +/obj/item/weapon/card/mining_point_card/survey{ + name = "survey point card"; + survey_points = 5000 + }, +/obj/item/weapon/card/mining_point_card/survey{ + name = "survey point card"; + survey_points = 5000 + }, +/obj/item/weapon/card/mining_point_card/survey{ + name = "survey point card"; + survey_points = 5000 + }, +/obj/item/weapon/card/mining_point_card/survey{ + name = "survey point card"; + survey_points = 5000 + }, +/obj/item/device/survivalcapsule/military, +/obj/item/device/survivalcapsule/military, +/obj/item/device/survivalcapsule/escapepod, +/obj/item/weapon/technomancer_catalog/universal, +/obj/item/weapon/technomancer_core/universal, +/obj/item/weapon/storage/secure/briefcase/money{ + desc = "An sleek tidy briefcase."; + name = "secure briefcase" + }, +/obj/item/weapon/storage/secure/briefcase/money{ + desc = "An sleek tidy briefcase."; + name = "secure briefcase" + }, +/obj/item/weapon/storage/secure/briefcase/money{ + desc = "An sleek tidy briefcase."; + name = "secure briefcase" + }, +/obj/item/weapon/storage/secure/briefcase/money{ + desc = "An sleek tidy briefcase."; + name = "secure briefcase" + }, +/obj/item/weapon/storage/secure/briefcase/money{ + desc = "An sleek tidy briefcase."; + name = "secure briefcase" + }, +/obj/item/weapon/storage/secure/briefcase/money{ + desc = "An sleek tidy briefcase."; + name = "secure briefcase" + }, +/obj/item/device/radio/uplink, +/obj/item/device/radio/uplink, +/obj/item/device/spaceflare, +/obj/item/device/spaceflare, +/obj/item/device/perfect_tele/frontier/unknown/four, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/bluespaceradio/tether_prelinked, +/obj/item/weapon/cat_box, +/obj/item/weapon/cat_box, +/obj/item/weapon/cat_box/black, +/obj/item/weapon/cat_box/black, +/obj/item/weapon/disposable_teleporter, +/obj/item/weapon/hand_tele, +/obj/item/weapon/storage/belt, +/obj/item/weapon/storage/belt/medical/alien, +/obj/item/weapon/storage/belt/utility/alien, +/obj/item/weapon/storage/belt/holding, +/obj/item/weapon/rig/ert/assetprotection, +/obj/item/weapon/rig/ert/assetprotection, +/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/ammo_magazine/m545saw, +/obj/item/ammo_magazine/m545saw, +/obj/item/ammo_magazine/m545saw, +/obj/item/ammo_magazine/m545saw, +/obj/item/ammo_magazine/m545saw/ap, +/obj/item/ammo_magazine/m545saw/ap, +/obj/item/ammo_magazine/m545saw/ap, +/obj/item/ammo_magazine/m545saw/ap, +/obj/item/ammo_magazine/m545saw/ap, +/obj/item/ammo_magazine/m545saw/ap, +/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/weapon/storage/box/sniperammo, +/obj/item/weapon/storage/box/sniperammo, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/weapon/storage/box/sniperammo, +/obj/item/weapon/storage/box/sniperammo, +/obj/item/modular_computer/laptop/preset/custom_loadout/hybrid, +/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"bk" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/obj/structure/closet/secure_closet/wall{ + pixel_x = 32; + req_access = list(101) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"bl" = ( +/obj/machinery/power/smes/buildable/hybrid{ + input_level = 200000; + output_level = 200000 + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"bm" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"bn" = ( +/obj/machinery/pointdefense_control{ + id_tag = "tabiranth_pd" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"bo" = ( +/obj/structure/closet/medical_wall{ + pixel_x = -32 + }, +/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, +/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, +/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, +/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, +/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, +/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, +/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, +/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, +/obj/item/weapon/storage/box/gloves, +/obj/item/weapon/storage/firstaid/surgery, +/obj/item/weapon/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner"; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner"; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/mmi/digital/posibrain, +/obj/item/device/mmi, +/obj/item/weapon/book/manual/robotics_cyborgs, +/obj/item/device/robotanalyzer, +/obj/item/weapon/tank/anesthetic, +/obj/item/weapon/tank/anesthetic, +/obj/item/weapon/tank/anesthetic, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical, +/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/stack/cable_coil/alien, +/obj/item/stack/nanopaste, +/obj/item/stack/nanopaste, +/obj/item/stack/nanopaste, +/obj/item/device/defib_kit/jumper_kit/loaded, +/obj/item/device/defib_kit/compact/loaded, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bp" = ( +/obj/machinery/computer/operating{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bq" = ( +/obj/machinery/mineral/equipment_vendor, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"br" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/rd, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"bs" = ( +/obj/structure/table/survival_pod, +/obj/machinery/turretid{ + control_area = /area/shuttle/tabiranth; + pixel_x = -32; + req_access = list(101) + }, +/obj/machinery/light/small{ + dir = 8; + pixel_x = 0 + }, +/obj/machinery/recharger, +/obj/item/modular_computer/laptop/preset/custom_loadout/elite, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"bt" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8; + frequency = 1380 + }, +/obj/machinery/light/small{ + icon_state = "bulb1"; + dir = 1 + }, +/obj/machinery/airlock_sensor{ + frequency = 1380; + pixel_y = 25 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "tabiranth_docker"; + pixel_y = -32; + req_one_access = list(101) + }, +/obj/effect/shuttle_landmark/shuttle_initializer/tabiranth, +/obj/effect/overmap/visitable/ship/landable/tabiranth, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"bu" = ( +/obj/machinery/computer/ship/engines{ + dir = 8; + icon_state = "computer" + }, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"bv" = ( +/obj/structure/medical_stand, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bw" = ( +/obj/machinery/optable, +/obj/machinery/oxygen_pump/anesthetic{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bx" = ( +/obj/machinery/mineral/equipment_vendor/survey, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"by" = ( +/obj/machinery/syndicate_beacon/virgo{ + charges = 10; + density = 0 + }, +/obj/effect/floor_decal/techfloor{ + icon_state = "techfloor_edges"; + dir = 6 + }, +/obj/machinery/vending/nifsoft_shop{ + categories = 111; + emagged = 1; + name = "Hacked NIFSoft Shop"; + prices = list() + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"bz" = ( +/obj/machinery/computer/ship/sensors{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"bA" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/alien/blue{ + req_one_access = list(108) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/tabiranth) +"bB" = ( +/obj/machinery/computer/shuttle_control/explore/hybridshuttle{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"bC" = ( +/obj/machinery/organ_printer/flesh/full, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bD" = ( +/obj/item/weapon/storage/firstaid/surgery, +/obj/item/weapon/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner"; + pixel_x = 2; + pixel_y = 2 + }, +/obj/structure/sink/kitchen{ + icon_state = "sink_alt"; + dir = 4; + pixel_x = -13 + }, +/obj/structure/table/survival_pod, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bE" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/shuttle/tabiranth) +"bF" = ( +/obj/machinery/computer/ship/helm{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"bG" = ( +/obj/machinery/ion_engine, +/turf/simulated/floor/reinforced/airless, +/area/shuttle/tabiranth) +"bH" = ( +/obj/structure/closet/hydrant{ + pixel_x = 32 + }, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/mask/gas, +/obj/item/device/flashlight, +/obj/item/weapon/tank/oxygen/red, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/extinguisher, +/obj/item/weapon/extinguisher, +/obj/item/weapon/extinguisher, +/obj/item/weapon/extinguisher, +/obj/item/clothing/head/hardhat/red, +/obj/item/weapon/storage/toolbox/emergency, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/tabiranth) +"bI" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/machinery/portable_atmospherics/canister/oxygen{ + anchored = 1; + density = 0; + health = 1000; + layer = 2.2; + volume = 10000 + }, +/obj/machinery/portable_atmospherics/canister/oxygen{ + anchored = 1; + density = 0; + health = 1000; + layer = 2.2; + volume = 10000 + }, +/obj/machinery/button/remote/blast_door{ + id = "ship-vault"; + name = "Vault Blast Door Controls"; + pixel_x = 26; + pixel_y = -26; + req_one_access = list(108) + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/tabiranth) +"bJ" = ( +/obj/structure/fans/hardlight, +/obj/machinery/door/airlock/alien/blue/locked{ + req_one_access = list(101) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "tabiranth_docker"; + name = "exterior access button"; + pixel_x = 5; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"bK" = ( +/obj/structure/handrail{ + dir = 8 + }, +/obj/machinery/recharge_station{ + density = 0; + layer = 2.2 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/tabiranth) +"bM" = ( +/obj/machinery/door/airlock/alien/blue{ + req_one_access = list(108) + }, +/obj/machinery/door/blast/regular{ + destroy_hits = 100; + dir = 4; + id = "ship-vault"; + name = "Vault" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/tabiranth) +"bN" = ( +/obj/machinery/door/airlock/alien/blue{ + req_one_access = list(101) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/tabiranth) +"bO" = ( +/obj/machinery/mech_recharger{ + icon = 'icons/turf/shuttle_alien_blue.dmi' + }, +/obj/mecha/combat/fighter/baron{ + ground_capable = 1; + health = 800; + internal_damage_threshold = 100; + maxhealth = 800; + name = "Panther" + }, +/turf/simulated/floor/reinforced, +/area/shuttle/tabiranth) + +(1,1,1) = {" +ba +ba +ba +ba +aa +ac +aD +ac +aM +ab +aa +ac +ad +ad +ad +ad +ba +"} +(2,1,1) = {" +aa +ac +ah +ah +ad +ad +aE +ad +ad +ad +ad +ac +bj +bq +bx +ad +aa +"} +(3,1,1) = {" +ab +ad +ai +bO +au +ac +aK +ad +aN +aX +bi +bM +bk +br +by +ac +ab +"} +(4,1,1) = {" +ac +ac +aj +aq +av +aA +aF +ad +aO +aC +bb +ac +ad +ad +ac +bE +bG +"} +(5,1,1) = {" +ad +ae +ak +ar +ay +aw +aG +ad +aU +aZ +bc +ad +bl +bs +bz +ac +ac +"} +(6,1,1) = {" +ad +af +al +as +as +as +aR +bh +ap +aW +bd +bA +bm +aQ +bI +bF +ad +"} +(7,1,1) = {" +ad +ag +am +at +az +ax +aI +ad +aV +bg +be +ad +bn +bu +bB +ac +ac +"} +(8,1,1) = {" +ac +ac +an +bO +aH +aB +aJ +ad +aS +aY +bf +ac +ad +ad +ac +bE +bG +"} +(9,1,1) = {" +ab +ad +ao +aq +aP +ac +aL +ad +aN +bH +bK +bN +bo +bv +bC +ac +ab +"} +(10,1,1) = {" +aa +ac +ah +ah +ad +ad +bt +ad +ad +ad +ad +ac +bp +bw +bD +ad +aa +"} +(11,1,1) = {" +ba +ba +ba +ba +aa +ac +bJ +ac +aT +ab +aa +ac +ad +ad +ad +ad +ba +"} diff --git a/vorestation.dme b/vorestation.dme index a7b4957d8b4..bb18968a33b 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2252,9 +2252,8 @@ #include "code\modules\mining\ore_box.dm" #include "code\modules\mining\ore_datum.dm" #include "code\modules\mining\resonator_vr.dm" -#include "code\modules\mining\shelter_atoms.dm" #include "code\modules\mining\shelter_atoms_vr.dm" -#include "code\modules\mining\shelters.dm" +#include "code\modules\mining\shelters_vr.dm" #include "code\modules\mining\drilling\drill.dm" #include "code\modules\mining\drilling\scanner.dm" #include "code\modules\mining\ore_redemption_machine\construction.dm" From 170d39868da79262c8764f86442ba5f07ae82d1f Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 15:05:54 -0400 Subject: [PATCH 02/11] Fixes path --- maps/tether/submaps/om_ships/shelter_6.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm index d6add5b89f6..222669d9e4a 100644 --- a/maps/tether/submaps/om_ships/shelter_6.dmm +++ b/maps/tether/submaps/om_ships/shelter_6.dmm @@ -1654,7 +1654,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/tabiranth) "bB" = ( -/obj/machinery/computer/shuttle_control/explore/hybridshuttle{ +/obj/machinery/computer/shuttle_control/explore/tabiranth{ dir = 8 }, /turf/simulated/floor/tiled/techmaint, From 46fb6c72bd982126e4adf18ddd7d7cce2c5200ab Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 15:38:11 -0400 Subject: [PATCH 03/11] Adds buttons for the dropship hangar --- maps/tether/submaps/om_ships/shelter_6.dmm | 65 +++++++++++----------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm index 222669d9e4a..0ff032206be 100644 --- a/maps/tether/submaps/om_ships/shelter_6.dmm +++ b/maps/tether/submaps/om_ships/shelter_6.dmm @@ -348,7 +348,8 @@ "ah" = ( /obj/structure/fans/hardlight, /obj/machinery/door/blast/regular{ - destroy_hits = 1000 + destroy_hits = 1000; + id = "tabi-hangar1" }, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/tabiranth) @@ -374,6 +375,11 @@ icon_state = "warning"; dir = 8 }, +/obj/machinery/button/remote/blast_door{ + id = "tabi-hangar1"; + pixel_x = -26; + pixel_y = 26 + }, /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) "al" = ( @@ -395,6 +401,11 @@ icon_state = "warning"; dir = 4 }, +/obj/machinery/button/remote/blast_door{ + id = "tabi-hangar2"; + pixel_x = 26; + pixel_y = 26 + }, /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) "an" = ( @@ -470,10 +481,11 @@ /turf/simulated/floor/bluegrid, /area/shuttle/tabiranth) "av" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/mech_recharger, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/mech_recharger, /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) "aw" = ( @@ -488,26 +500,6 @@ }, /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) -"ay" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/shuttle/tabiranth) -"az" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/shuttle/tabiranth) "aA" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/air{ @@ -624,11 +616,12 @@ /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) "aH" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/mech_recharger, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) "aI" = ( @@ -1734,7 +1727,7 @@ volume = 10000 }, /obj/machinery/button/remote/blast_door{ - id = "ship-vault"; + id = "tabi-vault"; name = "Vault Blast Door Controls"; pixel_x = 26; pixel_y = -26; @@ -1776,7 +1769,7 @@ /obj/machinery/door/blast/regular{ destroy_hits = 100; dir = 4; - id = "ship-vault"; + id = "tabi-vault"; name = "Vault" }, /obj/effect/floor_decal/industrial/warning{ @@ -1806,6 +1799,14 @@ }, /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) +"wz" = ( +/obj/structure/fans/hardlight, +/obj/machinery/door/blast/regular{ + destroy_hits = 1000; + id = "tabi-hangar2" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/tabiranth) (1,1,1) = {" ba @@ -1888,7 +1889,7 @@ ad ae ak ar -ay +aw aw aG ad @@ -1926,7 +1927,7 @@ ad ag am at -az +ax ax aI ad @@ -1981,8 +1982,8 @@ ab (10,1,1) = {" aa ac -ah -ah +wz +wz ad ad bt From c8e6c39e2572306b8a0ddafe0da3e421864fb5d7 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 16:04:37 -0400 Subject: [PATCH 04/11] Added some missing things --- maps/tether/submaps/om_ships/shelter_6.dmm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm index 0ff032206be..4319ae02c79 100644 --- a/maps/tether/submaps/om_ships/shelter_6.dmm +++ b/maps/tether/submaps/om_ships/shelter_6.dmm @@ -87,8 +87,6 @@ /obj/item/weapon/shield/energy, /obj/item/weapon/shield/energy, /obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, /obj/item/weapon/melee/baton/loaded, /obj/item/weapon/melee/baton/loaded, /obj/item/weapon/melee/baton/loaded, @@ -656,6 +654,7 @@ /obj/fiftyspawner/glass, /obj/fiftyspawner/glass, /obj/fiftyspawner/glass, +/obj/item/weapon/storage/belt/utility/full, /turf/simulated/floor/reinforced, /area/shuttle/tabiranth) "aJ" = ( @@ -781,7 +780,6 @@ /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, /obj/item/weapon/gun/projectile/pistol, /obj/item/weapon/gun/projectile/pistol, /obj/item/weapon/gun/projectile/pistol, @@ -872,6 +870,10 @@ /obj/item/weapon/tank/emergency/oxygen/double, /obj/item/weapon/tank/emergency/oxygen/double, /obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/device/binoculars, +/obj/item/device/binoculars, +/obj/item/device/binoculars, +/obj/item/device/perfect_tele, /turf/simulated/floor/tiled/white, /area/shuttle/tabiranth) "aP" = ( @@ -1427,6 +1429,8 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/item/device/perfect_tele/alien, +/obj/item/device/perfect_tele/frontier/staff, /turf/simulated/floor/tiled/techmaint, /area/shuttle/tabiranth) "bk" = ( From b6ab631075e6a4170d662d64ca9b4d82a76e21e9 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 16:08:01 -0400 Subject: [PATCH 05/11] Rearranges in the .dmm --- maps/tether/submaps/om_ships/shelter_6.dmm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm index 4319ae02c79..32ba8090d56 100644 --- a/maps/tether/submaps/om_ships/shelter_6.dmm +++ b/maps/tether/submaps/om_ships/shelter_6.dmm @@ -742,6 +742,7 @@ /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/device/perfect_tele, /obj/item/weapon/storage/belt/utility/chief/full, /obj/item/weapon/storage/belt/utility/chief/full, /obj/item/weapon/storage/belt/utility/chief/full, @@ -810,6 +811,10 @@ /obj/item/clothing/glasses/night, /obj/item/clothing/glasses/night, /obj/item/clothing/glasses/night, +/obj/item/device/binoculars, +/obj/item/device/binoculars, +/obj/item/device/binoculars, +/obj/item/device/binoculars, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, @@ -870,10 +875,6 @@ /obj/item/weapon/tank/emergency/oxygen/double, /obj/item/weapon/tank/emergency/oxygen/double, /obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/perfect_tele, /turf/simulated/floor/tiled/white, /area/shuttle/tabiranth) "aP" = ( @@ -908,10 +909,18 @@ /obj/item/weapon/storage/firstaid/adv, /obj/item/weapon/storage/firstaid/fire, /obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/firstaid/toxin, /obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/regular, /obj/item/weapon/storage/firstaid/surgery, /obj/item/weapon/storage/mre/menu11, /obj/item/weapon/storage/mre/menu11, @@ -1426,11 +1435,11 @@ /obj/item/weapon/storage/box/sniperammo, /obj/item/modular_computer/laptop/preset/custom_loadout/hybrid, /obj/item/modular_computer/tablet/preset/custom_loadout/hybrid, +/obj/item/device/perfect_tele/alien, +/obj/item/device/perfect_tele/frontier/staff, /obj/effect/floor_decal/techfloor{ dir = 9 }, -/obj/item/device/perfect_tele/alien, -/obj/item/device/perfect_tele/frontier/staff, /turf/simulated/floor/tiled/techmaint, /area/shuttle/tabiranth) "bk" = ( From acbb3f3835155fb8e8a6c8f6e0cca7d3ff33eb87 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 16:52:54 -0400 Subject: [PATCH 06/11] Oh I forgot to fix up the dispenser too --- .../dispenser/cartridge_presets_vr.dm | 9 ++++- .../dispenser/dispenser_presets_vr.dm | 36 ++++++++++++++++++- maps/tether/submaps/om_ships/shelter_6.dmm | 4 +-- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/dispenser/cartridge_presets_vr.dm index ebec2278a08..50c3f6d3998 100644 --- a/code/modules/reagents/dispenser/cartridge_presets_vr.dm +++ b/code/modules/reagents/dispenser/cartridge_presets_vr.dm @@ -7,4 +7,11 @@ //Biochem nutriment spawn_reagent = "nutriment" - protein spawn_reagent = "protein" \ No newline at end of file + protein spawn_reagent = "protein" + + //Special Ops + biomass spawn_reagent = "biomass" + carthatoline spawn_reagent = "carthatoline" + corophizine spawn_reagent = "corophizine" + myelamine spawn_reagent = "myelamine" + osteodaxon spawn_reagent = "osteodaxon" \ No newline at end of file diff --git a/code/modules/reagents/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/dispenser/dispenser_presets_vr.dm index bf7f85688da..ed63a60768a 100644 --- a/code/modules/reagents/dispenser/dispenser_presets_vr.dm +++ b/code/modules/reagents/dispenser/dispenser_presets_vr.dm @@ -30,4 +30,38 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/nutriment, /obj/item/weapon/reagent_containers/chem_disp_cartridge/protein, /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk - ) \ No newline at end of file + ) + +/obj/machinery/chemical_dispenser/ert/specialops + spawn_cartridges = list( + /obj/item/weapon/reagent_containers/chem_disp_cartridge/inaprov, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/dylovene, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/ryetalyn, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tramadol, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/oxycodone, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/sterilizine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/leporazine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/kelotane, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/dermaline, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin_p, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/synaptizine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/hyronalin, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/arithrazine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/alkysine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/imidazoline, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/peridaxon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/bicaridine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/hyperzine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/rezadone, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceacillin, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethylredox, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/carthatoline, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/corophizine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/myelamine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/osteodaxon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/biomass, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/iron, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/nutriment, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/protein + ) diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm index 32ba8090d56..7216f3a01db 100644 --- a/maps/tether/submaps/om_ships/shelter_6.dmm +++ b/maps/tether/submaps/om_ships/shelter_6.dmm @@ -1044,9 +1044,7 @@ }, /area/shuttle/tabiranth) "aU" = ( -/obj/machinery/chemical_dispenser/ert{ - dispense_reagents = list("inaprovaline","ryetalyn","paracetamol","tramadol","oxycodone","sterilizine","leporazine","kelotane","dermaline","dexalin","dexalinp","tricordrazine","anti_toxin","synaptizine","hyronalin","arithrazine","alkysine","imidazoline","peridaxon","bicaridine","hyperzine","rezadone","spaceacillin","ethylredoxrazine","stoxin","glucose","cryoxadone","clonexadone") - }, +/obj/machinery/chemical_dispenser/ert/specialops, /obj/structure/table/survival_pod, /obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, From a5f62634be5a9e14092d2d9ece70b537a3b4a7ba Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 19:30:35 -0400 Subject: [PATCH 07/11] Adds additional safeties Stops ships from being deployable on planet surfaces --- code/__defines/misc_vr.dm | 1 + code/modules/mining/shelter_atoms_vr.dm | 8 +++++++- code/modules/mining/shelters_vr.dm | 5 ++++- maps/tether/submaps/om_ships/shelter_5.dmm | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index bf6cb4d150a..71589e80c13 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -48,6 +48,7 @@ #define SHELTER_DEPLOY_BAD_TURFS "bad turfs" #define SHELTER_DEPLOY_BAD_AREA "bad area" #define SHELTER_DEPLOY_ANCHORED_OBJECTS "anchored objects" +#define SHELTER_DEPLOY_SHIP_SPACE "ship not in space" #define PTO_SECURITY "Security" #define PTO_MEDICAL "Medical" diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm index c44ca2ed97a..fd380e513e6 100644 --- a/code/modules/mining/shelter_atoms_vr.dm +++ b/code/modules/mining/shelter_atoms_vr.dm @@ -17,6 +17,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) var/template_id = "shelter_alpha" var/datum/map_template/shelter/template var/used = FALSE + var/is_ship = FALSE var/unique_id = null /obj/item/device/survivalcapsule/proc/get_template() @@ -47,7 +48,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) sleep(5 SECONDS) var/turf/deploy_location = get_turf(src) - var/status = template.check_deploy(deploy_location) + var/status = template.check_deploy(deploy_location, is_ship) var/turf/above_location = GetAbove(deploy_location) switch(status) @@ -61,6 +62,9 @@ GLOBAL_LIST_EMPTY(unique_deployable) var/height = template.height src.loc.visible_message("\The [src] doesn't have room to deploy! You need to clear a [width]x[height] area!") + if(SHELTER_DEPLOY_SHIP_SPACE) + src.loc.visible_message("\The [src] can only be deployed in space.") + if(status != SHELTER_DEPLOY_ALLOWED) used = FALSE return @@ -109,12 +113,14 @@ GLOBAL_LIST_EMPTY(unique_deployable) desc = "A prefabricated escape pod in a capsule. Contains a basic escape pod for survival purposes. There's a license for use printed on the bottom." template_id = "shelter_epsilon" unique_id = "shelter_5" + is_ship = TRUE /obj/item/device/survivalcapsule/dropship name = "dropship surfluid shelter capsule" desc = "A military dropship in a capsule. Contains everything an assault squad would need, minus the squad itself. This capsule is significantly larger than most. There's a license for use printed on the bottom." template_id = "shelter_zeta" unique_id = "shelter_6" + is_ship = TRUE w_class = ITEMSIZE_SMALL //Custom Shelter Capsules diff --git a/code/modules/mining/shelters_vr.dm b/code/modules/mining/shelters_vr.dm index 837ebb1bec3..e9839cafe7f 100644 --- a/code/modules/mining/shelters_vr.dm +++ b/code/modules/mining/shelters_vr.dm @@ -11,7 +11,7 @@ banned_areas = typecacheof(/area/shuttle) banned_objects = list() -/datum/map_template/shelter/proc/check_deploy(turf/deploy_location) +/datum/map_template/shelter/proc/check_deploy(turf/deploy_location, var/is_ship) var/affected = get_affected_turfs(deploy_location, centered=TRUE) for(var/turf/T in affected) var/area/A = get_area(T) @@ -21,6 +21,9 @@ var/banned = is_type_in_typecache(T, blacklisted_turfs) if(banned || T.density) return SHELTER_DEPLOY_BAD_TURFS + //Ships can only deploy in space (bacause their base turf is always turf/space) + if(is_ship && !is_type_in_typecache(T, typecacheof(/turf/space))) + return SHELTER_DEPLOY_SHIP_SPACE for(var/obj/O in T) if((O.density && O.anchored) || is_type_in_typecache(O, banned_objects)) diff --git a/maps/tether/submaps/om_ships/shelter_5.dmm b/maps/tether/submaps/om_ships/shelter_5.dmm index ef509d04d9c..3a3ef78f86c 100644 --- a/maps/tether/submaps/om_ships/shelter_5.dmm +++ b/maps/tether/submaps/om_ships/shelter_5.dmm @@ -192,6 +192,7 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, +/obj/machinery/recharger, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/deployable/escapepod) "r" = ( From 3279c318e320760eb74160474d8edbbe0eb7794e Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 20:49:26 -0400 Subject: [PATCH 08/11] Fix cruiser SMES --- maps/tether/submaps/om_ships/cruiser.dmm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/maps/tether/submaps/om_ships/cruiser.dmm b/maps/tether/submaps/om_ships/cruiser.dmm index c5c91ee91a9..089e2995822 100644 --- a/maps/tether/submaps/om_ships/cruiser.dmm +++ b/maps/tether/submaps/om_ships/cruiser.dmm @@ -3080,9 +3080,8 @@ charge = 2e+007; cur_coils = 4; input_attempt = 1; - input_level = 500000; - output_level = 1e+006; - RCon_tag = "Power - Main" + input_level = 1e+006; + output_level = 1e+006 }, /obj/structure/cable/cyan, /turf/simulated/floor/tiled/techfloor/grid, From 6ec61fa98823257a7d95061773fc17c7e05d6cb6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 22:34:06 -0400 Subject: [PATCH 09/11] Mass changes --- maps/tether/submaps/om_ships/shelter_5.dm | 2 +- maps/tether/submaps/om_ships/shelter_6.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/maps/tether/submaps/om_ships/shelter_5.dm b/maps/tether/submaps/om_ships/shelter_5.dm index 038c50cbbba..28dd871bbf8 100644 --- a/maps/tether/submaps/om_ships/shelter_5.dm +++ b/maps/tether/submaps/om_ships/shelter_5.dm @@ -45,6 +45,6 @@ [i]Class[/i]: Escape Pod [i]Transponder[/i]: Transmitting (CIV), non-hostile [b]Notice[/b]: Emergency Transponder Active"} - vessel_mass = 500 + vessel_mass = 1000 vessel_size = SHIP_SIZE_TINY shuttle = "Escape Pod" diff --git a/maps/tether/submaps/om_ships/shelter_6.dm b/maps/tether/submaps/om_ships/shelter_6.dm index c5450ff3502..d11afa04d34 100644 --- a/maps/tether/submaps/om_ships/shelter_6.dm +++ b/maps/tether/submaps/om_ships/shelter_6.dm @@ -47,7 +47,7 @@ [i]Class[/i]: Assault Dropship [i]Transponder[/i]: Transmitting (MIL), NanoTrasen [b]Notice[/b]: Experimental vessel"} - color = "#00ffcc" //Bluegreen - vessel_mass = 4500 + color = "#8800ff" //Indigo + vessel_mass = 5000 vessel_size = SHIP_SIZE_SMALL - shuttle = "NDV Tabiranth" \ No newline at end of file + shuttle = "NDV Tabiranth" From 4e6cdb011dbca82d107789e7753b7d08f27f133b Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 23:20:41 -0400 Subject: [PATCH 10/11] Update with adv magboots --- maps/submaps/shelters/shelter_4.dmm | 8 ++++---- maps/tether/submaps/om_ships/shelter_6.dmm | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/maps/submaps/shelters/shelter_4.dmm b/maps/submaps/shelters/shelter_4.dmm index 63100ce2861..e56f8095fe6 100644 --- a/maps/submaps/shelters/shelter_4.dmm +++ b/maps/submaps/shelters/shelter_4.dmm @@ -462,10 +462,10 @@ /obj/item/weapon/tank/oxygen, /obj/item/weapon/tank/oxygen, /obj/item/weapon/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm index 7216f3a01db..8850e7cefa8 100644 --- a/maps/tether/submaps/om_ships/shelter_6.dmm +++ b/maps/tether/submaps/om_ships/shelter_6.dmm @@ -152,10 +152,12 @@ /obj/item/clothing/head/helmet/space/void/merc/prototype, /obj/item/clothing/head/helmet/space/void/merc/prototype, /obj/item/clothing/head/helmet/space/void/merc/prototype, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, /obj/item/weapon/tank/oxygen, /obj/item/weapon/tank/oxygen, /obj/item/weapon/tank/oxygen, From 38739ce8ec1b674470d4ff7df3b3079c834b6ce0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 23:41:07 -0400 Subject: [PATCH 11/11] Adds lights, RTG to Escape pod --- maps/tether/submaps/om_ships/shelter_5.dmm | 63 +++++++++------------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/maps/tether/submaps/om_ships/shelter_5.dmm b/maps/tether/submaps/om_ships/shelter_5.dmm index 3a3ef78f86c..104a90a96a2 100644 --- a/maps/tether/submaps/om_ships/shelter_5.dmm +++ b/maps/tether/submaps/om_ships/shelter_5.dmm @@ -88,6 +88,10 @@ pixel_y = 22 }, /obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/light/small{ + dir = 8; + pixel_x = 0 + }, /turf/simulated/floor/tiled/steel_grid, /area/shuttle/deployable/escapepod) "i" = ( @@ -98,6 +102,10 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/machinery/light/small{ + dir = 8; + pixel_x = 0 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/deployable/escapepod) "j" = ( @@ -107,39 +115,15 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/deployable/escapepod) "k" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/cyan{ - d1 = 0; - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/deployable/escapepod) -"l" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/deployable/escapepod) "m" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/effect/floor_decal/techfloor{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/deployable/escapepod) "n" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/door/airlock/external, /obj/machinery/access_button{ command = "cycle_interior"; @@ -155,22 +139,12 @@ /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/deployable/escapepod) "o" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/shuttle_landmark/shuttle_initializer/escapepod, /obj/effect/overmap/visitable/ship/landable/escapepod, /turf/simulated/floor/tiled/steel_grid, /area/shuttle/deployable/escapepod) "p" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/door/airlock/external, /obj/effect/floor_decal/industrial/warning{ icon_state = "warning"; @@ -196,10 +170,10 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/deployable/escapepod) "r" = ( -/obj/machinery/power/smes/buildable/point_of_interest, /obj/structure/cable/cyan{ icon_state = "0-4" }, +/obj/machinery/power/rtg/advanced, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/deployable/escapepod) "s" = ( @@ -240,6 +214,19 @@ /obj/structure/sign/mining/survival, /turf/simulated/wall/rpshull, /area/shuttle/deployable/escapepod) +"L" = ( +/obj/effect/floor_decal/techfloor, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/deployable/escapepod) (1,1,1) = {" a @@ -272,15 +259,15 @@ b (5,1,1) = {" c f -l +k s v "} (6,1,1) = {" b f -l -s +k +L b "} (7,1,1) = {"