diff --git a/code/controllers/subsystems/skybox.dm b/code/controllers/subsystems/skybox.dm
index 99f69ec595..52065ad241 100644
--- a/code/controllers/subsystems/skybox.dm
+++ b/code/controllers/subsystems/skybox.dm
@@ -122,9 +122,15 @@ SUBSYSTEM_DEF(skybox)
if(istype(O))
var/image/self_image = O.generate_skybox(z)
new_overlays += self_image
- for(var/obj/effect/overmap/visitable/other in O.loc)
- if(other != O)
- new_overlays += other.get_skybox_representation(z)
+ //VOREStation Add
+ if(isbelly(O.loc)) // Teehee
+ base.icon = 'icons/skybox/skybox_vr.dmi'
+ base.icon_state = "flesh"
+ //VOREStation Add End
+ else
+ for(var/obj/effect/overmap/visitable/other in O.loc)
+ if(other != O)
+ new_overlays += other.get_skybox_representation(z)
// Allow events to apply custom overlays to skybox! (Awesome!)
for(var/datum/event/E in SSevents.active_events)
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index c07f783e9e..9669004bca 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -182,3 +182,10 @@
stack_trace("Directional light cone deleted, but not by our component")
return QDEL_HINT_LETMELIVE
return ..()
+
+/obj/effect/overlay/closet_door
+ anchored = TRUE
+ plane = FLOAT_PLANE
+ layer = FLOAT_LAYER
+ vis_flags = VIS_INHERIT_ID
+ appearance_flags = KEEP_TOGETHER | LONG_GLIDE | PIXEL_SCALE
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index b27ebc27c5..048d089fed 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -26,6 +26,7 @@
closet_appearance = null
open_sound = 'sound/items/zip.ogg'
close_sound = 'sound/items/zip.ogg'
+ door_anim_time = 0 //Unsupported
var/item_path = /obj/item/bodybag
density = FALSE
storage_capacity = (MOB_MEDIUM * 2) - 1
diff --git a/code/game/objects/items/poi_items.dm b/code/game/objects/items/poi_items.dm
index 2c05f0cfca..8e65ac005b 100644
--- a/code/game/objects/items/poi_items.dm
+++ b/code/game/objects/items/poi_items.dm
@@ -65,6 +65,7 @@
closet_appearance = null
catalogue_data = list(/datum/category_item/catalogue/information/objects/oldreactor)
climbable = FALSE
+ door_anim_time = 0 //Unsupported
starts_with = list(
/obj/item/weapon/fuel_assembly/deuterium = 6)
diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm
index fb27ea6977..7a91c6ad8f 100644
--- a/code/game/objects/structures/crates_lockers/__closets.dm
+++ b/code/game/objects/structures/crates_lockers/__closets.dm
@@ -36,6 +36,19 @@
var/closet_appearance = /decl/closet_appearance // The /decl that defines what decals we end up with, that makes our look unique
+ /// Currently animating the door transform
+ var/is_animating_door = FALSE
+ /// Length of time (ds) to animate the door transform
+ var/door_anim_time = 2.0
+ /// Amount to 'squish' the full width of the door by
+ var/door_anim_squish = 0.30
+ /// Virtual angle at which the door is opened to (136 by default, so not a full 180)
+ var/door_anim_angle = 136
+ /// Offset for the door hinge location from centerline
+ var/door_hinge = -6.5
+ /// Our visual object for the closet door
+ var/obj/effect/overlay/closet_door/door_obj
+
/obj/structure/closet/Initialize()
..()
return INITIALIZE_HINT_LATELOAD
@@ -66,6 +79,10 @@
color = null
update_icon()
+/obj/structure/closet/Destroy()
+ . = ..()
+ qdel_null(door_obj)
+
/obj/structure/closet/examine(mob/user)
. = ..()
if(Adjacent(user) || isobserver(user))
@@ -134,7 +151,7 @@
playsound(src, open_sound, 15, 1, -3)
if(initial(density))
density = !density
- update_icon()
+ animate_door()
return 1
/obj/structure/closet/proc/close()
@@ -159,7 +176,7 @@
playsound(src, close_sound, 15, 1, -3)
if(initial(density))
density = !density
- update_icon()
+ animate_door(TRUE)
return 1
//Cham Projector Exception
@@ -214,10 +231,11 @@
/obj/structure/closet/proc/toggle(mob/user as mob)
+ if(is_animating_door)
+ return
if(!(opened ? close() : open()))
to_chat(user, "It won't budge!")
return
- update_icon()
// this should probably use dump_contents()
/obj/structure/closet/ex_act(severity)
@@ -481,8 +499,45 @@
spawn(1) qdel(src)
return 1
-// Just a generic cabinet for mappers to use
-/obj/structure/closet/cabinet
- name = "cabinet"
- icon = 'icons/obj/closets/bases/cabinet.dmi'
- closet_appearance = /decl/closet_appearance/cabinet
+/obj/structure/closet/proc/animate_door(closing = FALSE)
+ if(!door_anim_time)
+ update_icon()
+ return
+ if(!door_obj)
+ door_obj = new
+ vis_contents |= door_obj
+ door_obj.icon = icon
+ door_obj.icon_state = "door_front"
+ is_animating_door = TRUE
+ if(!closing)
+ update_icon()
+ var/num_steps = door_anim_time / world.tick_lag
+ for(var/I in 0 to num_steps)
+ var/angle = door_anim_angle * (closing ? 1 - (I/num_steps) : (I/num_steps))
+ var/matrix/M = get_door_transform(angle)
+ var/door_state = angle >= 90 ? "door_back" : "door_front"
+ var/door_layer = angle >= 90 ? FLOAT_LAYER : ABOVE_MOB_LAYER
+
+ if(I == 0)
+ door_obj.transform = M
+ door_obj.icon_state = door_state
+ door_obj.layer = door_layer
+ else if(I == 1)
+ animate(door_obj, transform = M, icon_state = door_state, layer = door_layer, time = world.tick_lag, flags = ANIMATION_END_NOW)
+ else
+ animate(transform = M, icon_state = door_state, layer = door_layer, time = world.tick_lag)
+ addtimer(CALLBACK(src,.proc/end_door_animation,closing),door_anim_time,TIMER_UNIQUE|TIMER_OVERRIDE)
+
+/obj/structure/closet/proc/end_door_animation(closing = FALSE)
+ is_animating_door = FALSE
+ if(closing)
+ // There's not really harm in leaving it on, but, one less atom to send to clients to render when lockers are closed
+ vis_contents -= door_obj
+ update_icon()
+
+/obj/structure/closet/proc/get_door_transform(angle)
+ var/matrix/M = matrix()
+ M.Translate(-door_hinge, 0)
+ M.Multiply(matrix(cos(angle), 0, 0, -sin(angle) * door_anim_squish, 1, 0))
+ M.Translate(door_hinge, 0)
+ return M
diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
index 9075c87272..eb1ab2d780 100644
--- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
+++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
@@ -33,6 +33,8 @@
var/icon/closed_locked_welded_icon
var/icon/closed_unlocked_icon
var/icon/closed_unlocked_welded_icon
+ var/icon/door_front_icon
+ var/icon/door_back_icon
// Create open icon.
var/icon/new_icon = new
@@ -40,6 +42,10 @@
open_icon.Blend(icon(base_icon, "open"), ICON_OVERLAY)
open_icon.Blend(color, BLEND_ADD)
open_icon.Blend(icon(base_icon, "interior"), ICON_OVERLAY)
+
+ door_back_icon = icon(base_icon, "door_back")
+ door_back_icon.Blend(color, BLEND_ADD)
+
if(decal_icon)
for(var/thing in decals)
var/icon/this_decal_icon = icon(decal_icon, "[thing]_open")
@@ -47,6 +53,8 @@
open_icon.Blend(this_decal_icon, ICON_OVERLAY)
// Generate basic closed icons.
+ door_front_icon = icon(base_icon, "door_front")
+ door_front_icon.Blend(color, BLEND_ADD)
closed_emagged_icon = icon(base_icon, "base")
if(can_lock)
closed_emagged_icon.Blend(icon(base_icon, "lock"), ICON_OVERLAY)
@@ -56,6 +64,10 @@
var/icon/this_decal_icon = icon(decal_icon, thing)
this_decal_icon.Blend(decals[thing], BLEND_ADD)
closed_emagged_icon.Blend(this_decal_icon, ICON_OVERLAY)
+ door_front_icon.Blend(this_decal_icon, ICON_OVERLAY)
+
+ door_front_icon.AddAlphaMask(icon(base_icon, "door_front")) // Remove pesky 'more than just door' decals
+
closed_locked_icon = icon(closed_emagged_icon)
closed_unlocked_icon = icon(closed_emagged_icon)
@@ -83,13 +95,15 @@
closed_emagged_welded_icon.Blend(sparks, ICON_OVERLAY)
// Insert our bevy of icons into the final icon file.
- new_icon.Insert(open_icon, "open")
- new_icon.Insert(closed_emagged_icon, "closed_emagged")
- new_icon.Insert(closed_emagged_welded_icon, "closed_emagged_welded")
- new_icon.Insert(closed_locked_icon, "closed_locked")
- new_icon.Insert(closed_locked_welded_icon, "closed_locked_welded")
- new_icon.Insert(closed_unlocked_icon, "closed_unlocked")
- new_icon.Insert(closed_unlocked_welded_icon, "closed_unlocked_welded")
+ new_icon.Insert(open_icon, "open")
+ new_icon.Insert(closed_emagged_icon, "closed_emagged")
+ new_icon.Insert(closed_emagged_welded_icon, "closed_emagged_welded")
+ new_icon.Insert(closed_locked_icon, "closed_locked")
+ new_icon.Insert(closed_locked_welded_icon, "closed_locked_welded")
+ new_icon.Insert(closed_unlocked_icon, "closed_unlocked")
+ new_icon.Insert(closed_unlocked_welded_icon, "closed_unlocked_welded")
+ new_icon.Insert(door_front_icon, "door_front")
+ new_icon.Insert(door_back_icon, "door_back")
// Set icon!
icon = new_icon
diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index 3865641552..b42bbcb778 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -7,6 +7,7 @@
seal_tool = /obj/item/weapon/tool/screwdriver
breakout_sound = 'sound/weapons/tablehit1.ogg'
closet_appearance = null // Special icon for us
+ door_anim_time = 0 //Unsupported
/* Graves */
/obj/structure/closet/grave
@@ -20,6 +21,7 @@
max_closets = 1
opened = 1
closet_appearance = null // Special icon for us
+ door_anim_time = 0 //Unsupported
/obj/structure/closet/grave/attack_hand(mob/user as mob)
if(opened)
diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
index 72a9188d12..0e7763e827 100644
--- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
@@ -1,4 +1,5 @@
/obj/structure/closet/crate/critter
name = "critter crate"
desc = "A crate which can sustain life for a while."
- closet_appearance = /decl/closet_appearance/large_crate/critter
\ No newline at end of file
+ closet_appearance = /decl/closet_appearance/large_crate/critter
+ door_anim_time = 0 //Unsupported
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm
index 19d3f8b452..d024a71582 100644
--- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm
+++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm
@@ -13,6 +13,7 @@
opened = 0
sealed = 0 //Don't touch this.
health = 100
+ door_anim_time = 0 //Unsupported
/obj/structure/closet/secure_closet/egg/update_icon()
if(opened)
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 6ba78a90a0..2023737b8f 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -1,7 +1,9 @@
/obj/structure/closet/cabinet
name = "cabinet"
desc = "Old will forever be in fashion."
+ icon = 'icons/obj/closets/bases/cabinet.dmi'
closet_appearance = /decl/closet_appearance/cabinet
+ door_anim_time = 0 //Unsupported
/obj/structure/closet/acloset
name = "strange closet"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index bb7b05c7b3..0e05016224 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -312,3 +312,4 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
//too small to put a man in
large = 0
+ door_anim_time = 0 // Unsupported
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index 9b66918be0..c930b032a1 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -7,6 +7,7 @@
anchored = TRUE
health = 0 //destroying the statue kills the mob within
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
+ door_anim_time = 0 // Why is this a closet??
var/intialTox = 0 //these are here to keep the mob from taking damage from things that logically wouldn't affect a rock
var/intialFire = 0 //it's a little sloppy I know but it was this or the GODMODE flag. Lesser of two evils.
var/intialBrute = 0
diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm
index f140e7380f..0bf549f06a 100644
--- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm
@@ -10,6 +10,7 @@
anchored = TRUE
store_mobs = 0
wall_mounted = 1
+ door_anim_time = 0 // Unsupported
//spawns 2 sets of breathmask, emergency oxy tank and crowbar
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index eec6a8d892..bc178de97e 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -7,6 +7,7 @@
closet_appearance = /decl/closet_appearance/crate
climbable = TRUE
dir = 4 //Spawn facing 'forward' by default.
+ door_anim_time = 0 //Unsupported until appropriate sprites are available
var/points_per_crate = 5
var/rigged = 0
diff --git a/code/game/turfs/simulated/fancy_shuttles.dm b/code/game/turfs/simulated/fancy_shuttles.dm
index 9804d6c0c6..e03eff3e0c 100644
--- a/code/game/turfs/simulated/fancy_shuttles.dm
+++ b/code/game/turfs/simulated/fancy_shuttles.dm
@@ -54,6 +54,24 @@ GLOBAL_LIST_EMPTY(fancy_shuttles)
var/mutable_appearance/under_EM
var/fancy_shuttle_tag
+// Reinforced hull steel
+/turf/simulated/wall/fancy_shuttle/Initialize(mapload, materialtype, rmaterialtype, girdertype)
+ . = ..(mapload, MAT_STEELHULL, MAT_STEELHULL, MAT_STEELHULL)
+
+/turf/simulated/wall/fancy_shuttle/window
+ opacity = FALSE
+ icon_state = "hull_transparent"
+
+/turf/simulated/wall/fancy_shuttle/window/attack_generic(mob/user, damage, attack_message)
+ take_damage(damage)
+ return damage
+
+/turf/simulated/wall/fancy_shuttle/nondense
+ density = FALSE
+ blocks_air = FALSE
+ opacity = FALSE
+ icon_state = "hull_nondense"
+
/turf/simulated/wall/fancy_shuttle/pre_translate_A(turf/B)
. = ..()
remove_underlay()
@@ -62,15 +80,21 @@ GLOBAL_LIST_EMPTY(fancy_shuttles)
apply_underlay()
return ..()
-/turf/simulated/wall/fancy_shuttle/window
- opacity = FALSE
- icon_state = "hull_transparent"
+// No girders, and Eris plating
+/turf/simulated/wall/fancy_shuttle/dismantle_wall(var/devastated, var/explode, var/no_product)
-/turf/simulated/wall/fancy_shuttle/nondense
- density = FALSE
- blocks_air = FALSE
- opacity = FALSE
- icon_state = "hull_nondense"
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
+ if(!no_product && !devastated)
+ material.place_dismantled_product(src)
+ if (!reinf_material)
+ material.place_dismantled_product(src)
+
+ clear_plants()
+ material = get_material_by_name("placeholder")
+ reinf_material = null
+ girder_material = null
+
+ ChangeTurf(/turf/simulated/floor/plating/eris/under)
/turf/simulated/wall/fancy_shuttle/proc/remove_underlay()
if(under_MA)
@@ -217,6 +241,36 @@ GLOBAL_LIST_EMPTY(fancy_shuttles)
/obj/effect/fancy_shuttle_floor_preview/dropship
icon = 'icons/turf/fancy_shuttles/dropship_preview.dmi'
+/**
+ * Explo shuttle
+ * North facing: W:13, H:18
+ */
+/obj/effect/fancy_shuttle/exploration
+ icon = 'icons/turf/fancy_shuttles/exploration_preview.dmi'
+ split_file = 'icons/turf/fancy_shuttles/exploration.dmi'
+/obj/effect/fancy_shuttle_floor_preview/exploration
+ icon = 'icons/turf/fancy_shuttles/exploration_preview.dmi'
+
+/**
+ * Sec shuttle
+ * North facing: W:13, H:18
+ */
+/obj/effect/fancy_shuttle/security
+ icon = 'icons/turf/fancy_shuttles/security_preview.dmi'
+ split_file = 'icons/turf/fancy_shuttles/security.dmi'
+/obj/effect/fancy_shuttle_floor_preview/security
+ icon = 'icons/turf/fancy_shuttles/security_preview.dmi'
+
+/**
+ * Med shuttle
+ * North facing: W:13, H:18
+ */
+/obj/effect/fancy_shuttle/medical
+ icon = 'icons/turf/fancy_shuttles/medical_preview.dmi'
+ split_file = 'icons/turf/fancy_shuttles/medical.dmi'
+/obj/effect/fancy_shuttle_floor_preview/medical
+ icon = 'icons/turf/fancy_shuttles/medical_preview.dmi'
+
/**
* Orange line tram
* North facing: W:9, H:16
diff --git a/code/modules/ai/ai_holder_combat.dm b/code/modules/ai/ai_holder_combat.dm
index 760031985e..f84235c8f1 100644
--- a/code/modules/ai/ai_holder_combat.dm
+++ b/code/modules/ai/ai_holder_combat.dm
@@ -300,6 +300,11 @@
if(D.density)
ai_log("destroy_surroundings() : Attacking closed door.", AI_LOG_INFO)
return melee_attack(D)
+
+ // Should always be last thing attempted
+ if(!problem_turf.opacity)
+ ai_log("destroy_surroundings() : Attacking a transparent (window?) turf.", AI_LOG_INFO)
+ return melee_attack(problem_turf)
ai_log("destroy_surroundings() : Exiting due to nothing to attack.", AI_LOG_INFO)
return ATTACK_FAILED // Nothing to attack.
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index 080c2946e4..7b98dd5132 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -551,6 +551,18 @@
)
gear_tweaks += new/datum/gear_tweak/path(jacket)
+/datum/gear/suit/miscellaneous/light_jacket
+ display_name = "light jacket selection"
+ path = /obj/item/clothing/suit/storage/toggle/light_jacket
+
+/datum/gear/suit/miscellaneous/light_jacket/New()
+ ..()
+ var/list/jacket = list(
+ "grey light jacket" = /obj/item/clothing/suit/storage/toggle/light_jacket,
+ "dark blue light jacket" = /obj/item/clothing/suit/storage/toggle/light_jacket/blue
+ )
+ gear_tweaks += new/datum/gear_tweak/path(jacket)
+
/datum/gear/suit/miscellaneous/peacoat
display_name = "peacoat"
path = /obj/item/clothing/suit/storage/toggle/peacoat
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index a4b59ac612..7aa7e43385 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -726,6 +726,19 @@
item_state_slots = list(slot_r_hand_str = "med_dep_jacket", slot_l_hand_str = "med_dep_jacket")
flags_inv = HIDEHOLSTER
+/obj/item/clothing/suit/storage/toggle/light_jacket
+ name = "grey light jacket"
+ desc = "A light, cozy jacket. Now in grey."
+ icon_state = "grey_dep_jacket"
+ item_state_slots = list(slot_r_hand_str = "grey_dep_jacket", slot_l_hand_str = "grey_dep_jacket")
+ flags_inv = HIDEHOLSTER
+
+/obj/item/clothing/suit/storage/toggle/light_jacket/blue
+ name = "dark blue light jacket"
+ desc = "A light, cozy jacket. Now in dark blue."
+ icon_state = "blue_dep_jacket"
+ item_state_slots = list(slot_r_hand_str = "blue_dep_jacket", slot_l_hand_str = "blue_dep_jacket")
+
/*
* Track Jackets
*/
diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm
index 6d844d2861..a8992b749c 100644
--- a/code/modules/mob/living/carbon/human/examine_vr.dm
+++ b/code/modules/mob/living/carbon/human/examine_vr.dm
@@ -112,7 +112,7 @@
if(1000 to 1399)
message = "[t_He] [t_has] a rotund, thick gut. It bulges from their body obscenely, close to sagging under its own weight."
if(1400 to 1934) // One person fully digested.
- message = "[t_He] [t_is] sporting a large, round, sagging stomach. It's contains at least their body weight worth of glorping slush."
+ message = "[t_He] [t_is] sporting a large, round, sagging stomach. It contains at least their body weight worth of glorping slush."
if(1935 to 3004) // Two people.
message = "[t_He] [t_is] engorged with a huge stomach that sags and wobbles as they move. [t_He] must have consumed at least twice their body weight. It looks incredibly soft."
if(3005 to 4074) // Three people.
@@ -195,4 +195,4 @@
else
return "[t_He] [t_appear] to be in some sort of torpor."
if(feral)
- return "[t_He] [t_has] a crazed, wild look in [t_his] eyes!"
\ No newline at end of file
+ return "[t_He] [t_has] a crazed, wild look in [t_his] eyes!"
diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
index 5bb68f044d..df0142a12e 100644
--- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
+++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
@@ -272,7 +272,7 @@
if(eyecolor_val < 40)
eyecolor_val = 40
- eyecolor_rgb = rgb(eyecolor_hue, eyecolor_sat, eyecolor_val, COLORSPACE_HSV)
+ eyecolor_rgb = rgb(eyecolor_hue, eyecolor_sat, eyecolor_val, space=COLORSPACE_HSV)
H.r_eyes = rgb2num(eyecolor_rgb)[1]
H.g_eyes = rgb2num(eyecolor_rgb)[2]
diff --git a/code/modules/overmap/ships/ship_vr.dm b/code/modules/overmap/ships/ship_vr.dm
index 97afe44e72..5971957adc 100644
--- a/code/modules/overmap/ships/ship_vr.dm
+++ b/code/modules/overmap/ships/ship_vr.dm
@@ -45,4 +45,4 @@
var/list/listeners = get_people_in_ship()
for(var/mob/M as anything in listeners)
- M.show_message(message, m_type)
+ M.show_message(message, m_type)
\ No newline at end of file
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index da3e3c64de..e2042a9b9d 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -523,6 +523,15 @@
H.vent_gas(loc)
qdel(H)
+/obj/machinery/disposal/hitby(atom/movable/AM)
+ . = ..()
+ if(istype(AM, /obj/item) && !istype(AM, /obj/item/projectile))
+ if(prob(75))
+ AM.forceMove(src)
+ visible_message("\The [AM] lands in \the [src].")
+ else
+ visible_message("\The [AM] bounces off of \the [src]'s rim!")
+
/obj/machinery/disposal/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /obj/item/projectile))
return 1
diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 75fc1c35f4..3411a60fd3 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -652,7 +652,7 @@
//Digest a single item
//Receives a return value from digest_act that's how much nutrition
//the item should be worth
-/obj/belly/proc/digest_item(obj/item/item, /var/touchable_amount) //CHOMPEdit
+/obj/belly/proc/digest_item(obj/item/item, touchable_amount) //CHOMPEdit
var/digested = item.digest_act(src, touchable_amount) //CHOMPEdit
if(digested == FALSE) //CHOMPEdit
items_preserved |= item
diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm
index 9f4f8107de..b8b31070fb 100644
--- a/code/modules/vore/eating/bellymodes_vr.dm
+++ b/code/modules/vore/eating/bellymodes_vr.dm
@@ -132,17 +132,17 @@
var/to_update = FALSE
var/digestion_noise_chance = 0
var/list/touchable_mobs = list()
+ var/touchable_amount = touchable_atoms.len //CHOMPEdit start
for(var/A in touchable_atoms)
//Handle stray items
- if(isitem(A)) //CHOMPEdit start
+ if(isitem(A))
if(!item_mode_serial)
- var/touchable_amount = touchable_atoms.len
did_an_item = handle_digesting_item(A, touchable_amount)
else if(!did_an_item)
did_an_item = handle_digesting_item(A, 1)
if(did_an_item)
- to_update = TRUE //CHOMPEdit end
+ to_update = TRUE
//Less often than with normal digestion
if((item_digest_mode == IM_DIGEST_FOOD || item_digest_mode == IM_DIGEST) && prob(25))
@@ -150,6 +150,7 @@
// but we also want the prob(25) chance to run for -every- item we look at, not just once
// More gurgles the better~
digestion_noise_chance = 25
+ continue //CHOMPEdit end
//Handle eaten mobs
else if(isliving(A))
@@ -217,7 +218,7 @@
M.playsound_local(get_turf(src), preyloop, 80, 0, channel = CHANNEL_PREYLOOP)
M.next_preyloop = (world.time + (52 SECONDS))
-/obj/belly/proc/handle_digesting_item(obj/item/I, var/touchable_amount = 1) //CHOMPEdit
+/obj/belly/proc/handle_digesting_item(obj/item/I, touchable_amount) //CHOMPEdit
var/did_an_item = FALSE
// We always contaminate IDs.
if(contaminates || istype(I, /obj/item/weapon/card/id))
diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm
index a88a2fa3aa..c6cdabbcc0 100644
--- a/code/modules/vore/eating/digest_act_vr.dm
+++ b/code/modules/vore/eating/digest_act_vr.dm
@@ -3,7 +3,7 @@
//return non-negative integer: Amount of nutrition/charge gained (scaled to nutrition, other end can multiply for charge scale).
// Ye default implementation.
-/obj/item/proc/digest_act(atom/movable/item_storage = null, var/touchable_amount = 1) //CHOMPEdit
+/obj/item/proc/digest_act(atom/movable/item_storage = null, touchable_amount) //CHOMPEdit
if(istype(item_storage, /obj/item/device/dogborg/sleeper))
if(istype(src, /obj/item/device/pda))
var/obj/item/device/pda/P = src
@@ -26,9 +26,11 @@
if(isbelly(item_storage))
var/obj/belly/B = item_storage
- g_damage = 0.25 * (B.digest_brute + B.digest_burn) / touchable_amount //CHOMPEdit
- if(g_damage <= 0) //CHOMPEdit
- return FALSE //CHOMPEdit
+ if(!touchable_amount) //CHOMPEdit Start
+ touchable_amount = 1
+ g_damage = 0.25 * (B.digest_brute + B.digest_burn) / touchable_amount
+ if(g_damage <= 0)
+ return FALSE //CHOMPEdit End
if(digest_stage > 0)
if(g_damage > digest_stage)
diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi
index 82ae304307..602ab0bcd2 100644
Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ
diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi
index f5c48376be..6d959d86d8 100644
Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ
diff --git a/icons/mob/items/lefthand_suits.dmi b/icons/mob/items/lefthand_suits.dmi
index aab06d09ee..fd2c56a4c5 100644
Binary files a/icons/mob/items/lefthand_suits.dmi and b/icons/mob/items/lefthand_suits.dmi differ
diff --git a/icons/mob/items/righthand_suits.dmi b/icons/mob/items/righthand_suits.dmi
index 6afe96f806..d710deb759 100644
Binary files a/icons/mob/items/righthand_suits.dmi and b/icons/mob/items/righthand_suits.dmi differ
diff --git a/icons/obj/closets/bases/cabinet.dmi b/icons/obj/closets/bases/cabinet.dmi
index 236b164ca6..a8c0261900 100644
Binary files a/icons/obj/closets/bases/cabinet.dmi and b/icons/obj/closets/bases/cabinet.dmi differ
diff --git a/icons/obj/closets/bases/cart.dmi b/icons/obj/closets/bases/cart.dmi
index 852e539b4d..da1b28500b 100644
Binary files a/icons/obj/closets/bases/cart.dmi and b/icons/obj/closets/bases/cart.dmi differ
diff --git a/icons/obj/closets/bases/closet.dmi b/icons/obj/closets/bases/closet.dmi
index 551435629e..2753b92b91 100644
Binary files a/icons/obj/closets/bases/closet.dmi and b/icons/obj/closets/bases/closet.dmi differ
diff --git a/icons/obj/closets/bases/crate.dmi b/icons/obj/closets/bases/crate.dmi
index 83500acb3b..d83ac8da7b 100644
Binary files a/icons/obj/closets/bases/crate.dmi and b/icons/obj/closets/bases/crate.dmi differ
diff --git a/icons/obj/closets/bases/large_crate.dmi b/icons/obj/closets/bases/large_crate.dmi
index fd3400ed72..a8cb85d5ce 100644
Binary files a/icons/obj/closets/bases/large_crate.dmi and b/icons/obj/closets/bases/large_crate.dmi differ
diff --git a/icons/obj/closets/decals/closet.dmi b/icons/obj/closets/decals/closet.dmi
index a7bb7591b1..97e24b4f50 100644
Binary files a/icons/obj/closets/decals/closet.dmi and b/icons/obj/closets/decals/closet.dmi differ
diff --git a/icons/turf/fancy_shuttles/exploration.dmi b/icons/turf/fancy_shuttles/exploration.dmi
new file mode 100644
index 0000000000..5da4ff378e
Binary files /dev/null and b/icons/turf/fancy_shuttles/exploration.dmi differ
diff --git a/icons/turf/fancy_shuttles/exploration_preview.dmi b/icons/turf/fancy_shuttles/exploration_preview.dmi
new file mode 100644
index 0000000000..2ed3af4069
Binary files /dev/null and b/icons/turf/fancy_shuttles/exploration_preview.dmi differ
diff --git a/icons/turf/fancy_shuttles/medical.dmi b/icons/turf/fancy_shuttles/medical.dmi
new file mode 100644
index 0000000000..dc1833cc55
Binary files /dev/null and b/icons/turf/fancy_shuttles/medical.dmi differ
diff --git a/icons/turf/fancy_shuttles/medical_preview.dmi b/icons/turf/fancy_shuttles/medical_preview.dmi
new file mode 100644
index 0000000000..1b688eb8f0
Binary files /dev/null and b/icons/turf/fancy_shuttles/medical_preview.dmi differ
diff --git a/icons/turf/fancy_shuttles/security.dmi b/icons/turf/fancy_shuttles/security.dmi
new file mode 100644
index 0000000000..70fdbfbc65
Binary files /dev/null and b/icons/turf/fancy_shuttles/security.dmi differ
diff --git a/icons/turf/fancy_shuttles/security_preview.dmi b/icons/turf/fancy_shuttles/security_preview.dmi
new file mode 100644
index 0000000000..d0017da2a4
Binary files /dev/null and b/icons/turf/fancy_shuttles/security_preview.dmi differ
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index c63bbbe366..9ced578999 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -68,47 +68,28 @@
/obj/item/clothing/head/pizzaguy,
/turf/simulated/floor/tiled,
/area/quartermaster/warehouse)
-"aai" = (
-/obj/structure/plasticflaps,
-/obj/machinery/conveyor{
- dir = 8;
- id = "shuttle_inbound"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
-"aaj" = (
-/obj/structure/plasticflaps,
-/obj/machinery/conveyor{
- dir = 4;
- id = "shuttle_outbound"
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/cargo)
"aak" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/machinery/light{
+ dir = 8
},
-/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/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
+<<<<<<< HEAD
/obj/machinery/light,
/obj/structure/table/steel_reinforced,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cockpit)
>>>>>>> 94ac5d0d4b... Merge pull request #10419 from Novacat/nova-basicfixes
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+/obj/machinery/light,
+/obj/structure/table/steel_reinforced,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cockpit)
+=======
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
"aal" = (
/obj/structure/cable{
d1 = 1;
@@ -704,6 +685,7 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/engineering/engine_smes)
+<<<<<<< HEAD
"abJ" = (
/obj/machinery/computer/shuttle_control/explore/excursion{
dir = 1
@@ -738,6 +720,18 @@
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
=======
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+"abJ" = (
+/obj/machinery/computer/shuttle_control/explore/excursion{
+ dir = 1
+ },
+/obj/item/device/radio/intercom{
+ pixel_y = -24
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cockpit)
+=======
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
"abK" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -2682,11 +2676,6 @@
"afD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/light{
dir = 4
},
@@ -2984,12 +2973,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
-"agf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
"agg" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -3040,13 +3023,19 @@
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"agi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+/obj/structure/bed/chair/shuttle{
+ dir = 8
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/machinery/light{
dir = 4
},
-/obj/machinery/alarm{
- pixel_y = 22
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"agj" = (
/obj/structure/disposalpipe/segment{
@@ -3233,42 +3222,17 @@
},
/turf/simulated/floor/tiled,
/area/engineering/engine_monitoring)
-"agQ" = (
-/obj/machinery/disposal/deliveryChute{
- dir = 8
- },
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/cargo)
"agR" = (
-/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 = 4;
- icon_state = "1-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
-/obj/structure/cable/cyan{
- d2 = 4;
- icon_state = "0-4"
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/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,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"agS" = (
/obj/structure/filingcabinet,
@@ -3318,18 +3282,16 @@
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
"agV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
+/obj/structure/bed/chair/shuttle{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
},
-/obj/structure/cable/cyan{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"agW" = (
/obj/effect/floor_decal/borderfloor{
@@ -3353,10 +3315,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
-"agX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
"agY" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -3518,11 +3476,16 @@
/turf/simulated/floor/tiled,
/area/quartermaster/qm)
"ahk" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/machinery/power/smes/buildable/point_of_interest,
+/obj/structure/cable/cyan{
+ d2 = 2;
+ icon_state = "0-2"
},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/power)
"ahn" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -3712,10 +3675,14 @@
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
"ahO" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
/area/shuttle/excursion/general)
"ahP" = (
/obj/effect/floor_decal/industrial/warning,
@@ -5119,20 +5086,6 @@
"alF" = (
/turf/simulated/wall/r_wall,
/area/engineering/engine_monitoring)
-"alG" = (
-/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/panic_button{
- pixel_x = -32;
- pixel_y = 32
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/cockpit)
"alH" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -6309,14 +6262,11 @@
/turf/simulated/floor,
/area/storage/tech)
"aos" = (
-/obj/structure/disposaloutlet{
- dir = 8
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/general)
"aot" = (
/obj/structure/sign/nosmoking_2{
pixel_x = 32
@@ -6732,9 +6682,8 @@
dir = 1
=======
"aph" = (
-/obj/machinery/door/blast/regular{
- dir = 8
- },
+/obj/effect/floor_decal/borderfloor/corner,
+/obj/effect/floor_decal/industrial/danger/corner,
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"api" = (
@@ -10548,15 +10497,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/engineering/gravity_gen)
-"aBd" = (
-/obj/structure/disposaloutlet{
- dir = 4
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
"aBe" = (
/turf/simulated/wall,
/area/quartermaster/warehouse)
@@ -11011,23 +10951,9 @@
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
"aCt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
-"aCx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
},
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
@@ -11950,15 +11876,6 @@
/obj/random/tool,
/turf/simulated/floor,
/area/maintenance/cargo)
-"aHN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
"aHQ" = (
/obj/machinery/door/airlock/glass_external{
frequency = 1379;
@@ -12030,15 +11947,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/hallway)
-"aIk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
"aIl" = (
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
@@ -12120,14 +12028,8 @@
/turf/simulated/floor/tiled,
/area/engineering/engineering_monitoring)
"aJa" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/light{
- dir = 1
+/obj/machinery/door/blast/regular{
+ dir = 8
},
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
@@ -12958,8 +12860,15 @@
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/storage)
"aOH" = (
-/obj/effect/floor_decal/borderfloor/corner,
-/obj/effect/floor_decal/industrial/danger/corner,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"aOL" = (
@@ -13375,11 +13284,6 @@
},
/turf/simulated/floor/carpet/oracarpet,
/area/crew_quarters/heads/chief)
-"aSo" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/industrial/danger,
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
"aSu" = (
/obj/structure/table/reinforced,
/obj/machinery/light{
@@ -13464,22 +13368,11 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet/oracarpet,
/area/crew_quarters/heads/chief)
-"aTs" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/industrial/danger,
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
"aTA" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
+/turf/simulated/wall/fancy_shuttle/window{
+ fancy_shuttle_tag = "explo"
},
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/industrial/danger,
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
+/area/shuttle/excursion/cockpit)
"aTE" = (
/obj/structure/table/reinforced,
/obj/item/weapon/packageWrap,
@@ -13523,11 +13416,11 @@
/turf/simulated/floor/tiled,
/area/engineering/hallway)
"aTO" = (
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/effect/floor_decal/industrial/danger/corner{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
@@ -13783,9 +13676,8 @@
/area/engineering/gravity_gen)
"aWH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/camera/network/exploration{
- dir = 9
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
},
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
@@ -14675,32 +14567,23 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/crew)
"bmA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/machinery/light{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"bmW" = (
/turf/simulated/wall,
/area/quartermaster/belterdock)
"bnf" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced{
- dir = 1
+/obj/machinery/computer/ship/engines/adv,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "shuttle blast";
- name = "Shuttle Blast Doors";
- opacity = 0
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"bnl" = (
/obj/structure/catwalk,
/turf/simulated/floor,
@@ -14964,6 +14847,15 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor,
/area/storage/emergency_storage/emergency4)
+"bvH" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"bwb" = (
/obj/machinery/door/airlock/maintenance_hatch{
frequency = 1379;
@@ -15034,6 +14926,14 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/tether/station/dock_one)
+"byv" = (
+/obj/machinery/atmospherics/portables_connector,
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/power)
"byy" = (
/turf/simulated/wall/r_wall,
/area/engineering/gravity_lobby)
@@ -15392,9 +15292,11 @@
/turf/simulated/floor/tiled,
/area/tcommsat/computer)
"bLO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
@@ -15412,12 +15314,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/black,
/turf/simulated/floor/tiled,
/area/tcommsat/computer)
-"bMv" = (
-/obj/machinery/light/spot{
- pixel_y = 32
- },
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
"bMD" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -15428,40 +15324,35 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/tether/station/dock_one)
-"bNZ" = (
-/obj/structure/grille,
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "shuttle blast";
- name = "Shuttle Blast Doors";
- opacity = 0
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "pilot_room"
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
"bOf" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/handrail{
+/obj/structure/table/steel_reinforced,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cargo)
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"bOm" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/wall,
/area/quartermaster/storage)
"bOx" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cargo)
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"bOA" = (
/obj/structure/cable/green{
d1 = 2;
@@ -15507,17 +15398,15 @@
/turf/simulated/floor/tiled,
/area/engineering/gravity_lobby)
"bPq" = (
-/obj/effect/floor_decal/industrial/warning/corner,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/device/radio/intercom{
- dir = 4;
- pixel_x = 24
- },
-/obj/structure/handrail{
+/obj/structure/table/steel_reinforced,
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cargo)
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"bPx" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 1
@@ -15544,10 +15433,12 @@
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"bPE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"bPV" = (
@@ -15879,27 +15770,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
-"bYJ" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/door/blast/regular{
- density = 0;
- 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,
-/area/shuttle/excursion/general)
"bYK" = (
/obj/structure/cable/green{
dir = 1;
@@ -15909,11 +15779,15 @@
/turf/simulated/floor/tiled,
/area/tcommsat/computer)
"bYN" = (
-/obj/machinery/light{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/light{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"bZd" = (
@@ -15928,20 +15802,6 @@
/obj/item/clothing/gloves/yellow,
/turf/simulated/floor/tiled,
/area/engineering/workshop)
-"bZr" = (
-/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/cargo)
"bZt" = (
/obj/structure/dispenser{
phorontanks = 0
@@ -15955,61 +15815,44 @@
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/brown,
/obj/structure/curtain/open/bed,
-/obj/machinery/button/windowtint{
- id = "pilot_room";
- pixel_x = 26;
- pixel_y = 6;
- req_access = list()
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cargo)
-"bZF" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/handrail{
- dir = 4
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -22
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cargo)
-"bZH" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
+"bZF" = (
+/obj/machinery/computer/shuttle_control/explore/excursion{
+ dir = 4
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
+"bZH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"bZJ" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/structure/panic_button{
+ pixel_x = 32;
+ pixel_y = -6
+ },
+/obj/machinery/light{
dir = 4
},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cargo)
-"bZR" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/cargo)
-"bZS" = (
-/obj/machinery/disposal/deliveryChute{
- dir = 4
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"cah" = (
/obj/machinery/computer/telecomms/server{
dir = 8;
@@ -16446,6 +16289,7 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor,
/area/storage/tech)
+<<<<<<< HEAD
"cuN" = (
/obj/structure/cable/green{
d1 = 1;
@@ -16471,37 +16315,43 @@
},
/turf/simulated/floor/plating,
/area/shuttle/excursion/cargo)
-"cwo" = (
-/obj/structure/handrail,
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/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/cargo)
-"cwR" = (
-/obj/structure/handrail{
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+"cvx" = (
+/obj/machinery/shipsensors{
dir = 1
},
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/machinery/light/small{
+/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/turf/simulated/floor/tiled/techmaint,
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
/area/shuttle/excursion/cargo)
+=======
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+"cwo" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
+"cwR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/light/small,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"cxj" = (
/obj/structure/catwalk,
/obj/random/junk,
@@ -16519,23 +16369,17 @@
/turf/simulated/floor/tiled/techfloor,
/area/tcommsat/chamber)
"cys" = (
-/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)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/structure/cable/cyan{
- d2 = 4;
- icon_state = "0-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/machinery/light{
- dir = 8
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cargo)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"cyB" = (
/obj/machinery/door/airlock/glass_external,
/obj/effect/map_helper/airlock/door/ext_door,
@@ -16614,22 +16458,41 @@
"cCr" = (
/obj/structure/cable/cyan{
d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+ d2 = 4;
+ icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cargo)
-"cCJ" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "shuttle_outbound"
- },
-/obj/effect/floor_decal/industrial/warning{
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cargo)
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
+"cCJ" = (
+/obj/structure/cable/cyan{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/angled{
+ dir = 4;
+ req_access = null;
+ req_one_access = list(11,67)
+ },
+/obj/machinery/alarm/angled{
+ dir = 1
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"cCL" = (
/obj/structure/grille,
/obj/machinery/door/firedoor/glass,
@@ -16638,6 +16501,16 @@
},
/turf/simulated/floor/plating,
/area/quartermaster/delivery)
+"cDf" = (
+/obj/machinery/atmospherics/portables_connector/aux{
+ dir = 1
+ },
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/power)
"cDk" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -16672,13 +16545,6 @@
},
/turf/simulated/floor/tiled,
/area/ai_monitored/storage/eva)
-"cEi" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "shuttle_inbound"
- },
-/obj/effect/floor_decal/industrial/warning/full,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
"cEE" = (
/turf/simulated/wall/r_wall,
/area/bridge/secondary/teleporter)
@@ -16756,26 +16622,36 @@
},
/turf/simulated/floor/tiled/asteroid_steel/airless,
/area/quartermaster/belterdock)
+"cHP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/door/airlock/angled_tgmc{
+ dir = 4;
+ req_one_access = list(67)
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"cHV" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"cIa" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/hatch{
+/obj/machinery/door/airlock/angled_tgmc/dropship2_pilot{
req_one_access = list(67)
},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/cargo)
-"cII" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"cKd" = (
/obj/machinery/power/apc{
name = "south bump";
@@ -16821,13 +16697,27 @@
d2 = 2;
icon_state = "1-2"
},
-/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()
+/obj/machinery/door/airlock/angled_tgmc/dropship2_pilot{
+ req_one_access = list(67)
},
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
+"cND" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/obj/structure/handrail{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/cargo)
"cNJ" = (
/obj/effect/floor_decal/borderfloor{
@@ -16844,24 +16734,17 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/gear)
-"cNM" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/portable_atmospherics/canister/phoron,
-/obj/machinery/atmospherics/portables_connector/fuel{
+"cOc" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/effect/floor_decal/industrial/outline/red,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
-"cOc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
- dir = 1
+/obj/machinery/light{
+ dir = 8
},
-/turf/simulated/floor/tiled/techmaint,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"cOq" = (
/obj/effect/floor_decal/rust,
@@ -16900,17 +16783,29 @@
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
"cQu" = (
-/obj/machinery/portable_atmospherics/canister/phoron,
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/atmospherics/portables_connector/fuel{
- dir = 8
+/obj/structure/cable/cyan{
+ d2 = 2;
+ icon_state = "0-2"
},
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/power/apc/angled{
+ dir = 1;
+ req_access = null;
+ req_one_access = list(11,67)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"cRa" = (
-/obj/machinery/recharge_station,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/sleep_console,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"cTd" = (
/obj/effect/floor_decal/industrial/warning,
@@ -16932,24 +16827,15 @@
"cTQ" = (
/obj/structure/cable/cyan{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/structure/cable/cyan{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/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
- },
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"cUb" = (
/obj/machinery/light/small{
@@ -17006,21 +16892,12 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"cUQ" = (
-/obj/structure/cable/cyan{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/structure/bed/chair/shuttle,
+/obj/machinery/alarm/angled,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 8
- },
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"cVW" = (
/obj/structure/cable/green{
@@ -17085,6 +16962,13 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
+"cZA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
"cZP" = (
/obj/machinery/camera/network/telecom,
/turf/simulated/floor/bluegrid{
@@ -17101,45 +16985,20 @@
/turf/simulated/floor,
/area/maintenance/cargo)
"cZZ" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/cyan{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/structure/bed/chair/shuttle,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/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
- },
-/obj/machinery/door/airlock/hatch{
- req_one_access = list(67)
- },
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"dbF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
+ dir = 6
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/structure/cable/cyan{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/structure/closet/emergsuit_wall{
- pixel_y = 32
- },
-/obj/machinery/atmospherics/binary/pump/aux{
- dir = 4
- },
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"dbZ" = (
/obj/structure/cable/green{
@@ -17208,18 +17067,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/exploration/pilot_office)
-"dgu" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 8
- },
-/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)
"dgF" = (
/obj/machinery/mineral/input,
/obj/machinery/conveyor{
@@ -17271,6 +17118,7 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_one)
+<<<<<<< HEAD
"dhQ" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -17312,6 +17160,25 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
=======
/area/shuttle/excursion/general)
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+"dhQ" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
+=======
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
"dhS" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -17335,12 +17202,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_one)
-"dih" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
"diF" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 1
@@ -17348,15 +17209,13 @@
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
"diP" = (
-/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{
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/turf/simulated/floor/tiled/techmaint,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"diW" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -17382,12 +17241,21 @@
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
"dju" = (
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/portable_atmospherics/canister/phoron,
-/obj/machinery/atmospherics/portables_connector/fuel{
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"djU" = (
/turf/simulated/wall/r_wall,
@@ -17438,14 +17306,21 @@
name = "\improper Telecomms Entrance"
})
"dkV" = (
-/obj/structure/bed/chair/shuttle{
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -22
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"dls" = (
/obj/machinery/door/airlock/highsecurity{
@@ -17583,15 +17458,22 @@
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"dsD" = (
+/obj/structure/cable/cyan{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/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,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"dsX" = (
/obj/machinery/alarm{
@@ -17603,35 +17485,19 @@
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
"dsY" = (
-/obj/structure/bed/chair/shuttle{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/structure/closet/emergsuit_wall{
- dir = 4;
- pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
-"dtd" = (
-/obj/structure/extinguisher_cabinet{
- dir = 8;
- pixel_x = 30
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/structure/handrail{
+ dir = 1
},
-/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 = 15
- },
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"dua" = (
/obj/structure/shuttle/engine/propulsion{
@@ -17789,29 +17655,20 @@
},
/turf/simulated/floor,
/area/tether/exploration)
-"dBX" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
-"dCJ" = (
-/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)
"dDo" = (
/obj/structure/bed/chair/comfy/beige{
dir = 4
},
/turf/simulated/floor/wood,
/area/maintenance/station/cargo)
+"dDu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 6
+ },
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
"dDx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -17833,11 +17690,12 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/tether/station/dock_one)
-"dEc" = (
-/obj/structure/bed/chair/bay/shuttle{
- dir = 1
+"dGv" = (
+/obj/machinery/computer/ship/sensors/adv,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/cockpit)
"dHm" = (
/obj/effect/floor_decal/borderfloor{
@@ -17858,52 +17716,19 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_one)
-"dIv" = (
-/obj/structure/bed/chair/shuttle{
- dir = 4
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/obj/structure/closet/emergsuit_wall{
- dir = 8;
- pixel_x = -32
- },
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
"dJj" = (
/obj/structure/cable/cyan{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
+/obj/machinery/door/airlock/angled_tgmc{
+ req_one_access = list(67)
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
-"dJG" = (
-/obj/structure/bed/chair/shuttle{
- dir = 8
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet{
- dir = 8;
- pixel_x = 30
- },
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"dJJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -17912,12 +17737,9 @@
/turf/simulated/floor/tiled,
/area/tcommsat/computer)
"dJL" = (
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/reinforced,
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/industrial/danger,
+/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"dJN" = (
/obj/structure/disposalpipe/segment,
@@ -18002,17 +17824,6 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/gear)
-"dOQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
"dPx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -18063,11 +17874,6 @@
},
/turf/simulated/floor,
/area/quartermaster/storage)
-"dQG" = (
-/obj/structure/cable/cyan,
-/obj/machinery/power/smes/buildable/point_of_interest,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
"dQR" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -18143,31 +17949,15 @@
/obj/random/junk,
/turf/simulated/floor,
/area/maintenance/station/exploration)
-"dWc" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
+"dWh" = (
+/obj/machinery/atmospherics/portables_connector/fuel{
dir = 4
},
-/obj/structure/cable/cyan{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+/obj/machinery/portable_atmospherics/canister/phoron,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
-"dWh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 5
- },
-/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,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"dWO" = (
/obj/effect/floor_decal/borderfloor{
@@ -18196,43 +17986,31 @@
/turf/simulated/floor/tiled,
/area/quartermaster/office)
"dXD" = (
-/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/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(67)
- },
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
-"dYO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/handrail,
-/obj/structure/cable/cyan{
+"dYI" = (
+/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/reinforced,
+/area/tether/exploration)
+"dYO" = (
+/obj/machinery/portable_atmospherics/canister/empty,
+/obj/machinery/atmospherics/portables_connector,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"dYV" = (
/obj/machinery/gateway{
@@ -18284,45 +18062,24 @@
},
/turf/simulated/floor/tiled,
/area/engineering/hallway)
-"egt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
- },
-/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)
"egy" = (
/obj/machinery/gateway,
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/dark,
/area/gateway)
"egC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/obj/structure/cable/cyan{
d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/tiled/techmaint,
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"ehb" = (
/obj/machinery/door/firedoor/glass,
@@ -18331,13 +18088,23 @@
/turf/simulated/floor/tiled,
/area/tether/station/dock_one)
"ehh" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 1
+/obj/machinery/power/terminal{
+ dir = 4
},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/canister/empty,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/cable/green{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/machinery/alarm/angled,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/power)
"ejF" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 1
@@ -18382,41 +18149,20 @@
/obj/fiftyspawner/rods,
/turf/simulated/floor/tiled,
/area/ai_monitored/storage/eva)
-"ekv" = (
-/obj/machinery/power/terminal{
+"emi" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/obj/structure/cable/green{
- icon_state = "0-4"
- },
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
-"emi" = (
-/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"
- },
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/industrial/danger,
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"emN" = (
-/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"
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
},
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/industrial/danger,
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"eoh" = (
@@ -18456,24 +18202,6 @@
/obj/effect/floor_decal/steeldecal/steel_decals7,
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
-"epw" = (
-/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"
- },
-/obj/structure/closet/emergsuit_wall{
- dir = 8;
- pixel_x = -32
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
"eqw" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -18488,35 +18216,17 @@
/turf/simulated/floor,
/area/maintenance/cargo)
"erb" = (
-/obj/machinery/light/small,
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
+/obj/machinery/atmospherics/portables_connector/fuel{
+ dir = 4
},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/closet/crate/secure/phoron{
- name = "fuel crate";
- req_one_access = list(67)
+/obj/machinery/portable_atmospherics/canister/phoron,
+/obj/machinery/light{
+ dir = 8
},
-/obj/item/weapon/tank/phoron{
- pixel_x = 6;
- pixel_y = -6
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/item/weapon/tank/phoron{
- pixel_x = -5;
- pixel_y = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/item/device/radio/intercom{
- dir = 4;
- pixel_x = 24
- },
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"erc" = (
/obj/structure/disposalpipe/segment{
@@ -18570,6 +18280,19 @@
"etY" = (
/turf/simulated/wall,
/area/maintenance/station/exploration)
+"euo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/general)
"exi" = (
/obj/item/device/radio/intercom{
dir = 8;
@@ -18623,21 +18346,21 @@
/turf/simulated/floor/plating,
/area/tether/station/dock_two)
"ezh" = (
-/obj/machinery/sleeper{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/machinery/shuttle_sensor{
- id_tag = "shuttlesens_exp_psg";
- pixel_x = -25
- },
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"eBg" = (
-/obj/machinery/sleep_console,
-/obj/item/device/radio/intercom{
- pixel_y = -24
+/obj/machinery/door/airlock/angled_tgmc{
+ dir = 4;
+ req_one_access = list(67)
},
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"eBv" = (
/obj/machinery/atmospherics/binary/passive_gate/on{
@@ -18649,17 +18372,41 @@
/turf/simulated/floor/tiled,
/area/tcommsat/computer)
"eBI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/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,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 6
+ },
+/obj/structure/cable/cyan{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"eCo" = (
-/obj/structure/bed/chair/shuttle{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 8
},
-/turf/simulated/floor/tiled/techfloor,
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/angled_tgmc{
+ dir = 4;
+ req_one_access = list(67)
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"eCW" = (
/obj/machinery/door/firedoor/glass,
@@ -18689,11 +18436,19 @@
/turf/simulated/floor/wood,
/area/maintenance/station/cargo)
"eEO" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/general)
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 10
+ },
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/power)
"eFl" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -18709,13 +18464,21 @@
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
"eGK" = (
-/obj/effect/floor_decal/industrial/outline,
-/obj/machinery/atmospherics/portables_connector{
- dir = 4
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/power)
"eGR" = (
/obj/machinery/door/airlock/glass_external,
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -18753,34 +18516,17 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/belterdock)
-"eIG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10
- },
-/obj/structure/cable/yellow,
-/obj/machinery/power/port_gen/pacman/mrs{
- anchored = 1
- },
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
"eIJ" = (
-/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/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/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/aux,
-/obj/machinery/door/airlock/hatch{
- req_one_access = list()
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"eJv" = (
/obj/structure/grille,
@@ -18793,6 +18539,7 @@
/turf/simulated/floor/plating,
/area/tether/station/dock_one)
<<<<<<< HEAD
+<<<<<<< HEAD
"eJJ" = (
/obj/machinery/power/smes/buildable{
RCon_tag = "Substation - Asteroid Station";
@@ -18826,6 +18573,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/wall/rshull,
/area/shuttle/excursion/general)
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+"eJU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
+=======
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
"eJV" = (
/obj/structure/closet/crate,
/obj/machinery/light{
@@ -18872,18 +18626,6 @@
/obj/structure/window/reinforced,
/turf/simulated/shuttle/floor/yellow/airless,
/area/shuttle/belter)
-"eMe" = (
-/obj/machinery/computer/ship/helm,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cockpit)
-"eMl" = (
-/obj/machinery/computer/ship/sensors,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/cockpit)
-"eMo" = (
-/obj/machinery/mineral/equipment_vendor/survey,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
"eMv" = (
/obj/structure/table/rack{
dir = 8;
@@ -18898,34 +18640,6 @@
},
/turf/simulated/floor,
/area/maintenance/station/exploration)
-"eMS" = (
-/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/effect/floor_decal/industrial/outline/blue,
-/obj/item/weapon/storage/backpack/parachute,
-/obj/item/weapon/storage/backpack/parachute,
-/obj/item/weapon/storage/backpack/parachute,
-/obj/item/weapon/storage/backpack/parachute,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
"eNQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
@@ -18937,6 +18651,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/tiled,
/area/tether/station/dock_two)
+"ePh" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/general)
"ePp" = (
/obj/structure/cable/green{
d1 = 1;
@@ -18982,6 +18707,7 @@
},
/turf/simulated/floor/wood,
/area/quartermaster/qm)
+<<<<<<< HEAD
"eSw" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -19006,6 +18732,18 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+"eSD" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/handrail,
+/obj/structure/extinguisher_cabinet{
+ dir = 1;
+ pixel_y = 32
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/general)
+=======
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
"eTo" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4
@@ -19013,25 +18751,11 @@
/obj/machinery/meter,
/turf/simulated/floor,
/area/maintenance/cargo)
-"eTw" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/device/radio/intercom{
- dir = 1;
- pixel_y = 24
- },
-/obj/structure/handrail,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
"eTD" = (
-/obj/structure/handrail,
-/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/structure/closet/emergsuit_wall{
- pixel_y = 32
- },
-/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"eTQ" = (
/obj/structure/grille,
@@ -19055,17 +18779,6 @@
/obj/effect/floor_decal/industrial/warning/full,
/turf/simulated/floor/airless,
/area/shuttle/medivac/cockpit)
-"eVN" = (
-/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/atmospherics/pipe/manifold4w/hidden,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
"eVP" = (
/obj/structure/closet/secure_closet/pilot,
/obj/effect/floor_decal/borderfloor{
@@ -19101,21 +18814,6 @@
/obj/random/maintenance/cargo,
/turf/simulated/floor,
/area/maintenance/cargo)
-"eYw" = (
-/obj/machinery/airlock_sensor{
- pixel_y = 28
- },
-/obj/structure/handrail,
-/obj/machinery/light/small{
- dir = 4
- },
-/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)
"eZg" = (
/obj/structure/table/rack{
dir = 8;
@@ -19149,6 +18847,19 @@
/obj/effect/map_helper/airlock/sensor/chamber_sensor,
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
+"faK" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 1;
+ frequency = 1380;
+ id_tag = "expshuttle_docker_pump_out_external";
+ pixel_x = -10;
+ pixel_y = 6
+ },
+/obj/effect/map_helper/airlock/atmos/pump_out_external,
+/turf/simulated/wall/fancy_shuttle/nondense{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
"fca" = (
/obj/machinery/power/smes/buildable{
RCon_tag = "Substation - Exploration";
@@ -19188,11 +18899,6 @@
/area/tether/exploration)
"fez" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
@@ -19215,14 +18921,12 @@
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"fiK" = (
-/obj/structure/bed/chair/bay/shuttle{
- dir = 1
+/obj/machinery/alarm/angled,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/cockpit)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fiT" = (
/obj/machinery/holoposter{
dir = 4;
@@ -19302,15 +19006,41 @@
/turf/simulated/floor/tiled,
/area/tether/station/dock_two)
"fkj" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/hatch{
- req_one_access = list(67)
+/obj/machinery/atmospherics/binary/pump/fuel,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fkL" = (
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/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/item/weapon/storage/backpack/parachute,
+/obj/item/weapon/storage/backpack/parachute,
+/obj/item/weapon/storage/backpack/parachute,
+/obj/item/weapon/storage/backpack/parachute,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fkV" = (
/obj/machinery/power/terminal{
dir = 8
@@ -19361,17 +19091,18 @@
/turf/simulated/floor/tiled,
/area/tether/station/dock_one)
"flS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
- dir = 8
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 5
- },
-/obj/effect/floor_decal/emblem/nt2,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fmg" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -19445,15 +19176,16 @@
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"frS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 8
+/obj/structure/closet/secure_closet/guncabinet/excursion,
+/obj/item/weapon/pickaxe,
+/obj/machinery/light{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/effect/floor_decal/emblem/nt3,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fsA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -19468,21 +19200,6 @@
},
/turf/simulated/floor/wood,
/area/quartermaster/qm)
-"ftz" = (
-/obj/machinery/airlock_sensor{
- dir = 8;
- pixel_x = 26;
- pixel_y = -27
- },
-/obj/effect/map_helper/airlock/sensor/int_sensor,
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 8
- },
-/obj/machinery/atmospherics/binary/pump/fuel{
- dir = 8
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
"fva" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -19556,22 +19273,24 @@
/turf/simulated/floor/airless,
/area/space)
"fxa" = (
-/obj/machinery/door/airlock/glass_external,
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
+/obj/structure/handrail,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/effect/map_helper/airlock/door/int_door,
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
+/obj/structure/closet/emergsuit_wall{
+ pixel_y = 32
},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 8
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fxO" = (
/obj/structure/cable/green{
d1 = 1;
@@ -19634,59 +19353,37 @@
/turf/space,
/area/space)
"fAr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
-"fCg" = (
-/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/effect/overmap/visitable/ship/landable/excursion,
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 8
- },
-/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)
-"fCh" = (
-/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;
+/obj/structure/handrail,
+/obj/machinery/airlock_sensor{
pixel_y = 28
},
-/obj/effect/floor_decal/industrial/warning{
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/effect/map_helper/airlock/sensor/chamber_sensor,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
+"fAB" = (
+/turf/simulated/wall/fancy_shuttle/nondense{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
+"fCh" = (
+/obj/effect/floor_decal/borderfloor/corner{
dir = 8
},
-/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
+/obj/effect/floor_decal/industrial/danger/corner{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
"fDN" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -19758,14 +19455,11 @@
/turf/simulated/floor,
/area/maintenance/cargo)
"fGW" = (
-/obj/machinery/computer/ship/engines{
- dir = 1
- },
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
<<<<<<< HEAD
+<<<<<<< HEAD
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
"oTn" = (
@@ -19790,6 +19484,19 @@
/obj/item/weapon/pickaxe,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cockpit)
+"fIb" = (
+/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)
+=======
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
"fIw" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 6
@@ -19834,11 +19541,20 @@
/turf/simulated/wall,
/area/tether/station/dock_two)
"fMh" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fMr" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -19846,37 +19562,78 @@
/turf/simulated/floor/tiled,
/area/quartermaster/office)
"fMv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 5
},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fNB" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 8
},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
-"fNO" = (
-/obj/structure/handrail{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
-"fOn" = (
/obj/machinery/airlock_sensor{
dir = 8;
pixel_x = 26;
pixel_y = -27
},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
+/obj/effect/map_helper/airlock/sensor/int_sensor,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
+"fNO" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8
+ },
+/obj/machinery/door/airlock/angled_tgmc/security_glass{
+ dir = 4
+ },
+/obj/effect/map_helper/airlock/door/int_door,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
+"fOn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 4
+ },
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fPT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -19889,15 +19646,32 @@
/turf/simulated/floor/tiled,
/area/engineering/hallway)
"fPW" = (
-/obj/structure/handrail{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8
},
-/obj/structure/closet/emergsuit_wall{
- dir = 1;
- pixel_y = -32
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8
},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/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/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 8
+ },
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/obj/effect/overmap/visitable/ship/landable/excursion,
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fQr" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -19943,24 +19717,33 @@
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_two)
"fRX" = (
-/obj/structure/handrail{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8
},
-/obj/machinery/light/small{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/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/map_helper/airlock/door/ext_door,
+/obj/effect/map_helper/airlock/sensor/ext_sensor,
+/obj/machinery/door/airlock/angled_tgmc/security_glass{
dir = 4
},
-/obj/effect/map_helper/airlock/atmos/pump_out_internal,
-/obj/machinery/oxygen_pump{
- dir = 1;
- pixel_y = -32
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/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)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"fTF" = (
/obj/structure/cable/green{
d1 = 1;
@@ -20213,11 +19996,18 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"ghQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 6
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/structure/fuel_port{
+ dir = 1;
+ pixel_y = -34
},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
+/obj/machinery/recharger,
+/obj/structure/table/steel_reinforced,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"gif" = (
/obj/structure/cable{
d1 = 1;
@@ -20289,22 +20079,12 @@
/turf/simulated/floor,
/area/maintenance/station/exploration)
"gjS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
+/obj/machinery/suit_cycler/pilot,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/machinery/shuttle_sensor{
- dir = 5;
- id_tag = "shuttlesens_exp_int";
- pixel_y = -24
- },
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -22
- },
-/obj/structure/table/steel,
-/obj/machinery/recharger,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"gjW" = (
/obj/structure/cable/green{
d1 = 1;
@@ -20326,10 +20106,26 @@
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"gjZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
+"gkB" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
"gko" = (
/obj/effect/landmark{
@@ -20397,9 +20193,17 @@
/turf/simulated/floor/tiled,
/area/engineering/engineering_airlock)
"gnc" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"gnq" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 9
@@ -20418,13 +20222,11 @@
/turf/simulated/floor/tiled,
/area/engineering/foyer)
"gnS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/obj/machinery/light,
-/obj/machinery/suit_cycler/pilot,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
+/area/shuttle/excursion/cargo)
"gnV" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -20466,25 +20268,47 @@
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
"gsz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 10
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 6
+/obj/structure/handrail{
+ dir = 1
},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
+/obj/machinery/oxygen_pump{
+ dir = 1;
+ pixel_y = -32
+ },
+/obj/effect/map_helper/airlock/atmos/pump_out_internal,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"gtU" = (
/obj/random/junk,
/obj/effect/floor_decal/rust,
/turf/simulated/floor,
/area/maintenance/cargo)
"gtX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 8
+ },
+/obj/structure/handrail{
+ dir = 1
+ },
+/obj/item/device/radio/intercom{
+ dir = 4;
+ pixel_x = 24
+ },
+/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
+/obj/effect/map_helper/airlock/atmos/pump_out_internal,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"gtY" = (
/obj/machinery/atmospherics/unary/freezer{
dir = 1;
@@ -20531,6 +20355,17 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/engineering_airlock)
+"gyH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 9
+ },
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
"gzg" = (
/obj/machinery/camera/network/tether{
dir = 1
@@ -20621,14 +20456,28 @@
},
/area/tcommsat/chamber)
"gFT" = (
-/obj/structure/handrail{
- dir = 1
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
+/obj/structure/cable/cyan,
+/obj/machinery/power/apc/angled{
+ dir = 4;
+ req_access = null;
+ req_one_access = list(11,67)
},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/obj/structure/table/steel,
+/obj/machinery/cell_charger,
+/obj/random/powercell,
+/obj/item/stack/material/tritium{
+ amount = 15
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/power)
"gFV" = (
/obj/structure/cable/green{
d1 = 4;
@@ -20639,31 +20488,19 @@
/obj/machinery/door/airlock/glass,
/turf/simulated/floor/tiled/steel_grid,
/area/tether/station/dock_one)
-"gGk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 6
- },
-/obj/structure/shuttle/engine/heater,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/general)
"gGC" = (
/obj/structure/catwalk,
/obj/machinery/light/small,
/turf/simulated/floor,
/area/maintenance/station/exploration)
"gHF" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 6
},
-/obj/structure/shuttle/engine/heater,
-/obj/structure/window/reinforced{
- dir = 1
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/general)
+/area/shuttle/excursion/cargo)
"gIp" = (
/obj/structure/cable/green{
d1 = 1;
@@ -20673,32 +20510,13 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/crew)
"gIs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 6
- },
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
-"gJW" = (
-/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{
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
dir = 4
},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/excursion/general)
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
"gKa" = (
/obj/machinery/lapvend,
/turf/simulated/floor/tiled,
@@ -20713,9 +20531,21 @@
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
"gLG" = (
-/obj/effect/floor_decal/emblem/nt1,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/structure/cable/cyan{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc/angled{
+ dir = 1;
+ req_access = null;
+ req_one_access = list(11,67)
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"gLJ" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -20751,17 +20581,14 @@
/turf/simulated/floor/tiled,
/area/ai_monitored/storage/eva)
"gMr" = (
-/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)
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"gMR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -20792,14 +20619,23 @@
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
"gOT" = (
+<<<<<<< HEAD
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 5
>>>>>>> 45e710fa51... Merge pull request #10235 from Enzo-Leon/asteroid
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 5
+=======
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 1
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
},
-/obj/machinery/atmospherics/pipe/manifold/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
<<<<<<< HEAD
+<<<<<<< HEAD
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
"tCY" = (
@@ -20816,6 +20652,15 @@
=======
/turf/simulated/wall/rshull,
/area/shuttle/excursion/general)
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
+=======
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
"gPx" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -20840,16 +20685,6 @@
},
/turf/simulated/floor/tiled,
/area/tcommsat/computer)
-"gQc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 10
- },
-/obj/structure/shuttle/engine/heater,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/general)
"gTz" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -21046,16 +20881,13 @@
/turf/simulated/floor/tiled,
/area/tether/station/dock_one)
"haB" = (
-/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"
+/obj/machinery/atmospherics/unary/engine/fancy_shuttle{
+ dir = 1
},
-/obj/effect/map_helper/airlock/atmos/pump_out_external,
-/obj/structure/handrail,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/general)
+/turf/simulated/wall/fancy_shuttle/nondense{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
"hbc" = (
/obj/structure/cable/green{
icon_state = "0-2"
@@ -21253,6 +21085,19 @@
/obj/machinery/light/small,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
+"hjF" = (
+/obj/machinery/power/port_gen/pacman/mrs{
+ anchored = 1
+ },
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/power)
"hjG" = (
/obj/structure/cable/green{
d1 = 1;
@@ -21907,6 +21752,15 @@
/area/tether/outpost/solars_outside{
name = "\improper Telecomms Solar Field"
})
+"hFK" = (
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/obj/structure/handrail{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/general)
"hFV" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 10
@@ -21932,17 +21786,21 @@
/turf/simulated/floor/airless,
/area/shuttle/large_escape_pod1)
"hGI" = (
-/obj/structure/handrail{
- dir = 1
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 8
},
-/obj/machinery/oxygen_pump{
- dir = 1;
- pixel_y = -32
+/obj/machinery/atmospherics/binary/pump/aux{
+ dir = 8
},
-/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)
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"hHc" = (
/obj/structure/window/reinforced{
dir = 8
@@ -22407,6 +22265,20 @@
/obj/effect/floor_decal/steeldecal/steel_decals4,
/turf/simulated/floor/tiled,
/area/engineering/hallway)
+"hYI" = (
+/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,
+/area/tether/exploration)
"hYK" = (
/obj/structure/bed/chair,
/turf/simulated/floor/carpet,
@@ -22487,13 +22359,13 @@
/turf/simulated/floor/plating/eris/under,
/area/shuttle/large_escape_pod1)
"iaf" = (
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/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)
"iaj" = (
@@ -22611,6 +22483,21 @@
},
/turf/simulated/floor/tiled,
/area/tether/exploration/crew)
+"igN" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 8;
+ id = "shuttle_hatch";
+ name = "Shuttle Rear Hatch";
+ pixel_x = -24
+ },
+/obj/machinery/door/blast/angled{
+ id = "shuttle_hatch"
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"iie" = (
/obj/structure/table/rack/shelf,
/obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -22853,8 +22740,10 @@
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
"isS" = (
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cockpit)
"iuB" = (
/obj/structure/cable/green{
d1 = 4;
@@ -23910,6 +23799,17 @@
/obj/machinery/camera/network/mining,
/turf/simulated/floor/airless,
/area/quartermaster/belterdock)
+"jBW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+ dir = 1
+ },
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
"jBX" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 4
@@ -24054,18 +23954,19 @@
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_two)
"jJo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
+/obj/structure/handrail,
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+ cycle_to_external_air = 1;
+ frequency = 1380;
+ id_tag = "expshuttle_docker";
+ pixel_y = 28
},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold4w/hidden,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/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)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"jJU" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -24100,12 +24001,6 @@
/area/tether/outpost/solars_outside{
name = "\improper Telecomms Solar Field"
})
-"jOe" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9
- },
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
"jOH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -24567,6 +24462,13 @@
/area/tcommsat/entrance{
name = "\improper Telecomms Entrance"
})
+"kft" = (
+/obj/machinery/computer/ship/helm/adv,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
"khk" = (
/obj/machinery/access_button{
command = "cycle_exterior";
@@ -24615,6 +24517,19 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_two)
+"kiG" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 1;
+ frequency = 1380;
+ id_tag = "expshuttle_docker_pump_out_external";
+ pixel_x = 10;
+ pixel_y = 6
+ },
+/obj/effect/map_helper/airlock/atmos/pump_out_external,
+/turf/simulated/wall/fancy_shuttle/nondense{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
"kjA" = (
/obj/structure/cable{
d1 = 4;
@@ -24841,12 +24756,6 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/gear)
-"kqX" = (
-/obj/machinery/atmospherics/unary/engine{
- dir = 1
- },
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/excursion/general)
"kts" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
@@ -25421,21 +25330,13 @@
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"kRk" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/camera/network/exploration{
+ dir = 9
},
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "shuttle blast";
- name = "Shuttle Blast Doors";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cockpit)
+/turf/simulated/floor/tiled/monotile,
+/area/tether/exploration)
"kRF" = (
/obj/machinery/power/smes/buildable{
RCon_tag = "Substation - Telecomms";
@@ -26073,6 +25974,21 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/tiled,
/area/ai_monitored/storage/eva)
+"lwa" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"lwh" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26518,10 +26434,42 @@
},
/turf/simulated/floor/wood,
/area/quartermaster/qm)
-"lKl" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/turf/simulated/wall/rshull,
+"lJZ" = (
+/obj/structure/cable/cyan{
+ 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
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/obj/structure/handrail{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
/area/shuttle/excursion/general)
+"lKl" = (
+/obj/structure/handrail{
+ dir = 1
+ },
+/obj/structure/closet/emergsuit_wall{
+ dir = 1;
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+ dir = 1
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"lLp" = (
/obj/machinery/door/airlock/glass_external,
/obj/effect/map_helper/airlock/door/int_door,
@@ -26718,6 +26666,63 @@
},
/turf/simulated/floor/tiled,
/area/tether/exploration/crew)
+<<<<<<< HEAD
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+"lSs" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 9
+ },
+/obj/structure/sign/painting/public{
+ pixel_x = 30
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/atrium)
+=======
+"lSs" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 9
+ },
+/obj/structure/sign/painting/public{
+ pixel_x = 30
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/atrium)
+"lSw" = (
+/obj/structure/closet/emergsuit_wall{
+ pixel_y = 32
+ },
+/obj/machinery/alarm/angled{
+ dir = 4
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cockpit)
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
"lSR" = (
/obj/effect/landmark/start{
name = "Pilot"
@@ -27002,6 +27007,12 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
+"mmj" = (
+/obj/machinery/shipsensors/fancy_shuttle,
+/turf/simulated/wall/fancy_shuttle/nondense{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cockpit)
"mmJ" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -27093,6 +27104,7 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
+<<<<<<< HEAD
"moi" = (
/obj/machinery/turretid/stun{
ailock = 1;
@@ -27119,6 +27131,21 @@
/area/tcommsat/entrance{
name = "\improper Telecomms Entrance"
})
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+=======
+"mos" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/obj/structure/handrail{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
"mou" = (
/obj/machinery/door/airlock/glass_external,
/obj/structure/cable/green{
@@ -27983,6 +28010,7 @@
/obj/structure/catwalk,
/turf/simulated/floor,
/area/maintenance/cargo)
+<<<<<<< HEAD
"nab" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/light/small{
@@ -27995,6 +28023,21 @@
/area/tcommsat/entrance{
name = "\improper Telecomms Entrance"
})
+||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
+=======
+"mZB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/obj/machinery/door/airlock/angled_tgmc{
+ req_one_access = list(67)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/general)
+>>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2
"nac" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -28166,6 +28209,15 @@
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_two)
+"nhL" = (
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/general)
"nio" = (
/obj/machinery/light{
dir = 8
@@ -28987,17 +29039,12 @@
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/shuttle/securiship/general)
"nYi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
+/obj/machinery/mineral/equipment_vendor/survey,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
},
-/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)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"nYA" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -30395,6 +30442,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
+"pPa" = (
+/obj/machinery/door/blast/angled{
+ id = "shuttle_hatch"
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"pPm" = (
/obj/structure/closet/secure_closet/miner,
/obj/effect/floor_decal/borderfloor{
@@ -30518,20 +30574,6 @@
},
/turf/simulated/floor/tiled,
/area/tcommsat/computer)
-"qaf" = (
-/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/machinery/door/airlock/hatch{
- req_one_access = list(67)
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
"qai" = (
/obj/structure/closet/crate/internals,
/obj/random/maintenance/medical,
@@ -31930,8 +31972,10 @@
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_two)
"ruq" = (
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cockpit)
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
"rus" = (
/obj/effect/floor_decal/industrial/warning{
dir = 5
@@ -32316,6 +32360,17 @@
},
/turf/simulated/floor/tiled/white,
/area/tether/station/dock_two)
+"rWj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock/angled_tgmc{
+ req_one_access = list(67)
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/general)
"rWm" = (
/obj/machinery/computer/supplycomp/control,
/turf/simulated/floor/wood,
@@ -33382,6 +33437,19 @@
temperature = 80
},
/area/tcommsat/chamber)
+"tiw" = (
+/obj/effect/fancy_shuttle/exploration{
+ dir = 1;
+ fancy_shuttle_tag = "explo"
+ },
+/obj/effect/fancy_shuttle_floor_preview/exploration{
+ dir = 1;
+ plane = -45
+ },
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/area/shuttle/excursion/cargo)
"tiN" = (
/obj/machinery/computer/ship/engines,
/turf/simulated/floor/tiled/eris/steel/cyancorner,
@@ -35481,6 +35549,22 @@
/obj/effect/floor_decal/corner/lightgrey/bordercorner,
/turf/simulated/floor/tiled,
/area/tether/station/dock_two)
+"vFn" = (
+/obj/structure/extinguisher_cabinet{
+ dir = 1;
+ pixel_y = -30
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/general)
"vHM" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -35505,6 +35589,19 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/office)
+"vJC" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/light,
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/power)
"vKb" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -36408,7 +36505,9 @@
/turf/simulated/shuttle/floor/yellow/airless,
/area/shuttle/belter)
"wZB" = (
-/turf/simulated/wall/rshull,
+/turf/simulated/wall/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
/area/shuttle/excursion/general)
"xat" = (
/obj/effect/landmark/start{
@@ -36488,6 +36587,15 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/office)
+"xcE" = (
+/obj/structure/bed/chair/shuttle{
+ dir = 8
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/general)
"xdE" = (
/turf/simulated/wall/r_wall,
/area/gateway)
@@ -36793,6 +36901,16 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel_grid,
/area/gateway/prep_room)
+"xwI" = (
+/obj/structure/extinguisher_cabinet{
+ dir = 1;
+ pixel_y = -30
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/cargo)
"xwY" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor,
@@ -37205,6 +37323,30 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/delivery)
+"xXm" = (
+/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/alarm/angled{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/effect/floor_decal/fancy_shuttle{
+ fancy_shuttle_tag = "explo"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/excursion/general)
"xXR" = (
/obj/structure/bed/chair/shuttle{
dir = 4
@@ -47017,8 +47159,8 @@ aaa
aaa
aac
aac
-aac
-aac
+pny
+pny
pny
pny
pny
@@ -47158,15 +47300,15 @@ aaa
aaa
aaa
aaa
-aam
-aam
aac
pny
-aCt
+aOH
aML
+aCt
+cZA
bmA
-bLO
-bYN
+cto
+cto
cto
cto
cto
@@ -47301,11 +47443,9 @@ aaa
aaa
aaa
aam
-aam
-aam
+aJa
+aTO
aph
-aCx
-aOH
bfo
oge
kAp
@@ -47313,6 +47453,8 @@ kAp
kAp
kAp
kAp
+kAp
+kAp
oge
kAp
bfo
@@ -47442,12 +47584,17 @@ aaa
aaa
aaa
aab
-aaa
aam
-aam
-aph
-aCx
-aSo
+aJa
+aTO
+dJL
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
sUY
sUY
sUY
@@ -47458,11 +47605,6 @@ sUY
sUY
sUY
sUY
-wZB
-kRk
-kRk
-kRk
-ruq
sUY
sUY
eWv
@@ -47584,29 +47726,29 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
+aJa
+aTO
+dJL
sUY
sUY
-bZr
-cvx
+sUY
+isS
+isS
+isS
isS
wZB
-dhQ
-wZB
-dhQ
wZB
wZB
-eMe
-dEc
-abJ
+wZB
+wZB
+wZB
+wZB
ruq
-wZB
-sUY
+ruq
+ruq
+ruq
+tiw
eWv
bYt
pny
@@ -47726,29 +47868,29 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
+aJa
+aTO
+dJL
sUY
sUY
isS
isS
isS
-cNM
-dih
-dBX
-dWc
-epw
-qaf
-alG
+isS
+isS
+wZB
+wZB
+wZB
+wZB
+wZB
+wZB
+wZB
nYi
aak
+fGW
+ruq
ruq
-gGk
-kqX
eWv
bYt
pny
@@ -47868,29 +48010,29 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
+aJa
+aTO
+dJL
sUY
-bMv
+aTA
isS
+isS
+lSw
cwo
cIa
cOc
diP
-dCJ
+wZB
dWh
erb
+dWh
wZB
-eMl
fiK
fGW
-ruq
+xwI
gHF
-kqX
+haB
eWv
bYt
pny
@@ -48010,26 +48152,26 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
-sUY
-bNZ
+aJa
+aTO
+dJL
+aTA
+aTA
+isS
+isS
bZD
cwR
isS
cQu
dju
-wZB
+rWj
dXD
-wZB
-wZB
-eEO
+ePh
+gkB
+mZB
fkj
-eEO
+lwa
ghQ
gIs
haB
@@ -48160,29 +48302,29 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
+aJa
+aTO
+dJL
+aTA
+aTA
isS
isS
isS
+cHP
isS
-isS
-wZB
-wZB
+nhL
+dkV
wZB
dYO
ezh
+xXm
wZB
-eMo
fkL
-fIb
+fMh
gjS
-gtX
-sUY
+dDu
+faK
eWv
imG
hLI
@@ -48302,29 +48444,29 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aHN
-aTs
+aJa
+bLO
+emi
+aTA
+aTA
bnf
bOf
bZF
cys
-cII
+isS
cRa
-dkV
-dIv
-egt
+lJZ
+wZB
+wZB
eBg
wZB
-eMS
+wZB
gLG
fMh
gjZ
-gJW
-sUY
+mos
+igN
eWv
aeL
hNs
@@ -48468,13 +48610,13 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
-bnf
+aJa
+aTO
+dJL
+aTA
+aTA
+kft
bOx
bZH
cCr
@@ -48485,12 +48627,12 @@ dJj
egC
eBI
eIJ
-eBI
+euo
flS
fMv
gnc
gMr
-sUY
+pPa
eWv
ops
pny
@@ -48610,29 +48752,29 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aIk
+aJa
+bPE
+emN
aTA
-bnf
+aTA
+dGv
bPq
bZJ
cCJ
-cII
+isS
cUQ
dsY
-dJG
-dsY
+wZB
+wZB
eCo
wZB
-eSD
+wZB
frS
fNB
-gjZ
-gMr
-sUY
+bvH
+cND
+pPa
eWv
nDX
scu
@@ -48752,29 +48894,29 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
+aJa
+aTO
+dJL
+aTA
+aTA
+isS
+isS
isS
isS
-bZR
-aaj
isS
cZZ
+vFn
wZB
-wZB
-wZB
+hjF
eEO
+cDf
wZB
-eTw
-ftz
+ruq
fNO
gnS
-gtX
-sUY
+jBW
+kiG
eWv
hxD
scu
@@ -48894,23 +49036,23 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
-sUY
+aJa
+aTO
+dJL
+aTA
+aTA
isS
+wZB
aos
-agQ
-isS
+hFK
+hFK
dbF
agR
-dOQ
+wZB
ehh
eGK
-wZB
+vJC
ahO
fxa
fOn
@@ -49060,29 +49202,29 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
+aJa
+aTO
+dJL
sUY
-bMv
-agf
-agf
+aTA
isS
+wZB
+aos
+xcE
+xcE
agi
agV
-agX
+wZB
ahk
gFT
-wZB
+byv
eTD
jJo
hGI
lKl
-gHF
-kqX
+gyH
+haB
eWv
ops
scu
@@ -49202,29 +49344,29 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
+aJa
+aTO
+dJL
sUY
sUY
-bZS
-aBd
-isS
-dgu
-dtd
-dQG
-ekv
-eIG
-eJU
-eVN
+mmj
+wZB
+wZB
+wZB
+wZB
+wZB
+wZB
+wZB
+wZB
+wZB
+wZB
+wZB
fAr
fPW
gtX
-gQc
-kqX
+ruq
+fAB
eWv
hBS
scu
@@ -49344,29 +49486,29 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
+aJa
+aTO
+dJL
+sUY
sUY
sUY
-aai
-cEi
-isS
wZB
wZB
wZB
-bYJ
wZB
wZB
-eYw
-fCg
+wZB
+wZB
+wZB
+wZB
+wZB
+wZB
+ruq
fRX
-jOe
-wZB
-sUY
+ruq
+ruq
+ruq
eWv
hBS
scu
@@ -49486,27 +49628,27 @@ aaa
aaa
aaa
aaa
-aaa
aam
-aam
-aph
-aCx
-aSo
-sUY
-sUY
-sUY
-sUY
-sUY
-sUY
-sUY
-sUY
+aJa
+aTO
dJL
sUY
-wZB
-wZB
-fCh
-wZB
-wZB
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
+sUY
+dYI
+sUY
sUY
sUY
eWv
@@ -49629,11 +49771,9 @@ aaa
aaa
aaa
aam
-aam
-aam
-aph
-aCx
+aJa
aTO
+fCh
ali
bPD
bQx
@@ -49641,13 +49781,15 @@ bQx
bQx
bQx
bQx
+bQx
+bQx
ali
-emi
+bQx
bQx
bQx
fdw
bQx
-bQx
+hYI
bQx
bPD
ali
@@ -49770,23 +49912,23 @@ aaa
aaa
aaa
aaa
-aam
-aam
aac
pny
-aJa
+bYN
+kRk
+bpT
aWH
-bpT
-bPE
+cto
+cto
cto
cto
cto
cto
cto
bpT
-emN
-iaf
-vLG
+cto
+cto
+cto
fez
afD
iaf
@@ -49913,8 +50055,8 @@ aaa
aaa
aaa
aac
-aac
-aac
+pny
+pny
pny
pny
pny
diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm
index 3f3e6394d3..bcac1a03a3 100644
--- a/maps/tether/tether_areas.dm
+++ b/maps/tether/tether_areas.dm
@@ -1436,6 +1436,7 @@
/area/shuttle/excursion
requires_power = 1
icon_state = "shuttle2"
+ base_turf = /turf/simulated/floor/reinforced
/area/shuttle/excursion/general
name = "\improper Excursion Shuttle"
@@ -1446,6 +1447,9 @@
/area/shuttle/excursion/cargo
name = "\improper Excursion Shuttle Cargo"
+/area/shuttle/excursion/power
+ name = "\improper Excursion Shuttle Power"
+
/area/shuttle/tourbus
requires_power = 1
icon_state = "shuttle2"
diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm
index f8e126d024..42f9723477 100644
--- a/maps/tether/tether_shuttles.dm
+++ b/maps/tether/tether_shuttles.dm
@@ -191,7 +191,7 @@
warmup_time = 0
current_location = "tether_excursion_hangar"
docking_controller_tag = "expshuttle_docker"
- shuttle_area = list(/area/shuttle/excursion/cockpit, /area/shuttle/excursion/general, /area/shuttle/excursion/cargo)
+ shuttle_area = list(/area/shuttle/excursion/cockpit, /area/shuttle/excursion/general, /area/shuttle/excursion/cargo, /area/shuttle/excursion/power)
fuel_consumption = 3
move_direction = NORTH
diff --git a/vorestation.dme b/vorestation.dme
index cb2b5a41a8..d966c702b8 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3538,6 +3538,7 @@
#include "code\modules\overmap\ships\landable.dm"
#include "code\modules\overmap\ships\panicbutton.dm"
#include "code\modules\overmap\ships\ship.dm"
+#include "code\modules\overmap\ships\ship_vr.dm"
#include "code\modules\overmap\ships\computers\computer_shims.dm"
#include "code\modules\overmap\ships\computers\engine_control.dm"
#include "code\modules\overmap\ships\computers\helm.dm"