diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm
index 5ceec9978d..c92d42d82a 100644
--- a/code/controllers/globals.dm
+++ b/code/controllers/globals.dm
@@ -43,19 +43,22 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
 		return FALSE
 	return ..()
 
-/datum/controller/global_vars/Initialize(var/exclude_these)
+/datum/controller/global_vars/Initialize()
 	gvars_datum_init_order = list()
-	gvars_datum_protected_varlist = list("gvars_datum_protected_varlist")
-
-	//See https://github.com/tgstation/tgstation/issues/26954
-	for(var/I in typesof(/datum/controller/global_vars/proc))
-		var/CLEANBOT_RETURNS = "[I]"
-		pass(CLEANBOT_RETURNS)
-
-	for(var/I in (vars - gvars_datum_in_built_vars))
+	gvars_datum_protected_varlist = list(NAMEOF(src, gvars_datum_protected_varlist) = TRUE)
+	var/list/global_procs = typesof(/datum/controller/global_vars/proc)
+	var/expected_len = vars.len - gvars_datum_in_built_vars.len
+	if(global_procs.len != expected_len)
+		warning("Unable to detect all global initialization procs! Expected [expected_len] got [global_procs.len]!")
+		if(global_procs.len)
+			var/list/expected_global_procs = vars - gvars_datum_in_built_vars
+			for(var/I in global_procs)
+				expected_global_procs -= replacetext("[I]", "InitGlobal", "")
+			var/english_missing = expected_global_procs.Join(", ")
+			log_world("Missing procs: [english_missing]")
+	for(var/I in global_procs)
 		var/start_tick = world.time
-		call(src, "InitGlobal[I]")()
+		call(src, I)()
 		var/end_tick = world.time
 		if(end_tick - start_tick)
-			warning("Global [I] slept during initialization!")
-	QDEL_NULL(exclude_these)
\ No newline at end of file
+			warning("Global [replacetext("[I]", "InitGlobal", "")] slept during initialization!")
diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index 2744126054..a466062e81 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -419,6 +419,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 					pref.body_descriptors[entry] = descriptor.default_value // Species datums have initial default value.
 				else
 					pref.body_descriptors[entry] = CLAMP(last_descriptors[entry], 1, LAZYLEN(descriptor.standalone_value_descriptors))
+	
+	character.update_emotes()
 
 	return
 
diff --git a/code/modules/emotes/definitions/exertion.dm b/code/modules/emotes/definitions/exertion.dm
index 9d85bbb39a..ac0061cca3 100644
--- a/code/modules/emotes/definitions/exertion.dm
+++ b/code/modules/emotes/definitions/exertion.dm
@@ -5,7 +5,7 @@
 	emote_message_3p = "is sweating heavily."
 
 /decl/emote/exertion/biological/check_user(mob/living/user)
-	if(istype(user) && !user.isSynthetic(skip_emote_update = TRUE))
+	if(istype(user) && !user.isSynthetic())
 		return ..()
 	return FALSE
 
@@ -30,7 +30,7 @@
 	emote_message_3p = "USER's actuators whine with strain."
 
 /decl/emote/exertion/synthetic/check_user(mob/living/user)
-	if(istype(user) && user.isSynthetic(skip_emote_update = TRUE))
+	if(istype(user) && user.isSynthetic())
 		return ..()
 	return FALSE
 
diff --git a/code/modules/emotes/definitions/human.dm b/code/modules/emotes/definitions/human.dm
index 182e8df51a..982e472c5f 100644
--- a/code/modules/emotes/definitions/human.dm
+++ b/code/modules/emotes/definitions/human.dm
@@ -1,5 +1,11 @@
+/decl/emote/human
+	key = "vomit"
+
 /decl/emote/human/check_user(var/mob/living/carbon/human/user)
-	return istype(user)
+	return (istype(user))//VOREStation Edit - What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic())
+
+/decl/emote/human/do_emote(var/mob/living/carbon/human/user)
+	user.vomit()
 
 /decl/emote/human/deathgasp
 	key = "deathgasp"
diff --git a/code/modules/emotes/definitions/synthetics.dm b/code/modules/emotes/definitions/synthetics.dm
index 659a1eff44..2e31a07f8f 100644
--- a/code/modules/emotes/definitions/synthetics.dm
+++ b/code/modules/emotes/definitions/synthetics.dm
@@ -4,7 +4,7 @@
 	emote_sound = 'sound/machines/twobeep.ogg'
 
 /decl/emote/audible/synth/check_user(var/mob/living/user)
-	if(istype(user) && user.isSynthetic(skip_emote_update = TRUE))
+	if(istype(user) && user.isSynthetic())
 		return ..()
 	return FALSE
 
diff --git a/code/modules/emotes/definitions/visible_vomit.dm b/code/modules/emotes/definitions/visible_vomit.dm
index f60522eeeb..1ec79dea6a 100644
--- a/code/modules/emotes/definitions/visible_vomit.dm
+++ b/code/modules/emotes/definitions/visible_vomit.dm
@@ -4,7 +4,7 @@
 /decl/emote/visible/vomit/do_emote(var/atom/user, var/extra_params)
 	if(isliving(user))
 		var/mob/living/M = user
-		if(!M.isSynthetic(skip_emote_update = TRUE))
+		if(!M.isSynthetic())
 			M.vomit()
 			return
 	to_chat(src, SPAN_WARNING("You are unable to vomit."))	
diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm
index 2d311f2ceb..845a5202d3 100644
--- a/code/modules/emotes/emote_define.dm
+++ b/code/modules/emotes/emote_define.dm
@@ -172,7 +172,7 @@
 	return key
 
 /decl/emote/proc/check_synthetic(var/mob/living/user)
-	. = istype(user) && user.isSynthetic(skip_emote_update = TRUE)
+	. = istype(user) && user.isSynthetic()
 	if(!. && ishuman(user) && message_type == AUDIBLE_MESSAGE)
 		var/mob/living/carbon/human/H = user
 		if(H.should_have_organ(O_LUNGS))
diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm
index 12b3856df5..30ff2c1d2c 100644
--- a/code/modules/mob/living/bot/bot.dm
+++ b/code/modules/mob/living/bot/bot.dm
@@ -441,5 +441,5 @@
 	return 0
 
 
-/mob/living/bot/isSynthetic(var/skip_emote_update) //Robots are synthetic, no?
+/mob/living/bot/isSynthetic() //Robots are synthetic, no?
 	return 1
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index fff4159f9b..89ff4151fb 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -42,7 +42,7 @@
 		canmove = 0
 	return canmove
 
-/mob/living/carbon/brain/isSynthetic(var/skip_emote_update)
+/mob/living/carbon/brain/isSynthetic()
 	return istype(loc, /obj/item/device/mmi)
 
 /mob/living/carbon/brain/set_typing_indicator(var/state)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index e7cb45ac2b..834aa99209 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -33,6 +33,7 @@ var/list/_human_default_emotes = list(
 	/decl/emote/audible/grunt,
 	/decl/emote/audible/slap,
 	/decl/emote/audible/crack,
+	/decl/emote/human,
 	/decl/emote/human/deathgasp,
 	/decl/emote/audible/giggle,
 	/decl/emote/audible/scream,
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index c46e179ac3..20ac966e40 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -97,21 +97,8 @@
 
 // This is the 'mechanical' check for synthetic-ness, not appearance
 // Returns the company that made the synthetic
-/mob/living/carbon/human/isSynthetic(var/skip_emote_update)
-	if(synthetic) 
-		return synthetic //Your synthetic-ness is not going away
-	var/obj/item/organ/external/T = organs_by_name[BP_TORSO]
-	if(T && T.robotic >= ORGAN_ROBOT)
-		src.verbs += /mob/living/carbon/human/proc/self_diagnostics
-		src.verbs += /mob/living/carbon/human/proc/setmonitor_state//YWadd, early port, remove comment when it comes from upstream
-		src.verbs += /mob/living/carbon/human/proc/reagent_purge //VOREStation Add
-		src.verbs += /mob/living/carbon/human/proc/setmonitor_state
-		var/datum/robolimb/R = all_robolimbs[T.model]
-		synthetic = R
-		if(!skip_emote_update)
-			update_emotes()
-		return synthetic
-	return FALSE
+/mob/living/carbon/human/isSynthetic()
+	return synthetic
 
 // Would an onlooker know this person is synthetic?
 // Based on sort of logical reasoning, 'Look at head, look at torso'
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index d7c66d5289..33fb57356b 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -217,8 +217,7 @@
 
 		if(isSynthetic())
 			output += "Current Battery Charge: [nutrition]\n"
-
-		if(isSynthetic())
+			
 			var/toxDam = getToxLoss()
 			if(toxDam)
 				output += "System Instability: <span class='warning'>[toxDam > 25 ? "Severe" : "Moderate"]</span>. Seek charging station for cleanup.\n"
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical.dm
index beba4b35fc..f61212ba75 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical.dm
@@ -18,7 +18,7 @@
 	poison_resist = 1.0
 	shock_resist = -0.5
 
-/mob/living/simple_mob/mechanical/isSynthetic(var/skip_emote_update)
+/mob/living/simple_mob/mechanical/isSynthetic()
 	return TRUE
 
 /mob/living/simple_mob/mechanical/speech_bubble_appearance()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 7a9ad45242..f21ada00f7 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1073,7 +1073,7 @@ mob/verb/shifteast()
 	if(src.throw_icon)
 		src.throw_icon.icon_state = "act_throw_on"
 
-/mob/proc/isSynthetic(var/skip_emote_update)
+/mob/proc/isSynthetic()
 	return 0
 
 /mob/proc/is_muzzled()
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 025bcafef7..7c1034a77d 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -33,7 +33,7 @@
 		return L.mob_size <= MOB_MINISCULE
 	return 0
 
-/mob/living/silicon/isSynthetic(var/skip_emote_update)
+/mob/living/silicon/isSynthetic()
 	return 1
 
 /mob/proc/isMonkey()
diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm
index a26e2139e8..61073c9905 100644
--- a/code/modules/nifsoft/nif.dm
+++ b/code/modules/nifsoft/nif.dm
@@ -49,6 +49,12 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 
 	var/obj/item/device/communicator/commlink/comm		// The commlink requires this
 
+	var/list/starting_software = list(
+		/datum/nifsoft/commlink,
+		/datum/nifsoft/soulcatcher,
+		/datum/nifsoft/ar_civ
+	)
+
 	var/global/icon/big_icon
 	var/global/click_sound = 'sound/items/nif_click.ogg'
 	var/global/bad_sound = 'sound/items/nif_tone_bad.ogg'
@@ -89,13 +95,6 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 			spawn(0)
 				qdel(src)
 			return FALSE
-		else
-			//Free commlink and soulcatcher for return customers
-			new /datum/nifsoft/commlink(src)
-			new /datum/nifsoft/soulcatcher(src)
-
-	//Free civilian AR included
-	new /datum/nifsoft/ar_civ(src)
 
 	//If given wear (like when spawned) then done
 	if(wear)
@@ -131,6 +130,10 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 		human.nif = src
 		stat = NIF_INSTALLING
 		H.verbs |= /mob/living/carbon/human/proc/set_nif_examine
+		if(starting_software)
+			for(var/path in starting_software)
+				new path(src)
+			starting_software = null
 		return TRUE
 
 	return FALSE
@@ -596,6 +599,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 	name = "bootleg NIF"
 	desc = "When NanoTrasen tried to replicate the NIF tech by themselves, this is what they made. You probably shouldn't allow this inside you."
 	durability = 10
+	starting_software = null
 
 /obj/item/device/nif/authentic
 	name = "Authentic NIF"
diff --git a/code/modules/organs/internal/stomach.dm b/code/modules/organs/internal/stomach.dm
index 2ebfefea61..390a86db44 100644
--- a/code/modules/organs/internal/stomach.dm
+++ b/code/modules/organs/internal/stomach.dm
@@ -58,6 +58,8 @@
 
 	acidtype = "sacid"
 
+	organ_verbs = list(/mob/living/carbon/human/proc/reagent_purge) //VOREStation Add
+
 /obj/item/organ/internal/stomach/machine/handle_organ_proc_special()
 	..()
 	if(owner && owner.stat != DEAD)
diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm
index 870d1d6493..07dd2182f6 100644
--- a/code/modules/organs/subtypes/nano.dm
+++ b/code/modules/organs/subtypes/nano.dm
@@ -89,6 +89,10 @@
 	organ_tag = O_ORCH
 	parent_organ = BP_TORSO
 	vital = TRUE
+	organ_verbs = list(
+		/mob/living/carbon/human/proc/self_diagnostics,
+		/mob/living/carbon/human/proc/reagent_purge
+	)
 
 /obj/item/organ/internal/nano/refactory
 	name = "refactory module"
diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm
index bad69a2380..0b08d8a572 100644
--- a/code/modules/organs/subtypes/standard.dm
+++ b/code/modules/organs/subtypes/standard.dm
@@ -24,14 +24,23 @@
 	base_miss_chance = 10
 
 /obj/item/organ/external/chest/robotize()
-	if(..() && robotic != ORGAN_NANOFORM) //VOREStation Edit
-		// Give them fancy new organs.
-		owner.internal_organs_by_name[O_CELL] = new /obj/item/organ/internal/cell(owner,1)
-		owner.internal_organs_by_name[O_VOICE] = new /obj/item/organ/internal/voicebox/robot(owner, 1)
-		owner.internal_organs_by_name[O_PUMP] = new /obj/item/organ/internal/heart/machine(owner,1)
-		owner.internal_organs_by_name[O_CYCLER] = new /obj/item/organ/internal/stomach/machine(owner,1)
-		owner.internal_organs_by_name[O_HEATSINK] = new /obj/item/organ/internal/robotic/heatsink(owner,1)
-		owner.internal_organs_by_name[O_DIAGNOSTIC] = new /obj/item/organ/internal/robotic/diagnostic(owner,1)
+	if(..() && owner)
+		if(robotic != ORGAN_NANOFORM) //VOREStation Edit
+			// Give them fancy new organs.
+			owner.internal_organs_by_name[O_CELL] = new /obj/item/organ/internal/cell(owner,1)
+			owner.internal_organs_by_name[O_VOICE] = new /obj/item/organ/internal/voicebox/robot(owner, 1)
+			owner.internal_organs_by_name[O_PUMP] = new /obj/item/organ/internal/heart/machine(owner,1)
+			owner.internal_organs_by_name[O_CYCLER] = new /obj/item/organ/internal/stomach/machine(owner,1)
+			owner.internal_organs_by_name[O_HEATSINK] = new /obj/item/organ/internal/robotic/heatsink(owner,1)
+			owner.internal_organs_by_name[O_DIAGNOSTIC] = new /obj/item/organ/internal/robotic/diagnostic(owner,1)
+
+		var/datum/robolimb/R = all_robolimbs[model] // company should be set in parent by now
+		if(!R)
+			log_error("A torso was robotize() but has no model that can be found: [model]. May affect FBPs.")
+		owner.synthetic = R
+		owner.update_emotes()
+	return FALSE
+
 
 /obj/item/organ/external/chest/handle_germ_effects()
 	. = ..() //Should return an infection level
@@ -279,7 +288,14 @@
 	return ..()
 
 /obj/item/organ/external/head/robotize(var/company, var/skip_prosthetics, var/keep_organs)
-	return ..(company, skip_prosthetics, 1)
+	. = ..(company, skip_prosthetics, 1)
+	if(model)
+		var/datum/robolimb/robohead = all_robolimbs[model]
+		if(robohead?.monitor_styles && robohead?.monitor_icon)
+			LAZYDISTINCTADD(organ_verbs, /mob/living/carbon/human/proc/setmonitor_state)
+		else
+			LAZYREMOVE(organ_verbs, /mob/living/carbon/human/proc/setmonitor_state)
+		handle_organ_mod_special()
 
 /obj/item/organ/external/head/removed()
 	if(owner)
diff --git a/interface/interface.dm b/interface/interface.dm
index 3c35a1e063..e1fc8988ef 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -93,6 +93,8 @@ Hotkey-Mode: (hotkey-mode must be on)
 \t5 = emote
 \tx = swap-hand
 \tz = activate held object (or y)
+\tu = Rest
+\tb = Resist
 \tj = toggle-aiming-mode
 \tf = cycle-intents-left
 \tg = cycle-intents-right
@@ -113,6 +115,8 @@ Any-Mode: (hotkey doesn't need to be on)
 \tCtrl+q = drop
 \tCtrl+e = equip
 \tCtrl+r = throw
+\tCtrl+u = Rest
+\tCtrl+b = Resist
 \tCtrl+x = swap-hand
 \tCtrl+z = activate held object (or Ctrl+y)
 \tCtrl+f = cycle-intents-left
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 32eefdb361..524b6e00bd 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -352,6 +352,12 @@ macro "macro"
 	elem 
 		name = "CTRL+Z"
 		command = "Activate-Held-Object"
+	elem 
+		name = "CTRL+U"
+		command = "Rest"
+	elem 
+		name = "CTRL+B"
+		command = "Resist"
 	elem 
 		name = "CTRL+NUMPAD1"
 		command = "body-r-leg"
diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm
index 9c7918e65a..260f2915a2 100644
--- a/maps/offmap_vr/talon/talon_v2.dm
+++ b/maps/offmap_vr/talon/talon_v2.dm
@@ -155,7 +155,7 @@ so stay sharp eh?<br>\
 	info = {"to whoever's stuck at the helm of this farce of an operation,<br>\
 good news! you may have noticed the entire ship was replaced pretty much overnight.<br>\
 that or it changed shape or something? whatever, not important.<br>\
-it is essential that I tell you that there is most definitely not a new smuggling compartment hidden under your end table<br>\
+it is essential that I tell you that there is most definitely not a new smuggling compartment hidden under the carpet at the foot of your bed<br>\
 unfortunately I couldn't possibly tell you the fictional combination for a hypothetical compartment that doesn't exist<br>\
 have fun!<br>\
 <br>\
@@ -171,6 +171,9 @@ what is important is that the shuttle has been replaced. it is now capable of fu
 but the rear airlock is a bit fussy. be sure to use the manual switches on each side of the airlock if you're matching another airlock and one side is exposed to vacuum or a hostile atmosphere!<br>\
 also be sure that it's locked down before you take off, the automatic switch is a bit stupid sometimes!<br>\
 <br>\
+finally, make sure you check the shuttle's APC power level before you head out! it can be fussy about (re)charging off the main ship grid sometimes. despite having someone in to look at the cables, we couldn't figure out why.<br>\
+I recommend packing a spare battery (there should be a few in engineering you can borrow and charge up) to be safe. don't wanna get stranded!<br>\
+<br>\
 <i>Harry Townes</i>"}
 
 //Prevents remote control of drones
@@ -546,7 +549,6 @@ also be sure that it's locked down before you take off, the automatic switch is
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "ore_clown"
 
-
 /obj/random/multiple/ore_pile/talon/item_to_spawn()
 	return pick(
 			prob(10);list(
diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm
index df1ce5dc03..3c9382a08d 100644
--- a/maps/offmap_vr/talon/talon_v2.dmm
+++ b/maps/offmap_vr/talon/talon_v2.dmm
@@ -33,10 +33,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/brig)
 "ae" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/green{
@@ -44,6 +40,11 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "ah" = (
@@ -133,6 +134,9 @@
 	dir = 1;
 	pixel_y = -25
 	},
+/obj/machinery/light/small{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/workroom)
 "aw" = (
@@ -217,7 +221,7 @@
 	dir = 1;
 	pixel_y = -32
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "aI" = (
 /obj/machinery/atmospherics/pipe/manifold/visible,
@@ -268,7 +272,8 @@
 	req_one_access = list(301)
 	},
 /obj/structure/cable/green{
-	dir = 1;
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -316,7 +321,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "aZ" = (
 /obj/structure/cable/green{
@@ -390,6 +395,9 @@
 /obj/effect/map_helper/airlock/atmos/chamber_pump,
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
 /obj/structure/handrail,
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/wing_port)
 "bk" = (
@@ -404,9 +412,7 @@
 	pixel_y = -24
 	},
 /obj/structure/cable/green,
-/obj/structure/safe/floor{
-	name = "smuggling compartment"
-	},
+/obj/item/weapon/paper/talon_captain,
 /turf/simulated/floor/carpet/blucarpet,
 /area/talon_v2/crew_quarters/cap_room)
 "bo" = (
@@ -443,16 +449,17 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/hangar)
 "bz" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/armory)
 "bA" = (
@@ -537,10 +544,10 @@
 /turf/simulated/floor/tiled/white,
 /area/talon_v2/medical)
 "bT" = (
+/obj/structure/closet/secure_closet/talon_guard,
 /obj/item/device/radio/off{
 	channels = list("Talon" = 1)
 	},
-/obj/structure/closet/secure_closet/talon_guard,
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/sec_room)
 "bU" = (
@@ -615,13 +622,14 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "ce" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "cf" = (
@@ -713,14 +721,15 @@
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/cap_room)
 "cr" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/light{
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "ct" = (
@@ -1229,6 +1238,9 @@
 /obj/structure/table/standard,
 /obj/fiftyspawner/steel,
 /obj/fiftyspawner/copper,
+/obj/machinery/light/small{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/workroom)
 "dV" = (
@@ -1335,10 +1347,6 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "ej" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
@@ -1355,6 +1363,11 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/central_hallway/fore)
 "ek" = (
@@ -1436,10 +1449,6 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/starboard)
 "ey" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/button/remote/airlock{
 	dir = 4;
 	id = "talon_capdoor";
@@ -1447,6 +1456,11 @@
 	pixel_x = 28;
 	specialfunctions = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/cap_room)
 "ez" = (
@@ -1491,16 +1505,17 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/starboard)
 "eG" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/secure_storage)
 "eH" = (
@@ -1680,6 +1695,7 @@
 /obj/structure/handrail{
 	dir = 4
 	},
+/obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/aft_port)
 "fo" = (
@@ -1723,6 +1739,9 @@
 /obj/structure/handrail{
 	dir = 8
 	},
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/aft_port)
 "fr" = (
@@ -1745,6 +1764,7 @@
 /obj/structure/handrail{
 	dir = 4
 	},
+/obj/effect/floor_decal/industrial/warning/corner,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/aft_starboard)
 "fs" = (
@@ -1755,6 +1775,7 @@
 /obj/structure/handrail{
 	dir = 8
 	},
+/obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/aft_starboard)
 "fv" = (
@@ -1881,7 +1902,8 @@
 "gb" = (
 /obj/structure/bed/chair/wood,
 /obj/structure/cable/green{
-	dir = 1;
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/carpet/blucarpet,
@@ -1983,11 +2005,17 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/workroom)
 "go" = (
-/obj/structure/catwalk,
 /obj/machinery/alarm/talon{
 	dir = 8;
 	pixel_x = 22
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/maintenance/aft_port)
 "gr" = (
@@ -2012,15 +2040,16 @@
 /obj/effect/floor_decal/emblem/talon_big{
 	dir = 1
 	},
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/central_hallway/fore)
 "gt" = (
@@ -2118,10 +2147,6 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/starboard)
 "gN" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/cable/green{
 	d1 = 2;
 	d2 = 4;
@@ -2137,6 +2162,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/central_hallway/fore)
 "gO" = (
@@ -2172,10 +2202,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/maintenance/wing_starboard)
 "gV" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
@@ -2183,6 +2209,11 @@
 	dir = 4;
 	pixel_x = 32
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "hb" = (
@@ -2379,7 +2410,8 @@
 /area/space)
 "hQ" = (
 /obj/structure/cable/green{
-	dir = 1;
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -2424,10 +2456,6 @@
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/bar)
 "ig" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/sign/warning/nosmoking_1{
 	pixel_x = 26
 	},
@@ -2437,7 +2465,12 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
-/obj/effect/catwalk_plated/dark,
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "ii" = (
@@ -2470,6 +2503,9 @@
 	dir = 6
 	},
 /obj/structure/handrail,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/fore_port)
 "iw" = (
@@ -2563,7 +2599,8 @@
 /area/talon_v2/engineering/star_store)
 "iP" = (
 /obj/structure/cable/green{
-	dir = 1;
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -2757,7 +2794,8 @@
 /obj/item/weapon/pen,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/structure/cable/green{
-	dir = 1;
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -3355,12 +3393,13 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/central_hallway/fore)
 "lJ" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /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"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/armory)
 "lK" = (
@@ -3432,15 +3471,11 @@
 /turf/simulated/wall/shull,
 /area/talon_v2/crew_quarters/pilot_room)
 "lV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/maintenance/aft_port)
@@ -3493,15 +3528,16 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/central_hallway/fore)
 "mc" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "md" = (
@@ -3615,6 +3651,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/wing_port)
 "mC" = (
@@ -3734,7 +3773,7 @@
 	dir = 1;
 	pixel_y = -32
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "mV" = (
 /obj/structure/cable/green{
@@ -3753,10 +3792,6 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "mZ" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 4;
@@ -3765,6 +3800,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/junction,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "nb" = (
@@ -3821,15 +3861,16 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "ns" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/pilot_room)
 "nu" = (
@@ -4012,7 +4053,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/aux{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/map_helper/airlock/sensor/ext_sensor,
+/obj/machinery/airlock_sensor/airlock_exterior/shuttle{
+	dir = 4;
+	pixel_x = 11;
+	pixel_y = 24
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "om" = (
 /obj/effect/floor_decal/industrial/warning,
@@ -4035,12 +4082,13 @@
 "oo" = (
 /obj/machinery/door/firedoor/glass/talon,
 /obj/machinery/door/airlock/glass,
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "op" = (
@@ -4164,6 +4212,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/wing_starboard)
 "oU" = (
@@ -4320,10 +4371,6 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/engineering/star_store)
 "pw" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/catwalk,
@@ -4335,6 +4382,11 @@
 	dir = 8;
 	pixel_x = 24
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "px" = (
@@ -4342,13 +4394,14 @@
 	dir = 4;
 	pixel_x = 30
 	},
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/talon_v2/crew_quarters/cap_room)
 "pA" = (
@@ -4370,10 +4423,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/crew_quarters/restrooms)
 "pC" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
@@ -4381,6 +4430,11 @@
 	dir = 8;
 	pixel_x = 30
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "pE" = (
@@ -4458,8 +4512,8 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
-/obj/structure/catwalk,
 /obj/structure/disposalpipe/segment,
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "pV" = (
@@ -4525,20 +4579,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/port_store)
-"qj" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor/glass/talon,
-/obj/machinery/door/airlock/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/central_hallway/fore)
 "qk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -4569,6 +4609,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass/talon,
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/brig)
 "qo" = (
@@ -4669,7 +4712,6 @@
 "qD" = (
 /obj/structure/table/standard,
 /obj/item/weapon/storage/toolbox/electrical,
-/obj/item/stack/marker_beacon/thirty,
 /obj/item/weapon/pipe_dispenser,
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/techfloor/grid,
@@ -4702,9 +4744,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/refining)
 "qI" = (
-/obj/structure/bed/chair/bay/chair{
-	dir = 1
-	},
+/obj/structure/table/woodentable,
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/bar)
 "qJ" = (
@@ -4860,6 +4900,7 @@
 /obj/structure/closet/emergsuit_wall{
 	pixel_y = 32
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "rl" = (
@@ -4884,12 +4925,13 @@
 /area/talon_v2/brig)
 "rt" = (
 /obj/effect/floor_decal/emblem/talon_big,
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/central_hallway/fore)
 "ru" = (
@@ -5042,10 +5084,6 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/starboard)
 "rU" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/cable/green{
 	d1 = 2;
 	d2 = 4;
@@ -5054,6 +5092,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "rW" = (
@@ -5229,16 +5272,17 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/port_store)
 "sF" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/junction{
 	dir = 2;
 	icon_state = "pipe-j2"
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "sI" = (
@@ -5413,11 +5457,12 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "tk" = (
+/obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
-	dir = 1;
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "tl" = (
@@ -5431,10 +5476,6 @@
 /turf/space,
 /area/space)
 "to" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/light{
 	dir = 4
 	},
@@ -5448,6 +5489,11 @@
 	pixel_x = 32;
 	pixel_y = 3
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "tp" = (
@@ -5473,10 +5519,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/crew_quarters/med_room)
 "tx" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
@@ -5493,6 +5535,11 @@
 	pixel_x = 32;
 	pixel_y = 6
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "ty" = (
@@ -5502,10 +5549,10 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/maintenance/wing_port)
 "tz" = (
+/obj/structure/closet/secure_closet/talon_pilot,
 /obj/item/device/radio/off{
 	channels = list("Talon" = 1)
 	},
-/obj/structure/closet/secure_closet/talon_pilot,
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/pilot_room)
 "tA" = (
@@ -5787,16 +5834,11 @@
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/pilot_room)
 "uB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+/obj/structure/bed/chair/bay/chair{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/structure/catwalk,
-/obj/structure/trash_pile,
-/turf/simulated/floor/plating,
-/area/talon_v2/maintenance/aft_port)
+/turf/simulated/floor/wood,
+/area/talon_v2/crew_quarters/bar)
 "uF" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/item/clothing/suit/space/void/refurb/talon,
@@ -5834,10 +5876,6 @@
 /turf/simulated/floor/reinforced/airless,
 /area/space)
 "uM" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
@@ -5845,6 +5883,11 @@
 	dir = 4;
 	pixel_x = 32
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "uO" = (
@@ -6033,10 +6076,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/workroom)
 "vw" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
@@ -6044,6 +6083,11 @@
 	dir = 4;
 	pixel_x = 32
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "vx" = (
@@ -6223,8 +6267,12 @@
 /obj/structure/closet/crate/secure/phoron{
 	req_one_access = list(301)
 	},
-/obj/item/weapon/tank/phoron/pressurized,
-/obj/item/weapon/tank/phoron/pressurized,
+/obj/item/weapon/tank/phoron/pressurized{
+	pixel_x = -3
+	},
+/obj/item/weapon/tank/phoron/pressurized{
+	pixel_x = 3
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/talonboat)
 "vW" = (
@@ -6242,6 +6290,9 @@
 	id = "talon_boat_cockpit";
 	pixel_y = 28
 	},
+/obj/item/device/radio/off{
+	channels = list("Talon" = 1)
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/talonboat)
 "vZ" = (
@@ -6358,10 +6409,6 @@
 /turf/simulated/floor/carpet,
 /area/talon_v2/crew_quarters/eng_room)
 "wy" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/cable/green{
 	d1 = 2;
 	d2 = 4;
@@ -6378,6 +6425,11 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "wz" = (
@@ -6429,9 +6481,12 @@
 /turf/simulated/floor/reinforced/airless,
 /area/talon_v2/maintenance/fore_port)
 "wS" = (
-/obj/structure/table/woodentable,
-/turf/simulated/floor/wood,
-/area/talon_v2/crew_quarters/bar)
+/obj/structure/catwalk,
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/atmospherics)
 "wU" = (
 /obj/machinery/door/firedoor/glass/talon,
 /obj/machinery/door/airlock/maintenance/sec{
@@ -6472,7 +6527,7 @@
 	dir = 1
 	},
 /obj/item/weapon/storage/toolbox/emergency,
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "wZ" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -6495,7 +6550,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
-/obj/item/weapon/paper/talon_captain,
 /obj/item/weapon/paper/dockingcodes,
 /turf/simulated/floor/carpet/blucarpet,
 /area/talon_v2/crew_quarters/cap_room)
@@ -6604,15 +6658,13 @@
 	pixel_x = 22
 	},
 /obj/structure/cable/green{
-	dir = 1;
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/talon_v2/crew_quarters/cap_room)
 "xw" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
@@ -6652,6 +6704,9 @@
 	layer = 3.3;
 	pixel_y = 26
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/talonboat)
 "xH" = (
@@ -6862,11 +6917,11 @@
 /obj/structure/closet/walllocker_double/west,
 /obj/item/weapon/cell/apc,
 /obj/item/weapon/cell/apc,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/engineering,
 /obj/item/device/radio/off{
 	channels = list("Talon" = 1)
 	},
-/obj/random/maintenance/engineering,
-/obj/random/maintenance/engineering,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "yp" = (
@@ -6899,6 +6954,9 @@
 	dir = 10
 	},
 /obj/structure/handrail,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/fore_starboard)
 "yw" = (
@@ -7164,7 +7222,7 @@
 	dir = 1
 	},
 /obj/item/weapon/storage/toolbox/mechanical,
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "zF" = (
 /obj/structure/catwalk,
@@ -7296,10 +7354,10 @@
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/bar)
 "Ae" = (
+/obj/structure/closet/secure_closet/talon_doctor,
 /obj/item/device/radio/off{
 	channels = list("Talon" = 1)
 	},
-/obj/structure/closet/secure_closet/talon_doctor,
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/med_room)
 "Ag" = (
@@ -7404,9 +7462,6 @@
 /obj/item/device/radio/off{
 	channels = list("Talon" = 1)
 	},
-/obj/item/device/radio/off{
-	channels = list("Talon" = 1)
-	},
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/secure_storage)
 "AD" = (
@@ -7480,13 +7535,9 @@
 /obj/machinery/door/blast/regular/open{
 	id = "talon_boat_east"
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "AO" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
@@ -7496,6 +7547,11 @@
 	name = "DOCTOR'S QUARTERS";
 	pixel_x = 32
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "AQ" = (
@@ -7588,11 +7644,11 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/catwalk,
 /obj/structure/disposalpipe/junction{
 	dir = 2;
 	icon_state = "pipe-j2"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "Bc" = (
@@ -7617,16 +7673,17 @@
 /turf/simulated/floor/reinforced/airless,
 /area/talon_v2/crew_quarters/cap_room)
 "Bi" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "Bj" = (
@@ -7688,15 +7745,16 @@
 /area/talon_v2/brig)
 "Bt" = (
 /obj/machinery/door/firedoor/glass/talon,
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "Bu" = (
@@ -7765,10 +7823,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/crew_quarters/restrooms)
 "BJ" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/cable/green{
 	d1 = 2;
 	d2 = 4;
@@ -7790,6 +7844,11 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/central_hallway)
 "BK" = (
@@ -7811,9 +7870,6 @@
 	dir = 8;
 	name = "Waste Compresser"
 	},
-/obj/structure/railing/grey{
-	dir = 1
-	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "BT" = (
@@ -7850,6 +7906,9 @@
 /obj/structure/handrail{
 	dir = 1
 	},
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/fore_starboard)
 "BX" = (
@@ -7878,10 +7937,6 @@
 /turf/simulated/floor/carpet,
 /area/talon_v2/crew_quarters/eng_room)
 "Cb" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/door/firedoor/glass/talon,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -7889,6 +7944,11 @@
 	name = "Talon Storage";
 	req_one_access = list(301)
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/secure_storage)
 "Cd" = (
@@ -7964,10 +8024,6 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/port_store)
 "Cs" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/catwalk,
@@ -7982,6 +8038,11 @@
 /obj/item/weapon/cell/device,
 /obj/random/maintenance/engineering,
 /obj/random/maintenance/engineering,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "Cw" = (
@@ -8032,9 +8093,9 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/maintenance/aft_starboard)
 "CA" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 6
-	},
+/obj/machinery/atmospherics/pipe/simple/visible/red,
+/obj/structure/catwalk,
+/obj/structure/railing/grey,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "CB" = (
@@ -8119,13 +8180,14 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "CO" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "CP" = (
@@ -8321,8 +8383,12 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/central_hallway/fore)
 "DM" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 4
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/catwalk,
+/obj/structure/railing/grey{
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
@@ -8331,7 +8397,13 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "DR" = (
-/obj/machinery/atmospherics/pipe/manifold/visible,
+/obj/machinery/atmospherics/pipe/simple/visible{
+	dir = 9
+	},
+/obj/structure/catwalk,
+/obj/structure/railing/grey{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "DT" = (
@@ -8456,9 +8528,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
-/obj/machinery/light/small{
-	dir = 8
-	},
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/brig)
 "Eo" = (
@@ -8543,10 +8612,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/secure_storage)
 "EF" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
@@ -8560,6 +8625,11 @@
 	icon_state = "2-8"
 	},
 /obj/structure/disposalpipe/junction,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/central_hallway/fore)
 "EH" = (
@@ -8755,15 +8825,16 @@
 /obj/machinery/door/airlock/medical{
 	req_one_access = list(301)
 	},
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/white,
 /area/talon_v2/medical)
 "Fo" = (
@@ -8818,7 +8889,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "Fz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/aux,
@@ -8940,14 +9011,11 @@
 	dir = 8;
 	pixel_x = -32
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "FT" = (
 /obj/machinery/door/firedoor/glass/talon,
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/door/airlock/engineering{
 	name = "Talon Engineering";
 	req_one_access = list(301)
@@ -8958,6 +9026,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "FU" = (
@@ -9148,10 +9221,6 @@
 /area/talon_v2/maintenance/wing_starboard)
 "Gw" = (
 /obj/machinery/door/firedoor/glass/talon,
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
@@ -9162,6 +9231,11 @@
 	name = "Pilot's Cabin";
 	req_one_access = list(301)
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/crew_quarters/pilot_room)
 "Gx" = (
@@ -9242,17 +9316,9 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/brig)
-"GN" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/girder,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering)
 "GQ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/blue,
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "GT" = (
@@ -9353,6 +9419,7 @@
 	dir = 8
 	},
 /obj/structure/table/steel,
+/obj/item/stack/marker_beacon/thirty,
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/refining)
 "Hh" = (
@@ -9445,10 +9512,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/bridge)
 "HA" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/door/firedoor/glass/talon,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9456,6 +9519,11 @@
 	name = "Talon Armory";
 	req_one_access = list(301)
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/armory)
 "HC" = (
@@ -9477,7 +9545,8 @@
 "HE" = (
 /obj/item/modular_computer/console/preset/talon,
 /obj/structure/cable/green{
-	dir = 1;
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/carpet/blucarpet,
@@ -9536,10 +9605,6 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "HK" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/alarm/talon{
@@ -9547,6 +9612,11 @@
 	pixel_x = 22
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "HN" = (
@@ -9583,6 +9653,7 @@
 	dir = 4;
 	pixel_x = -24
 	},
+/obj/effect/catwalk_plated/dark,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "HW" = (
@@ -9665,7 +9736,7 @@
 /obj/machinery/door/blast/regular/open{
 	id = "talon_boat_west"
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "Ii" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -9759,6 +9830,9 @@
 /obj/machinery/camera/network/talon{
 	dir = 1
 	},
+/obj/structure/safe/floor{
+	name = "smuggling compartment"
+	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/talon_v2/crew_quarters/cap_room)
 "It" = (
@@ -9909,16 +9983,17 @@
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/meditation)
 "IW" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/sign/department/armory{
 	name = "GUARD'S QUARTERS";
 	pixel_x = -32
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "IY" = (
@@ -10009,7 +10084,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/aux{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "Jp" = (
 /obj/structure/closet/excavation,
@@ -10055,10 +10130,6 @@
 /obj/machinery/atmospherics/pipe/simple/visible/red{
 	dir = 9
 	},
-/obj/structure/railing/grey,
-/obj/structure/railing/grey{
-	dir = 4
-	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "Jz" = (
@@ -10069,6 +10140,9 @@
 /obj/structure/handrail{
 	dir = 1
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/wing_port)
 "JA" = (
@@ -10160,12 +10234,13 @@
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/eng_room)
 "JL" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "JO" = (
@@ -10438,6 +10513,10 @@
 /obj/structure/closet/walllocker/medical/east,
 /obj/item/weapon/storage/firstaid/regular,
 /obj/item/weapon/storage/firstaid/o2,
+/obj/item/weapon/extinguisher/mini,
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/talonboat)
 "KO" = (
@@ -10641,8 +10720,6 @@
 /turf/simulated/floor/reinforced/airless,
 /area/space)
 "LA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/catwalk,
 /obj/structure/barricade,
 /turf/simulated/floor/plating,
@@ -10665,16 +10742,17 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "LD" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "LF" = (
@@ -10715,7 +10793,8 @@
 /obj/machinery/light,
 /obj/item/stack/cable_coil/green,
 /obj/item/stack/cable_coil/green,
-/turf/simulated/floor/tiled/techfloor,
+/obj/item/weapon/extinguisher,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "LN" = (
 /obj/structure/cable/green{
@@ -10907,7 +10986,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "MG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -11114,7 +11193,8 @@
 	},
 /obj/structure/table/rack/shelf/steel,
 /obj/item/device/radio/off{
-	channels = list("Talon" = 1)
+	channels = list("Talon" = 1);
+	pixel_y = 6
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/armory)
@@ -11224,6 +11304,7 @@
 /obj/effect/map_helper/airlock/atmos/chamber_pump,
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
 /obj/structure/handrail,
+/obj/effect/floor_decal/industrial/warning/corner,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/wing_starboard)
 "NU" = (
@@ -11679,7 +11760,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "Pr" = (
 /obj/machinery/shower,
@@ -11989,11 +12070,13 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/maintenance/wing_starboard)
 "Qu" = (
-/obj/structure/catwalk,
 /obj/machinery/firealarm{
 	dir = 4;
 	pixel_x = 26
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/maintenance/aft_port)
 "Qv" = (
@@ -12426,7 +12509,7 @@
 	dir = 4
 	},
 /obj/structure/handrail,
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "RQ" = (
 /turf/simulated/wall/shull,
@@ -12525,10 +12608,6 @@
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/cap_room)
 "St" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/structure/cable/green{
 	d1 = 2;
 	d2 = 8;
@@ -12537,6 +12616,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "Su" = (
@@ -12654,15 +12738,16 @@
 "SQ" = (
 /obj/machinery/door/firedoor/glass/talon,
 /obj/machinery/door/airlock/glass,
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "ST" = (
@@ -12685,7 +12770,8 @@
 /area/talon_v2/maintenance/wing_starboard)
 "SU" = (
 /obj/structure/cable/green{
-	dir = 1;
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -12862,16 +12948,17 @@
 /turf/simulated/wall/shull,
 /area/talon_v2/maintenance/wing_port)
 "TB" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/effect/catwalk_plated,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/central_hallway/port)
 "TD" = (
@@ -13026,6 +13113,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible/blue{
 	dir = 10
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "Uj" = (
@@ -13118,6 +13206,9 @@
 /obj/structure/handrail{
 	dir = 1
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/wing_starboard)
 "Uu" = (
@@ -13152,7 +13243,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "Uz" = (
 /obj/structure/catwalk,
@@ -13284,10 +13375,6 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/maintenance/aft_port)
 "Vi" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
@@ -13297,6 +13384,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "Vj" = (
@@ -13610,10 +13702,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/maintenance/wing_starboard)
 "Wt" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
@@ -13631,6 +13719,11 @@
 	pixel_x = 32;
 	pixel_y = 3
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/talon_v2/central_hallway)
 "Wu" = (
@@ -13702,6 +13795,7 @@
 /obj/machinery/atmospherics/pipe/manifold/visible/blue{
 	dir = 8
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "WQ" = (
@@ -13801,10 +13895,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/brig)
 "Xn" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
@@ -13820,6 +13910,11 @@
 	pixel_x = 32;
 	pixel_y = 3
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway)
 "Xo" = (
@@ -13886,6 +13981,9 @@
 /obj/structure/closet/walllocker/medical/south,
 /obj/item/weapon/storage/firstaid/regular,
 /obj/item/weapon/storage/firstaid/o2,
+/obj/item/device/radio/off{
+	channels = list("Talon" = 1)
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/central_hallway/fore)
 "XG" = (
@@ -13965,9 +14063,6 @@
 	dir = 1;
 	pixel_y = 32
 	},
-/obj/structure/bed/chair/bay/chair{
-	dir = 4
-	},
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/bar)
 "XW" = (
@@ -14211,6 +14306,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass/talon,
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/brig)
 "YJ" = (
@@ -14303,12 +14401,13 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/starboard)
 "YX" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "1-2"
-	},
 /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"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/secure_storage)
 "YY" = (
@@ -14569,6 +14668,9 @@
 /obj/structure/handrail{
 	dir = 1
 	},
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/fore_port)
 "ZJ" = (
@@ -22095,9 +22197,9 @@ Oj
 Oj
 WZ
 NB
-gI
+TX
 LA
-uB
+Mi
 tC
 tC
 tC
@@ -22664,7 +22766,7 @@ Kx
 Zc
 oG
 OP
-dR
+wS
 dR
 Ha
 ti
@@ -22811,7 +22913,7 @@ BT
 ZB
 Jv
 hp
-DR
+aI
 pR
 KU
 FJ
@@ -22953,7 +23055,7 @@ ZS
 nP
 CC
 rz
-DM
+CD
 yc
 KU
 rJ
@@ -23374,10 +23476,10 @@ Oj
 Zc
 mk
 yF
-dR
+pE
 BO
 DP
-yq
+DM
 CD
 mX
 GY
@@ -23516,7 +23618,7 @@ Gl
 wW
 XY
 IG
-WY
+CA
 Jw
 jC
 pr
@@ -23661,7 +23763,7 @@ Fo
 pE
 AE
 zV
-Bn
+DR
 EI
 Xp
 dq
@@ -24058,7 +24160,7 @@ IW
 ej
 mc
 mc
-qj
+SQ
 Xn
 Vi
 pp
@@ -24084,7 +24186,7 @@ jO
 Zc
 rk
 Nh
-CA
+Gh
 TZ
 OJ
 qw
@@ -25082,7 +25184,7 @@ Sr
 jc
 LN
 Im
-GN
+LN
 gj
 SC
 Gb
@@ -25175,7 +25277,7 @@ JO
 JO
 JO
 XU
-By
+uB
 oh
 so
 Pk
@@ -25316,7 +25418,7 @@ aa
 XP
 XP
 JO
-wS
+OX
 qI
 oh
 DU