diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index bca9df5ae1..157a3f113f 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -55,6 +55,9 @@
var/rev_cooldown = 0
var/tcrystals = 0
+ var/list/purchase_log = new
+ var/used_TC = 0
+
// the world.time since the mob has been brigged, or -1 if not at all
var/brigged_since = -1
@@ -73,7 +76,7 @@
/datum/mind/New(var/key)
src.key = key
-
+ purchase_log = list()
..()
/datum/mind/proc/transfer_to(mob/living/new_character)
diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm
index 65f71f2584..8addcc3f64 100644
--- a/code/datums/uplink/badassery.dm
+++ b/code/datums/uplink/badassery.dm
@@ -22,22 +22,22 @@
desc = "Buys you one random item."
/datum/uplink_item/item/badassery/random_one/buy(var/obj/item/device/uplink/U, var/mob/user)
- var/datum/uplink_item/item = default_uplink_selection.get_random_item(U.uses)
+ var/datum/uplink_item/item = default_uplink_selection.get_random_item((user ? user.mind.tcrystals : DEFAULT_TELECRYSTAL_AMOUNT), U)
return item.buy(U, user)
-/datum/uplink_item/item/badassery/random_one/can_buy(obj/item/device/uplink/U)
- return default_uplink_selection.get_random_item(U.uses, U) != null
+/datum/uplink_item/item/badassery/random_one/can_buy(var/obj/item/device/uplink/U, var/telecrystals)
+ return default_uplink_selection.get_random_item(telecrystals, U) != null
/datum/uplink_item/item/badassery/random_many
name = "Random Items"
desc = "Buys you as many random items you can afford. Convenient packaging NOT included."
-/datum/uplink_item/item/badassery/random_many/cost(var/telecrystals)
+/datum/uplink_item/item/badassery/random_many/cost(obj/item/device/uplink/U, var/telecrystals)
return max(1, telecrystals)
-/datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/device/uplink/U, var/loc)
+/datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/M)
var/list/bought_items = list()
- for(var/datum/uplink_item/UI in get_random_uplink_items(U, U.uses, loc))
+ for(var/datum/uplink_item/UI in get_random_uplink_items(U, M.mind.tcrystals, loc))
UI.purchase_log(U)
var/obj/item/I = UI.get_goods(U, loc)
if(istype(I))
@@ -47,7 +47,7 @@
/datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/device/uplink/U)
feedback_add_details("traitor_uplink_items_bought", "[src]")
- log_and_message_admins("used \the [U.loc] to buy \a [src]")
+ log_and_message_admins("used \the [U.loc] to buy \a [src] at random")
/****************
* Surplus Crate *
diff --git a/code/datums/uplink/telecrystals.dm b/code/datums/uplink/telecrystals.dm
index f814b55232..66a099581e 100644
--- a/code/datums/uplink/telecrystals.dm
+++ b/code/datums/uplink/telecrystals.dm
@@ -5,8 +5,8 @@
category = /datum/uplink_category/telecrystals
blacklisted = 1
-/datum/uplink_item/item/telecrystal/get_goods(var/obj/item/device/uplink/U, var/loc)
- return new /obj/item/stack/telecrystal(loc, cost(U.uses))
+/datum/uplink_item/item/telecrystal/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/M)
+ return new /obj/item/stack/telecrystal(loc, cost(U, M.mind.tcrystals))
/datum/uplink_item/item/telecrystal/one
name = "Telecrystal - 01"
@@ -35,5 +35,5 @@
/datum/uplink_item/item/telecrystal/all
name = "Telecrystals - Empty Uplink"
-/datum/uplink_item/item/telecrystal/all/cost(var/telecrystals)
- return max(1, telecrystals)
\ No newline at end of file
+/datum/uplink_item/item/telecrystal/all/cost(obj/item/device/uplink/U, mob/M)
+ return max(1, M.mind.tcrystals)
\ No newline at end of file
diff --git a/code/datums/uplink/uplink_categories.dm b/code/datums/uplink/uplink_categories.dm
index d9e6d84db7..f7236ddbb0 100644
--- a/code/datums/uplink/uplink_categories.dm
+++ b/code/datums/uplink/uplink_categories.dm
@@ -6,12 +6,6 @@
..()
items = list()
-/datum/uplink_category/proc/can_view(obj/item/device/uplink/U)
- for(var/datum/uplink_item/item in items)
- if(item.can_view(U))
- return 1
- return 0
-
datum/uplink_category/ammunition
name = "Ammunition"
diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm
index 8d9de8f732..e02e604984 100644
--- a/code/datums/uplink/uplink_items.dm
+++ b/code/datums/uplink/uplink_items.dm
@@ -31,7 +31,7 @@ var/datum/uplink/uplink = new()
var/item_cost = 0
var/datum/uplink_category/category // Item category
var/list/datum/antagonist/antag_roles // Antag roles this item is displayed to. If empty, display to all.
- var/blacklisted = 0
+ var/blacklisted = FALSE
/datum/uplink_item/item
var/path = null
@@ -48,50 +48,34 @@ var/datum/uplink/uplink = new()
if(!extra_args)
return
- if(!can_buy(U))
+ if(!can_buy(U, user.mind.tcrystals))
return
- if(U.CanUseTopic(user, GLOB.tgui_inventory_state) != STATUS_INTERACTIVE)
+ if(U.tgui_status(user, GLOB.tgui_deep_inventory_state) != STATUS_INTERACTIVE)
return
- var/cost = cost(U.uses, U)
+ var/cost = cost(U, user.mind.tcrystals)
var/goods = get_goods(U, get_turf(user), user, extra_args)
if(!goods)
return
- purchase_log(U)
+ purchase_log(user)
user.mind.tcrystals -= cost
- U.used_TC += cost
+ user.mind.used_TC += cost
return goods
// Any additional arguments you wish to send to the get_goods
/datum/uplink_item/proc/extra_args(var/mob/user)
- return 1
+ return TRUE
-/datum/uplink_item/proc/can_buy(obj/item/device/uplink/U)
- if(cost(U.uses, U) > U.uses)
- return 0
+/datum/uplink_item/proc/can_buy(var/obj/item/device/uplink/U, var/telecrystals)
+ if(cost(U, telecrystals) > telecrystals)
+ return FALSE
- return can_view(U)
+ return TRUE
-/datum/uplink_item/proc/can_view(obj/item/device/uplink/U)
- // Making the assumption that if no uplink was supplied, then we don't care about antag roles
- if(!U || !antag_roles.len)
- return 1
-
- // With no owner, there's no need to check antag status.
- if(!U.uplink_owner)
- return 0
-
- for(var/antag_role in antag_roles)
- var/datum/antagonist/antag = all_antag_types[antag_role]
- if(!isnull(antag))
- if(antag.is_antagonist(U.uplink_owner))
- return 1
- return 0
-
-/datum/uplink_item/proc/cost(var/telecrystals, obj/item/device/uplink/U)
+/datum/uplink_item/proc/cost(obj/item/device/uplink/U, mob/M)
. = item_cost
if(U)
. = U.get_item_cost(src, .)
@@ -100,19 +84,19 @@ var/datum/uplink/uplink = new()
return desc
// get_goods does not necessarily return physical objects, it is simply a way to acquire the uplink item without paying
-/datum/uplink_item/proc/get_goods(var/obj/item/device/uplink/U, var/loc)
- return 0
+/datum/uplink_item/proc/get_goods(var/obj/item/device/uplink/U, var/loc, mob/user)
+ return FALSE
/datum/uplink_item/proc/log_icon()
return
-/datum/uplink_item/proc/purchase_log(obj/item/device/uplink/U)
+/datum/uplink_item/proc/purchase_log(mob/M)
feedback_add_details("traitor_uplink_items_bought", "[src]")
- log_and_message_admins("used \the [U.loc] to buy \a [src]")
- U.purchase_log[src] = U.purchase_log[src] + 1
+ log_and_message_admins("\the [M] bought \a [src] through the uplink")
+ M.mind.purchase_log[src] += 1
datum/uplink_item/dd_SortValue()
- return cost(INFINITY)
+ return item_cost
/********************************
* *
@@ -133,7 +117,7 @@ datum/uplink_item/dd_SortValue()
A.put_in_any_hand_if_possible(I)
return I
-/datum/uplink_item/item/get_goods(var/obj/item/device/uplink/U, var/loc)
+/datum/uplink_item/item/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user)
var/obj/item/I = new path(loc)
return I
@@ -208,7 +192,7 @@ datum/uplink_item/dd_SortValue()
/proc/get_surplus_items(var/obj/item/device/uplink/U, var/remaining_TC, var/loc)
var/list/bought_items = list()
- var/override = 1
+ var/override = TRUE
while(remaining_TC)
var/datum/uplink_item/I = all_uplink_selection.get_random_item(remaining_TC, U, bought_items, override)
if(!I)
diff --git a/code/game/antagonist/antagonist_print.dm b/code/game/antagonist/antagonist_print.dm
index 8d8e484fae..99216b9ef5 100644
--- a/code/game/antagonist/antagonist_print.dm
+++ b/code/game/antagonist/antagonist_print.dm
@@ -1,7 +1,7 @@
/datum/antagonist/proc/print_player_summary()
if(!current_antagonists.len)
- return 0
+ return FALSE
var/text = "
The [current_antagonists.len == 1 ? "[role_text] was" : "[role_text_plural] were"]:"
for(var/datum/mind/P in current_antagonists)
@@ -21,7 +21,7 @@
else
text += "Fail."
feedback_add_details(feedback_tag,"[O.type]|FAIL")
- failed = 1
+ failed = TRUE
num++
if(failed)
text += "
The [role_text] has failed."
@@ -32,7 +32,7 @@
text += "
Their objectives were:"
var/num = 1
for(var/datum/objective/O in global_objectives)
- text += print_objective(O, num, 1)
+ text += print_objective(O, num, TRUE)
num++
// Display the results.
@@ -68,14 +68,14 @@
/datum/antagonist/proc/print_player_full(var/datum/mind/ply)
var/text = print_player_lite(ply)
- var/TC_uses = 0
- var/uplink_true = 0
+ var/TC_uses = FALSE
+ var/uplink_true = FALSE
var/purchases = ""
- for(var/obj/item/device/uplink/H in GLOB.world_uplinks)
- if(H && H.uplink_owner && H.uplink_owner == ply)
- TC_uses += H.used_TC
- uplink_true = 1
- purchases += get_uplink_purchases(H)
+ for(var/mob/M in player_list)
+ if(M.mind && M.mind.used_TC)
+ TC_uses += M.mind.used_TC
+ uplink_true = TRUE
+ purchases += get_uplink_purchases(M.mind)
if(uplink_true)
text += " (used [TC_uses] TC)"
if(purchases)
@@ -83,18 +83,8 @@
return text
-/proc/print_ownerless_uplinks()
- var/has_printed = 0
- for(var/obj/item/device/uplink/H in GLOB.world_uplinks)
- if(isnull(H.uplink_owner) && H.used_TC)
- if(!has_printed)
- has_printed = 1
- to_world("Ownerless Uplinks")
- to_world("[H.loc] (used [H.used_TC] TC)")
- to_world(get_uplink_purchases(H))
-
-/proc/get_uplink_purchases(var/obj/item/device/uplink/H)
+/proc/get_uplink_purchases(var/datum/mind/M)
var/list/refined_log = new()
- for(var/datum/uplink_item/UI in H.purchase_log)
- refined_log.Add("[H.purchase_log[UI]]x[UI.log_icon()][UI.name]")
+ for(var/datum/uplink_item/UI in M.purchase_log)
+ refined_log.Add("[M.purchase_log[UI]]x[UI.log_icon()][UI.name]")
. = english_list(refined_log, nothing_text = "")
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 42e6a6ddd0..18d58a33ae 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -292,7 +292,6 @@ var/global/list/additional_antag_types = list()
antag.check_victory()
antag.print_player_summary()
sleep(10)
- print_ownerless_uplinks()
var/clients = 0
var/surviving_humans = 0
diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm
index bc9c199ed2..9d7e5ed958 100644
--- a/code/game/machinery/doors/blast_door.dm
+++ b/code/game/machinery/doors/blast_door.dm
@@ -29,6 +29,7 @@
var/close_sound = 'sound/machines/door/blastdoorclose.ogg'
var/damage = BLAST_DOOR_CRUSH_DAMAGE
var/multiplier = 1 // The multiplier for how powerful our YEET is.
+ var/istransparent = 0
closed_layer = ON_WINDOW_LAYER // Above airlocks when closed
var/id = 1.0
@@ -108,10 +109,13 @@
src.density = 1
update_nearby_tiles()
src.update_icon()
- src.set_opacity(1)
+ if(src.istransparent)
+ src.set_opacity(0)
+ else
+ src.set_opacity(1)
sleep(15)
src.operating = 0
-
+
// Blast door crushing.
for(var/turf/turf in locs)
for(var/atom/movable/AM in turf)
@@ -276,10 +280,11 @@
// Parameters: None
// Description: Closes the door. Does necessary checks.
/obj/machinery/door/blast/close()
+
if (src.operating || (stat & BROKEN || stat & NOPOWER))
return
- force_close()
+ force_close()
// Proc: repair()
// Parameters: None
@@ -323,5 +328,52 @@ obj/machinery/door/blast/regular/open
icon_state = "shutter1"
damage = SHUTTER_CRUSH_DAMAGE
+// SUBTYPE: Transparent
+// Not technically a blast door but operates like one. Allows air and light.
+obj/machinery/door/blast/gate
+ name = "thick gate"
+ icon_state_open = "tshutter0"
+ icon_state_opening = "tshutterc0"
+ icon_state_closed = "tshutter1"
+ icon_state_closing = "tshutterc1"
+ icon_state = "tshutter1"
+ damage = SHUTTER_CRUSH_DAMAGE
+ maxhealth = 400
+ block_air_zones = 0
+ opacity = 0
+ istransparent = 1
+
+obj/machinery/door/blast/gate/open
+ icon_state = "tshutter0"
+ density = 0
+
+/obj/machinery/door/blast/gate/thin
+ name = "thin gate"
+ icon_state_open = "shutter2_0"
+ icon_state_opening = "shutter2_c0"
+ icon_state_closed = "shutter2_1"
+ icon_state_closing = "shutter2_c1"
+ icon_state = "shutter2_1"
+ maxhealth = 200
+ opacity = 0
+
+/obj/machinery/door/blast/gate/thin/open
+ icon_state = "shutter2_1"
+ density = 0
+
+/obj/machinery/door/blast/gate/bars
+ name = "prison bars"
+ icon_state_open = "bars_0"
+ icon_state_opening = "bars_c0"
+ icon_state_closed = "bars_1"
+ icon_state_closing = "bars_c1"
+ icon_state = "bars_1"
+ maxhealth = 600
+ opacity = 0
+
+/obj/machinery/door/blast/gate/bars/open
+ icon_state = "bars_1"
+ density = 0
+
#undef BLAST_DOOR_CRUSH_DAMAGE
#undef SHUTTER_CRUSH_DAMAGE
\ No newline at end of file
diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm
index c4069be3ed..4c07229df7 100644
--- a/code/game/objects/items/devices/uplink.dm
+++ b/code/game/objects/items/devices/uplink.dm
@@ -1,5 +1,3 @@
-GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
-
// I placed this here because of how relevant it is.
// You place this in your uplinkable item to check if an uplink is active or not.
// If it is, it will display the uplink menu and return 1, else it'll return false.
@@ -14,29 +12,19 @@ GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
/obj/item/device/uplink
var/welcome = "Welcome, Operative" // Welcoming menu message
- var/uses // Numbers of crystals
var/list/ItemsCategory // List of categories with lists of items
var/list/ItemsReference // List of references with an associated item
var/list/nanoui_items // List of items for NanoUI use
var/faction = "" //Antag faction holder.
- var/list/purchase_log = new
- var/datum/mind/uplink_owner = null
- var/used_TC = 0
var/offer_time = 10 MINUTES //The time increment per discount offered
var/next_offer_time
var/datum/uplink_item/discount_item //The item to be discounted
var/discount_amount //The amount as a percent the item will be discounted by
var/compact_mode = FALSE
-/obj/item/device/uplink/Initialize(var/mapload, var/datum/mind/owner = null, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
+/obj/item/device/uplink/Initialize(var/mapload)
. = ..()
- uplink_owner = owner
- purchase_log = list()
- if(owner)
- uses = owner.tcrystals
- else
- uses = telecrystals
addtimer(CALLBACK(src, .proc/next_offer), offer_time) //It seems like only the /hidden type actually makes use of this...
/obj/item/device/uplink/get_item_cost(var/item_type, var/item_cost)
@@ -85,7 +73,7 @@ GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
/obj/item/device/uplink/hidden/proc/trigger(mob/user as mob)
if(!active)
toggle()
- interact(user)
+ tgui_interact(user)
// Checks to see if the value meets the target. Like a frequency being a traitor_frequency, in order to unlock a headset.
// If true, it accesses trigger() and returns 1. If it fails, it returns false. Use this to see if you need to close the
@@ -93,8 +81,8 @@ GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
/obj/item/device/uplink/hidden/proc/check_trigger(mob/user as mob, var/value, var/target)
if(value == target)
trigger(user)
- return 1
- return 0
+ return TRUE
+ return FALSE
// Legacy
/obj/item/device/uplink/hidden/interact(mob/user)
@@ -107,12 +95,11 @@ GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
return loc
/obj/item/device/uplink/hidden/tgui_state(mob/user)
- return GLOB.tgui_inventory_state
+ return GLOB.tgui_deep_inventory_state
/obj/item/device/uplink/hidden/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui)
if(!active)
toggle()
- uses = user.mind.tcrystals
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "Uplink", "Remote Uplink")
@@ -127,7 +114,7 @@ GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
var/list/data = ..()
- data["telecrystals"] = uses
+ data["telecrystals"] = user.mind.tcrystals
data["lockable"] = TRUE
data["compactMode"] = compact_mode
@@ -177,22 +164,19 @@ GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
data["categories"] = list()
for(var/datum/uplink_category/category in uplink.categories)
- if(category.can_view(src))
- var/list/cat = list(
+ var/list/cat = list(
"name" = category.name,
"items" = (category == selected_cat ? list() : null)
)
- for(var/datum/uplink_item/item in category.items)
- if(!item.can_view(src))
- continue
- var/cost = item.cost(uses, src) || "???"
- cat["items"] += list(list(
- "name" = item.name,
- "cost" = cost,
- "desc" = item.description(),
- "ref" = REF(item),
- ))
- data["categories"] += list(cat)
+ for(var/datum/uplink_item/item in category.items)
+ var/cost = item.cost(src, user) || "???"
+ cat["items"] += list(list(
+ "name" = item.name,
+ "cost" = cost,
+ "desc" = item.description(),
+ "ref" = REF(item),
+ ))
+ data["categories"] += list(cat)
return data
@@ -228,9 +212,9 @@ GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
//
// Includes normal radio uplink, multitool uplink,
// implant uplink (not the implant tool) and a preset headset uplink.
-/obj/item/device/radio/uplink/New(atom/loc, datum/mind/target_mind, telecrystals)
- ..(loc)
- hidden_uplink = new(src, target_mind, telecrystals)
+/obj/item/device/radio/uplink/New()
+ ..()
+ hidden_uplink = new(src)
icon_state = "radio"
/obj/item/device/radio/uplink/attack_self(mob/user as mob)
@@ -238,6 +222,7 @@ GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
hidden_uplink.trigger(user)
/obj/item/device/multitool/uplink/New()
+ ..()
hidden_uplink = new(src)
/obj/item/device/multitool/uplink/attack_self(mob/user as mob)
@@ -250,4 +235,3 @@ GLOBAL_LIST_BOILERPLATE(world_uplinks, /obj/item/device/uplink)
/obj/item/device/radio/headset/uplink/New()
..()
hidden_uplink = new(src)
- hidden_uplink.uses = DEFAULT_TELECRYSTAL_AMOUNT
diff --git a/code/game/objects/items/devices/uplink_random_lists.dm b/code/game/objects/items/devices/uplink_random_lists.dm
index de05f91013..89bfd5f004 100644
--- a/code/game/objects/items/devices/uplink_random_lists.dm
+++ b/code/game/objects/items/devices/uplink_random_lists.dm
@@ -34,11 +34,11 @@ var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random
if(!prob(RI.keep_probability))
continue
var/datum/uplink_item/I = uplink.items_assoc[RI.uplink_item]
- if(I.cost(telecrystals, U) > telecrystals)
+ if(I.cost(U) > telecrystals)
continue
if(bought_items && (I in bought_items) && !prob(RI.reselect_probability))
continue
- if(U && !I.can_buy(U))
+ if(U && !I.can_buy(U, telecrystals))
continue
return I
diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm
index 31bd79b6b9..e72a23c9c6 100644
--- a/code/modules/client/preference_setup/loadout/loadout_head.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head.dm
@@ -335,7 +335,7 @@
path = /obj/item/clothing/head/welding/engie
/datum/gear/head/beret/solgov
- display_name = "beret sol, selection"
+ display_name = "beret government, selection"
path = /obj/item/clothing/head/beret/solgov
/datum/gear/head/beret/solgov/New()
diff --git a/code/modules/client/preferences_vr.dm b/code/modules/client/preferences_vr.dm
index 737ddddfe1..783ee0c4ae 100644
--- a/code/modules/client/preferences_vr.dm
+++ b/code/modules/client/preferences_vr.dm
@@ -1,7 +1,7 @@
/datum/preferences
var/show_in_directory = 1 //Show in Character Directory
var/directory_tag = "Unset" //Sorting tag to use in character directory
- var/directory_erptag = "No ERP" //ditto, but for non-vore scenes
+ var/directory_erptag = "Unset" //ditto, but for non-vore scenes
var/directory_ad = "" //Advertisement stuff to show in character directory.
var/sensorpref = 5 //Set character's suit sensor level
var/job_talon_high = 0
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 23c629fac2..da22b29f1f 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -175,6 +175,7 @@
icon_state = "beret_corporate_hos"
item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black")
+
//Medical
/obj/item/clothing/head/surgery
name = "surgical cap"
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index dab5e97075..7846061025 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -452,3 +452,31 @@
icon_state = "blackngoldheaddress"
flags_inv = HIDEEYES
body_parts_covered = HEAD|EYES
+
+//Corporate Berets
+
+/obj/item/clothing/head/beret/corp/saare
+ name = "\improper SAARE beret"
+ desc = "A red beret denoting service with Stealth Assault Enterprises. For mercenaries that are more inclined towards style than safety."
+ icon_state = "beret_red"
+
+/obj/item/clothing/head/beret/corp/saare/officer
+ name = "\improper SAARE officer beret"
+ desc = "A red beret with a gold insignia, denoting senior service with Stealth Assault Enterprises. For mercenaries who are more inclined towards style than safety."
+ icon_state = "beret_redgold"
+
+/obj/item/clothing/head/beret/corp/pcrc
+ name = "\improper PCRC beret"
+ desc = "A black beret with a PCRC logo insignia, denoting service with Proxima Centauri Risk Control. For private security personnel that are more inclined towards style than safety."
+ icon_state = "beret_black_observatory"
+
+
+/obj/item/clothing/head/beret/corp/hedberg
+ name = "\improper Hedberg-Hammarstrom beret"
+ desc = "A tan beret denoting service with Hedberg-Hammarstrom private security. For mercenaries who are more inclined towards style than safety."
+ icon_state = "beret_tan"
+
+/obj/item/clothing/head/beret/corp/xion
+ name = "\improper Xion beret"
+ desc = "An orange beret denoting employment with Xion Manufacturing. For personnel that are more inclined towards style than safety."
+ icon_state = "beret_orange"
\ No newline at end of file
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 4cf06d6cc2..6ef9ee2be6 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -151,11 +151,11 @@
flags_inv = HIDEEARS
/obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
- if(src.icon_state == "ushankadown")
- src.icon_state = "ushankaup"
+ if(src.icon_state == initial(icon_state))
+ src.icon_state = "[icon_state]up"
to_chat(user, "You raise the ear flaps on the ushanka.")
else
- src.icon_state = "ushankadown"
+ src.icon_state = initial(icon_state)
to_chat(user, "You lower the ear flaps on the ushanka.")
/*
diff --git a/code/modules/clothing/head/solgov.dm b/code/modules/clothing/head/solgov.dm
index 6a3c585aaa..6b2623ff52 100644
--- a/code/modules/clothing/head/solgov.dm
+++ b/code/modules/clothing/head/solgov.dm
@@ -11,14 +11,14 @@
)
/obj/item/clothing/head/soft/solgov/veteranhat
- name = "veteran hat"
- desc = "It's a tacky black ballcap bearing the yellow service ribbon of the Gaia Conflict."
+ name = "veteran cap"
+ desc = "It's a tacky black ballcap bearing the yellow service ribbon of the Almach War."
icon_state = "cap_veteran"
/obj/item/clothing/head/soft/solgov/sifguard
name = "\improper SifGuard cap"
desc = "It's a black ballcap bearing a Sif Defense Force crest."
- icon_state = "expeditionsoft"
+ icon_state = "sifguardsoft"
item_state_slots = list(
slot_l_hand_str = "blacksoft",
slot_r_hand_str = "blacksoft",
@@ -27,7 +27,7 @@
/obj/item/clothing/head/soft/solgov/sifguard/co
name = "\improper SifGuard captain's cap"
desc = "It's a black ballcap bearing the Sif Defense Force crest. The brim has gold trim."
- icon_state = "expeditioncomsoft"
+ icon_state = "sifguardcomsoft"
/obj/item/clothing/head/soft/solgov/fleet
name = "fleet cap"
@@ -88,17 +88,17 @@
/obj/item/clothing/head/service/sifguard
name = "\improper SifGuard peaked cap"
desc = "A peaked black uniform cap belonging to the Sif Defense Force Corps."
- icon_state = "ecdresscap"
+ icon_state = "sifguarddresscap"
/obj/item/clothing/head/service/sifguard/command
name = "\improper SifGuard officer's peaked cap"
desc = "A peaked black uniform cap belonging to the Sif Defense Force. This one is trimmed in gold."
- icon_state = "ecdresscap_ofcr"
+ icon_state = "sifguarddresscap_ofcr"
/obj/item/clothing/head/service/sifguard/captain
name = "\improper SifGuard captain's peaked cap"
desc = "A gold-trimmed peaked black uniform cap belonging to a Captain of the Sif Defense Force."
- icon_state = "ecdresscap_capt"
+ icon_state = "sifguarddresscap_capt"
/obj/item/clothing/head/service/sifguard/senior_command
name = "senior SifGuard officer's peaked cap"
@@ -127,7 +127,7 @@
/obj/item/clothing/head/service/army/campaign
name = "campaign cover"
- desc = "A green campaign cover with an SCG Marine crest. Only found on the heads of Drill Sergeants."
+ desc = "A green campaign cover with an SCG Marine crest. Typically found on the heads of Drill Sergeants."
icon_state = "greendrill"
//Dress
@@ -170,60 +170,45 @@
//Berets
+//Government Departments
+
/obj/item/clothing/head/beret/solgov
- name = "peacekeeper beret"
- desc = "A beret in Solar Confederate Government colors. For peacekeepers that are more inclined towards style than safety."
+ name = "\improper SCG beret"
+ desc = "A beret in basic Solar Confederate Government colors. For peacekeepers that are more inclined towards style than safety."
icon_state = "beret_lightblue"
-/obj/item/clothing/head/beret/solgov/homeguard
- name = "home guard beret"
- desc = "A red beret denoting service in the Sol Home Guard. For personnel that are more inclined towards style than safety."
- icon_state = "beret_red"
-
-/obj/item/clothing/head/beret/solgov/gateway
- name = "gateway administration beret"
- desc = "An orange beret denoting service in the Gateway Administration. For personnel that are more inclined towards style than safety."
- icon_state = "beret_orange"
-
-/obj/item/clothing/head/beret/solgov/customs
- name = "customs and trade beret"
- desc = "A purple beret denoting service in the Customs and Trade Bureau. For personnel that are more inclined towards style than safety."
+/obj/item/clothing/head/beret/solgov/ttc
+ name = "transgressive technologies beret"
+ desc = "A purple beret denoting service in the Transgressive Technologies Commission. For g-men that are more inclined towards style than safety."
icon_state = "beret_purpleyellow"
-/obj/item/clothing/head/beret/solgov/orbital
- name = "orbital assault beret"
- desc = "A blue beret denoting orbital assault training. For helljumpers that are more inclined towards style than safety."
+/obj/item/clothing/head/beret/solgov/eio
+ name = "intelligence oversight beret"
+ desc = "A blue beret denoting service in Emergent Intelligent Oversight. For g-men that are more inclined towards style than safety."
icon_state = "beret_blue"
-/obj/item/clothing/head/beret/solgov/research
- name = "government research beret"
- desc = "A green beret denoting service in the Bureau of Research. For explorers that are more inclined towards style than safety."
+/obj/item/clothing/head/beret/solgov/survey
+ name = "government survey beret"
+ desc = "A green beret denoting service in the SCG Galactic Survey Administration. For explorers that are more inclined towards style than safety."
icon_state = "beret_green"
+/obj/item/clothing/head/beret/solgov/survey/extraplanar
+ name = "extraplanar survey beret"
+ desc = "A green beret with a silver emblem, denoting service in the Extraplanar Discovery Division of the GSA. For extraplanar explorers who are more inclined towards style than safety."
+ icon_state = "beret_greensilver"
+
+/obj/item/clothing/head/beret/solgov/inspector
+ name = "\improper Solar Inspection Group beret"
+ desc = "A grey beret with a silver insignia, denoting service in the Solar Inspection Group. For Almach-inspection personnel who are more inclined towards style than safety."
+ icon_state = "beret_graysilver"
+
/obj/item/clothing/head/beret/solgov/health
name = "health service beret"
desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety."
icon_state = "beret_white"
-/obj/item/clothing/head/beret/solgov/marcom
- name = "\improper MARSCOM beret"
- desc = "A red beret with a gold insignia, denoting service in the SCGDF Mars Central Command. For brass who are more inclined towards style than safety."
- icon_state = "beret_redgold"
-/obj/item/clothing/head/beret/solgov/stratcom
- name = "\improper STRATCOM beret"
- desc = "A grey beret with a silver insignia, denoting service in the SCGDF Strategic Command. For intelligence personnel who are more inclined towards style than safety."
- icon_state = "beret_graysilver"
-
-/obj/item/clothing/head/beret/solgov/diplomatic
- name = "diplomatic security beret"
- desc = "A tan beret denoting service in the SCG Marines Diplomatic Security Group. For security personnel who are more inclined towards style than safety."
- icon_state = "beret_tan"
-
-/obj/item/clothing/head/beret/solgov/borderguard
- name = "border security beret"
- desc = "A green beret with a silver emblem, denoting service in the Bureau of Border Security. For border guards who are more inclined towards style than safety."
- icon_state = "beret_greensilver"
+//SifGuard
/obj/item/clothing/head/beret/solgov/sifguard
name = "\improper SifGuard beret"
@@ -260,15 +245,12 @@
desc = "A Sif Defense Force beret with a command crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_command"
-/obj/item/clothing/head/beret/solgov/sifguard/branch
- name = "\improper Field Operations beret"
- desc = "An Sif Defense Force beret carrying insignia of the Field Operations section of the Sif Defense Force. For personnel that are more inclined towards style than safety."
- icon_state = "beret_black_fieldOps"
+/obj/item/clothing/head/beret/solgov/sifguard/patrol
+ name = "\improper SifGuard Anti-piracy beret"
+ desc = "An Sif Defense Force beret carrying insignia of the Anti-Piracy taskforce. For personnel that are more inclined towards style than safety."
+ icon_state = "beret_black_patrol"
-/obj/item/clothing/head/beret/solgov/sifguard/branch/observatory
- name = "\improper Observatory beret"
- desc = "An Sif Defense Force beret carrying insignia of the Observatory section of the Sif Defense Force. For personnel that are more inclined towards style than safety."
- icon_state = "beret_black_observatory"
+//Fleet
/obj/item/clothing/head/beret/solgov/fleet
name = "fleet beret"
@@ -320,6 +302,8 @@
desc = "A white SCG Fleet beret with a golden crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_whiterim_com"
+/*
+Unused Baylore Stuff
/obj/item/clothing/head/beret/solgov/fleet/branch
name = "first fleet beret"
desc = "An SCG Fleet beret carrying insignia of First Fleet, the Sol Guard, stationed in Sol. For personnel that are more inclined towards style than safety."
@@ -345,46 +329,44 @@
desc = "An SCG Fleet beret carrying insignia of Fifth Fleet, the Quick Reaction Force, recently formed and outfited with last tech. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_fifth"
+*/
+
//ushanka
/obj/item/clothing/head/ushanka/solgov
name = "\improper SifGuard fur hat"
desc = "An Sif Defense Force synthfur-lined hat for operating in cold environments."
- icon_state = "ecushankadown"
- //icon_state_up = "ecushankaup"
+ icon_state = "sifguardushankadown"
/obj/item/clothing/head/ushanka/solgov/fleet
name = "fleet fur hat"
desc = "An SCG Fleet synthfur-lined hat for operating in cold environments."
icon_state = "flushankadown"
- //icon_state_up = "flushankaup"
-/obj/item/clothing/head/ushanka/solgov/army
+/obj/item/clothing/head/ushanka/solgov/marine
name = "marine fur hat"
desc = "An SCG Marine synthfur-lined hat for operating in cold environments."
icon_state = "barushankadown"
- //icon_state_up = "barushankaup"
-/obj/item/clothing/head/ushanka/solgov/army/green
- name = "green marine fur hat"
- desc = "An SCG Marine synthfur-lined hat for operating in cold environments."
+/obj/item/clothing/head/ushanka/solgov/marine/green
+ name = "\improper Hedberg-Hammarstrom fur hat"
+ desc = "An Hedberg-Hammarstrom private security synthfur-lined hat for operating in cold environments."
icon_state = "arushankadown"
- //icon_state_up = "mcushankaup"
-//Terran
+//Almachi
-/obj/item/clothing/head/terran/navy/service
- name = "ICCGN service cover"
- desc = "A service uniform cover, worn by low-ranking crew within the Independent Navy."
- icon_state = "terranservice"
- item_state = "terranservice"
+/obj/item/clothing/head/almach
+ name = "\improper Almach Militia service cover"
+ desc = "A service uniform cover, occasionally worn by crew within the defunct Almach Militia."
+ icon_state = "almachhat"
+ item_state = "almachhat"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet")
body_parts_covered = 0
/obj/item/clothing/head/terran/navy/service/command
- name = "ICCGN command service cover"
- desc = "A service uniform cover, worn by high-ranking crew within the Independent Navy."
- icon_state = "terranservice_comm"
- item_state = "terranservice_comm"
+ name = "\improper Almach Militia command service cover"
+ desc = "A service uniform cover, occasionally worn by command crew within the defunct Almach Militia."
+ icon_state = "almachhat_comm"
+ item_state = "almachhat_comm"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 20f33104ca..e12cef7303 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -353,6 +353,11 @@
icon_badge = "pcrcvest_badge"
icon_nobadge = "pcrcvest_nobadge"
+/obj/item/clothing/suit/storage/vest/solgov/hedberg
+ name = "Hedberg-Hammarstrom armor vest"
+ desc = "A simple kevlar plate carrier belonging to Hedberg-Hammarstrom. The company logo is clearly visible."
+ icon_state = "secwebvest"
+
/obj/item/clothing/suit/storage/vest/solgov
name = "\improper Solar Confederate Government armored vest"
desc = "A synthetic armor vest. This one is marked with the crest of the Solar Confederate Government."
@@ -361,14 +366,9 @@
/obj/item/clothing/suit/storage/vest/solgov/heavy
name = "\improper Solar Confederate Government heavy armored vest"
- desc = "A synthetic armor vest with PEACEKEEPER printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates."
+ desc = "A synthetic armor vest with Solar Confederate Government printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates."
icon_state = "solwebvest"
-/obj/item/clothing/suit/storage/vest/solgov/security
- name = "master at arms heavy armored vest"
- desc = "A synthetic armor vest with MASTER AT ARMS printed in silver lettering on the chest. This one has added webbing and ballistic plates."
- icon_state = "secwebvest"
-
/obj/item/clothing/suit/storage/vest/solgov/command
name = "command heavy armored vest"
desc = "A synthetic armor vest with Solar Confederate Government printed in detailed gold lettering on the chest. This one has added webbing and ballistic plates."
diff --git a/code/modules/clothing/suits/solgov.dm b/code/modules/clothing/suits/solgov.dm
index a0bb547f3e..73463c002c 100644
--- a/code/modules/clothing/suits/solgov.dm
+++ b/code/modules/clothing/suits/solgov.dm
@@ -23,19 +23,19 @@
/obj/item/clothing/suit/storage/solgov/service/sifguard
name = "\improper SifGuard jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force."
- icon_state = "ecservice_crew"
+ icon_state = "sgservice_crew"
/obj/item/clothing/suit/storage/solgov/service/sifguard/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/service)
/obj/item/clothing/suit/storage/solgov/service/sifguard/medical/command
- icon_state = "ecservice_officer"
+ icon_state = "sgservice_officer"
/obj/item/clothing/suit/storage/solgov/service/sifguard/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/service)
/obj/item/clothing/suit/storage/solgov/service/sifguard/engineering/command
- icon_state = "ecservice_officer"
+ icon_state = "sgservice_officer"
/obj/item/clothing/suit/storage/solgov/service/sifguard/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/service)
@@ -44,28 +44,28 @@
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/service)
/obj/item/clothing/suit/storage/solgov/service/sifguard/security/command
- icon_state = "ecservice_officer"
+ icon_state = "sgservice_officer"
/obj/item/clothing/suit/storage/solgov/service/sifguard/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/service)
/obj/item/clothing/suit/storage/solgov/service/sifguard/service/command
- icon_state = "ecservice_officer"
+ icon_state = "sgservice_officer"
/obj/item/clothing/suit/storage/solgov/service/sifguard/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/service)
/obj/item/clothing/suit/storage/solgov/service/sifguard/exploration/command
- icon_state = "ecservice_officer"
+ icon_state = "sgservice_officer"
/obj/item/clothing/suit/storage/solgov/service/sifguard/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/service)
/obj/item/clothing/suit/storage/solgov/service/sifguard/research/command
- icon_state = "ecservice_officer"
+ icon_state = "sgservice_officer"
/obj/item/clothing/suit/storage/solgov/service/sifguard/command
- icon_state = "ecservice_officer"
+ icon_state = "sgservice_officer"
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/service)
/obj/item/clothing/suit/storage/solgov/service/fleet
@@ -181,8 +181,8 @@
/obj/item/clothing/suit/storage/solgov/dress
name = "dress jacket"
desc = "A uniform dress jacket, fancy."
- icon_state = "ecdress_xpl"
- item_state = "ecdress_xpl"
+ icon_state = "sgdress_xpl"
+ item_state = "sgdress_xpl"
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
@@ -193,39 +193,39 @@
/obj/item/clothing/suit/storage/solgov/dress/sifguard
name = "\improper SifGuard dress jacket"
desc = "A silver and grey dress jacket belonging to the Sif Defense Force. Fashionable, for the 25th century at least."
- icon_state = "ecdress_xpl"
- item_state = "ecdress_xpl"
+ icon_state = "sgdress_xpl"
+ item_state = "sgdress_xpl"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/senior
name = "\improper SifGuard senior's dress coat"
- icon_state = "ecdress_sxpl"
- item_state = "ecdress_sxpl"
+ icon_state = "sgdress_sxpl"
+ item_state = "sgdress_sxpl"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/chief
name = "\improper SifGuard chief's dress coat"
icon_state = "ecdress_cxpl"
- item_state = "ecdress_cxpl"
+ item_state = "sgdress_cxpl"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command
name = "\improper SifGuard officer's dress coat"
desc = "A gold and black dress peacoat belonging to the Sif Defense Force. The height of fashion."
icon_state = "ecdress_ofcr"
- item_state = "ecdress_ofcr"
+ item_state = "sgdress_ofcr"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command/cdr
name = "\improper SifGuard commander's dress coat"
- icon_state = "ecdress_cdr"
- item_state = "ecdress_cdr"
+ icon_state = "sgdress_cdr"
+ item_state = "sgdress_cdr"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command/capt
name = "\improper SifGuard captain's dress coat"
- icon_state = "ecdress_capt"
- item_state = "ecdress_capt"
+ icon_state = "sgdress_capt"
+ item_state = "sgdress_capt"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command/adm
name = "\improper SifGuard admiral's dress coat"
- icon_state = "ecdress_adm"
- item_state = "ecdress_adm"
+ icon_state = "sgdress_adm"
+ item_state = "sgdress_adm"
/obj/item/clothing/suit/storage/solgov/dress/fleet
name = "fleet dress jacket"
@@ -328,36 +328,36 @@
item_state = "labcoat"
blood_overlay_type = "coat"
-/obj/item/clothing/suit/storage/marshal_jacket
- name = "colonial marshal jacket"
- desc = "A black synthleather jacket. The word 'MARSHAL' is stenciled onto the back in gold lettering."
+/obj/item/clothing/suit/storage/eio_jacket
+ name = "EIO jacket"
+ desc = "A black synthleather jacket. The acronym 'EIO' of the Emergent Intelligence Oversight is stenciled onto the back in gold lettering."
icon_state = "marshal_jacket"
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
body_parts_covered = UPPER_TORSO|ARMS
-//Terrans
+//SAARE Mercenaries
//Service
-/obj/item/clothing/suit/storage/terran/service/navy
- name = "ICCGN coat"
- desc = "A ICCG Navy service coat. Black and undecorated."
+/obj/item/clothing/suit/storage/saare/service/
+ name = "SAARE coat"
+ desc = "An Stealth Assault Enterprises . Black and undecorated."
icon_state = "terranservice"
item_state = "terranservice"
icon = 'icons/obj/clothing/suits_solgov.dmi'
icon_override = 'icons/mob/suit_solgov.dmi'
-/obj/item/clothing/suit/storage/terran/service/navy/command
- name = "indie command coat"
- desc = "An ICCG Navy service command coat. White and undecorated."
+/obj/item/clothing/suit/storage/saare/service/command
+ name = "SAARE command coat"
+ desc = "An Stealth Assault Enterprises command coat. White and undecorated."
icon_state = "terranservice_comm"
item_state = "terranservice_comm"
//Dress
-/obj/item/clothing/suit/dress/terran
+/obj/item/clothing/suit/dress/saare
name = "dress jacket"
- desc = "A uniform dress jacket, fancy."
+ desc = "A Stealth Assault Enterprises uniform dress jacket, fancy."
icon_state = "terrandress"
item_state = "terrandress"
icon = 'icons/obj/clothing/suits_solgov.dmi'
@@ -369,19 +369,19 @@
valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK)
/obj/item/clothing/suit/dress/terran/navy
- name = "ICCGN dress cloak"
- desc = "A black ICCG Navy dress cloak with red detailing. So sexy it hurts."
+ name = "SAARE dress cloak"
+ desc = "A Stealth Assault Enterprises dress cloak with red detailing. So sexy it hurts."
icon_state = "terrandress"
item_state = "terrandress"
/obj/item/clothing/suit/dress/terran/navy/officer
- name = "ICCGN officer's dress cloak"
- desc = "A black ICCG Navy dress cloak with gold detailing. Smells like ceremony."
+ name = "SAARE officer's dress cloak"
+ desc = "A black Stealth Assault Enterprises dress cloak with gold detailing. Smells like ceremony."
icon_state = "terrandress_off"
item_state = "terrandress_off"
/obj/item/clothing/suit/dress/terran/navy/command
- name = "ICCGN command dress cloak"
- desc = "A black ICCG Navy dress cloak with royal detailing. Smells like ceremony."
+ name = "SAARE command dress cloak"
+ desc = "A black Stealth Assault Enterprises dress cloak with royal detailing. Smells like ceremony."
icon_state = "terrandress_comm"
item_state = "terrandress_comm"
\ No newline at end of file
diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/solgov.dm
index 815798f90d..cd2c111098 100644
--- a/code/modules/clothing/under/solgov.dm
+++ b/code/modules/clothing/under/solgov.dm
@@ -471,30 +471,30 @@
//Terrans
-/obj/item/clothing/under/terran
- name = "master ICCGN uniform"
+/obj/item/clothing/under/saare
+ name = "master SAARE uniform"
desc = "You shouldn't be seeing this."
icon = 'icons/obj/clothing/uniforms_solgov.dmi'
item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi')
armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5)
siemens_coefficient = 0.8
-/obj/item/clothing/under/terran/navy/utility
- name = "ICCGN utility uniform"
- desc = "A comfortable black utility jumpsuit. Worn by the ICCG Navy."
+/obj/item/clothing/under/saare/utility
+ name = "SAARE utility uniform"
+ desc = "A comfortable black utility jumpsuit. Worn by Stealth Assault Enterprises mercenaries."
icon_state = "terranutility"
worn_state = "terranutility"
-/obj/item/clothing/under/terran/navy/service
- name = "ICCGN service uniform"
- desc = "The service uniform of the ICCG Navy, for low-ranking crew."
+/obj/item/clothing/under/saare/service
+ name = "SAARE service uniform"
+ desc = "The service uniform of Stealth Assault Enterprises, for low-ranking mercenaries."
icon_state = "terranservice"
worn_state = "terranservice"
armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 5, rad = 0)
siemens_coefficient = 0.9
-/obj/item/clothing/under/terran/navy/service/command
- name = "ICCGN command service uniform"
- desc = "The service uniform of the ICCG Navy, for high-ranking crew."
+/obj/item/clothing/under/saare/service/command
+ name = "SAARE command service uniform"
+ desc = "The service uniform of Stealth Assault Enterprises, for high-ranking mercenaries."
icon_state = "terranservice_comm"
worn_state = "terranservice_comm"
\ No newline at end of file
diff --git a/code/modules/lore_codex/news_data/main.dm b/code/modules/lore_codex/news_data/main.dm
index f4565329bb..b9f1be4b40 100644
--- a/code/modules/lore_codex/news_data/main.dm
+++ b/code/modules/lore_codex/news_data/main.dm
@@ -321,7 +321,7 @@
\
Sources within the Vir Governmental Authority have reported that a full scale recall of remote drone craft under their operation has been initiated in order to improve security measures and prevent future exploitation of government systems, statements that eerily echo those of Occulum Broadcast following emergent drone attacks earlier this year. Investigations are reportedly \"well underway\" to determine the whereabouts of those responsible for the apparent manual modification of these short-range remote craft.\
\
- Erkki Laukkanen, Chief of Fleet Staff for the Vir Defense Force has commended all patrol crews involved, and has promised \"swift retribution\" for the attempted bombings."
+ Erkki Laukkanen, Chief of Fleet Staff for the Sif Defense Force has commended all patrol crews involved, and has promised \"swift retribution\" for the attempted bombings."
/datum/lore/codex/page/article26
name = "11/24/62 - Boiling Point Stronghold Seized in Vir"
data = "Combined forces from the SCG Fleet and Almach Militia have today struck a powerful blow to Boiling Point terrorist operations in the Vir system. With close cooperation from the crew of NanoTrasen facilities in the region, special forces were able to infiltrate what is believed to have been a major stronghold for the radical Mercurial group, located deep in the remote Ullran Expanse region of Sif. The raid closely follows the thwarted Boiling Point attack on the Radiance Energy Chain, a major energy collection array in the system which is now known to have been masterminded from the concealed bunker complex on Sif.\
@@ -354,7 +354,7 @@
\
No more! Shall the people of this great nation have to fear the machinations of radicals! No more! Shall these twisted minds impose their perversion of humanity through violence! No more!\
\
- This Assembly... Nay, this nation expresses its thanks the noble members of our military who joined together to make this outcome possible. We thank the Fleet, of course for their tireless action hunting down these killers, and their heroic action over this past weekend. We thank the Vir Defense Force, without whom we could never have located the intelligence that led to these decisive victories... The Almach Militia, for their cooperation in the apprehension of these so-called \"revolutionaries\". \[West clears their throat\] And of course, we thank the local forces - the police and reserves who dealt firsthand with the chaos sewn by Boiling Point in their vicious crusade.\
+ This Assembly... Nay, this nation expresses its thanks the noble members of our military who joined together to make this outcome possible. We thank the Fleet, of course for their tireless action hunting down these killers, and their heroic action over this past weekend. We thank the Sif Defense Force, without whom we could never have located the intelligence that led to these decisive victories... The Almach Militia, for their cooperation in the apprehension of these so-called \"revolutionaries\". \[West clears their throat\] And of course, we thank the local forces - the police and reserves who dealt firsthand with the chaos sewn by Boiling Point in their vicious crusade.\
\
\[Mackenzie West shifts at the podium, setting down the List of Dissidents.\]\
\
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index eb5225c8b8..c898c492c7 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -43,7 +43,7 @@
organs -= OR
qdel(OR)
- if(LAZYLEN(internal_organs))
+ if(LAZYLEN(internal_organs) && !istype(src, /mob/living/simple_mob/animal))
internal_organs_by_name.Cut()
while(internal_organs.len)
var/obj/item/OR = internal_organs[1]
diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm
index 2ec6a4e536..936674061a 100644
--- a/code/modules/pda/cart.dm
+++ b/code/modules/pda/cart.dm
@@ -307,5 +307,4 @@ var/list/civilian_cartridges = list(
name = "F.R.A.M.E. cartridge"
icon_state = "cart"
charges = 5
- var/telecrystals = 0
messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/frame)
diff --git a/code/modules/pda/messenger_plugins.dm b/code/modules/pda/messenger_plugins.dm
index 90cb9460a4..dd77e621a0 100644
--- a/code/modules/pda/messenger_plugins.dm
+++ b/code/modules/pda/messenger_plugins.dm
@@ -85,7 +85,4 @@
P.lock_code = lock_code
// else
// P.hidden_uplink.hidden_crystals += P.hidden_uplink.uses //Temporarially hide the PDA's crystals, so you can't steal telecrystals.
- var/obj/item/weapon/cartridge/frame/parent_cart = pda.cartridge
- P.hidden_uplink.uses = parent_cart.telecrystals
- parent_cart.telecrystals = 0
P.hidden_uplink.active = TRUE
diff --git a/code/modules/persistence/filth.dm b/code/modules/persistence/filth.dm
index 2d8e91b5ce..059f1b61fe 100644
--- a/code/modules/persistence/filth.dm
+++ b/code/modules/persistence/filth.dm
@@ -10,4 +10,4 @@
/obj/effect/decal/cleanable/filth/Initialize()
. = ..()
- alpha = rand(180,220)
\ No newline at end of file
+ alpha = rand(180,220)
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index ea7572fc3a..9ecec2bca5 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -70,7 +70,14 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
var/change = new_size - size_multiplier
var/duration = (abs(change)+0.25) SECONDS
var/matrix/resize = matrix() // Defines the matrix to change the player's size
- resize.Scale(new_size * icon_scale_x, new_size * icon_scale_y) //Change the size of the matrix
+ var/special_x = 1
+ var/special_y = 1
+ if(ishuman(src))
+ var/mob/living/carbon/human/H = src
+ var/datum/species/S = H.species
+ special_x = S.icon_scale_x
+ special_y = S.icon_scale_y
+ resize.Scale(new_size * icon_scale_x * special_x, new_size * icon_scale_y * special_y) //Change the size of the matrix
resize.Translate(0, (vis_height/2) * (new_size - 1)) //Move the player up in the tile so their feet align with the bottom
animate(src, transform = resize, time = duration) //Animate the player resizing
@@ -338,4 +345,4 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
return TRUE
#undef STEP_TEXT_OWNER
-#undef STEP_TEXT_PREY
\ No newline at end of file
+#undef STEP_TEXT_PREY
diff --git a/html/changelogs/woodrat - WR_shutters.yml b/html/changelogs/woodrat - WR_shutters.yml
new file mode 100644
index 0000000000..4e8a24e018
--- /dev/null
+++ b/html/changelogs/woodrat - WR_shutters.yml
@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+#################################
+
+# Your name.
+author: Woodrat
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Added new shutters ported from World."
+ - tweak: "Replaced lightswitch, request console, newscaster sprite with one from Virgo."
\ No newline at end of file
diff --git a/icons/_nanomaps/tether_nanomap_z7.png b/icons/_nanomaps/tether_nanomap_z7.png
index c404e1da35..0fa79b686d 100644
Binary files a/icons/_nanomaps/tether_nanomap_z7.png and b/icons/_nanomaps/tether_nanomap_z7.png differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 69842406d4..f845638d11 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit_solgov.dmi b/icons/mob/suit_solgov.dmi
index 9806d68b9c..de20b89c17 100644
Binary files a/icons/mob/suit_solgov.dmi and b/icons/mob/suit_solgov.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 8be6774832..8391cf09ef 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits_solgov.dmi b/icons/obj/clothing/suits_solgov.dmi
index 13aa71d033..e5259d22e8 100644
Binary files a/icons/obj/clothing/suits_solgov.dmi and b/icons/obj/clothing/suits_solgov.dmi differ
diff --git a/icons/obj/doors/rapid_pdoor.dmi b/icons/obj/doors/rapid_pdoor.dmi
index 66027d65fd..01ab429f32 100644
Binary files a/icons/obj/doors/rapid_pdoor.dmi and b/icons/obj/doors/rapid_pdoor.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index ddb2a72503..80b4217be1 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index c806ec99be..e982df9b9f 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi
index 659b22ff7a..a375136543 100644
Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index a82fdd2dfd..0900c5dd4f 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -457,9 +457,9 @@
/obj/machinery/atmospherics/unary/engine{
dir = 1
},
-/turf/simulated/floor/reinforced,
+/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/excursion/cargo)
+/area/shuttle/excursion/general)
"aaS" = (
/obj/structure/catwalk,
/obj/structure/cable{
@@ -511,15 +511,27 @@
/turf/simulated/floor,
/area/maintenance/station/ai)
"aaX" = (
-/obj/structure/table,
-/turf/simulated/floor,
-/area/maintenance/station/ai)
-"aaY" = (
-/obj/item/stack/material/steel{
- amount = 6
+/obj/item/weapon/stool,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
},
-/turf/simulated/floor,
-/area/maintenance/station/ai)
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration/pilot_office)
+"aaY" = (
+/obj/effect/floor_decal/industrial/warning/cee{
+ dir = 1
+ },
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"aaZ" = (
/obj/structure/railing{
dir = 4
@@ -913,15 +925,9 @@
/turf/simulated/floor/tiled,
/area/security/hallwayaux)
"abL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/cargo)
"abM" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -3100,8 +3106,11 @@
/turf/simulated/floor/tiled,
/area/security/eva)
"agy" = (
-/turf/simulated/wall,
-/area/maintenance/station/ai)
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"agJ" = (
/turf/simulated/mineral/vacuum,
/area/maintenance/station/ai)
@@ -3763,13 +3772,14 @@
/turf/simulated/floor,
/area/maintenance/station/ai)
"aiK" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "shuttle_outbound"
+/obj/machinery/disposal/deliveryChute{
+ dir = 4
},
-/obj/structure/plasticflaps,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion/cargo)
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"aiQ" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -3798,17 +3808,34 @@
/turf/simulated/wall,
/area/maintenance/cargo)
"aiX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 6
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 6;
+ icon_state = "intact-fuel"
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/area/shuttle/excursion/general)
"aiY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/obj/machinery/shuttle_sensor{
+ dir = 5;
+ id_tag = "shuttlesens_exp_int";
+ pixel_y = -24
+ },
+/obj/machinery/alarm{
+ dir = 4;
+ icon_state = "alarm0";
+ pixel_x = -22;
+ pixel_y = 0
+ },
+/obj/structure/handrail{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"ajf" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/steeldecal/steel_decals6{
@@ -4245,14 +4272,26 @@
/turf/simulated/floor,
/area/maintenance/station/sec_upper)
"akx" = (
-/obj/item/device/radio/intercom{
- pixel_y = -24
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
},
-/obj/machinery/light,
-/obj/structure/bed/chair/shuttle{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/hatch{
+ req_one_access = list()
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"akz" = (
/obj/effect/floor_decal/borderfloorblack{
@@ -5654,8 +5693,18 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4;
+ icon_state = "map-scrubbers"
+ },
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"anC" = (
@@ -6087,9 +6136,18 @@
/turf/simulated/floor,
/area/maintenance/station/ai)
"aoU" = (
-/obj/structure/table/bench,
-/turf/simulated/floor,
-/area/maintenance/station/ai)
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_x = 0;
+ pixel_y = 28
+ },
+/obj/structure/cable/green{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration/pilot_office)
"aoV" = (
/obj/item/weapon/stool,
/turf/simulated/floor,
@@ -17697,11 +17755,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/camera/network/exploration{
dir = 9;
icon_state = "camera"
@@ -18467,6 +18520,9 @@
/area/quartermaster/storage)
"aQz" = (
/obj/structure/railing,
+/obj/item/stack/material/steel{
+ amount = 6
+ },
/turf/simulated/floor,
/area/maintenance/cargo)
"aQA" = (
@@ -18559,13 +18615,13 @@
/turf/simulated/floor,
/area/tether/exploration)
"aQL" = (
-/obj/machinery/alarm{
- dir = 1;
- icon_state = "alarm0";
- pixel_y = -22
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "shuttle_inbound"
},
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
+/obj/structure/plasticflaps,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"aQN" = (
/obj/machinery/light/small{
dir = 1
@@ -18635,9 +18691,18 @@
/turf/simulated/floor/tiled,
/area/security/hallway)
"aQX" = (
-/obj/structure/railing,
-/turf/simulated/floor,
-/area/maintenance/station/ai)
+/obj/machinery/shipsensors{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8;
+ icon_state = "warning"
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"aQY" = (
/obj/structure/railing{
dir = 8
@@ -18782,11 +18847,16 @@
/turf/simulated/mineral/vacuum,
/area/quartermaster/office)
"aRv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 10
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10;
+ icon_state = "intact-fuel"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 6;
+ icon_state = "intact"
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/area/shuttle/excursion/general)
"aRw" = (
/obj/structure/catwalk,
/obj/machinery/light/small{
@@ -18928,14 +18998,9 @@
/turf/simulated/floor,
/area/maintenance/station/elevator)
"aRQ" = (
-/obj/structure/closet/crate,
-/obj/random/drinkbottle,
-/obj/random/contraband,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/clean,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor,
-/area/maintenance/station/ai)
+/obj/structure/closet/secure_closet/personal,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration/pilot_office)
"aRT" = (
/obj/structure/catwalk,
/obj/structure/cable{
@@ -18948,22 +19013,31 @@
dir = 8
},
/obj/random/junk,
+/obj/structure/closet/secure_closet/pilot,
/turf/simulated/floor,
/area/maintenance/cargo)
"aRX" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor,
-/area/maintenance/station/ai)
+/obj/structure/table/rack/shelf,
+/obj/item/weapon/tank/oxygen,
+/obj/item/device/suit_cooling_unit,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/suit/space/void/pilot,
+/obj/item/clothing/head/helmet/space/void/pilot,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration/pilot_office)
"aRY" = (
/obj/structure/railing,
/obj/effect/floor_decal/rust,
/turf/simulated/floor,
/area/maintenance/cargo)
"aRZ" = (
-/obj/structure/railing,
-/obj/random/junk,
-/turf/simulated/floor,
-/area/maintenance/station/ai)
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "shuttle_outbound"
+ },
+/obj/structure/plasticflaps,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/cargo)
"aSa" = (
/obj/structure/cable/green{
d1 = 4;
@@ -18979,11 +19053,23 @@
/turf/simulated/floor/tiled,
/area/maintenance/station/sec_upper)
"aSb" = (
-/obj/structure/railing,
-/obj/random/trash,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor,
-/area/maintenance/station/ai)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/handrail{
+ dir = 4
+ },
+/obj/structure/closet/emergsuit_wall{
+ pixel_y = 32
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24;
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"aSd" = (
/obj/structure/railing,
/obj/structure/railing{
@@ -19054,13 +19140,14 @@
/turf/simulated/open,
/area/tether/exploration)
"aSq" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_x = 0;
- pixel_y = -24
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 6;
+ icon_state = "intact-fuel"
},
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"aSr" = (
/obj/structure/railing,
/obj/structure/table/rack{
@@ -19134,19 +19221,19 @@
/turf/simulated/floor,
/area/maintenance/cargo)
"aSx" = (
-/obj/structure/catwalk,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/obj/machinery/alarm{
- dir = 1;
- icon_state = "alarm0";
- pixel_y = -22
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
},
-/turf/simulated/floor,
-/area/maintenance/station/ai)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
"aSy" = (
/obj/effect/landmark/start{
name = "Cargo Technician"
@@ -19754,18 +19841,23 @@
/turf/simulated/floor/plating,
/area/quartermaster/belterdock/refinery)
"aUf" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 8;
- frequency = 1380;
- id_tag = "expshuttle_docker_pump_out_external"
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/structure/handrail{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/effect/map_helper/airlock/atmos/pump_out_external,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8;
+ icon_state = "intact-aux"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"aUg" = (
/obj/machinery/firealarm{
dir = 1;
@@ -19794,10 +19886,27 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"aUl" = (
-/obj/machinery/light,
-/obj/structure/stasis_cage,
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8;
+ icon_state = "intact-aux"
+ },
+/obj/machinery/door/airlock/hatch{
+ req_one_access = list()
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"aUn" = (
/obj/structure/cable/green{
d1 = 4;
@@ -19954,12 +20063,18 @@
/turf/simulated/floor/tiled/asteroid_steel/airless,
/area/quartermaster/belterdock)
"aUJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5;
+ icon_state = "intact-scrubbers"
},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/cockpit)
"aUN" = (
/obj/effect/floor_decal/industrial/warning{
dir = 5;
@@ -19981,12 +20096,14 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"aUR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 6;
- icon_state = "intact"
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/obj/machinery/alarm{
+ pixel_y = 22
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"aUS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -20047,11 +20164,13 @@
/turf/simulated/floor/tiled/asteroid_steel/airless,
/area/quartermaster/belterdock)
"aVi" = (
-/obj/machinery/shuttle_sensor{
- dir = 2;
- id_tag = "shuttlesens_exp_psg"
+/obj/machinery/portable_atmospherics/canister/phoron,
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/atmospherics/portables_connector/fuel{
+ dir = 8;
+ icon_state = "map_connector-fuel"
},
-/turf/simulated/wall/rshull,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"aVj" = (
/obj/structure/cable/green{
@@ -20237,12 +20356,17 @@
/turf/simulated/floor/airless,
/area/shuttle/medivac/engines)
"aVQ" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 8;
- icon_state = "map"
+/obj/machinery/atmospherics/portables_connector{
+ dir = 8
},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/item/device/radio/intercom{
+ dir = 4;
+ pixel_x = 24
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"aVS" = (
/obj/structure/bed/chair/shuttle{
dir = 4
@@ -20357,16 +20481,29 @@
/turf/simulated/floor,
/area/maintenance/station/cargo)
"aWn" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/shuttle_sensor{
- dir = 5;
- id_tag = "shuttlesens_exp_int"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/cockpit)
"aWp" = (
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"aWq" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1;
@@ -20387,9 +20524,21 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"aWs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/obj/machinery/airlock_sensor{
+ pixel_y = 28
+ },
+/obj/structure/handrail,
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_y = 0
+ },
+/obj/effect/map_helper/airlock/sensor/chamber_sensor,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 8
+ },
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"aWv" = (
/obj/machinery/alarm{
dir = 4;
@@ -20439,14 +20588,15 @@
/turf/simulated/floor/plating,
/area/crew_quarters/medical_restroom)
"aWG" = (
-/obj/machinery/disposal/deliveryChute{
- dir = 8
+/obj/machinery/computer/shuttle_control/explore/excursion{
+ dir = 1;
+ icon_state = "computer"
},
-/obj/structure/disposalpipe/trunk{
- dir = 4
+/obj/item/device/radio/intercom{
+ pixel_y = -24
},
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cockpit)
"aWI" = (
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
@@ -20475,11 +20625,16 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
"aWL" = (
-/obj/machinery/shipsensors{
- dir = 1
+/obj/structure/bed/chair/shuttle{
+ dir = 4
},
-/obj/effect/floor_decal/industrial/warning/full,
-/turf/simulated/floor/reinforced,
+/obj/machinery/alarm{
+ dir = 4;
+ icon_state = "alarm0";
+ pixel_x = -22;
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"aWO" = (
/obj/machinery/conveyor{
@@ -20582,11 +20737,28 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/gear)
"aXb" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/obj/machinery/power/apc{
+ alarms_hidden = 1;
+ name = "south bump";
+ pixel_y = -28;
+ req_access = list();
+ req_one_access = list(11,67)
+ },
+/obj/structure/cable/cyan,
+/obj/machinery/button/remote/blast_door{
+ dir = 8;
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ pixel_x = -25;
+ pixel_y = -25;
+ req_access = list(67)
+ },
+/obj/machinery/light,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cockpit)
"aXe" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -20649,10 +20821,6 @@
/obj/structure/stasis_cage,
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
-"aXr" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/yellow,
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
"aXs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -20706,19 +20874,25 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
"aXC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 5;
+ icon_state = "intact-fuel"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 9;
+ icon_state = "intact"
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/area/shuttle/excursion/general)
"aXD" = (
-/obj/structure/table/rack/shelf,
-/obj/item/weapon/tank/oxygen,
-/obj/item/device/suit_cooling_unit,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/pilot,
-/obj/item/clothing/head/helmet/space/void/pilot,
-/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/obj/structure/bed/chair/shuttle{
+ dir = 8
+ },
+/obj/structure/closet/emergsuit_wall{
+ dir = 4;
+ pixel_x = 32
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"aXH" = (
/obj/machinery/shipsensors{
@@ -20781,11 +20955,15 @@
/turf/space,
/area/space)
"aXS" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/device/radio/intercom{
+ dir = 1;
+ pixel_y = 24;
+ req_access = list()
+ },
+/obj/structure/handrail,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"aXT" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -20897,13 +21075,27 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/gear)
"aYw" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 1;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/obj/machinery/door/firedoor/glass,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/reinforced,
-/area/tether/exploration)
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"aYz" = (
/obj/structure/window/reinforced,
/obj/structure/grille,
@@ -20920,18 +21112,12 @@
/turf/space,
/area/space)
"aYD" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/industrial/danger{
- dir = 8
- },
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/reinforced,
/area/tether/exploration)
"aYE" = (
/obj/structure/closet/crate,
@@ -21096,14 +21282,11 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"aZy" = (
-/obj/structure/disposaloutlet{
- dir = 8
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 1
},
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/cockpit)
"aZA" = (
/obj/structure/table/steel,
/obj/item/stack/flag/yellow{
@@ -21140,11 +21323,11 @@
/turf/simulated/floor/plating,
/area/quartermaster/belterdock/refinery)
"aZD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 9
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/area/shuttle/excursion/general)
"aZH" = (
/obj/machinery/conveyor{
dir = 8;
@@ -21578,6 +21761,24 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/nuke_storage)
+"brK" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 8;
+ id = "shuttle_hatch";
+ name = "Shuttle Rear Hatch";
+ pixel_x = -25
+ },
+/obj/machinery/door/blast/regular{
+ dir = 4;
+ id = "shuttle_hatch";
+ name = "Shuttle Rear Hatch"
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"btu" = (
/obj/structure/cable{
d1 = 4;
@@ -21603,8 +21804,20 @@
/turf/simulated/mineral/vacuum,
/area/mine/explored/upper_level)
"bDD" = (
-/obj/machinery/sleep_console,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 5;
+ icon_state = "intact-fuel"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"bFB" = (
/obj/structure/lattice,
@@ -21614,14 +21827,14 @@
/turf/space,
/area/space)
"bFX" = (
-/obj/machinery/power/port_gen/pacman/mrs,
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
+/obj/structure/disposaloutlet{
+ dir = 8
},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
-/area/shuttle/excursion/general)
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/cargo)
"bHX" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -21674,22 +21887,19 @@
/turf/simulated/floor/tiled/eris/techmaint_cargo,
/area/shuttle/securiship/general)
"bRO" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced{
- dir = 4
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
},
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 1;
- icon_state = "pdoor0";
- id = "shuttle blast";
- name = "Shuttle Blast Doors";
- opacity = 0
+/obj/effect/floor_decal/industrial/danger{
+ dir = 8
},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/excursion/general)
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
"bTM" = (
/turf/simulated/floor/tiled/eris/dark/violetcorener,
/area/shuttle/securiship/general)
@@ -21758,7 +21968,14 @@
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/shuttle/securiship/general)
"cgm" = (
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/binary/pump/fuel,
+/obj/structure/fuel_port{
+ dir = 4;
+ pixel_x = 29
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"ciI" = (
/obj/structure/cable/green{
@@ -21767,9 +21984,11 @@
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/shuttle/securiship/engines)
"ckU" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/structure/closet/secure_closet/guncabinet/excursion,
+/obj/item/weapon/pickaxe,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"coc" = (
/obj/machinery/computer/ship/helm{
req_one_access = list(67,58)
@@ -21777,19 +21996,14 @@
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/shuttle/securiship/cockpit)
"cow" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/machinery/disposal/deliveryChute{
+ dir = 8
},
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/alarm{
- dir = 4;
- icon_state = "alarm0";
- pixel_x = -22
+/obj/structure/disposalpipe/trunk{
+ dir = 4
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
-/area/shuttle/excursion/general)
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/cargo)
"crE" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -21870,15 +22084,13 @@
/turf/simulated/floor/tiled/eris/dark/techfloor,
/area/shuttle/medivac/engines)
"cQa" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 1;
+ icon_state = "map-fuel"
+ },
/obj/structure/shuttle/engine/heater,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{
- dir = 1
- },
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"cTI" = (
/obj/machinery/door/airlock/glass_external,
/obj/effect/map_helper/airlock/door/ext_door,
@@ -21905,36 +22117,44 @@
/turf/simulated/floor/tiled/eris/steel/cyancorner,
/area/shuttle/medivac/cockpit)
"dhq" = (
-/obj/machinery/airlock_sensor{
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+ cycle_to_external_air = 1;
+ frequency = 1380;
+ id_tag = "expshuttle_docker";
pixel_y = 28
},
/obj/structure/handrail,
-/obj/machinery/light/small{
- dir = 4;
- pixel_y = 0
- },
-/obj/effect/map_helper/airlock/sensor/chamber_sensor,
-/obj/effect/map_helper/airlock/atmos/pump_out_internal,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume,
-/turf/simulated/floor/tiled/eris/dark/danger,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/pipe/manifold4w/hidden,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"dhW" = (
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/machinery/atmospherics/portables_connector,
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/alarm{
- pixel_y = 22
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"dln" = (
/obj/structure/bed/padded,
/turf/simulated/floor/tiled/eris/dark/violetcorener,
/area/shuttle/medivac/general)
"doD" = (
-/obj/machinery/computer/ship/sensors,
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/cockpit)
+/obj/effect/floor_decal/industrial/warning/corner,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/handrail,
+/obj/item/device/radio/intercom{
+ dir = 4;
+ pixel_x = 24
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cargo)
"dvH" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -21986,24 +22206,22 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"dFx" = (
-/obj/structure/cable/cyan{
- d1 = 4;
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+ d1 = 2;
d2 = 8;
- icon_state = "4-8"
+ icon_state = "2-8"
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/structure/handrail{
- dir = 1
- },
-/obj/structure/cable/cyan{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
-/area/shuttle/excursion/general)
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
+"dIM" = (
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration/pilot_office)
"dLI" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/wall,
@@ -22056,33 +22274,34 @@
/turf/simulated/floor/tiled,
/area/security/hallway)
"efQ" = (
-/obj/structure/cable/cyan,
/obj/structure/handrail{
dir = 1
},
-/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 1
- },
-/turf/simulated/floor/tiled/eris/dark/danger,
-/area/shuttle/excursion/cargo)
-"egf" = (
-/obj/machinery/atmospherics/binary/pump,
-/obj/machinery/firealarm{
+/obj/machinery/oxygen_pump{
dir = 1;
- pixel_x = 0;
- pixel_y = -26
+ pixel_y = -32
},
-/obj/item/weapon/tank/phoron{
- pixel_x = -5;
- pixel_y = 5
- },
-/obj/item/weapon/tank/phoron{
- pixel_x = 6;
- pixel_y = -6
- },
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/effect/map_helper/airlock/atmos/pump_out_internal,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume,
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
+"egf" = (
+/obj/effect/floor_decal/industrial/outline,
+/obj/machinery/atmospherics/portables_connector{
+ dir = 4
+ },
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
+"ehc" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/catwalk,
+/turf/simulated/floor,
+/area/maintenance/station/ai)
"ehI" = (
/obj/machinery/atm{
pixel_y = 30
@@ -22104,21 +22323,40 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"ejd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 6
+/obj/machinery/atmospherics/portables_connector{
+ dir = 1
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/portable_atmospherics/canister/empty,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"elB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/light/small{
+ dir = 8
},
-/obj/structure/cable/cyan{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24;
+ pixel_y = 0
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
+"eof" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_x = 0;
+ pixel_y = -24
+ },
+/obj/machinery/light,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
+"esH" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+ dir = 1;
+ icon_state = "map"
+ },
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/general)
"esK" = (
/obj/machinery/door/firedoor/glass/hidden/steel{
@@ -22127,34 +22365,48 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"eug" = (
-/obj/structure/disposaloutlet{
- dir = 4
+/obj/machinery/computer/ship/engines{
+ dir = 1
},
-/obj/structure/disposalpipe/trunk{
- dir = 8
+/obj/machinery/alarm{
+ dir = 1;
+ icon_state = "alarm0";
+ pixel_y = -22
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/tiled/eris/techmaint_perforated,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cockpit)
"evl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9;
- icon_state = "intact"
+/obj/machinery/light/small,
+/obj/machinery/alarm{
+ dir = 1;
+ icon_state = "alarm0";
+ pixel_y = -22
+ },
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/closet/crate/secure/phoron{
+ name = "fuel crate";
+ req_one_access = list(67)
+ },
+/obj/item/weapon/tank/phoron{
+ pixel_x = 6;
+ pixel_y = -6
+ },
+/obj/item/weapon/tank/phoron{
+ pixel_x = -5;
+ pixel_y = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
+ dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 9;
+ pixel_y = 0
},
-/obj/structure/cable/cyan{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/item/device/radio/intercom{
+ dir = 4;
+ pixel_x = 24
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"ewT" = (
/obj/machinery/atmospherics/portables_connector/fuel{
@@ -22165,6 +22417,20 @@
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/shuttle/securiship/engines)
+"eAm" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
"eBO" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -22180,13 +22446,7 @@
opacity = 0
},
/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/excursion/general)
-"eKK" = (
-/obj/machinery/sleeper{
- dir = 8
- },
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/turf/simulated/floor/plating,
/area/shuttle/excursion/general)
"eLO" = (
/obj/structure/window/reinforced{
@@ -22199,14 +22459,26 @@
/turf/simulated/floor/tiled/eris/dark/violetcorener,
/area/shuttle/securiship/general)
"eQX" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/structure/cable/cyan{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/tiled/eris/white/bluecorner,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock/hatch{
+ req_one_access = list()
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"eVj" = (
/obj/structure/cable/cyan{
@@ -22294,27 +22566,10 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"feb" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/light/small{
- dir = 1;
- icon_state = "bulb1"
- },
-/obj/structure/cable/cyan{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- alarms_hidden = 1;
- dir = 1;
- name = "north bump";
- pixel_x = 0;
- pixel_y = 28
- },
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/general)
"fkB" = (
/obj/machinery/door/airlock/glass_external,
@@ -22335,6 +22590,13 @@
/obj/machinery/door/firedoor/glass/hidden/steel,
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
+"fmc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 6;
+ icon_state = "intact"
+ },
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
"fox" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -22400,19 +22662,15 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"fQo" = (
-/obj/structure/cable/cyan{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
+/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/cockpit)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cargo)
"fZo" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -22426,11 +22684,12 @@
/turf/simulated/floor/tiled/eris/techmaint_panels,
/area/shuttle/medivac/engines)
"gde" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/excursion/cargo)
+/obj/machinery/sleep_console,
+/obj/item/device/radio/intercom{
+ pixel_y = -24
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"gdk" = (
/obj/machinery/light/small,
/obj/machinery/atmospherics/portables_connector{
@@ -22441,9 +22700,12 @@
/turf/simulated/floor/tiled/eris/dark/techfloor,
/area/shuttle/medivac/engines)
"geP" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+ req_one_access = list(67)
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/cockpit)
"gfw" = (
/obj/structure/cable{
d1 = 4;
@@ -22457,6 +22719,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
+"ghy" = (
+/obj/structure/stasis_cage,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
"gqZ" = (
/obj/effect/floor_decal/borderfloor{
dir = 1;
@@ -22469,17 +22736,16 @@
/turf/simulated/floor/tiled,
/area/security/security_processing)
"gsT" = (
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
- cycle_to_external_air = 1;
- frequency = 1380;
- id_tag = "expshuttle_docker";
- pixel_y = 28
- },
/obj/structure/handrail,
/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume,
-/turf/simulated/floor/tiled/eris/dark/danger,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 4
+ },
+/obj/structure/closet/emergsuit_wall{
+ pixel_y = 32
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"gvu" = (
/obj/structure/bed/chair/shuttle{
dir = 4
@@ -22491,12 +22757,13 @@
/turf/simulated/floor/tiled/eris/white,
/area/shuttle/medivac/general)
"gAZ" = (
-/obj/machinery/atmospherics/portables_connector{
+/obj/structure/handrail{
dir = 1
},
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/portable_atmospherics/canister/phoron,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"gBb" = (
/obj/effect/floor_decal/borderfloor{
@@ -22590,27 +22857,28 @@
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/shuttle/medivac/general)
"gNy" = (
-/obj/machinery/door/airlock/glass_external,
-/obj/machinery/airlock_sensor/airlock_exterior/shuttle{
- dir = 6;
- frequency = 1380;
- id_tag = "expshuttle_exterior_sensor";
- master_tag = "expshuttle_docker";
- pixel_x = 4;
- pixel_y = 28
+/obj/effect/shuttle_landmark{
+ base_area = /area/tether/exploration;
+ base_turf = /turf/simulated/floor/reinforced;
+ docking_controller = "expshuttle_dock";
+ landmark_tag = "tether_excursion_hangar";
+ name = "Excursion Shuttle Dock"
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9;
- icon_state = "intact"
- },
-/obj/effect/floor_decal/industrial/warning{
+/obj/effect/overmap/visitable/ship/landable/excursion,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 8;
- icon_state = "warning"
+ icon_state = "intact-fuel"
},
-/obj/effect/map_helper/airlock/door/ext_door,
-/obj/effect/map_helper/airlock/sensor/ext_sensor,
-/turf/simulated/floor/tiled/eris/techmaint_panels,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8;
+ icon_state = "intact-aux"
+ },
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"gQS" = (
/obj/effect/landmark{
name = "morphspawn"
@@ -22681,21 +22949,40 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
+"hkB" = (
+/obj/structure/catwalk,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor,
+/area/maintenance/station/ai)
"hpj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/structure/bed/chair/shuttle{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4;
- icon_state = "intact-scrubbers"
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/structure/closet/emergsuit_wall{
+ dir = 8;
+ pixel_x = -32
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"hsy" = (
-/obj/effect/floor_decal/industrial/outline,
-/obj/machinery/atmospherics/portables_connector,
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/obj/machinery/shuttle_sensor{
+ id_tag = "shuttlesens_exp_psg";
+ pixel_x = -25
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"htW" = (
/obj/effect/floor_decal/borderfloor{
@@ -22718,28 +23005,15 @@
/turf/simulated/wall/rshull,
/area/shuttle/securiship/engines)
"hyH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
+/obj/structure/bed/chair/shuttle{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4;
- icon_state = "intact-scrubbers"
- },
-/obj/structure/cable/cyan{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
-/area/shuttle/excursion/general)
-"hGJ" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/industrial/warning/corner{
+/obj/structure/closet/emergsuit_wall{
dir = 1;
- icon_state = "warningcorner"
+ pixel_y = -32
},
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"hIb" = (
/obj/machinery/light/small{
dir = 1
@@ -22754,12 +23028,9 @@
/turf/simulated/floor/tiled/eris/dark/techfloor,
/area/shuttle/medivac/engines)
"hNx" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/obj/machinery/mineral/equipment_vendor/survey,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"hPJ" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -22771,11 +23042,13 @@
/turf/simulated/floor/tiled,
/area/security/hallway)
"hTW" = (
-/obj/structure/bed/chair/shuttle,
-/obj/machinery/light{
- dir = 1
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/portable_atmospherics/canister/phoron,
+/obj/machinery/atmospherics/portables_connector/fuel{
+ dir = 8;
+ icon_state = "map_connector-fuel"
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"hZs" = (
/obj/effect/floor_decal/borderfloor{
@@ -22809,19 +23082,46 @@
/turf/simulated/floor/tiled,
/area/security/hallway)
"ijU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5;
- icon_state = "intact-supply"
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 10;
+ icon_state = "intact"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4;
- icon_state = "intact-scrubbers"
+/obj/structure/cable/yellow,
+/obj/machinery/power/port_gen/pacman/mrs{
+ anchored = 1
},
-/obj/structure/handrail{
- dir = 1
- },
-/turf/simulated/floor/tiled/eris/white/bluecorner,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
+"ikk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8;
+ icon_state = "intact-aux"
+ },
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 4
+ },
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
+"imZ" = (
+/obj/machinery/alarm{
+ dir = 1;
+ icon_state = "alarm0";
+ pixel_y = -22
+ },
+/obj/structure/catwalk,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor,
+/area/maintenance/station/ai)
"inX" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -22853,35 +23153,25 @@
/turf/simulated/wall/rshull,
/area/shuttle/securiship/general)
"isN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4;
- icon_state = "intact-scrubbers"
+/obj/structure/bed/chair/shuttle{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet{
+ dir = 8;
+ pixel_x = 30
+ },
+/obj/machinery/light{
dir = 4
},
-/obj/machinery/door/airlock/hatch{
- req_one_access = list(67)
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/obj/structure/cable/cyan{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/eris/techmaint_panels,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"iCh" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 1;
- icon_state = "warning"
- },
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/eris/techmaint_perforated,
-/area/shuttle/excursion/cargo)
+/obj/machinery/computer/ship/sensors,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cockpit)
"iDH" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -22907,23 +23197,17 @@
/turf/simulated/floor/tiled/eris/dark/techfloor,
/area/shuttle/medivac/engines)
"iEV" = (
-/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
},
-/obj/effect/shuttle_landmark{
- base_area = /area/tether/exploration;
- base_turf = /turf/simulated/floor/reinforced;
- docking_controller = "expshuttle_dock";
- landmark_tag = "tether_excursion_hangar";
- name = "Excursion Shuttle Dock"
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8;
+ icon_state = "intact-aux"
},
-/obj/effect/overmap/visitable/ship/landable/excursion,
-/turf/simulated/floor/tiled/eris/dark/danger,
-/area/shuttle/excursion/cargo)
-"iFx" = (
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/cockpit)
+/obj/machinery/atmospherics/pipe/manifold/hidden,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"iJs" = (
/obj/machinery/conveyor{
dir = 4;
@@ -22933,15 +23217,13 @@
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"iJT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 6;
+ icon_state = "intact-fuel"
+ },
/obj/structure/shuttle/engine/heater,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 6
- },
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"iOI" = (
/obj/structure/cable{
d1 = 4;
@@ -22965,26 +23247,23 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"iPK" = (
-/obj/structure/closet/emergsuit_wall{
- pixel_x = -32
- },
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/suit_cycler/exploration,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"iQS" = (
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/brown,
/obj/structure/curtain/open/bed,
-/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"iUO" = (
/obj/structure/barricade,
/turf/simulated/floor,
/area/maintenance/station/sec_upper)
"iWG" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating/eris/under,
+/obj/machinery/recharge_station,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"iXe" = (
/obj/machinery/light{
@@ -23015,11 +23294,9 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"jcr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 9;
- icon_state = "intact"
- },
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/structure/cable/cyan,
+/obj/machinery/power/smes/buildable/point_of_interest,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"jfu" = (
/obj/machinery/newscaster{
@@ -23060,12 +23337,19 @@
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/shuttle/securiship/general)
"jsf" = (
-/obj/machinery/disposal/deliveryChute{
- dir = 4
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/excursion/cargo)
+/obj/machinery/door/airlock/hatch{
+ req_one_access = list(67)
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"jxg" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/maintenance/sec{
@@ -23103,13 +23387,17 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"jQx" = (
-/obj/structure/cable/cyan{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9;
+ pixel_y = 0
},
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5;
+ icon_state = "intact-scrubbers"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"jRD" = (
/obj/effect/floor_decal/borderfloor{
dir = 1;
@@ -23149,12 +23437,9 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"kgD" = (
-/obj/structure/fuel_port{
- pixel_x = 0;
- pixel_y = 3
- },
-/turf/simulated/floor/tiled/eris/techmaint,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
"khf" = (
/obj/structure/window/reinforced{
dir = 8;
@@ -23166,6 +23451,14 @@
},
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/shuttle/securiship/general)
+"kkg" = (
+/obj/machinery/alarm{
+ dir = 1;
+ icon_state = "alarm0";
+ pixel_y = -22
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration/pilot_office)
"knm" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -23186,6 +23479,21 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
+"krj" = (
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock{
+ name = "Pilot's Office";
+ req_one_access = list(67)
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
"krV" = (
/obj/machinery/light,
/obj/structure/cable/green{
@@ -23197,19 +23505,9 @@
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/shuttle/securiship/engines)
"kCz" = (
-/obj/machinery/door/airlock/hatch{
- req_one_access = list(67)
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4;
- icon_state = "intact-scrubbers"
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/eris/techmaint_panels,
-/area/shuttle/excursion/general)
+/obj/machinery/computer/ship/helm,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cockpit)
"kDC" = (
/obj/structure/bed/chair/bay/chair/padded/blue{
dir = 4;
@@ -23259,11 +23557,17 @@
/turf/simulated/floor/tiled/eris/dark/techfloor,
/area/shuttle/medivac/engines)
"kPW" = (
-/obj/structure/handrail{
+/obj/machinery/door/blast/regular{
+ dir = 4;
+ id = "shuttle_hatch";
+ name = "Shuttle Rear Hatch"
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
-/turf/simulated/floor/tiled/eris/dark/danger,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"kSC" = (
/obj/effect/floor_decal/borderfloor{
dir = 1;
@@ -23290,28 +23594,43 @@
/turf/simulated/floor/tiled,
/area/security/hallway)
"kTn" = (
-/obj/item/device/radio/intercom{
- dir = 1;
- pixel_y = 24;
- req_access = list()
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
+"kUK" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/closet/emergsuit_wall{
+ pixel_y = 32
},
/obj/structure/handrail,
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
-"kUK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/structure/closet/secure_closet/guncabinet/excursion,
-/obj/item/weapon/pickaxe,
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"kVs" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/structure/handrail{
+ dir = 4
+ },
/obj/structure/cable/cyan{
d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 4;
+ icon_state = "1-4"
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/structure/cable/cyan{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -28;
+ req_access = list();
+ req_one_access = list(11,67)
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"lad" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -23334,17 +23653,11 @@
/turf/simulated/floor/tiled/eris/steel/cyancorner,
/area/shuttle/medivac/cockpit)
"lfJ" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/alarm{
- dir = 1;
- icon_state = "alarm0";
- pixel_y = -22
- },
-/obj/structure/handrail{
- dir = 1
- },
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/cockpit)
"lnp" = (
/obj/machinery/door/airlock/glass_external,
/obj/structure/cable/green{
@@ -23420,6 +23733,15 @@
/obj/machinery/door/window/brigdoor/eastleft,
/turf/simulated/floor/tiled/eris/dark/violetcorener,
/area/shuttle/securiship/general)
+"lLA" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/catwalk,
+/turf/simulated/floor,
+/area/maintenance/station/ai)
"lOS" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -23439,14 +23761,14 @@
/area/hallway/station/upper)
"lSD" = (
/obj/structure/cable/cyan{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/cockpit)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cargo)
"meu" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled,
@@ -23484,16 +23806,24 @@
/turf/simulated/floor/tiled/eris/dark/techfloor,
/area/shuttle/securiship/general)
"mnk" = (
-/obj/machinery/door/airlock/hatch{
- req_one_access = list(67)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
/obj/structure/cable/cyan{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/eris/techmaint_panels,
+/obj/structure/closet/emergsuit_wall{
+ pixel_y = 32
+ },
+/obj/machinery/atmospherics/binary/pump/aux{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"mqv" = (
/obj/structure/disposalpipe/segment{
@@ -23577,6 +23907,12 @@
/obj/effect/floor_decal/techfloor/hole/right,
/turf/simulated/floor/tiled/techfloor,
/area/tether/station/stairs_three)
+"mUI" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration/pilot_office)
"ndd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 5;
@@ -23607,13 +23943,30 @@
/turf/simulated/floor/tiled/eris/white,
/area/shuttle/medivac/general)
"nlw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/item/device/radio/intercom{
- dir = 8;
- pixel_x = -24;
- pixel_y = 0
+/obj/machinery/door/airlock/glass_external,
+/obj/machinery/airlock_sensor/airlock_exterior/shuttle{
+ dir = 6;
+ frequency = 1380;
+ id_tag = "expshuttle_exterior_sensor";
+ master_tag = "expshuttle_docker";
+ pixel_x = 4;
+ pixel_y = 28
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8;
+ icon_state = "warning"
+ },
+/obj/effect/map_helper/airlock/door/ext_door,
+/obj/effect/map_helper/airlock/sensor/ext_sensor,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8;
+ icon_state = "intact-aux"
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"nlX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/aux{
@@ -23706,40 +24059,27 @@
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/shuttle/securiship/engines)
"nwM" = (
+/obj/structure/disposaloutlet{
+ dir = 4
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
+"nzo" = (
+/obj/machinery/power/terminal{
+ dir = 1;
+ icon_state = "term"
+ },
/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
+ d2 = 2;
+ icon_state = "0-2"
},
-/obj/machinery/power/terminal,
-/obj/machinery/cell_charger,
-/obj/structure/table/steel,
-/obj/machinery/firealarm{
- dir = 2;
- layer = 3.3;
- pixel_x = 0;
- pixel_y = 26
- },
-/obj/random/powercell,
-/obj/item/stack/material/tritium{
- amount = 5
- },
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
-/area/shuttle/excursion/general)
-"nzo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 10
- },
-/obj/machinery/light/small{
- dir = 4;
- pixel_y = 0
- },
-/obj/structure/closet/crate/freezer/rations,
-/obj/item/weapon/storage/mre/menu11,
-/obj/item/weapon/storage/mre/menu10,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"nzs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -23750,6 +24090,15 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
+"nEe" = (
+/obj/structure/closet/crate,
+/obj/random/drinkbottle,
+/obj/random/contraband,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor,
+/area/maintenance/station/ai)
"nRt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 10
@@ -23828,24 +24177,12 @@
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/shuttle/securiship/cockpit)
"opv" = (
-/obj/machinery/firealarm{
- dir = 2;
- layer = 3.3;
- pixel_x = 0;
- pixel_y = 26
+/obj/structure/handrail{
+ dir = 8
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 8;
- icon_state = "warning"
- },
-/obj/machinery/conveyor_switch/oneway{
- id = "shuttle_outbound"
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"opL" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -23884,20 +24221,41 @@
/turf/simulated/floor/tiled/eris/steel/cyancorner,
/area/shuttle/medivac/cockpit)
"oqg" = (
-/obj/structure/bed/chair/shuttle,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 8
+ },
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4;
+ icon_state = "map-scrubbers"
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"owc" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/structure/closet/emcloset/legacy,
+/obj/machinery/light{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4;
- icon_state = "intact-scrubbers"
- },
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"owU" = (
/obj/effect/floor_decal/borderfloor{
dir = 9
@@ -23922,6 +24280,13 @@
},
/turf/simulated/floor/tiled,
/area/security/hallwayaux)
+"ozS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 9;
+ icon_state = "intact"
+ },
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
"oDi" = (
/obj/machinery/door/window/brigdoor/northleft{
req_access = list(5)
@@ -23929,13 +24294,23 @@
/turf/simulated/floor/tiled/eris/dark/violetcorener,
/area/shuttle/medivac/general)
"oDB" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
},
-/obj/structure/bed/chair/shuttle{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/handrail,
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"oGF" = (
/obj/machinery/door/airlock/glass_external,
@@ -23950,24 +24325,10 @@
/turf/simulated/wall/rshull,
/area/shuttle/securiship/general)
"oNI" = (
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/structure/closet/emcloset/legacy,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"oPK" = (
/obj/structure/window/reinforced{
@@ -23984,20 +24345,6 @@
},
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/shuttle/securiship/engines)
-"oUa" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4;
- icon_state = "intact-scrubbers"
- },
-/obj/machinery/light,
-/obj/item/device/radio/intercom{
- pixel_y = -24
- },
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/general)
"oWx" = (
/obj/structure/cable/cyan{
d1 = 1;
@@ -24008,29 +24355,21 @@
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/shuttle/securiship/general)
"oYj" = (
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -23;
- pixel_y = 0
- },
-/obj/machinery/button/remote/blast_door{
- dir = 8;
- id = "shuttle blast";
- name = "Shuttle Blast Doors";
- pixel_x = -25;
- pixel_y = -21;
- req_access = list(67)
- },
-/obj/structure/bed/chair/bay/comfy/blue{
- dir = 1;
- icon_state = "bay_comfychair_preview";
- pixel_y = 5
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/handrail{
dir = 4
},
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/cockpit)
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/machinery/alarm{
+ dir = 4;
+ icon_state = "alarm0";
+ pixel_x = -22;
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cargo)
"peF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -24078,17 +24417,24 @@
/turf/simulated/wall/rshull,
/area/shuttle/securiship/engines)
"pwj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/handrail{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/light/small{
dir = 4;
- icon_state = "intact-scrubbers"
+ pixel_y = 0
},
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating/eris/under,
+/obj/effect/map_helper/airlock/atmos/pump_out_internal,
+/obj/machinery/oxygen_pump{
+ dir = 1;
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/unary/vent_pump/high_volume,
+/obj/item/device/radio/intercom{
+ dir = 4;
+ pixel_x = 24
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"pOc" = (
/obj/structure/disposalpipe/segment,
@@ -24100,12 +24446,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
-"pPy" = (
-/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 4
- },
-/turf/simulated/floor/tiled/eris/dark/danger,
-/area/shuttle/excursion/cargo)
"pQE" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -24169,19 +24509,23 @@
/turf/simulated/floor/plating,
/area/shuttle/securiship/general)
"qcm" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/button/remote/blast_door{
+ dir = 8;
+ id = "shuttle_hatch";
+ name = "Shuttle Rear Hatch";
+ pixel_x = -25
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/structure/cable/cyan{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/obj/machinery/door/airlock/hatch{
+ req_one_access = list()
},
-/obj/structure/closet/emergsuit_wall{
- pixel_x = 32
- },
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"qgj" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -24195,17 +24539,17 @@
/turf/simulated/floor/tiled/dark,
/area/security/nuke_storage)
"qmq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 5;
- icon_state = "intact"
+ icon_state = "intact-aux"
},
-/obj/structure/cable/cyan{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"qxW" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -24221,20 +24565,19 @@
opacity = 0
},
/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating/eris/under,
+/turf/simulated/floor/plating,
/area/shuttle/excursion/general)
"qEn" = (
-/obj/machinery/computer/ship/helm,
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/cockpit)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/handrail,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cargo)
"qJK" = (
-/obj/machinery/suit_cycler/pilot,
-/obj/machinery/firealarm{
- dir = 1;
- pixel_x = 0;
- pixel_y = -26
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
},
-/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"qLc" = (
/obj/effect/floor_decal/industrial/warning,
@@ -24286,22 +24629,37 @@
/turf/simulated/floor/tiled/eris/techmaint_panels,
/area/shuttle/medivac/engines)
"qPS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/machinery/door/blast/regular{
+ density = 0;
dir = 4;
- icon_state = "intact-scrubbers"
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
},
-/turf/simulated/floor/tiled/eris/white/bluecorner,
+/turf/simulated/floor/plating,
/area/shuttle/excursion/general)
"qTB" = (
-/obj/machinery/computer/ship/engines{
- dir = 1;
- icon_state = "computer"
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -28;
+ req_access = list();
+ req_one_access = list(11,67)
},
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/cockpit)
+/obj/structure/cable/cyan{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cargo)
"qYJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 1
@@ -24312,24 +24670,45 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"reu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass,
/obj/structure/cable/cyan{
d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 4;
+ icon_state = "1-4"
},
-/obj/machinery/door/airlock/hatch{
- req_one_access = list(67)
+/obj/structure/cable/cyan{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/turf/simulated/floor/tiled/eris/techmaint_panels,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 6;
+ icon_state = "intact-aux"
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"rhv" = (
-/obj/structure/bed/chair/shuttle{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"rju" = (
/obj/structure/foamedmetal,
@@ -24435,12 +24814,16 @@
/turf/simulated/floor/tiled/dark,
/area/security/security_equiptment_storage)
"rFo" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/structure/handrail{
- dir = 1
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
},
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/obj/structure/cable/cyan{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"rIS" = (
/obj/machinery/door/airlock/glass_mining{
name = "Delivery Office";
@@ -24460,27 +24843,60 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/delivery)
+"rJm" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration/pilot_office)
"rLd" = (
-/obj/machinery/door/airlock/glass_external,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
+/obj/machinery/airlock_sensor{
+ dir = 8;
+ pixel_x = 26;
+ pixel_y = -27
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
+/obj/effect/map_helper/airlock/sensor/int_sensor,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
},
-/obj/effect/map_helper/airlock/door/int_door,
-/turf/simulated/floor/tiled/eris/techmaint_panels,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8;
+ icon_state = "intact-aux"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"rUl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10;
+ icon_state = "intact-fuel"
+ },
/obj/structure/shuttle/engine/heater,
-/obj/structure/window/reinforced{
- dir = 1
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
+"scI" = (
+/obj/machinery/alarm{
+ dir = 1;
+ icon_state = "alarm0";
+ pixel_y = -22
},
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 10
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
"sdI" = (
/obj/machinery/power/apc{
alarms_hidden = 1;
@@ -24496,42 +24912,9 @@
/turf/simulated/floor/tiled/eris/white,
/area/shuttle/medivac/general)
"shd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 4
- },
-/obj/machinery/door/airlock/glass_external{
- icon_state = "door_locked";
- id_tag = "expshuttle_door_cargo";
- locked = 1;
- req_one_access = list()
- },
-/obj/machinery/button/remote/airlock{
- desiredstate = 1;
- dir = 4;
- icon_state = "doorctrl0";
- id = "expshuttle_door_cargo";
- name = "hatch bolt control";
- pixel_x = -32;
- req_one_access = list(19,43,67);
- specialfunctions = 4
- },
-/turf/simulated/floor/tiled/eris/techmaint_panels,
-/area/shuttle/excursion/cargo)
-"slB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/structure/cable/cyan{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"sqj" = (
/obj/structure/cable/green{
dir = 1;
@@ -24544,11 +24927,10 @@
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/shuttle/securiship/engines)
"sFS" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/obj/machinery/meter,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"sHL" = (
/obj/structure/cable/green{
@@ -24577,14 +24959,10 @@
/obj/effect/map_helper/airlock/door/ext_door,
/turf/simulated/floor/tiled/eris/techmaint_panels,
/area/shuttle/securiship/general)
-"sTT" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "shuttle_inbound"
- },
-/obj/structure/plasticflaps,
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/excursion/cargo)
+"tmE" = (
+/obj/machinery/suit_cycler/pilot,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration/pilot_office)
"tnc" = (
/obj/structure/cable/cyan{
d1 = 1;
@@ -24656,22 +25034,15 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"tEV" = (
-/obj/machinery/oxygen_pump{
- pixel_y = -32
- },
/obj/structure/handrail{
dir = 1
},
-/obj/machinery/light/small{
- dir = 4;
- pixel_y = 0
+/obj/structure/closet/emergsuit_wall{
+ dir = 1;
+ pixel_y = -32
},
-/obj/effect/map_helper/airlock/atmos/pump_out_internal,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 1
- },
-/turf/simulated/floor/tiled/eris/dark/danger,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"tTA" = (
/obj/effect/floor_decal/corner/blue{
dir = 10;
@@ -24735,16 +25106,19 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"uqh" = (
-/obj/machinery/light{
- dir = 1
+/obj/structure/handrail,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
},
-/obj/structure/table/rack/shelf,
-/obj/item/weapon/tank/oxygen,
-/obj/item/device/suit_cooling_unit,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/pilot,
-/obj/item/clothing/head/helmet/space/void/pilot,
-/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/obj/structure/closet/emergsuit_wall{
+ pixel_y = 32
+ },
+/obj/item/device/radio/intercom{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"urb" = (
/obj/machinery/portable_atmospherics/canister/air,
@@ -24768,12 +25142,14 @@
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/shuttle/securiship/cockpit)
"utX" = (
-/obj/machinery/computer/shuttle_control/explore/excursion{
- dir = 1;
- icon_state = "computer"
+/obj/machinery/conveyor_switch/oneway{
+ id = "shuttle_outbound"
},
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/cockpit)
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cargo)
"uzs" = (
/obj/machinery/shipsensors{
dir = 1
@@ -24794,16 +25170,11 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"uGF" = (
-/obj/item/device/radio/intercom{
- dir = 1;
- pixel_y = 24;
- req_access = list()
- },
-/obj/structure/handrail,
-/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume,
-/turf/simulated/floor/tiled/eris/dark/danger,
-/area/shuttle/excursion/cargo)
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"uIH" = (
/obj/structure/cable/green{
dir = 1;
@@ -24817,6 +25188,18 @@
},
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/shuttle/securiship/general)
+"uQo" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_x = 0;
+ pixel_y = -24
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/machinery/light,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration/pilot_office)
"uRY" = (
/obj/machinery/atmospherics/portables_connector{
dir = 1
@@ -24846,14 +25229,18 @@
/turf/simulated/floor/plating/eris/under,
/area/shuttle/medivac/general)
"uVS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5;
- icon_state = "intact-scrubbers"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
+/obj/structure/extinguisher_cabinet{
+ dir = 8;
+ pixel_x = 30
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/structure/table/steel,
+/obj/machinery/recharger,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"uZd" = (
/obj/structure/bed/chair/bay/chair/padded/beige{
@@ -24879,36 +25266,38 @@
/turf/simulated/floor/tiled/eris/dark/techfloor,
/area/shuttle/securiship/general)
"vpU" = (
-/obj/machinery/light{
+/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 28
- },
-/obj/structure/cable/cyan{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/structure/bed/chair/bay/comfy/blue{
- dir = 1;
- icon_state = "bay_comfychair_preview";
- pixel_y = 5
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/cockpit)
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cargo)
"vqZ" = (
/turf/simulated/wall/rshull,
/area/shuttle/securiship/cockpit)
"vre" = (
-/obj/machinery/atmospherics/portables_connector,
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/structure/extinguisher_cabinet{
+ dir = 8;
+ pixel_x = 30
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/structure/cable/cyan{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/table/steel,
+/obj/machinery/cell_charger,
+/obj/random/powercell,
+/obj/item/stack/material/tritium{
+ amount = 5
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"vux" = (
/obj/structure/cable/green{
@@ -24935,20 +25324,23 @@
/turf/simulated/floor,
/area/maintenance/station/sec_upper)
"vFT" = (
-/obj/machinery/door/airlock/hatch{
- req_one_access = newlist()
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/structure/cable/cyan{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
+"vJd" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 1;
+ frequency = 1380;
+ id_tag = "expshuttle_docker_pump_out_external"
},
-/turf/simulated/floor/tiled/eris/techmaint_panels,
-/area/shuttle/excursion/cargo)
+/obj/effect/map_helper/airlock/atmos/pump_out_external,
+/obj/structure/handrail,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"vQT" = (
/obj/structure/bed/chair/bay/chair/padded/beige{
dir = 4;
@@ -24992,23 +25384,23 @@
/turf/simulated/floor/tiled/eris/steel/cyancorner,
/area/shuttle/medivac/cockpit)
"wiE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/firealarm{
- dir = 4;
- layer = 3.3;
- pixel_x = 26
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10;
+ icon_state = "intact-fuel"
},
-/obj/structure/handrail{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/obj/structure/cable/cyan{
d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 8;
+ icon_state = "1-8"
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"wls" = (
/obj/machinery/status_display{
@@ -25079,84 +25471,114 @@
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/shuttle/securiship/engines)
"wJy" = (
-/obj/item/device/radio/intercom{
- dir = 4;
- pixel_x = 24
- },
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/general)
-"wOI" = (
-/obj/machinery/atmospherics/portables_connector{
+/obj/structure/handrail{
dir = 1
},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/canister/empty,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
-/area/shuttle/excursion/general)
-"wPw" = (
-/obj/machinery/atmospherics/pipe/manifold4w/visible,
-/turf/simulated/floor/tiled/eris/dark/danger,
-/area/shuttle/excursion/cargo)
-"wPF" = (
-/obj/structure/bed/chair/shuttle,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/alarm{
- pixel_y = 22
- },
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
-/area/shuttle/excursion/general)
-"wRt" = (
-/obj/machinery/mineral/equipment_vendor/survey,
-/turf/simulated/floor/tiled/eris/techmaint_perforated,
-/area/shuttle/excursion/cargo)
-"wRy" = (
-/obj/machinery/door/airlock/glass_external,
-/obj/effect/map_helper/airlock/door/ext_door,
-/turf/simulated/floor/tiled/eris/techmaint_panels,
-/area/shuttle/medivac/general)
-"wSA" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 6;
- icon_state = "intact"
- },
-/obj/structure/cable/cyan{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/structure/cable/cyan{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
-/area/shuttle/excursion/general)
-"wUW" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
/obj/machinery/alarm{
dir = 1;
icon_state = "alarm0";
pixel_y = -22
},
-/turf/simulated/floor/tiled/eris/white/bluecorner,
-/area/shuttle/excursion/general)
-"wWn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/handrail{
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
+"wMg" = (
+/obj/machinery/light,
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
+"wOI" = (
+/obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
+"wPw" = (
+/obj/machinery/door/airlock/glass_external,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/obj/effect/map_helper/airlock/door/int_door,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8;
+ icon_state = "intact-aux"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
+"wPF" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden,
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
+"wRt" = (
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 1
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/cockpit)
+"wRy" = (
+/obj/machinery/door/airlock/glass_external,
+/obj/effect/map_helper/airlock/door/ext_door,
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/shuttle/medivac/general)
+"wSA" = (
/obj/structure/cable/cyan{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
+"wUW" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock/hatch{
+ req_one_access = list(67)
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
+"wWn" = (
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"wXX" = (
/obj/effect/floor_decal/borderfloor{
@@ -25206,9 +25628,8 @@
/turf/simulated/wall/rshull,
/area/shuttle/securiship/engines)
"xeA" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
-/obj/machinery/meter,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"xir" = (
/obj/machinery/airlock_sensor{
@@ -25223,12 +25644,10 @@
/turf/simulated/floor/tiled/eris/white,
/area/shuttle/medivac/general)
"xiw" = (
-/obj/structure/cable/cyan{
- d2 = 8;
- icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
},
-/obj/machinery/power/smes/buildable/point_of_interest,
-/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/general)
"xnm" = (
/obj/structure/cable/green{
@@ -25258,18 +25677,13 @@
/turf/simulated/wall/rshull,
/area/shuttle/securiship/engines)
"xvO" = (
-/obj/machinery/oxygen_pump{
- pixel_y = -32
+/obj/machinery/airlock_sensor{
+ dir = 8;
+ pixel_x = 26;
+ pixel_y = -27
},
-/obj/structure/handrail{
- dir = 1
- },
-/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 1
- },
-/turf/simulated/floor/tiled/eris/dark/danger,
-/area/shuttle/excursion/cargo)
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
"xwM" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -25293,26 +25707,11 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"xAb" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced{
- dir = 4
+/obj/machinery/conveyor_switch/oneway{
+ id = "shuttle_inbound"
},
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 1;
- icon_state = "pdoor0";
- id = "shuttle blast";
- name = "Shuttle Blast Doors";
- opacity = 0
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating/eris/under,
+/obj/effect/floor_decal/industrial/warning/full,
+/turf/simulated/floor/plating,
/area/shuttle/excursion/general)
"xBW" = (
/obj/structure/disposalpipe/segment{
@@ -25339,26 +25738,11 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"xCq" = (
-/obj/machinery/recharger,
-/obj/structure/table/steel,
-/obj/machinery/light{
- dir = 4;
- icon_state = "tube1"
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
-/obj/machinery/power/apc{
- alarms_hidden = 1;
- dir = 2;
- name = "south bump";
- pixel_y = -28;
- req_access = list(67)
- },
-/obj/structure/cable/cyan{
- d2 = 8;
- icon_state = "0-8"
- },
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
"xLC" = (
/obj/structure/cable/green{
dir = 1;
@@ -25371,25 +25755,32 @@
/turf/simulated/wall,
/area/quartermaster/office)
"ydg" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "shuttle_inbound"
+/obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 8
},
-/obj/effect/floor_decal/industrial/warning/full,
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/excursion/cargo)
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 1;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"ydG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
-/obj/machinery/airlock_sensor{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 8;
- pixel_x = 26;
- pixel_y = -27
+ icon_state = "intact-aux"
},
-/obj/effect/map_helper/airlock/sensor/int_sensor,
-/turf/simulated/floor/tiled/eris/dark/gray_perforated,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"ydR" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -36137,20 +36528,20 @@ abY
acE
acK
acK
+adj
+adj
+adj
acK
acK
acK
acK
acK
-acK
-acK
-acK
-acK
-acK
+adj
ydg
-sTT
-aWp
-aWp
+ydg
+ydg
+adj
+acK
acK
ams
aOz
@@ -36279,20 +36670,20 @@ akS
acE
acK
acK
+aaY
+aQX
adj
adj
eBO
adj
eBO
adj
-eBO
-aWp
-aWp
-aWp
+adj
+kCz
aZy
aWG
-aWp
-aWp
+adj
+adj
acK
ams
aOz
@@ -36420,20 +36811,20 @@ abe
abX
acE
acK
-aWL
+acK
adj
-aXD
-qJK
adj
+adj
+aSb
oNI
iPK
-eKK
+rFo
aWp
jsf
aWn
aUJ
aXb
-aWp
+adj
iJT
aaR
ams
@@ -36566,16 +36957,16 @@ afh
adj
uqh
wUW
-adj
+aSq
oqg
cgm
bDD
-aWp
-aiK
+evl
+adj
iCh
wRt
eug
-aWp
+adj
cQa
aaR
ams
@@ -36707,21 +37098,21 @@ acK
qxW
iQS
wJy
-ijU
+adj
aVi
hTW
-cgm
+adj
akx
-aWp
-opv
-hGJ
+adj
+adj
+lfJ
geP
lfJ
aiX
aZD
acK
ams
-aUl
+aXq
abe
aoS
aoS
@@ -36849,21 +37240,21 @@ adj
adj
adj
adj
-kCz
adj
-wPF
-uVS
+adj
+adj
+adj
oDB
-aWp
-kTn
+hsy
+adj
hNx
-geP
+kTn
ckU
aiY
-aWp
-acK
+fmc
+vJd
ams
-aXq
+ghy
abe
abe
abe
@@ -36987,22 +37378,22 @@ aaa
abe
acs
acF
-qxW
+adj
qEn
oYj
qTB
qPS
iWG
-oqg
+aWL
hpj
rhv
gde
-kgD
+adj
owc
-geP
-rFo
-aiY
-aWp
+kTn
+agy
+qJK
+brK
acK
ams
amq
@@ -37129,8 +37520,8 @@ aaa
abe
abY
acE
-qxW
-iFx
+adj
+qEn
fQo
lSD
eQX
@@ -37140,7 +37531,7 @@ wSA
wiE
vFT
qcm
-slB
+vFT
qmq
jQx
shd
@@ -37271,22 +37662,22 @@ aaa
abe
acA
acG
-qxW
+adj
doD
vpU
utX
-oUa
-adj
-adj
+qPS
+aUf
+aXD
isN
+aXD
+hyH
adj
-aWp
-aiX
kUK
ydG
xCq
-aXr
-aWp
+qJK
+kPW
acK
ams
amq
@@ -37294,8 +37685,8 @@ aQb
aOx
aOx
abe
-aSi
-agJ
+ehc
+hkB
aiV
abn
apt
@@ -37415,29 +37806,29 @@ abX
acE
adj
adj
+abL
+aRZ
+adj
+aUl
adj
adj
-pwj
adj
-hsy
-evl
-nlw
wOI
-aiY
+adj
aXS
rLd
-aWp
-aiY
-aWp
-acK
+opv
+uVS
+esH
+vJd
ams
-amq
+eof
abe
abe
abe
abe
+adV
aSi
-agJ
aiV
apy
apY
@@ -37556,16 +37947,16 @@ abe
abX
acE
acK
-qxW
+adj
bFX
cow
-hyH
+adj
mnk
kVs
elB
ejd
egf
-aZD
+adj
uGF
wPw
xvO
@@ -37573,13 +37964,13 @@ aRv
aXC
acK
ams
-anz
+amq
abe
aRQ
-agK
-aQX
+dIM
+aRQ
+adV
aSi
-agJ
aiV
aiV
aiV
@@ -37699,33 +38090,33 @@ abX
acE
acK
afh
-adj
feb
-dFx
+feb
adj
+aUR
dhW
xeA
sFS
gAZ
-aWp
+adj
gsT
-pPy
+ikk
efQ
-aWp
+wPF
cQa
aaR
ams
-amq
-abe
-aoU
+aSx
+krj
+rJm
aaX
-aRZ
+uQo
+adV
aSi
agJ
agJ
agJ
agJ
-agJ
aqr
arN
asz
@@ -37841,29 +38232,29 @@ abX
acE
acK
acK
-adj
+aiK
nwM
-xiw
adj
+aVQ
vre
jcr
nzo
-gAZ
-aWp
+ijU
+kgD
dhq
iEV
tEV
-aWp
+xiw
rUl
aaR
ams
-aQL
+eAm
abe
aoU
-aaY
-agK
+mUI
+kkg
+adV
aSi
-aRt
aaF
aeM
ahs
@@ -37983,33 +38374,33 @@ akS
acE
acK
acK
-adj
+aQL
xAb
adj
adj
adj
-bRO
adj
-aUR
-aVQ
+aYw
+adj
+adj
aWs
gNy
-aWp
-aWp
-aWp
+pwj
+ozS
+adj
acK
ams
-aSq
+eAm
abe
-agK
aRX
-aSb
+tmE
+aRX
+adV
aSi
-aRt
aib
aib
aib
-agJ
+nEe
aqu
arP
asB
@@ -38126,28 +38517,28 @@ acE
acK
acK
acK
-aYw
acK
acK
acK
acK
acK
-aUf
-aUf
+aYD
acK
+adj
+adj
+nlw
+adj
+adj
acK
acK
-aWp
-aWp
-acK
ams
-amq
+scI
abe
abe
abe
abe
-aSx
-agy
+adV
+aSi
abj
aib
aib
@@ -38268,12 +38659,12 @@ acH
adb
adk
adF
-aYD
+adF
adF
adF
adF
adb
-adF
+bRO
adk
adF
adF
@@ -38283,14 +38674,14 @@ adF
adk
adb
amt
-anz
+wMg
abe
awE
aQK
abe
-aSi
-agJ
-agJ
+lLA
+imZ
+adV
agJ
aib
agJ
@@ -38410,12 +38801,12 @@ acC
adc
adl
adH
-abL
-aWk
-aWk
-aWk
+acC
+acC
+acC
+acC
aNk
-aVI
+dFx
aYQ
aSK
aWk
diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm
index 575bacd2d7..7ed327bf89 100644
--- a/maps/tether/tether_areas.dm
+++ b/maps/tether/tether_areas.dm
@@ -1315,6 +1315,11 @@
sound_env = SMALL_ENCLOSED
ambience = AMBIENCE_GENERIC
+/area/tether/exploration/pilot_office
+ name = "\improper Pilot's Office"
+ sound_env = STANDARD_STATION
+ ambience = AMBIENCE_GENERIC
+
/area/shuttle/excursion
requires_power = 1
icon_state = "shuttle2"