diff --git a/code/__defines/damage_organs.dm b/code/__defines/damage_organs.dm
index 3c0e190427..114f9b7c11 100644
--- a/code/__defines/damage_organs.dm
+++ b/code/__defines/damage_organs.dm
@@ -6,6 +6,7 @@
#define OXY "oxy"
#define CLONE "clone"
#define HALLOSS "halloss"
+#define ELECTROCUTE "electrocute"
#define CUT "cut"
#define BRUISE "bruise"
diff --git a/code/datums/supplypacks/engineering.dm b/code/datums/supplypacks/engineering.dm
index f74320cfe2..c4951dd5f2 100644
--- a/code/datums/supplypacks/engineering.dm
+++ b/code/datums/supplypacks/engineering.dm
@@ -21,6 +21,48 @@
containertype = /obj/structure/closet/crate/engineering
containername = "Superconducting Magnetic Coil crate"
+/datum/supply_packs/eng/shield_capacitor
+ name = "Shield Capacitor"
+ contains = list(/obj/machinery/shield_capacitor)
+ cost = 20
+ containertype = /obj/structure/closet/crate/engineering
+ containername = "shield capacitor crate"
+
+/datum/supply_packs/eng/shield_capacitor/advanced
+ name = "Advanced Shield Capacitor"
+ contains = list(/obj/machinery/shield_capacitor/advanced)
+ cost = 30
+ containertype = /obj/structure/closet/crate/engineering
+ containername = "advanced shield capacitor crate"
+
+/datum/supply_packs/eng/bubble_shield
+ name = "Bubble Shield Generator"
+ contains = list(/obj/machinery/shield_gen)
+ cost = 40
+ containertype = /obj/structure/closet/crate/engineering
+ containername = "shield bubble generator crate"
+
+/datum/supply_packs/eng/bubble_shield/advanced
+ name = "Advanced Bubble Shield Generator"
+ contains = list(/obj/machinery/shield_gen/advanced)
+ cost = 60
+ containertype = /obj/structure/closet/crate/engineering
+ containername = "advanced bubble shield generator crate"
+
+/datum/supply_packs/eng/hull_shield
+ name = "Hull Shield Generator"
+ contains = list(/obj/machinery/shield_gen/external)
+ cost = 80
+ containertype = /obj/structure/closet/crate/engineering
+ containername = "shield hull generator crate"
+
+/datum/supply_packs/eng/hull_shield/advanced
+ name = "Advanced Hull Shield Generator"
+ contains = list(/obj/machinery/shield_gen/external/advanced)
+ cost = 120
+ containertype = /obj/structure/closet/crate/engineering
+ containername = "advanced hull shield generator crate"
+
/datum/supply_packs/eng/electrical
name = "Electrical maintenance crate"
contains = list(
diff --git a/code/game/antagonist/station/thug.dm b/code/game/antagonist/station/thug.dm
index 54f5f83663..2ea752e3b7 100644
--- a/code/game/antagonist/station/thug.dm
+++ b/code/game/antagonist/station/thug.dm
@@ -13,5 +13,5 @@ var/datum/antagonist/thug/thugs
Try to make sure other players have fun! If you are confused or at a loss, always adminhelp, \
and before taking extreme actions, please try to also contact the administration! \
Think through your actions and make the roleplay immersive! Please remember all \
- rules aside from those without explicit exceptions apply to antagonists."
- flags = ANTAG_SUSPICIOUS | ANTAG_IMPLANT_IMMUNE | ANTAG_RANDSPAWN | ANTAG_VOTABLE
\ No newline at end of file
+ rules aside from those with explicit exceptions apply to antagonists."
+ flags = ANTAG_SUSPICIOUS | ANTAG_IMPLANT_IMMUNE | ANTAG_RANDSPAWN | ANTAG_VOTABLE
diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm
index e54eb3c1cd..7c6a9cc7af 100644
--- a/code/game/gamemodes/changeling/changeling_powers.dm
+++ b/code/game/gamemodes/changeling/changeling_powers.dm
@@ -219,7 +219,11 @@ turf/proc/AdjacentTurfsRangedSting()
victims += C
var/mob/living/carbon/T = input(src, "Who will we sting?") as null|anything in victims
- if(!T) return
+ if(!T)
+ return
+ if(T.isSynthetic())
+ src << "We are unable to pierce the outer shell of [T]."
+ return
if(!(T in view(changeling.sting_range))) return
if(!sting_can_reach(T, changeling.sting_range)) return
if(!changeling_power(required_chems)) return
diff --git a/code/game/gamemodes/changeling/powers/armblade.dm b/code/game/gamemodes/changeling/powers/armblade.dm
index 139950e900..5ab724789b 100644
--- a/code/game/gamemodes/changeling/powers/armblade.dm
+++ b/code/game/gamemodes/changeling/powers/armblade.dm
@@ -134,4 +134,5 @@
/obj/item/weapon/melee/changeling/claw/greater
name = "hand greatclaw"
force = 20
- armor_penetration = 20
\ No newline at end of file
+ armor_penetration = 20
+ pry = 1
\ No newline at end of file
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index ca1d5639e9..8db7a49255 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -123,7 +123,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
if(word1 == cultwords["hell"] && word2 == cultwords["join"] && word3 == cultwords["self"])
return tearreality()
if(word1 == cultwords["destroy"] && word2 == cultwords["see"] && word3 == cultwords["technology"])
- return emp(src.loc,3)
+ return emp(src.loc,5)
if(word1 == cultwords["travel"] && word2 == cultwords["blood"] && word3 == cultwords["self"])
return drain()
if(word1 == cultwords["see"] && word2 == cultwords["hell"] && word3 == cultwords["join"])
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 64f07bd1d5..5669981f77 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -56,31 +56,31 @@
if(shocked)
shock(user, 50)
-
- var/dat = "
Autolathe Control Panel
"
+ var/list/dat = list()
+ dat += "Autolathe Control Panel
"
if(!disabled)
dat += ""
- var/material_top = ""
- var/material_bottom = "
"
+ var/list/material_top = list("
")
+ var/list/material_bottom = list("
")
for(var/material in stored_material)
material_top += "| [material] | "
material_bottom += "[stored_material[material]]/[storage_capacity[material]] | "
- dat += "[material_top]
[material_bottom]
"
+ dat += "[material_top.Join()][material_bottom.Join()]
"
dat += "Printable Designs
"
for(var/datum/category_item/autolathe/R in current_category.items)
if(R.hidden && !hacked)
continue
var/can_make = 1
- var/material_string = ""
- var/multiplier_string = ""
+ var/list/material_string = list()
+ var/list/multiplier_string = list()
var/max_sheets
var/comma
if(!R.resources || !R.resources.len)
- material_string = "No resources required."
+ material_string += "No resources required."
else
//Make sure it's buildable and list requires resources.
for(var/material in R.resources)
@@ -99,12 +99,12 @@
if(R.is_stack)
if(max_sheets && max_sheets > 0)
max_sheets = min(max_sheets, R.max_stack) // Limit to the max allowed by stack type.
- multiplier_string += "
"
+ multiplier_string += "
"
for(var/i = 5;i\[x[i]\]"
multiplier_string += "\[x[max_sheets]\]"
- dat += "| [R.hidden ? "*" : ""][can_make ? "" : ""][R.name][can_make ? "" : ""][R.hidden ? "*" : ""][multiplier_string] | [material_string] |
"
+ dat += "| [R.hidden ? "*" : ""][can_make ? "" : ""][R.name][can_make ? "" : ""][R.hidden ? "*" : ""][multiplier_string.Join()] | [material_string.Join()] |
"
dat += "
"
//Hacking.
@@ -114,7 +114,7 @@
dat += "
"
- user << browse(dat, "window=autolathe")
+ user << browse(dat.Join(), "window=autolathe")
onclose(user, "autolathe")
/obj/machinery/autolathe/attackby(var/obj/item/O as obj, var/mob/user as mob)
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 96ab5eab20..87077b68db 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -289,3 +289,27 @@
if(!usr.incapacitated())
return
go_in(usr)
+
+/obj/machinery/recharge_station/ghost_pod_recharger
+ name = "drone pod"
+ desc = "This is a pod which used to contain a drone... Or maybe it still does?"
+ icon = 'icons/obj/structures.dmi'
+
+/obj/machinery/recharge_station/ghost_pod_recharger/update_icon()
+ ..()
+ if(stat & BROKEN)
+ icon_state = "borg_pod_closed"
+ desc = "It appears broken..."
+ return
+
+ if(occupant)
+ if((stat & NOPOWER) && !has_cell_power())
+ icon_state = "borg_pod_closed"
+ desc = "It appears to be unpowered..."
+ else
+ icon_state = "borg_pod_closed"
+ else
+ icon_state = "borg_pod_opened"
+
+ if(icon_update_tick == 0)
+ build_overlays()
\ No newline at end of file
diff --git a/code/game/machinery/vr_console.dm b/code/game/machinery/vr_console.dm
new file mode 100644
index 0000000000..ff156fa287
--- /dev/null
+++ b/code/game/machinery/vr_console.dm
@@ -0,0 +1,222 @@
+/obj/machinery/vr_sleeper
+ name = "VR sleeper"
+ desc = "A fancy bed with built-in sensory I/O ports and connectors to interface users' minds with their bodies in virtual reality."
+ icon = 'icons/obj/Cryogenic2.dmi'
+ icon_state = "syndipod_0"
+ density = 1
+ anchored = 1
+ circuit = /obj/item/weapon/circuitboard/vr_sleeper
+ var/mob/living/carbon/human/occupant = null
+ var/mob/living/carbon/human/avatar = null
+ var/datum/mind/vr_mind = null
+
+ use_power = 1
+ idle_power_usage = 15
+ active_power_usage = 200
+ light_color = "#FF0000"
+
+/obj/machinery/vr_sleeper/New()
+ ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
+ component_parts += new /obj/item/stack/material/glass/reinforced(src, 2)
+
+ RefreshParts()
+
+/obj/machinery/vr_sleeper/initialize()
+ update_icon()
+
+/obj/machinery/vr_sleeper/process()
+ if(stat & (NOPOWER|BROKEN))
+ return
+
+/obj/machinery/vr_sleeper/update_icon()
+ icon_state = "syndipod_[occupant ? "1" : "0"]"
+
+/obj/machinery/vr_sleeper/Topic(href, href_list)
+ if(..())
+ return 1
+
+ if(usr == occupant)
+ to_chat(usr, "You can't reach the controls from the inside.")
+ return
+
+ add_fingerprint(usr)
+
+ if(href_list["eject"])
+ go_out()
+
+ return 1
+
+/obj/machinery/vr_sleeper/attackby(var/obj/item/I, var/mob/user)
+ add_fingerprint(user)
+ if(default_deconstruction_screwdriver(user, I))
+ return
+ else if(default_deconstruction_crowbar(user, I))
+ return
+
+
+/obj/machinery/vr_sleeper/MouseDrop_T(var/mob/target, var/mob/user)
+ if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user)|| !isliving(target))
+ return
+ go_in(target, user)
+
+
+
+/obj/machinery/sleeper/relaymove(var/mob/user)
+ ..()
+ if(usr.incapacitated())
+ return
+ go_out()
+
+
+
+/obj/machinery/vr_sleeper/emp_act(var/severity)
+ if(stat & (BROKEN|NOPOWER))
+ ..(severity)
+ return
+
+ if(occupant)
+ // This will eject the user from VR
+ // ### Fry the brain?
+ go_out()
+
+ ..(severity)
+
+/obj/machinery/vr_sleeper/verb/eject()
+ set src in oview(1)
+ set category = "Object"
+ set name = "Eject VR Capsule"
+
+ if(usr.incapacitated())
+ return
+
+ if(usr != occupant && avatar && alert(avatar, "Someone wants to remove you from virtual reality. Do you want to leave?", "Leave VR?", "Yes", "No") == "No")
+ return
+
+ // The player in VR is fine with leaving, kick them out and reset avatar
+ avatar.exit_vr()
+ avatar = null
+ go_out()
+ add_fingerprint(usr)
+
+/obj/machinery/vr_sleeper/verb/climb_in()
+ set src in oview(1)
+ set category = "Object"
+ set name = "Enter VR Capsule"
+
+ if(usr.incapacitated())
+ return
+ go_in(usr, usr)
+ add_fingerprint(usr)
+
+/obj/machinery/vr_sleeper/relaymove(mob/user as mob)
+ if(user.incapacitated())
+ return 0 //maybe they should be able to get out with cuffs, but whatever
+ go_out()
+
+/obj/machinery/vr_sleeper/proc/go_in(var/mob/M, var/mob/user)
+ if(!M)
+ return
+ if(stat & (BROKEN|NOPOWER))
+ return
+ if(!ishuman(M))
+ user << "\The [src] rejects [M] with a sharp beep."
+ if(occupant)
+ user << "\The [src] is already occupied."
+ return
+
+ if(M == user)
+ visible_message("\The [user] starts climbing into \the [src].")
+ else
+ visible_message("\The [user] starts putting [M] into \the [src].")
+
+ if(do_after(user, 20))
+ if(occupant)
+ to_chat(user, "\The [src] is already occupied.")
+ return
+ M.stop_pulling()
+ if(M.client)
+ M.client.perspective = EYE_PERSPECTIVE
+ M.client.eye = src
+ M.loc = src
+ update_use_power(2)
+ occupant = M
+
+ update_icon()
+
+ enter_vr()
+ return
+
+/obj/machinery/vr_sleeper/proc/go_out()
+ if(!occupant)
+ return
+
+ if(occupant.client)
+ occupant.client.eye = occupant.client.mob
+ occupant.client.perspective = MOB_PERSPECTIVE
+ occupant.loc = src.loc
+ occupant = null
+ for(var/atom/movable/A in src) // In case an object was dropped inside or something
+ if(A == circuit)
+ continue
+ if(A in component_parts)
+ continue
+ A.loc = src.loc
+ update_use_power(1)
+ update_icon()
+
+/obj/machinery/vr_sleeper/proc/enter_vr()
+
+ // No mob to transfer a mind from
+ if(!occupant)
+ return
+
+ // No mind to transfer
+ if(!occupant.mind)
+ return
+
+ // Mob doesn't have an active consciousness to send/receive from
+ if(occupant.stat != CONSCIOUS)
+ return
+
+ avatar = occupant.vr_link
+ // If they've already enterred VR, and are reconnecting, prompt if they want a new body
+ if(avatar && alert(occupant, "You already have a Virtual Reality avatar. Would you like to use it?", "New avatar", "Yes", "No") == "No")
+ // Delink the mob
+ occupant.vr_link = null
+ avatar = null
+
+ if(!avatar)
+ // Get the desired spawn location to put the body
+ var/S = null
+ var/list/vr_landmarks = list()
+ for(var/obj/effect/landmark/virtual_reality/sloc in landmarks_list)
+ vr_landmarks += sloc.name
+
+ S = input(occupant, "Please select a location to spawn your avatar at:", "Spawn location") as null|anything in vr_landmarks
+ if(!S)
+ return 0
+
+ for(var/obj/effect/landmark/virtual_reality/i in landmarks_list)
+ if(i.name == S)
+ S = i
+ break
+
+ avatar = new(S, "Virtual Reality Avatar")
+ // If the user has a non-default (Human) bodyshape, make it match theirs.
+ if(occupant.species.name != "Promethean" && occupant.species.name != "Human")
+ avatar.shapeshifter_change_shape(occupant.species.name)
+ avatar.forceMove(get_turf(S)) // Put the mob on the landmark, instead of inside it
+ avatar.Sleeping(1)
+
+ occupant.enter_vr(avatar)
+
+ // Prompt for username after they've enterred the body.
+ var/newname = sanitize(input(avatar, "You are enterring virtual reality. Your username is currently [src.name]. Would you like to change it to something else?", "Name change") as null|text, MAX_NAME_LEN)
+ if (newname)
+ avatar.real_name = newname
+
+ else
+ occupant.enter_vr(avatar)
+
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 547406aa1d..b8cb8006d2 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -107,6 +107,18 @@
return 1
+/obj/effect/landmark/virtual_reality
+ name = "virtual_reality"
+ icon = 'icons/mob/screen1.dmi'
+ icon_state = "x"
+ anchored = 1.0
+
+/obj/effect/landmark/virtual_reality/New()
+ ..()
+ tag = "virtual_reality*[name]"
+ invisibility = 101
+ return 1
+
//Costume spawner landmarks
/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 6b4a09c6a5..8b00612641 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -80,6 +80,7 @@
var/list/sprite_sheets_obj = list()
var/toolspeed = 1.0 // This is a multipler on how 'fast' a tool works. e.g. setting this to 0.5 will make the tool work twice as fast.
+ var/addblends // Icon overlay for ADD highlights when applicable.
/obj/item/New()
..()
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 53d647a4f0..ca4b8d8066 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -8,7 +8,7 @@
var/spamcheck = 0
var/emagged = 0
var/insults = 0
- var/list/insultmsg = list("FUCK EVERYONE!", "I'M A TATER!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!")
+ var/list/insultmsg = list("FUCK EVERYONE!", "I'M A TERRORIST!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "GLORY TO ALMACH!")
/obj/item/device/megaphone/attack_self(mob/living/user as mob)
if (user.client)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 6065d6a514..a79faa60d2 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -699,54 +699,6 @@
desc = "A \"Space Life\" brand Emergency Response Team Commander action figure."
icon_state = "ert"
-/obj/item/toy/therapy_red
- name = "red therapy doll"
- desc = "A toy for therapeutic and recreational purposes. This one is red."
- icon = 'icons/obj/toy.dmi'
- icon_state = "therapyred"
- item_state = "egg4" // It's the red egg in items_left/righthand
- w_class = ITEMSIZE_TINY
-
-/obj/item/toy/therapy_purple
- name = "purple therapy doll"
- desc = "A toy for therapeutic and recreational purposes. This one is purple."
- icon = 'icons/obj/toy.dmi'
- icon_state = "therapypurple"
- item_state = "egg1" // It's the magenta egg in items_left/righthand
- w_class = ITEMSIZE_TINY
-
-/obj/item/toy/therapy_blue
- name = "blue therapy doll"
- desc = "A toy for therapeutic and recreational purposes. This one is blue."
- icon = 'icons/obj/toy.dmi'
- icon_state = "therapyblue"
- item_state = "egg2" // It's the blue egg in items_left/righthand
- w_class = ITEMSIZE_TINY
-
-/obj/item/toy/therapy_yellow
- name = "yellow therapy doll"
- desc = "A toy for therapeutic and recreational purposes. This one is yellow."
- icon = 'icons/obj/toy.dmi'
- icon_state = "therapyyellow"
- item_state = "egg5" // It's the yellow egg in items_left/righthand
- w_class = ITEMSIZE_TINY
-
-/obj/item/toy/therapy_orange
- name = "orange therapy doll"
- desc = "A toy for therapeutic and recreational purposes. This one is orange."
- icon = 'icons/obj/toy.dmi'
- icon_state = "therapyorange"
- item_state = "egg4" // It's the red one again, lacking an orange item_state and making a new one is pointless
- w_class = ITEMSIZE_TINY
-
-/obj/item/toy/therapy_green
- name = "green therapy doll"
- desc = "A toy for therapeutic and recreational purposes. This one is green."
- icon = 'icons/obj/toy.dmi'
- icon_state = "therapygreen"
- item_state = "egg3" // It's the green egg in items_left/righthand
- w_class = ITEMSIZE_TINY
-
/*
* Plushies
*/
@@ -800,9 +752,10 @@
//Small plushies.
/obj/item/toy/plushie
name = "generic small plush"
- desc = "A very generic small plushie. It seems to not want to exist."
+ desc = "A small toy plushie. It's very cute."
icon = 'icons/obj/toy.dmi'
icon_state = "nymphplushie"
+ w_class = ITEMSIZE_TINY
var/last_message = 0
/obj/item/toy/plushie/attack_self(mob/user as mob)
@@ -815,9 +768,24 @@
else if (user.a_intent == I_GRAB)
user.visible_message("\The [user] attempts to strangle [src]!","You attempt to strangle [src]!")
else
- user.visible_message("\The [user] pokes the [src].","You poke the [src].")
+ user.visible_message("\The [user] pokes [src].","You poke [src].")
last_message = world.time
+obj/item/toy/plushie/verb/rename_plushie()
+ set name = "Name Plushie"
+ set category = "Object"
+ set desc = "Give your plushie a cute name!"
+ w_class = ITEMSIZE_TINY
+ var/mob/M = usr
+ if(!M.mind) return 0
+
+ var/input = sanitizeSafe(input("What do you want to name the plushie?", ,""), MAX_NAME_LEN)
+
+ if(src && input && !M.stat && in_range(M,src))
+ name = input
+ to_chat(M, "You name the plushie [input], giving it a hug for good luck.")
+ return 1
+
/obj/item/toy/plushie/nymph
name = "diona nymph plush"
desc = "A plushie of an adorable diona nymph! While its level of self-awareness is still being debated, its level of cuteness is not."
@@ -830,7 +798,7 @@
/obj/item/toy/plushie/kitten
name = "kitten plush"
- desc = "A plushie of a cute kitten! Watch as it purrs it's way right into your heart."
+ desc = "A plushie of a cute kitten! Watch as it purrs its way right into your heart."
icon_state = "kittenplushie"
/obj/item/toy/plushie/lizard
@@ -848,6 +816,49 @@
desc = "A farwa plush doll. It's soft and comforting!"
icon_state = "farwaplushie"
+/obj/item/toy/plushie/therapy/red
+ name = "red therapy doll"
+ desc = "A toy for therapeutic and recreational purposes. This one is red."
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "therapyred"
+ item_state = "egg4" // It's the red egg in items_left/righthand
+
+/obj/item/toy/plushie/therapy/purple
+ name = "purple therapy doll"
+ desc = "A toy for therapeutic and recreational purposes. This one is purple."
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "therapypurple"
+ item_state = "egg1" // It's the magenta egg in items_left/righthand
+
+/obj/item/toy/plushie/therapy/blue
+ name = "blue therapy doll"
+ desc = "A toy for therapeutic and recreational purposes. This one is blue."
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "therapyblue"
+ item_state = "egg2" // It's the blue egg in items_left/righthand
+
+/obj/item/toy/plushie/therapy/yellow
+ name = "yellow therapy doll"
+ desc = "A toy for therapeutic and recreational purposes. This one is yellow."
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "therapyyellow"
+ item_state = "egg5" // It's the yellow egg in items_left/righthand
+
+/obj/item/toy/plushie/therapy/orange
+ name = "orange therapy doll"
+ desc = "A toy for therapeutic and recreational purposes. This one is orange."
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "therapyorange"
+ item_state = "egg4" // It's the red one again, lacking an orange item_state and making a new one is pointless
+
+/obj/item/toy/plushie/therapy/green
+ name = "green therapy doll"
+ desc = "A toy for therapeutic and recreational purposes. This one is green."
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "therapygreen"
+ item_state = "egg3" // It's the green egg in items_left/righthand
+
+
//Toy cult sword
/obj/item/toy/cultsword
name = "foam sword"
diff --git a/code/game/objects/items/weapons/circuitboards/frame.dm b/code/game/objects/items/weapons/circuitboards/frame.dm
index fa48be65bb..3cbc54e855 100644
--- a/code/game/objects/items/weapons/circuitboards/frame.dm
+++ b/code/game/objects/items/weapons/circuitboards/frame.dm
@@ -202,6 +202,15 @@
/obj/item/weapon/reagent_containers/syringe = 3,
/obj/item/stack/material/glass/reinforced = 2)
+/obj/item/weapon/circuitboard/vr_sleeper
+ name = T_BOARD("VR sleeper")
+ build_path = /obj/machinery/vr_sleeper
+ board_type = new /datum/frame/frame_types/medical_pod
+ origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
+ req_components = list(
+ /obj/item/weapon/stock_parts/scanning_module = 1,
+ /obj/item/stack/material/glass/reinforced = 2)
+
/obj/item/weapon/circuitboard/dna_analyzer
name = T_BOARD("dna analyzer")
build_path = /obj/machinery/dnaforensics
diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm
index f075ea49f9..e0975361eb 100644
--- a/code/game/objects/items/weapons/id cards/station_ids.dm
+++ b/code/game/objects/items/weapons/id cards/station_ids.dm
@@ -373,8 +373,8 @@
job_access_type = /datum/job/bartender
/obj/item/weapon/card/id/civilian/botanist
- assignment = "Gardener"
- rank = "Gardener"
+ assignment = "Botanist"
+ rank = "Botanist"
job_access_type = /datum/job/hydro
/obj/item/weapon/card/id/civilian/chaplain
diff --git a/code/game/objects/items/weapons/implants/implantreagent_vr.dm b/code/game/objects/items/weapons/implants/implantreagent_vr.dm
index 6c7eb572e2..1c4e9a9b04 100644
--- a/code/game/objects/items/weapons/implants/implantreagent_vr.dm
+++ b/code/game/objects/items/weapons/implants/implantreagent_vr.dm
@@ -2,8 +2,8 @@
name = "reagent generator implant"
desc = "This is an implant that has attached storage and generates a reagent."
implant_color = "r"
- var/datum/reagent/generated_reagent = null
- var/gen_amount = 2 //amount of reagent generated per process tick
+ var/list/generated_reagents = list("water" = 2) //Any number of reagents, the associated value is how many units are generated per process()
+ var/reagent_name = "water" //What is shown when reagents are removed, doesn't need to be an actual reagent
var/gen_cost = 0.5 //amount of nutrient taken from the host per process tick
var/transfer_amount = 30 //amount transferred when using verb
var/usable_volume = 120
@@ -15,7 +15,7 @@
var/list/random_emote = list() //An emote the person with the implant may be forced to perform after a prob check, such as [X] meows.
var/assigned_proc = /mob/living/carbon/human/proc/use_reagent_implant
var/verb_name = "Transfer From Reagent Implant"
- var/verb_desc = "Remove reagents from am internal reagent into a container"
+ var/verb_desc = "Remove reagents from an internal reagent into a container"
/obj/item/weapon/implant/reagent_generator/New()
..()
@@ -38,7 +38,7 @@
/obj/item/weapon/implant/reagent_generator/process()
var/before_gen
- if(imp_in && generated_reagent)
+ if(imp_in && generated_reagents)
before_gen = reagents.total_volume
if(reagents.total_volume < reagents.maximum_volume)
if(imp_in.nutrition >= gen_cost)
@@ -57,7 +57,8 @@
/obj/item/weapon/implant/reagent_generator/proc/do_generation()
imp_in.nutrition -= gen_cost
- reagents.add_reagent(generated_reagent, gen_amount)
+ for(var/reagent in generated_reagents)
+ reagents.add_reagent(reagent, generated_reagents[reagent])
/mob/living/carbon/human/proc/use_reagent_implant()
set name = "Transfer From Reagent Implant"
@@ -90,7 +91,7 @@
var/container_name = container.name
if(rimplant.reagents.trans_to(container, amount = rimplant.transfer_amount))
user.visible_message("[usr] [pick(rimplant.emote_descriptor)] into \the [container_name].",
- "You [pick(rimplant.self_emote_descriptor)] some [rimplant.generated_reagent] into \the [container_name].")
+ "You [pick(rimplant.self_emote_descriptor)] some [rimplant.reagent_name] into \the [container_name].")
if(prob(5))
src.visible_message("[src] [pick(rimplant.random_emote)].") // M-mlem.
if(rimplant.reagents.total_volume == rimplant.reagents.maximum_volume * 0.05)
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 194a017df9..ce3d6c023a 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -655,6 +655,61 @@
nextrefueltick = world.time + 10
reagents.add_reagent("fuel", 1)
+/*
+ * Backpack Welder.
+ */
+
+/obj/item/weapon/weldingtool/tubefed
+ name = "tube-fed welding tool"
+ desc = "A bulky, cooler-burning welding tool that draws from a worn welding tank."
+ icon_state = "tubewelder"
+ max_fuel = 10
+ w_class = ITEMSIZE_NO_CONTAINER
+ matter = null
+ toolspeed = 1.25
+ change_icons = 0
+ flame_intensity = 1
+ eye_safety_modifier = 1
+ always_process = TRUE
+ var/obj/item/weapon/weldpack/mounted_pack = null
+
+/obj/item/weapon/weldingtool/tubefed/New(location)
+ ..()
+ if(istype(location, /obj/item/weapon/weldpack))
+ var/obj/item/weapon/weldpack/holder = location
+ mounted_pack = holder
+ else
+ qdel(src)
+
+/obj/item/weapon/weldingtool/tubefed/Destroy()
+ mounted_pack.nozzle = null
+ mounted_pack = null
+ return ..()
+
+/obj/item/weapon/weldingtool/tubefed/process()
+ if(mounted_pack)
+ if(!istype(mounted_pack.loc,/mob/living/carbon/human))
+ mounted_pack.return_nozzle()
+ else
+ var/mob/living/carbon/human/H = mounted_pack.loc
+ if(H.back != mounted_pack)
+ mounted_pack.return_nozzle()
+
+ if(mounted_pack.loc != src.loc && src.loc != mounted_pack)
+ mounted_pack.return_nozzle()
+ visible_message("\The [src] retracts to its fueltank.")
+
+ if(get_fuel() <= get_max_fuel())
+ mounted_pack.reagents.trans_to_obj(src, 1)
+
+ ..()
+
+/obj/item/weapon/weldingtool/tubefed/dropped(mob/user)
+ ..()
+ if(src.loc != user)
+ mounted_pack.return_nozzle()
+ to_chat(user, "\The [src] retracts to its fueltank.")
+
/*
* Electric/Arc Welder
*/
diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm
index 6a6d77521e..0312ca55f8 100644
--- a/code/game/objects/items/weapons/weldbackpack.dm
+++ b/code/game/objects/items/weapons/weldbackpack.dm
@@ -6,46 +6,140 @@
icon_state = "welderpack"
w_class = ITEMSIZE_LARGE
var/max_fuel = 350
+ var/obj/item/weapon/nozzle = null //Attached welder, or other spray device.
+ var/nozzle_attached = 0
/obj/item/weapon/weldpack/New()
var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
+ nozzle = new/obj/item/weapon/weldingtool/tubefed(src)
+ nozzle_attached = 1
+
+/obj/item/weapon/weldpack/Destroy()
+ qdel(nozzle)
+ nozzle = null
+ return ..()
+
+/obj/item/weapon/weldpack/dropped(mob/user)
+ ..()
+ if(nozzle)
+ user.remove_from_mob(nozzle)
+ return_nozzle()
+ to_chat(user, "\The [nozzle] retracts to its fueltank.")
+
+/obj/item/weapon/weldpack/proc/get_nozzle(var/mob/living/user)
+ if(!ishuman(user))
+ return 0
+
+ var/mob/living/carbon/human/H = user
+
+ if(H.hands_are_full()) //Make sure our hands aren't full.
+ to_chat(H, "Your hands are full. Drop something first.")
+ return 0
+
+ var/obj/item/weapon/F = nozzle
+ H.put_in_hands(F)
+ nozzle_attached = 0
+
+ return 1
+
+/obj/item/weapon/weldpack/proc/return_nozzle(var/mob/living/user)
+ nozzle.forceMove(src)
+ nozzle_attached = 1
/obj/item/weapon/weldpack/attackby(obj/item/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/weldingtool))
+ if(istype(W, /obj/item/weapon/weldingtool) && !(W == nozzle))
var/obj/item/weapon/weldingtool/T = W
if(T.welding & prob(50))
message_admins("[key_name_admin(user)] triggered a fueltank explosion.")
log_game("[key_name(user)] triggered a fueltank explosion.")
- user << "That was stupid of you."
+ to_chat(user,"That was stupid of you.")
explosion(get_turf(src),-1,0,2)
if(src)
qdel(src)
return
- else
+ else if(T.status)
if(T.welding)
- user << "That was close!"
+ to_chat(user,"That was close!")
src.reagents.trans_to_obj(W, T.max_fuel)
- user << "Welder refilled!"
+ to_chat(user, "Welder refilled!")
playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
return
- user << "The tank scoffs at your insolence. It only provides services to welders."
+ else if(nozzle)
+ if(nozzle == W)
+ if(!user.unEquip(W))
+ to_chat(user,"\The [W] seems to be stuck to your hand.")
+ return
+ if(!nozzle_attached)
+ return_nozzle()
+ to_chat(user,"You attach \the [W] to the [src].")
+ return
+ else
+ to_chat(user,"The [src] already has a nozzle!")
+ else
+ to_chat(user,"The tank scoffs at your insolence. It only provides services to welders.")
return
+/obj/item/weapon/weldpack/attack_hand(mob/user as mob)
+ if(istype(user, /mob/living/carbon/human))
+ var/mob/living/carbon/human/wearer = user
+ if(wearer.back == src)
+ if(nozzle && nozzle_attached)
+ if(!wearer.incapacitated())
+ get_nozzle(user)
+ else
+ to_chat(user,"\The [src] does not have a nozzle attached!")
+ else
+ ..()
+ else
+ ..()
+
/obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity)
if(!proximity) // this replaces and improves the get_dist(src,O) <= 1 checks used previously
return
if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel)
O.reagents.trans_to_obj(src, max_fuel)
- user << "You crack the cap off the top of the pack and fill it back up again from the tank."
+ to_chat(user,"You crack the cap off the top of the pack and fill it back up again from the tank.")
playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
return
else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel)
- user << "The pack is already full!"
+ to_chat(user,"The pack is already full!")
return
+/obj/item/weapon/weldpack/MouseDrop(obj/over_object as obj) //This is terrifying.
+ if(!canremove)
+ return
+
+ if (ishuman(usr) || issmall(usr)) //so monkeys can take off their backpacks -- Urist
+
+ if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech. why?
+ return
+
+ if (!( istype(over_object, /obj/screen) ))
+ return ..()
+
+ //makes sure that the thing is equipped, so that we can't drag it into our hand from miles away.
+ //there's got to be a better way of doing this.
+ if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
+ return
+
+ if (( usr.restrained() ) || ( usr.stat ))
+ return
+
+ if ((src.loc == usr) && !(istype(over_object, /obj/screen)) && !usr.unEquip(src))
+ return
+
+ switch(over_object.name)
+ if("r_hand")
+ usr.u_equip(src)
+ usr.put_in_r_hand(src)
+ if("l_hand")
+ usr.u_equip(src)
+ usr.put_in_l_hand(src)
+ src.add_fingerprint(usr)
+
/obj/item/weapon/weldpack/examine(mob/user)
..(user)
user << text("\icon[] [] units of fuel left!", src, src.reagents.total_volume)
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index 82545b5293..a244a02a08 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -518,12 +518,12 @@
/obj/random/toy/item_to_spawn()
return pick(/obj/item/toy/bosunwhistle,
- /obj/item/toy/therapy_red,
- /obj/item/toy/therapy_purple,
- /obj/item/toy/therapy_blue,
- /obj/item/toy/therapy_yellow,
- /obj/item/toy/therapy_orange,
- /obj/item/toy/therapy_green,
+ /obj/item/toy/plushie/therapy/red,
+ /obj/item/toy/plushie/therapy/purple,
+ /obj/item/toy/plushie/therapy/blue,
+ /obj/item/toy/plushie/therapy/yellow,
+ /obj/item/toy/plushie/therapy/orange,
+ /obj/item/toy/plushie/therapy/green,
/obj/item/toy/cultsword,
/obj/item/toy/katana,
/obj/item/toy/snappop,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 43f93f1faa..98ecb2bec7 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -258,8 +258,8 @@
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/camera(src)
- new /obj/item/toy/therapy_blue(src)
new /obj/item/weapon/storage/fancy/vials(src) //VOREStation Edit - adding vials for new hypo
+ new /obj/item/toy/plushie/therapy/blue(src)
return
/obj/structure/closet/secure_closet/psych
diff --git a/code/game/objects/structures/ghost_pods/ghost_pods.dm b/code/game/objects/structures/ghost_pods/ghost_pods.dm
index 7beba29caa..9eeefeee61 100644
--- a/code/game/objects/structures/ghost_pods/ghost_pods.dm
+++ b/code/game/objects/structures/ghost_pods/ghost_pods.dm
@@ -22,6 +22,8 @@
if(winner.len)
var/mob/observer/dead/D = winner[1]
create_occupant(D)
+ new /obj/machinery/recharge_station/ghost_pod_recharger(src.loc)
+ del(src)
return TRUE
else
return FALSE
@@ -29,7 +31,6 @@
// Override this to create whatever mob you need. Be sure to call ..() if you don't want it to make infinite mobs.
/obj/structure/ghost_pod/proc/create_occupant(var/mob/M)
used = TRUE
- icon_state = icon_state_opened
return TRUE
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 03128cccf0..d1a7e42908 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -20,7 +20,7 @@
var/material/material
var/material/padding_material
var/base_icon = "bed"
- var/applies_material_colour = 1 //VOREStation Add - For special color beds/chairs
+ var/applies_material_colour = 1
/obj/structure/bed/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc)
@@ -47,6 +47,7 @@
var/cache_key = "[base_icon]-[material.name]"
if(isnull(stool_cache[cache_key]))
var/image/I = image(icon, base_icon) //VOREStation Edit
+ //var/image/I = image('icons/obj/furniture.dmi', base_icon) //From Polaris Sync. Not sure if this is a better way of doing it or not. Uncomment if so.
if(applies_material_colour) //VOREStation Add - Goes with added var
I.color = material.icon_colour
stool_cache[cache_key] = I
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 04e647f944..b990e8c514 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -83,7 +83,6 @@
src.set_dir(turn(src.dir, 90))
return
-//VOREStation Add - Shuttle Chair
/obj/structure/bed/chair/shuttle
name = "chair"
desc = "You sit in this. Either by will or force."
@@ -91,7 +90,7 @@
color = null
base_icon = "shuttle_chair"
applies_material_colour = 0
-//VOREStation Add End
+
// Leaving this in for the sake of compilation.
/obj/structure/bed/chair/comfy
desc = "It's a chair. It looks comfy."
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 843c2f0dab..13a24987b7 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -91,16 +91,13 @@
playsound(src, "shatter", 70, 1)
if(display_message)
visible_message("[src] shatters!")
- if(dir == SOUTHWEST)
- var/index = null
- index = 0
- while(index < 2)
- new shardtype(loc) //todo pooling?
- if(reinf) new /obj/item/stack/rods(loc)
- index++
- else
+ new shardtype(loc)
+ if(reinf)
+ new /obj/item/stack/rods(loc)
+ if(is_fulltile())
new shardtype(loc) //todo pooling?
- if(reinf) new /obj/item/stack/rods(loc)
+ if(reinf)
+ new /obj/item/stack/rods(loc)
qdel(src)
return
@@ -290,11 +287,9 @@
else
playsound(src, W.usesound, 75, 1)
visible_message("[user] dismantles \the [src].")
- if(dir == SOUTHWEST)
- var/obj/item/stack/material/mats = new glasstype(loc)
- mats.amount = is_fulltile() ? 4 : 2
- else
- new glasstype(loc)
+ var/obj/item/stack/material/mats = new glasstype(loc)
+ if(is_fulltile())
+ mats.amount = 4
qdel(src)
else if(istype(W,/obj/item/frame) && anchored)
var/obj/item/frame/F = W
@@ -329,6 +324,9 @@
if(usr.incapacitated())
return 0
+ if(is_fulltile())
+ return 0
+
if(anchored)
usr << "It is fastened to the floor therefore you can't rotate it!"
return 0
@@ -348,6 +346,9 @@
if(usr.incapacitated())
return 0
+ if(is_fulltile())
+ return 0
+
if(anchored)
usr << "It is fastened to the floor therefore you can't rotate it!"
return 0
@@ -361,13 +362,16 @@
/obj/structure/window/New(Loc, start_dir=null, constructed=0)
..()
+ if (start_dir)
+ set_dir(start_dir)
+
//player-constructed windows
if (constructed)
anchored = 0
+ state = 0
update_verbs()
-
- if (start_dir)
- set_dir(start_dir)
+ if(is_fulltile())
+ maxhealth *= 2
health = maxhealth
@@ -406,10 +410,10 @@
//Updates the availabiliy of the rotation verbs
/obj/structure/window/proc/update_verbs()
- if(anchored)
+ if(anchored || is_fulltile())
verbs -= /obj/structure/window/proc/rotate
verbs -= /obj/structure/window/proc/revrotate
- else
+ else if(!is_fulltile())
verbs += /obj/structure/window/proc/rotate
verbs += /obj/structure/window/proc/revrotate
@@ -507,14 +511,6 @@
glasstype = /obj/item/stack/material/glass/reinforced
force_threshold = 6
-
-/obj/structure/window/New(Loc, constructed=0)
- ..()
-
- //player-constructed windows
- if (constructed)
- state = 0
-
/obj/structure/window/reinforced/full
dir = SOUTHWEST
icon_state = "fwindow"
diff --git a/code/game/objects/stumble_into_vr.dm b/code/game/objects/stumble_into_vr.dm
index cddcd80610..90a519b2a2 100644
--- a/code/game/objects/stumble_into_vr.dm
+++ b/code/game/objects/stumble_into_vr.dm
@@ -4,6 +4,7 @@
to_chat(M, "You just [pick("ran", "slammed")] into \the [src]!")
M.apply_damage(5, BRUTE)
M.Weaken(2)
+ M.stop_flying()
/obj/structure/table/stumble_into(mob/living/M)
var/obj/occupied = turf_is_crowded()
@@ -17,6 +18,7 @@
M.apply_damage(5, BRUTE)
M.Weaken(2)
M.forceMove(get_turf(src))
+ M.stop_flying()
/obj/machinery/disposal/stumble_into(mob/living/M)
playsound(get_turf(src), 'sound/effects/clang.ogg', 25, 1, -1)
@@ -27,18 +29,21 @@
M.apply_damage(5, BRUTE)
M.Weaken(2)
M.forceMove(src)
+ M.stop_flying()
update()
/obj/structure/inflatable/stumble_into(mob/living/M)
playsound(get_turf(M), "sound/effects/Glasshit.ogg", 25, 1, -1)
visible_message("[M] [pick("ran", "slammed")] into \the [src]!")
M.Weaken(1)
+ M.stop_flying()
/obj/structure/kitchenspike/stumble_into(mob/living/M)
playsound(get_turf(M), "sound/weapons/pierce.ogg", 25, 1, -1)
visible_message("[M] [pick("ran", "slammed")] into the spikes on \the [src]!")
M.apply_damage(15, BRUTE, sharp=1)
M.Weaken(5)
+ M.stop_flying()
/obj/structure/m_tray/stumble_into(mob/living/M)
playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 25, 1, -1)
@@ -46,6 +51,7 @@
M.apply_damage(5, BRUTE)
M.Weaken(2)
M.forceMove(get_turf(src))
+ M.stop_flying()
/obj/structure/c_tray/stumble_into(mob/living/M)
playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 25, 1, -1)
@@ -53,12 +59,14 @@
M.apply_damage(5, BRUTE)
M.Weaken(2)
M.forceMove(get_turf(src))
+ M.stop_flying()
/obj/structure/window/stumble_into(mob/living/M)
visible_message("[M] [pick("ran", "slammed")] into \the [src]!")
M.apply_damage(5, BRUTE)
M.Weaken(2)
hitby(M)
+ M.stop_flying()
/obj/structure/railing/stumble_into(mob/living/M)
var/obj/occupied = turf_is_crowded()
@@ -67,6 +75,7 @@
playsound(get_turf(src), 'sound/misc/slip.ogg', 25, 1, -1)
visible_message("[M] [pick("tripped", "stumbled")] over \the [src]!")
M.Weaken(2)
+ M.stop_flying()
if(get_turf(M) == get_turf(src))
M.forceMove(get_step(src, src.dir))
else
@@ -81,6 +90,7 @@
M.apply_damage(15, BURN)
M.Weaken(5)
M.emote("scream")
+ M.stop_flying()
/obj/machinery/atmospherics/unary/cryo_cell/stumble_into(mob/living/M)
if((stat & (NOPOWER|BROKEN)) || !istype(M, /mob/living/carbon) || occupant || M.abiotic() || !node)
@@ -90,6 +100,7 @@
M.apply_damage(5, BRUTE)
M.Weaken(2)
put_mob(M)
+ M.stop_flying()
/obj/machinery/porta_turret/stumble_into(mob/living/M)
..()
@@ -119,6 +130,7 @@
update_icon()
add_fingerprint(M)
updateUsrDialog()
+ M.stop_flying()
/obj/machinery/vending/stumble_into(mob/living/M)
..()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index d34b210b99..91ece51356 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -145,6 +145,9 @@ var/const/enterloopsanity = 100
M.lastarea = get_area(M.loc)
if(M.lastarea.has_gravity == 0)
inertial_drift(M)
+ if(M.flying) //VORESTATION Edit Start. This overwrites the above is_space without touching it all that much.
+ inertial_drift(M)
+ M.make_floating(1) //VOREStation Edit End.
else if(!is_space())
M.inertia_dir = 0
M.make_floating(0)
diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm
index 26e3a9c733..b721188bc5 100644
--- a/code/modules/busy_space/organizations.dm
+++ b/code/modules/busy_space/organizations.dm
@@ -104,7 +104,7 @@
// Note that the current station being used will be pruned from this list upon being instantiated
destination_names = list(
"NSS Exodus in Nyx",
- "NCS Northern Star in Vir",
+ //"NCS Northern Star in Vir",
"NLS Southern Cross in Vir",
"NAS Vir Central Command",
"a dockyard orbiting Sif",
diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index ab70fb464a..52b41025e4 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -3,6 +3,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
/datum/preferences
var/equip_preview_mob = EQUIP_PREVIEW_ALL
+ var/icon/bgstate = "000"
+ var/list/bgstate_options = list("000", "fff", "steel", "white")
+
/datum/category_item/player_setup_item/general/body
name = "Body"
sort_order = 3
@@ -34,6 +37,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["synth_green"] >> pref.g_synth
S["synth_blue"] >> pref.b_synth
pref.preview_icon = null
+ S["bgstate"] >> pref.bgstate
/datum/category_item/player_setup_item/general/body/save_character(var/savefile/S)
S["species"] << pref.species
@@ -61,6 +65,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["synth_red"] << pref.r_synth
S["synth_green"] << pref.g_synth
S["synth_blue"] << pref.b_synth
+ S["bgstate"] << pref.bgstate
/datum/category_item/player_setup_item/general/body/sanitize_character(var/savefile/S)
if(!pref.species || !(pref.species in playable_species))
@@ -87,6 +92,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!pref.rlimb_data) pref.rlimb_data = list()
if(!pref.body_markings) pref.body_markings = list()
else pref.body_markings &= body_marking_styles_list
+ if(!pref.bgstate || !(pref.bgstate in pref.bgstate_options))
+ pref.bgstate = "000"
// Moved from /datum/preferences/proc/copy_to()
/datum/category_item/player_setup_item/general/body/copy_to_mob(var/mob/living/carbon/human/character)
@@ -268,6 +275,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
. += "Preview "
. += ""
+ . += " Cycle background"
. += " [pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]"
. += " [pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]"
. += " | "
@@ -701,6 +709,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.b_synth = hex2num(copytext(new_color, 6, 8))
return TOPIC_REFRESH_UPDATE_PREVIEW
+ else if(href_list["cycle_bg"])
+ pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options)
+ return TOPIC_REFRESH_UPDATE_PREVIEW
+
return ..()
/datum/category_item/player_setup_item/general/body/proc/reset_limbs()
diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm
index 6f3115fd2f..860869883f 100644
--- a/code/modules/client/preference_setup/loadout/loadout_general.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_general.dm
@@ -34,6 +34,18 @@
display_name = "Spaceball booster pack"
path = /obj/item/weapon/pack/spaceball
+/datum/gear/plushie
+ display_name = "plushie selection"
+ path = /obj/item/toy/plushie/
+
+/datum/gear/plushie/New()
+ ..()
+ var/list/plushies = list()
+ for(var/plushie in subtypesof(/obj/item/toy/plushie/) - /obj/item/toy/plushie/therapy)
+ var/obj/item/toy/plushie/plushie_type = plushie
+ plushies[initial(plushie_type.name)] = plushie_type
+ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(plushies))
+
/datum/gear/flask
display_name = "flask"
path = /obj/item/weapon/reagent_containers/food/drinks/flask/barflask
diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm
index da6c3949f3..38f945648c 100644
--- a/code/modules/client/preference_setup/loadout/loadout_head.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head.dm
@@ -154,34 +154,10 @@
path = /obj/item/clothing/head/fedora/grey
/datum/gear/head/hairflower
- display_name = "hair flower pin, red"
- path = /obj/item/clothing/head/hairflower
-
-/datum/gear/head/hairflower/yellow
- display_name = "hair flower pin, yellow"
- path = /obj/item/clothing/head/hairflower/yellow
-
-/datum/gear/head/hairflower/pink
- display_name = "hair flower pin, pink"
- path = /obj/item/clothing/head/hairflower/pink
-
-/datum/gear/head/hairflower/blue
- display_name = "hair flower pin, blue"
- path = /obj/item/clothing/head/hairflower/blue
-
-/datum/gear/head/hairflower/violet
- display_name = "hair flower pin, violet"
- path = /obj/item/clothing/head/hairflower/violet
-
-/datum/gear/head/hairflower/orange
- display_name = "hair flower pin, orange"
- path = /obj/item/clothing/head/hairflower/orange
-
-/datum/gear/head/hairflower/white
display_name = "hair flower pin"
path = /obj/item/clothing/head/hairflower/white
-/datum/gear/head/hairflower/white/New()
+/datum/gear/head/hairflower/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
@@ -372,4 +348,4 @@
/datum/gear/head/surgical/purple
display_name = "surgical cap, purple"
- path = /obj/item/clothing/head/surgery/purple
\ No newline at end of file
+ path = /obj/item/clothing/head/surgery/purple
diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm
index ba2d995b27..6b15fba5ea 100644
--- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm
@@ -73,10 +73,6 @@
display_name = "shoes, yellow"
path = /obj/item/clothing/shoes/yellow
-/datum/gear/shoes/flats
- display_name = "flats, black"
- path = /obj/item/clothing/shoes/flats
-
/datum/gear/shoes/hitops/
display_name = "high-top, white"
path = /obj/item/clothing/shoes/hitops/
@@ -109,30 +105,6 @@
display_name = "high-top, yellow"
path = /obj/item/clothing/shoes/hitops/yellow
-/datum/gear/shoes/flats/blue
- display_name = "flats, blue"
- path = /obj/item/clothing/shoes/flats/blue
-
-/datum/gear/shoes/flats/brown
- display_name = "flats, brown"
- path = /obj/item/clothing/shoes/flats/brown
-
-/datum/gear/shoes/flats/orange
- display_name = "flats, orange"
- path = /obj/item/clothing/shoes/flats/orange
-
-/datum/gear/shoes/flats/purple
- display_name = "flats, purple"
- path = /obj/item/clothing/shoes/flats/purple
-
-/datum/gear/shoes/flats/red
- display_name = "flats, red"
- path = /obj/item/clothing/shoes/flats/red
-
-/datum/gear/shoes/flats/white
- display_name = "flats, white"
- path = /obj/item/clothing/shoes/flats/white
-
/datum/gear/shoes/flipflops
display_name = "flip flops"
path = /obj/item/clothing/shoes/flipflop
@@ -157,11 +129,11 @@
..()
gear_tweaks = list(gear_tweak_free_color_choice)
-/datum/gear/shoes/flats/color
+/datum/gear/shoes/flats
display_name = "flats"
path = /obj/item/clothing/shoes/flats/white/color
-/datum/gear/shoes/flats/color/New()
+/datum/gear/shoes/flats/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
@@ -246,4 +218,4 @@
/datum/gear/shoes/boots/winter/hydro
display_name = "hydroponics winter boots"
path = /obj/item/clothing/shoes/boots/winter/hydro
- allowed_roles = list("Botanist", "Xenobiologist")
\ No newline at end of file
+ allowed_roles = list("Botanist", "Xenobiologist")
diff --git a/code/modules/client/preferences_vr.dm b/code/modules/client/preferences_vr.dm
index 57a7c00f55..5c4ba8f3c6 100644
--- a/code/modules/client/preferences_vr.dm
+++ b/code/modules/client/preferences_vr.dm
@@ -6,19 +6,22 @@
dress_preview_mob(mannequin)
var/icon/bgstate = pick("000", "FFF", "steel", "white", "plating", "reinforced")
- preview_icon = icon('icons/effects/128x48_vr.dmi', bgstate)
- preview_icon.Scale(64+64, 16+32)
+ preview_icon = icon('icons/effects/128x72_vr.dmi', bgstate)
+ preview_icon.Scale(128, 72)
mannequin.dir = NORTH
var/icon/stamp = getFlatIcon(mannequin)
- preview_icon.Blend(stamp, ICON_OVERLAY, 49, 9)
+ stamp.Scale(stamp.Width()*size_multiplier,stamp.Height()*size_multiplier)
+ preview_icon.Blend(stamp, ICON_OVERLAY, 65-stamp.Width()/2, 5)
mannequin.dir = WEST
stamp = getFlatIcon(mannequin)
- preview_icon.Blend(stamp, ICON_OVERLAY, 1, 9)
+ stamp.Scale(stamp.Width()*size_multiplier,stamp.Height()*size_multiplier)
+ preview_icon.Blend(stamp, ICON_OVERLAY, 15-stamp.Width()/2, 5)
mannequin.dir = SOUTH
stamp = getFlatIcon(mannequin)
- preview_icon.Blend(stamp, ICON_OVERLAY, 83, 9)
+ stamp.Scale(stamp.Width()*size_multiplier,stamp.Height()*size_multiplier)
+ preview_icon.Blend(stamp, ICON_OVERLAY, 115-stamp.Width()/2, 5)
preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2) // Scaling here to prevent blurring in the browser.
\ No newline at end of file
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 94ed2c9f87..d7e0362272 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -77,6 +77,7 @@
desc = "A pair of gloves that reach past the elbow. Fancy!"
name = "evening gloves"
icon_state = "evening_gloves"
+ addblends = "evening_gloves_a"
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index cc3f276566..85f51e2cdd 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -34,9 +34,11 @@
/obj/item/clothing/head/hairflower/white
icon_state = "hairflower_white"
+ addblends = "hairflower_white_a"
/obj/item/clothing/head/hairflower/bow
icon_state = "bow"
+ addblends = "bow_a"
name = "hair bow"
desc = "A ribbon tied into a bow with a clip on the back to attach to hair."
item_state_slots = list(slot_r_hand_str = "pill", slot_l_hand_str = "pill")
@@ -155,6 +157,7 @@
/obj/item/clothing/head/flatcap/grey
icon_state = "flat_capw"
+ addblends = "flat_capw_a"
item_state_slots = list(slot_r_hand_str = "greysoft", slot_l_hand_str = "greysoft")
/obj/item/clothing/head/pirate
@@ -300,6 +303,7 @@
name = "hijab"
desc = "A veil that is wrapped to cover the head and chest"
icon_state = "hijab"
+ addblends = "hijab_a"
item_state_slots = list(slot_r_hand_str = "beret_white", slot_l_hand_str = "beret_white")
body_parts_covered = 0
flags_inv = BLOCKHAIR
@@ -308,12 +312,14 @@
name = "kippa"
desc = "A small, brimless cap."
icon_state = "kippa"
+ addblends = "kippa_a"
body_parts_covered = 0
/obj/item/clothing/head/turban
name = "turban"
desc = "A cloth used to wind around the head"
icon_state = "turban"
+ addblends = "turban_a"
item_state_slots = list(slot_r_hand_str = "beret_white", slot_l_hand_str = "beret_white")
body_parts_covered = 0
flags_inv = BLOCKHEADHAIR
@@ -322,24 +328,28 @@
name = "taqiyah"
desc = "A short, rounded skullcap usually worn for religious purposes."
icon_state = "taqiyah"
+ addblends = "taqiyah_a"
item_state_slots = list(slot_r_hand_str = "taq", slot_l_hand_str = "taq")
/obj/item/clothing/head/beanie
name = "beanie"
desc = "A head-hugging brimless winter cap. This one is tight."
icon_state = "beanie"
+ addblends = "beanie_a"
body_parts_covered = 0
/obj/item/clothing/head/beanie_loose
name = "loose beanie"
desc = "A head-hugging brimless winter cap. This one is loose."
icon_state = "beanie_hang"
+ addblends = "beanie_hang_a"
body_parts_covered = 0
/obj/item/clothing/head/beretg
name = "beret"
desc = "A beret, an artists favorite headwear."
icon_state = "beret_g"
+ addblends = "beret_g_a"
body_parts_covered = 0
/obj/item/clothing/head/sombrero
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index 6b4b270f97..85ffb970b8 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -54,6 +54,7 @@
name = "white flats"
desc = "Shiny white flats."
icon_state = "flatswhite"
+ addblends = "flatswhite_a"
item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
/obj/item/clothing/shoes/flats/white/color
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index c1c833a308..8ee0ae2d32 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -124,23 +124,27 @@
name = "flip flops"
desc = "A pair of foam flip flops. For those not afraid to show a little ankle."
icon_state = "thongsandal"
+ addblends = "thongsandal_a"
/obj/item/clothing/shoes/athletic
name = "athletic shoes"
desc = "A pair of sleek atheletic shoes. Made by and for the sporty types."
icon_state = "sportshoe"
+ addblends = "sportshoe_a"
item_state_slots = list(slot_r_hand_str = "sportheld", slot_l_hand_str = "sportheld")
/obj/item/clothing/shoes/skater
name = "skater shoes"
desc = "A pair of wide shoes with thick soles. Designed for skating."
icon_state = "skatershoe"
+ addblends = "skatershoe_a"
item_state_slots = list(slot_r_hand_str = "skaterheld", slot_l_hand_str = "skaterheld")
/obj/item/clothing/shoes/heels
name = "high heels"
desc = "A pair of high-heeled shoes. Fancy!"
icon_state = "heels"
+ addblends = "heels_a"
/obj/item/clothing/shoes/footwraps
name = "cloth footwraps"
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index 934d7407d9..dfc416aa69 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -54,7 +54,7 @@
//Breach thresholds, should ideally be inherited by most (if not all) voidsuits.
//With 0.2 resiliance, will reach 10 breach damage after 3 laser carbine blasts or 8 smg hits.
- breach_threshold = 18
+ breach_threshold = 12
can_breach = 1
//Inbuilt devices.
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 602b854287..006de8e99c 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -277,6 +277,7 @@ obj/item/clothing/suit/kimono
name = "kimono"
desc = "A traditional Japanese kimono."
icon_state = "kimono"
+ addblends = "kimono_a"
/*
* coats
@@ -344,6 +345,7 @@ obj/item/clothing/suit/storage/toggle/peacoat
name = "peacoat"
desc = "A well-tailored, stylish peacoat."
icon_state = "peacoat"
+ addblends = "peacoat_a"
item_state_slots = list(slot_r_hand_str = "peacoat", slot_l_hand_str = "peacoat")
flags_inv = HIDEHOLSTER
/*
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 4392a26492..2acaff6852 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -45,6 +45,16 @@
mob_overlay = image("icon" = sprite_sheets[wearer.species.get_bodytype(wearer)], "icon_state" = "[tmp_icon_state]")
else
mob_overlay = image("icon" = INV_ACCESSORIES_DEF_ICON, "icon_state" = "[tmp_icon_state]")
+ if(addblends)
+ var/icon/base = new/icon("icon" = mob_overlay.icon, "icon_state" = mob_overlay.icon_state)
+ var/addblend_icon = new/icon("icon" = mob_overlay.icon, "icon_state" = src.addblends)
+ if(color)
+ base.Blend(src.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ mob_overlay = image(base)
+ else
+ mob_overlay.color = src.color
+
return mob_overlay
//when user attached an accessory to S
diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm
index 3f53c44392..bf40074a2a 100644
--- a/code/modules/clothing/under/accessories/armband.dm
+++ b/code/modules/clothing/under/accessories/armband.dm
@@ -37,6 +37,7 @@
/obj/item/clothing/accessory/armband/med/color
name = "armband"
desc = "A fancy armband."
+ addblends = "med_a"
/obj/item/clothing/accessory/armband/medblue
name = "EMT armband"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index f9a0a9ab37..77046dd89e 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -627,17 +627,20 @@
name = "long dress"
desc = "A long dress."
icon_state = "whitedress2"
+ addblends = "whitedress2_a"
flags_inv = HIDESHOES
/obj/item/clothing/under/dress/white3
name = "short dress"
desc = "A short, plain dress."
icon_state = "whitedress3"
+ addblends = "whitedress3_a"
/obj/item/clothing/under/dress/white4
name = "long flared dress"
desc = "A long white dress that flares out at the bottom."
icon_state = "whitedress4"
+ addblends = "whitedress4_a"
flags_inv = HIDESHOES
/obj/item/clothing/under/dress/darkred
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index 322115cc0b..c306d842d0 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -121,6 +121,7 @@
name = "yoga pants"
desc = "A pair of tight-fitting yoga pants for those lazy days."
icon_state = "yogapants"
+ addblends = "yogapants_a"
/*
* Baggy Pants
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index d752f0d5cd..00e5bf2ea4 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -619,3 +619,235 @@
activate_pin(2)
+/obj/item/integrated_circuit/input/atmo_scanner
+ name = "integrated atmospheric analyser"
+ desc = "The same atmospheric analysis module that is integrated into every PDA. \
+ This allows the machine to know the composition, temperature and pressure of the surrounding atmosphere."
+ icon_state = "medscan_adv"
+ complexity = 9
+ inputs = list()
+ outputs = list(
+ "pressure" = IC_PINTYPE_NUMBER,
+ "temperature" = IC_PINTYPE_NUMBER,
+ "oxygen" = IC_PINTYPE_NUMBER,
+ "nitrogen" = IC_PINTYPE_NUMBER,
+ "carbon dioxide" = IC_PINTYPE_NUMBER,
+ "phoron" = IC_PINTYPE_NUMBER,
+ "other" = IC_PINTYPE_NUMBER
+ )
+ activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
+ spawn_flags = IC_SPAWN_RESEARCH
+ origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3)
+ power_draw_per_use = 60
+
+/obj/item/integrated_circuit/input/atmo_scanner/do_work()
+ var/turf/T = get_turf(src)
+ if(!istype(T)) //Invalid input
+ return
+ var/datum/gas_mixture/environment = T.return_air()
+
+ var/pressure = environment.return_pressure()
+ var/total_moles = environment.total_moles
+
+ if (total_moles)
+ var/o2_level = environment.gas["oxygen"]/total_moles
+ var/n2_level = environment.gas["nitrogen"]/total_moles
+ var/co2_level = environment.gas["carbon_dioxide"]/total_moles
+ var/phoron_level = environment.gas["phoron"]/total_moles
+ var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
+ set_pin_data(IC_OUTPUT, 1, pressure)
+ set_pin_data(IC_OUTPUT, 2, round(environment.temperature-T0C,0.1))
+ set_pin_data(IC_OUTPUT, 3, round(o2_level*100,0.1))
+ set_pin_data(IC_OUTPUT, 4, round(n2_level*100,0.1))
+ set_pin_data(IC_OUTPUT, 5, round(co2_level*100,0.1))
+ set_pin_data(IC_OUTPUT, 6, round(phoron_level*100,0.01))
+ set_pin_data(IC_OUTPUT, 7, round(unknown_level, 0.01))
+ else
+ set_pin_data(IC_OUTPUT, 1, 0)
+ set_pin_data(IC_OUTPUT, 2, -273.15)
+ set_pin_data(IC_OUTPUT, 3, 0)
+ set_pin_data(IC_OUTPUT, 4, 0)
+ set_pin_data(IC_OUTPUT, 5, 0)
+ set_pin_data(IC_OUTPUT, 6, 0)
+ set_pin_data(IC_OUTPUT, 7, 0)
+ push_data()
+ activate_pin(2)
+
+/obj/item/integrated_circuit/input/pressure_sensor
+ name = "integrated pressure sensor"
+ desc = "A tiny pressure sensor module similar to that found in a PDA atmosphere analyser."
+ icon_state = "medscan_adv"
+ complexity = 3
+ inputs = list()
+ outputs = list(
+ "pressure" = IC_PINTYPE_NUMBER
+ )
+ activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
+ spawn_flags = IC_SPAWN_RESEARCH
+ origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3)
+ power_draw_per_use = 20
+
+/obj/item/integrated_circuit/input/pressure_sensor/do_work()
+ var/turf/T = get_turf(src)
+ if(!istype(T)) //Invalid input
+ return
+ var/datum/gas_mixture/environment = T.return_air()
+
+ var/pressure = environment.return_pressure()
+ var/total_moles = environment.total_moles
+
+ if (total_moles)
+ set_pin_data(IC_OUTPUT, 1, pressure)
+ else
+ set_pin_data(IC_OUTPUT, 1, 0)
+ push_data()
+ activate_pin(2)
+
+/obj/item/integrated_circuit/input/temperature_sensor
+ name = "integrated temperature sensor"
+ desc = "A tiny temperature sensor module similar to that found in a PDA atmosphere analyser."
+ icon_state = "medscan_adv"
+ complexity = 3
+ inputs = list()
+ outputs = list(
+ "temperature" = IC_PINTYPE_NUMBER
+ )
+ activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
+ spawn_flags = IC_SPAWN_RESEARCH
+ origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3)
+ power_draw_per_use = 20
+
+/obj/item/integrated_circuit/input/temperature_sensor/do_work()
+ var/turf/T = get_turf(src)
+ if(!istype(T)) //Invalid input
+ return
+ var/datum/gas_mixture/environment = T.return_air()
+
+ var/total_moles = environment.total_moles
+
+ if (total_moles)
+ set_pin_data(IC_OUTPUT, 1, round(environment.temperature-T0C,0.1))
+ else
+ set_pin_data(IC_OUTPUT, 1, -273.15)
+ push_data()
+ activate_pin(2)
+
+/obj/item/integrated_circuit/input/oxygen_sensor
+ name = "integrated oxygen sensor"
+ desc = "A tiny oxygen sensor module similar to that found in a PDA atmosphere analyser."
+ icon_state = "medscan_adv"
+ complexity = 3
+ inputs = list()
+ outputs = list(
+ "oxygen" = IC_PINTYPE_NUMBER
+ )
+ activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
+ spawn_flags = IC_SPAWN_RESEARCH
+ origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3)
+ power_draw_per_use = 20
+
+/obj/item/integrated_circuit/input/oxygen_sensor/do_work()
+ var/turf/T = get_turf(src)
+ if(!istype(T)) //Invalid input
+ return
+ var/datum/gas_mixture/environment = T.return_air()
+
+ var/total_moles = environment.total_moles
+
+ if (total_moles)
+ var/o2_level = environment.gas["oxygen"]/total_moles
+ set_pin_data(IC_OUTPUT, 1, round(o2_level*100,0.1))
+ else
+ set_pin_data(IC_OUTPUT, 1, 0)
+ push_data()
+ activate_pin(2)
+
+/obj/item/integrated_circuit/input/co2_sensor
+ name = "integrated co2 sensor"
+ desc = "A tiny carbon dioxide sensor module similar to that found in a PDA atmosphere analyser."
+ icon_state = "medscan_adv"
+ complexity = 3
+ inputs = list()
+ outputs = list(
+ "co2" = IC_PINTYPE_NUMBER
+ )
+ activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
+ spawn_flags = IC_SPAWN_RESEARCH
+ origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3)
+ power_draw_per_use = 20
+
+/obj/item/integrated_circuit/input/co2_sensor/do_work()
+ var/turf/T = get_turf(src)
+ if(!istype(T)) //Invalid input
+ return
+ var/datum/gas_mixture/environment = T.return_air()
+
+ var/total_moles = environment.total_moles
+
+ if (total_moles)
+ var/co2_level = environment.gas["carbon_dioxide"]/total_moles
+ set_pin_data(IC_OUTPUT, 1, round(co2_level*100,0.1))
+ else
+ set_pin_data(IC_OUTPUT, 1, 0)
+ push_data()
+ activate_pin(2)
+
+/obj/item/integrated_circuit/input/nitrogen_sensor
+ name = "integrated nitrogen sensor"
+ desc = "A tiny nitrogen sensor module similar to that found in a PDA atmosphere analyser."
+ icon_state = "medscan_adv"
+ complexity = 3
+ inputs = list()
+ outputs = list(
+ "nitrogen" = IC_PINTYPE_NUMBER
+ )
+ activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
+ spawn_flags = IC_SPAWN_RESEARCH
+ origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3)
+ power_draw_per_use = 20
+
+/obj/item/integrated_circuit/input/nitrogen_sensor/do_work()
+ var/turf/T = get_turf(src)
+ if(!istype(T)) //Invalid input
+ return
+ var/datum/gas_mixture/environment = T.return_air()
+
+ var/total_moles = environment.total_moles
+
+ if (total_moles)
+ var/n2_level = environment.gas["nitrogen"]/total_moles
+ set_pin_data(IC_OUTPUT, 1, round(n2_level*100,0.1))
+ else
+ set_pin_data(IC_OUTPUT, 1, 0)
+ push_data()
+ activate_pin(2)
+
+/obj/item/integrated_circuit/input/phoron_sensor
+ name = "integrated phoron sensor"
+ desc = "A tiny phoron gas sensor module similar to that found in a PDA atmosphere analyser."
+ icon_state = "medscan_adv"
+ complexity = 3
+ inputs = list()
+ outputs = list(
+ "phoron" = IC_PINTYPE_NUMBER
+ )
+ activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
+ spawn_flags = IC_SPAWN_RESEARCH
+ origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3)
+ power_draw_per_use = 20
+
+/obj/item/integrated_circuit/input/phoron_sensor/do_work()
+ var/turf/T = get_turf(src)
+ if(!istype(T)) //Invalid input
+ return
+ var/datum/gas_mixture/environment = T.return_air()
+
+ var/total_moles = environment.total_moles
+
+ if (total_moles)
+ var/phoron_level = environment.gas["phoron"]/total_moles
+ set_pin_data(IC_OUTPUT, 1, round(phoron_level*100,0.1))
+ else
+ set_pin_data(IC_OUTPUT, 1, 0)
+ push_data()
+ activate_pin(2)
\ No newline at end of file
diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm
index 221777f56a..66a1ad9be4 100644
--- a/code/modules/mob/animations.dm
+++ b/code/modules/mob/animations.dm
@@ -86,7 +86,11 @@ note dizziness decrements automatically in the mob's Life() proc.
if(anchored||buckled)
make_floating(0)
return
-
+ if(ishuman(src)) //VOREStation Edit Start. Floating code.
+ var/mob/living/carbon/human/H = src
+ if(H.flying)
+ make_floating(1)
+ return //VOREStation Edit End
var/turf/turf = get_turf(src)
if(!istype(turf,/turf/space))
var/area/A = turf.loc
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 4fe77323f2..7ca7f74737 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -201,6 +201,11 @@ Works together with spawning an observer, noted above.
/mob/proc/ghostize(var/can_reenter_corpse = 1)
if(key)
+ if(ishuman(src))
+ var/mob/living/carbon/human/H = src
+ if(H.vr_holder && !can_reenter_corpse)
+ H.exit_vr()
+ return 0
var/mob/observer/dead/ghost = new(src) //Transfer safety to observer spawning proc.
ghost.can_reenter_corpse = can_reenter_corpse
ghost.timeofdeath = src.timeofdeath //BS12 EDIT
@@ -243,9 +248,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/turf/location = get_turf(src)
message_admins("[key_name_admin(usr)] has ghosted. (JMP)")
log_game("[key_name_admin(usr)] has ghosted.")
- var/mob/observer/dead/ghost = ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
- ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly.
- announce_ghost_joinleave(ghost)
+ var/mob/observer/dead/ghost = ghostize(0) // 0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
+ if(ghost)
+ ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly.
+ announce_ghost_joinleave(ghost)
/mob/observer/dead/can_use_hands() return 0
/mob/observer/dead/is_active() return 0
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 28f907d55c..84db5c29d2 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -109,20 +109,28 @@
playsound(loc, "sparks", 50, 1, -1)
if (shock_damage > 15)
src.visible_message(
- "[src] was shocked by \the [source]!", \
- "You feel a powerful shock course through your body!", \
- "You hear a heavy electrical crack." \
+ "[src] was electrocuted[source ? " by the [source]" : ""]!", \
+ "You feel a powerful shock course through your body!", \
+ "You hear a heavy electrical crack." \
)
- if(stun)
- Stun(10)//This should work for now, more is really silly and makes you lay there forever
- Weaken(10)
else
src.visible_message(
- "[src] was mildly shocked by \the [source].", \
- "You feel a mild shock course through your body.", \
- "You hear a light zapping." \
+ "[src] was shocked[source ? " by the [source]" : ""].", \
+ "You feel a shock course through your body.", \
+ "You hear a zapping sound." \
)
+ if(stun)
+ switch(shock_damage)
+ if(16 to 20)
+ Stun(2)
+ if(21 to 25)
+ Weaken(2)
+ if(26 to 30)
+ Weaken(5)
+ if(31 to INFINITY)
+ Weaken(10) //This should work for now, more is really silly and makes you lay there forever
+
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, loc)
s.start()
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 66ba7ecd51..08d0c9384e 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -25,7 +25,7 @@
weapon_edge = 0
hit_embed_chance = I.force/(I.w_class*3)
- apply_damage(effective_force, I.damtype, hit_zone, blocked, sharp=weapon_sharp, edge=weapon_edge, used_weapon=I)
+ apply_damage(effective_force, I.damtype, hit_zone, blocked, soaked, sharp=weapon_sharp, edge=weapon_edge, used_weapon=I)
//Melee weapon embedded object code.
if (I && I.damtype == BRUTE && !I.anchored && !is_robot_module(I) && I.embed_chance > 0)
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index ffac791a1f..5fe75e9eae 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -1,5 +1,15 @@
/mob/living/carbon/human/gib()
+ if(vr_holder)
+ exit_vr()
+ // Delete the link, because this mob won't be around much longer
+ vr_holder.vr_link = null
+
+ if(vr_link)
+ vr_link.exit_vr()
+ vr_link.vr_holder = null
+ vr_link = null
+
for(var/obj/item/organ/I in internal_organs)
I.removed()
if(istype(loc,/turf))
@@ -40,6 +50,7 @@
//Handle species-specific deaths.
species.handle_death(src)
animate_tail_stop()
+ stop_flying() //VOREStation Edit.
//Handle snowflake ling stuff.
if(mind && mind.changeling)
@@ -80,6 +91,20 @@
if(wearing_rig)
wearing_rig.notify_ai("Warning: user death event. Mobility control passed to integrated intelligence system.")
+ // If the body is in VR, move the mind back to the real world
+ if(vr_holder)
+ src.exit_vr()
+ src.vr_holder.vr_link = null
+ for(var/obj/item/W in src)
+ src.drop_from_inventory(W)
+
+ // If our mind is in VR, bring it back to the real world so it can die with its body
+ if(vr_link)
+ vr_link.exit_vr()
+ vr_link.vr_holder = null
+ vr_link = null
+ to_chat(src, "Everything abruptly stops.")
+
return ..(gibbed,species.get_death_message(src))
/mob/living/carbon/human/proc/ChangeToHusk()
@@ -113,4 +138,4 @@
mutations.Add(SKELETON)
status_flags |= DISFIGURED
update_body(1)
- return
+ return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index d4b6e58912..06632781a1 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1202,12 +1202,16 @@
species.update_attack_types() //VOREStation Edit Start Required for any trait that updates unarmed_types in setup.
if(species.gets_food_nutrition != 1) //Bloodsucker trait. Tacking this on here.
verbs |= /mob/living/carbon/human/proc/bloodsuck
- if(species.can_drain_prey == 1)
+ if(species.can_drain_prey)
verbs |= /mob/living/carbon/human/proc/succubus_drain //Succubus drain trait.
verbs |= /mob/living/carbon/human/proc/succubus_drain_finialize
verbs |= /mob/living/carbon/human/proc/succubus_drain_lethal
- if(species.hard_vore_enabled == 1) //Hardvore verb.
- verbs |= /mob/living/carbon/human/proc/shred_limb //VOREStation Edit End
+ if(species.hard_vore_enabled) //Hardvore verb.
+ verbs |= /mob/living/carbon/human/proc/shred_limb
+ if(species.can_fly)
+ verbs |= /mob/living/proc/flying_toggle //Flying wings!
+ verbs |= /mob/living/proc/start_wings_hovering
+ //VOREStation Edit End
// Rebuild the HUD. If they aren't logged in then login() should reinstantiate it for them.
if(client && client.screen)
@@ -1447,6 +1451,8 @@
/mob/living/carbon/human/Check_Shoegrip()
if(shoes && (shoes.item_flags & NOSLIP) && istype(shoes, /obj/item/clothing/shoes/magboots)) //magboots + dense_object = no floating
return 1
+ if(flying) //VOREStation Edit. Checks to see if they have wings and are flying.
+ return 1 //VOREStation Edit.
return 0
//Puts the item into our active hand if possible. returns 1 on success.
@@ -1562,4 +1568,55 @@
var/turf/T = get_turf(src)
var/obj/item/clothing/accessory/permit/drone/permit = new(T)
permit.set_name(real_name)
- equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor.
\ No newline at end of file
+ equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor.
+
+// enter_vr is called on the original mob, and puts the mind into the supplied vr mob
+/mob/living/carbon/human/proc/enter_vr(var/mob/living/carbon/human/avatar) // Avatar is currently a human, because we have preexisting setup code for appearance manipulation, etc.
+ if(!istype(avatar))
+ return
+
+ // Link the two mobs for client transfer
+ avatar.vr_holder = src
+ src.teleop = avatar
+ src.vr_link = avatar // Can't reuse vr_holder so that death can automatically eject users from VR
+
+ // Move the mind
+ avatar.Sleeping(1)
+ src.mind.transfer_to(avatar)
+ to_chat(avatar, "You have enterred Virtual Reality!\nAll normal gameplay rules still apply.\nWounds you suffer here won't persist when you leave VR, but some of the pain will.\nYou can leave VR at any time by using the \"Exit Virtual Reality\" verb in the Abilities tab, or by ghosting.\nYou can modify your appearance by using various \"Change \[X\]\" verbs in the Abilities tab.")
+ to_chat(avatar, " You black out for a moment, and wake to find yourself in a new body in virtual reality.") // So this is what VR feels like?
+
+// exit_vr is called on the vr mob, and puts the mind back into the original mob
+/mob/living/carbon/human/verb/exit_vr()
+ set name = "Exit Virtual Reality"
+ set category = "Abilities"
+
+ if(!vr_holder)
+ return
+ if(!mind)
+ return
+
+ var/total_damage
+ // Tally human damage
+ if(ishuman(src))
+ var/mob/living/carbon/human/H = src
+ total_damage = H.getBruteLoss() + H.getFireLoss() + H.getOxyLoss() + H.getToxLoss()
+
+ // Move the mind back to the original mob
+// vr_holder.Sleeping(1)
+ src.mind.transfer_to(vr_holder)
+ to_chat(vr_holder, "You black out for a moment, and wake to find yourself back in your own body.")
+ // Two-thirds damage is transferred as agony for /humans
+ // Getting hurt in VR doesn't damage the physical body, but you still got hurt.
+ if(ishuman(vr_holder) && total_damage)
+ var/mob/living/carbon/human/V = vr_holder
+ V.stun_effect_act(0, total_damage*2/3, null) // 200 damage leaves the user in paincrit for several seconds, agony reaches 0 after around 2m.
+ to_chat(vr_holder, "Pain from your time in VR lingers.") // 250 damage leaves the user unconscious for several seconds in addition to paincrit
+
+ // Maintain a link with the mob, but don't use teleop
+ vr_holder.vr_link = src
+ vr_holder.teleop = null
+
+ if(istype(vr_holder.loc, /obj/machinery/vr_sleeper))
+ var/obj/machinery/vr_sleeper/V = vr_holder.loc
+ V.go_out()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 39860aaefa..950fca565e 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -429,9 +429,9 @@ This function restores all organs.
zone = BP_HEAD
return organs_by_name[zone]
-/mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null)
+/mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null)
if(Debug2)
- world.log << "## DEBUG: human/apply_damage() was called on [src], with [damage] damage, and an armor value of [blocked]."
+ world.log << "## DEBUG: human/apply_damage() was called on [src], with [damage] damage, an armor value of [blocked], and a soak value of [soaked]."
var/obj/item/organ/external/organ = null
if(isorgan(def_zone))
@@ -446,7 +446,7 @@ This function restores all organs.
if((damage > 25 && prob(20)) || (damage > 50 && prob(60)))
if(organ && organ.organ_can_feel_pain())
emote("scream")
- ..(damage, damagetype, def_zone, blocked)
+ ..(damage, damagetype, def_zone, blocked, soaked)
return 1
//Handle BRUTE and BURN damage
@@ -455,12 +455,18 @@ This function restores all organs.
if(blocked >= 100)
return 0
+ if(soaked >= damage)
+ return 0
if(!organ) return 0
if(blocked)
blocked = (100-blocked)/100
damage = (damage * blocked)
+
+ if(soaked)
+ damage -= soaked
+
if(Debug2)
world.log << "## DEBUG: [src] was hit for [damage]."
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 103019380a..c1717ee201 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -103,3 +103,8 @@
var/step_count = 0 // Track how many footsteps have been taken to know when to play footstep sounds
can_be_antagged = TRUE
+
+// Used by mobs in virtual reality to point back to the "real" mob the client belongs to.
+ var/mob/living/carbon/human/vr_holder = null
+ // Used by "real" mobs after they leave a VR session
+ var/mob/living/carbon/human/vr_link = null
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 93f583c5ab..4103e96d7f 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -141,6 +141,8 @@
if(((!check_drift) || (check_drift && thrust.stabilization_on)) && (!lying) && (thrust.allow_thrust(0.01, src)))
inertia_dir = 0
return 1
+ if(flying) //VOREStation Edit. If you're flying, you glide around!
+ return 0 //VOREStation Edit.
//If no working jetpack then use the other checks
if(..())
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index c8c5fe641a..b55648ea03 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -67,6 +67,7 @@
Sleeping(20)
//No need to update all of these procs if the guy is dead.
+ fall() //VORESTATION EDIT. Prevents people from floating
if(stat != DEAD && !stasis)
//Updates the number of stored chemicals for powers
handle_changeling()
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index a2b38e4c22..f85686e6cd 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -11,6 +11,7 @@
// Icon/appearance vars.
var/icobase = 'icons/mob/human_races/r_human.dmi' // Normal icon set.
+ var/icobase_add // Icon set for highlight blends when applicable.
var/deform = 'icons/mob/human_races/r_def_human.dmi' // Mutated icon set.
var/speech_bubble_appearance = "normal" // Part of icon_state to use for speech bubbles when talking. See talk.dmi for available icons.
@@ -28,6 +29,7 @@
var/tail // Name of tail state in species effects icon file.
var/tail_animation // If set, the icon to obtain tail animation states from.
+ var/tail_animation_add // Highlight overlay for tail.
var/tail_hair
var/race_key = 0 // Used for mob icon cache string.
@@ -274,11 +276,14 @@
var/t_him = "them"
if(ishuman(target))
var/mob/living/carbon/human/T = target
- switch(T.identifying_gender)
- if(MALE)
- t_him = "him"
- if(FEMALE)
- t_him = "her"
+ if(!T.species.ambiguous_genders || (T.species.ambiguous_genders && H.species == T.species))
+ switch(T.identifying_gender)
+ if(MALE)
+ t_him = "him"
+ if(FEMALE)
+ t_him = "her"
+ else
+ t_him = "them"
else
switch(target.gender)
if(MALE)
diff --git a/code/modules/mob/living/carbon/human/species/species_getters.dm b/code/modules/mob/living/carbon/human/species/species_getters.dm
index efb053eddf..e0be03af1d 100644
--- a/code/modules/mob/living/carbon/human/species/species_getters.dm
+++ b/code/modules/mob/living/carbon/human/species/species_getters.dm
@@ -10,6 +10,9 @@
/datum/species/proc/get_tail_animation(var/mob/living/carbon/human/H)
return tail_animation
+/datum/species/proc/get_tail_animation_a(var/mob/living/carbon/human/H)
+ return tail_animation_add
+
/datum/species/proc/get_tail_hair(var/mob/living/carbon/human/H)
return tail_hair
@@ -28,6 +31,9 @@
/datum/species/proc/get_icobase(var/mob/living/carbon/human/H, var/get_deform)
return (get_deform ? deform : icobase)
+/datum/species/proc/get_icobase_a(var/mob/living/carbon/human/H)
+ return icobase_add
+
/datum/species/proc/get_station_variant()
return name
diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
index 1fb7b6c300..11a50c1316 100644
--- a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
+++ b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
@@ -148,9 +148,16 @@ var/list/wrapped_species_by_ref = list()
last_special = world.time + 50
- var/new_species = input("Please select a species to emulate.", "Shapeshifter Body") as null|anything in species.get_valid_shapeshifter_forms(src)
+ var/new_species = null
+ new_species = input("Please select a species to emulate.", "Shapeshifter Body") as null|anything in species.get_valid_shapeshifter_forms(src)
+
if(!new_species || !all_species[new_species] || wrapped_species_by_ref["\ref[src]"] == new_species)
return
+ shapeshifter_change_shape(new_species)
+
+/mob/living/carbon/human/proc/shapeshifter_change_shape(var/new_species = null)
+ if(!new_species)
+ return
wrapped_species_by_ref["\ref[src]"] = new_species
visible_message("\The [src] shifts and contorts, taking the form of \a [new_species]!")
diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm
index 228d2d9c31..c6a69369fa 100644
--- a/code/modules/mob/living/carbon/human/species/species_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/species_vr.dm
@@ -26,4 +26,16 @@
unarmed_attacks = list()
unarmed_types += /datum/unarmed_attack/bite/sharp/numbing
for(var/u_type in unarmed_types)
- unarmed_attacks += new u_type()
\ No newline at end of file
+ unarmed_attacks += new u_type()
+
+/datum/species/create_organs(var/mob/living/carbon/human/H)
+ if(H.nif)
+ var/type = H.nif.type
+ var/durability = H.nif.durability
+ var/list/nifsofts = H.nif.nifsofts
+ ..()
+
+ var/obj/item/device/nif/nif = new type(H,durability)
+ nif.nifsofts = nifsofts
+ else
+ ..()
diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm
index d27aeb02d7..71fd0d7a61 100644
--- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm
@@ -5,6 +5,7 @@
var/can_drain_prey = 0 //Determines if the person can use the succubus drain or not.
var/hard_vore_enabled = 0 //Determines if the person has the hardvore verb or not.
var/metabolism = 0.0015
+ var/can_fly = 0 //Determines if the species can fly if they have wings.
/datum/species/custom
name = "Custom Species"
diff --git a/code/modules/mob/living/carbon/human/species/station/seromi.dm b/code/modules/mob/living/carbon/human/species/station/seromi.dm
index 6fd0100220..3f98c6682b 100644
--- a/code/modules/mob/living/carbon/human/species/station/seromi.dm
+++ b/code/modules/mob/living/carbon/human/species/station/seromi.dm
@@ -26,8 +26,9 @@
tail_hair = "feathers"
reagent_tag = IS_TESHARI
- icobase = 'icons/mob/human_races/r_seromi.dmi'
- deform = 'icons/mob/human_races/r_seromi.dmi'
+ icobase = 'icons/mob/human_races/r_seromi_m.dmi'
+ icobase_add = 'icons/mob/human_races/r_seromi_a.dmi'
+ deform = 'icons/mob/human_races/r_seromi_m.dmi'
damage_overlays = 'icons/mob/human_races/masks/dam_seromi.dmi'
damage_mask = 'icons/mob/human_races/masks/dam_mask_seromi.dmi'
blood_mask = 'icons/mob/human_races/masks/blood_seromi.dmi'
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index 120e7b7010..316b822236 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -25,10 +25,12 @@
/datum/species/unathi
name = "Unathi"
name_plural = "Unathi"
- icobase = 'icons/mob/human_races/r_lizard.dmi'
+ icobase = 'icons/mob/human_races/r_lizard_m.dmi'
+ icobase_add = 'icons/mob/human_races/r_lizard_a.dmi'
deform = 'icons/mob/human_races/r_def_lizard.dmi'
tail = "sogtail"
- tail_animation = 'icons/mob/species/unathi/tail.dmi'
+ tail_animation = 'icons/mob/species/unathi/tail_m.dmi'
+ tail_animation_add = 'icons/mob/species/unathi/tail_a.dmi'
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
primitive_form = "Stok"
darksight = 3
@@ -127,10 +129,12 @@
/datum/species/tajaran
name = "Tajara"
name_plural = "Tajaran"
- icobase = 'icons/mob/human_races/r_tajaran.dmi'
+ icobase = 'icons/mob/human_races/r_tajaran_m.dmi'
+ icobase_add = 'icons/mob/human_races/r_tajaran_a.dmi'
deform = 'icons/mob/human_races/r_def_tajaran.dmi'
tail = "tajtail"
- tail_animation = 'icons/mob/species/tajaran/tail.dmi'
+ tail_animation = 'icons/mob/species/tajaran/tail_m.dmi'
+ tail_animation_add = 'icons/mob/species/tajaran/tail_a.dmi'
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
darksight = 8
slowdown = -0.5
@@ -212,7 +216,8 @@
/datum/species/skrell
name = "Skrell"
name_plural = "Skrell"
- icobase = 'icons/mob/human_races/r_skrell.dmi'
+ icobase = 'icons/mob/human_races/r_skrell_m.dmi'
+ icobase_add = 'icons/mob/human_races/r_skrell_a.dmi'
deform = 'icons/mob/human_races/r_def_skrell.dmi'
primitive_form = "Neaera"
unarmed_types = list(/datum/unarmed_attack/punch)
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
index e1209352b1..93aedb8e77 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
@@ -720,3 +720,56 @@
T.apply_damage(25, BRUTE, D)
C.visible_message("[C] severely damages [D] of [T]!") //Keep it vague. Let the /me's do the talking.
log_and_message_admins("shreded [D] of [T].", C)
+
+/mob/living/proc/flying_toggle()
+ set name = "Toggle Flight"
+ set desc = "While flying over open spaces, you will use up some nutrition. If you run out nutrition, you will fall. Additionally, you can't fly if you are too heavy."
+ set category = "Abilities"
+
+ var/mob/living/carbon/human/C = src
+ if(!C.wing_style) //The species var isn't taken into account here, as it's only purpose is to give this proc to a person.
+ to_chat(src, "You cannot fly without wings!!")
+ return
+ if(C.incapacitated(INCAPACITATION_ALL))
+ to_chat(src, "You cannot fly in this state!")
+ return
+ if(C.nutrition < 25 && !C.flying) //Don't have any food in you?" You can't fly.
+ to_chat(C, "You lack the nutrition to fly.")
+ return
+ if(C.nutrition > 1000 && !C.flying)
+ to_chat(C, "You have eaten too much to fly! You need to lose some nutrition.")
+ return
+
+ C.flying = !C.flying
+ update_floating()
+ to_chat(C, "You have [C.flying?"started":"stopped"] flying.")
+
+//Proc to stop inertial_drift. Exchange nutrition in order to stop gliding around.
+/mob/living/proc/start_wings_hovering()
+ set name = "Hover"
+ set desc = "Allows you to stop gliding and hover. This will take a fair amount of nutrition to perform."
+ set category = "Abilities"
+
+ var/mob/living/carbon/human/C = src
+ if(!C.wing_style) //The species var isn't taken into account here, as it's only purpose is to give this proc to a person.
+ to_chat(src, "You don't have wings!")
+ return
+ if(C.incapacitated(INCAPACITATION_ALL))
+ to_chat(src, "You cannot hover in your current state!")
+ return
+ if(C.nutrition < 50 && !C.flying) //Don't have any food in you?" You can't hover, since it takes up 25 nutrition. And it's not 25 since we don't want them to immediately fall.
+ to_chat(C, "You lack the nutrition to fly.")
+ return
+ if(C.anchored)
+ to_chat(C, "You are already hovering and/or anchored in place!")
+ return
+
+ if(!C.anchored && !C.pulledby) //Not currently anchored, and not pulled by anyone.
+ C.anchored = 1 //This is the only way to stop the inertial_drift.
+ C.nutrition -= 25
+ update_floating()
+ to_chat(C, "You hover in place.")
+ spawn(6) //.6 seconds.
+ C.anchored = 0
+ else
+ return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm
index e44ec37ad1..33777448d5 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm
@@ -14,6 +14,7 @@
slowdown = -0.2 //scuttly, but not as scuttly as a tajara or a teshari.
brute_mod = 0.8 //About as tanky to brute as a Unathi. They'll probably snap and go feral when hurt though.
burn_mod = 1.15 //As vulnerable to burn as a Tajara.
+ can_fly = 1 //They have wings by default.
num_alternate_languages = 2
secondary_langs = list("Sol Common")
diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
index f6b94f68f3..046a867e48 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
@@ -76,6 +76,7 @@
secondary_langs = list(LANGUAGE_SKRELLIAN)
name_language = LANGUAGE_SKRELLIAN
color_mult = 1
+ inherent_verbs = list(/mob/living/carbon/human/proc/shred_limb)
min_age = 18
max_age = 110
@@ -119,6 +120,7 @@
secondary_langs = list(LANGUAGE_BIRDSONG)
name_language = LANGUAGE_BIRDSONG
color_mult = 1
+ can_fly = 1
min_age = 18
max_age = 110
@@ -355,6 +357,7 @@ datum/species/harpy
secondary_langs = list(LANGUAGE_BIRDSONG)
name_language = null
color_mult = 1
+ can_fly = 1
min_age = 18
max_age = 80
@@ -385,4 +388,4 @@ datum/species/harpy
deform = 'icons/mob/human_races/r_def_vox_old.dmi'
/obj/item/organ/external/head/vox
- eye_icon = "vox_eyes_s_old"
\ No newline at end of file
+ eye_icon = "vox_eyes_s_old"
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
index 6b6b4092bf..74da59b887 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
@@ -119,3 +119,9 @@
desc = "Decreases stun duration from flashes and other light-based stuns and disabilities by 50%"
cost = 1
var_changes = list("flash_mod" = 0.5)
+
+/datum/trait/winged_flight
+ name = "Winged Flight"
+ desc = "Allows you to fly by using your wings."
+ cost = 2 //Some in game value.
+ var_changes = list("can_fly" = 1)
diff --git a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
new file mode 100644
index 0000000000..cd55725b40
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
@@ -0,0 +1,32 @@
+// ### Wooo, inheritance. Basically copying everything I don't need to edit from prometheans, because they mostly work already.
+// ### Any and all of this is open to change for balance or whatever.
+// ###
+// ###
+// Species definition follows.
+/datum/species/shapeshifter/promethean/avatar
+
+ name = "Virtual Reality Avatar"
+ name_plural = "Virtual Reality Avatars"
+ blurb = "A 3-dimensional representation of some sort of animate object used to display the presence and actions of some-one or -thing using a virtual reality program."
+ show_ssd = "eerily still"
+ death_message = "flickers briefly, their gear falling in a heap on the floor around their motionless body."
+ knockout_message = "has been knocked unconscious!"
+
+ spawn_flags = SPECIES_IS_RESTRICTED
+
+ speech_bubble_appearance = "cyber"
+
+ male_cough_sounds = list('sound/effects/mob_effects/m_cougha.ogg','sound/effects/mob_effects/m_coughb.ogg', 'sound/effects/mob_effects/m_coughc.ogg')
+ female_cough_sounds = list('sound/effects/mob_effects/f_cougha.ogg','sound/effects/mob_effects/f_coughb.ogg')
+ male_sneeze_sound = 'sound/effects/mob_effects/sneeze.ogg'
+ female_sneeze_sound = 'sound/effects/mob_effects/f_sneeze.ogg'
+
+ unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite)
+ has_organ = list(O_BRAIN = /obj/item/organ/internal/brain/slime, O_EYES = /obj/item/organ/internal/eyes) // Slime core.
+ heal_rate = 0 // Avatars don't naturally heal like prometheans, at least not for now
+
+/datum/species/shapeshifter/promethean/avatar/handle_death(var/mob/living/carbon/human/H)
+ return
+
+/datum/species/shapeshifter/promethean/avatar/handle_environment_special(var/mob/living/carbon/human/H)
+ return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 7d98f0b833..b1b6e8b56a 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -400,11 +400,14 @@ var/global/list/damage_icon_parts = list()
face_standing.Blend(facial_s, ICON_OVERLAY)
if(h_style && !(head && (head.flags_inv & BLOCKHEADHAIR)))
- var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
+ var/datum/sprite_accessory/hair/hair_style = hair_styles_list[h_style]
if(hair_style && (src.species.get_bodytype(src) in hair_style.species_allowed))
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
+ var/icon/hair_s_add = new/icon("icon" = hair_style.icon_add, "icon_state" = "[hair_style.icon_state]_s")
if(hair_style.do_colouration)
- hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_MULTIPLY) //VOREStation edit
+ hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_MULTIPLY)
+ hair_s.Blend(hair_s_add, ICON_ADD)
+ overlays |= hair_s //VOREStation edit? Sync note: The new Polaris doesn't have this, but looking elsewhere I assume this is needed. Comment out/remove if not.
face_standing.Blend(hair_s, ICON_OVERLAY)
@@ -527,7 +530,16 @@ var/global/list/damage_icon_parts = list()
//need to append _s to the icon state for legacy compatibility
var/image/standing = image(icon = under_icon, icon_state = "[under_state]_s")
- standing.color = w_uniform.color
+
+ if(w_uniform.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = w_uniform.addblends)
+ if(w_uniform.color)
+ base.Blend(w_uniform.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = w_uniform.color
//apply blood overlay
if(w_uniform.blood_DNA)
@@ -591,7 +603,15 @@ var/global/list/damage_icon_parts = list()
bloodsies.color = gloves.blood_color
standing.overlays += bloodsies
gloves.screen_loc = ui_gloves
- standing.color = gloves.color
+ if(gloves.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = gloves.addblends)
+ if(gloves.color)
+ base.Blend(gloves.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = gloves.color
overlays_standing[GLOVES_LAYER] = standing
else
if(blood_DNA)
@@ -612,7 +632,15 @@ var/global/list/damage_icon_parts = list()
standing = image("icon" = glasses.sprite_sheets[species.get_bodytype(src)], "icon_state" = "[glasses.icon_state]")
else
standing = image("icon" = 'icons/mob/eyes.dmi', "icon_state" = "[glasses.icon_state]")
- standing.color = glasses.color
+ if(glasses.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = glasses.addblends)
+ if(glasses.color)
+ base.Blend(glasses.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = glasses.color
overlays_standing[GLASSES_LAYER] = standing
else
@@ -640,7 +668,15 @@ var/global/list/damage_icon_parts = list()
standing = image("icon" = l_ear.sprite_sheets[species.get_bodytype(src)], "icon_state" = "[t_type]")
else
standing = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[t_type]")
- standing.color = l_ear.color
+ if(l_ear.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = l_ear.addblends)
+ if(l_ear.color)
+ base.Blend(l_ear.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = l_ear.color
both.overlays += standing
if(r_ear)
@@ -654,7 +690,15 @@ var/global/list/damage_icon_parts = list()
standing = image("icon" = r_ear.sprite_sheets[species.get_bodytype(src)], "icon_state" = "[t_type]")
else
standing = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[t_type]")
- standing.color = r_ear.color
+ if(r_ear.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = r_ear.addblends)
+ if(r_ear.color)
+ base.Blend(r_ear.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = r_ear.color
both.overlays += standing
overlays_standing[EARS_LAYER] = both
@@ -688,8 +732,18 @@ var/global/list/damage_icon_parts = list()
var/image/bloodsies = image("icon" = species.get_blood_mask(src), "icon_state" = "shoeblood")
bloodsies.color = shoes.blood_color
standing.overlays += bloodsies
- standing.color = shoes.color
+
+ if(shoes.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = shoes.addblends)
+ if(shoes.color)
+ base.Blend(shoes.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = shoes.color
overlays_standing[shoe_layer] = standing
+
else
if(feet_blood_DNA)
var/image/bloodsies = image("icon" = species.get_blood_mask(src), "icon_state" = "shoeblood")
@@ -755,7 +809,15 @@ var/global/list/damage_icon_parts = list()
if(hat.on && light_overlay_cache[cache_key])
standing.overlays |= light_overlay_cache[cache_key]
- standing.color = head.color
+ if(head.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = head.addblends)
+ if(head.color)
+ base.Blend(head.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = head.color
overlays_standing[HEAD_LAYER] = standing
else
@@ -790,7 +852,15 @@ var/global/list/damage_icon_parts = list()
if(!i_state) i_state = i.icon_state
standing.overlays += image("icon" = 'icons/mob/belt.dmi', "icon_state" = "[i_state]")
- standing.color = belt.color
+ if(belt.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = belt.addblends)
+ if(belt.color)
+ base.Blend(belt.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = belt.color
overlays_standing[belt_layer] = standing
else
@@ -819,6 +889,17 @@ var/global/list/damage_icon_parts = list()
if(wear_suit.icon_override && wear_suit.item_state)
t_state = wear_suit.item_state
//VOREStation Code End
+ standing = image("icon" = t_icon, "icon_state" = "[wear_suit.icon_state]")
+
+ if(wear_suit.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = wear_suit.addblends)
+ if(wear_suit.color)
+ base.Blend(wear_suit.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = wear_suit.color
standing = image("icon" = t_icon, "icon_state" = t_state) //VOREStation Edit
standing.color = wear_suit.color
@@ -876,7 +957,15 @@ var/global/list/damage_icon_parts = list()
standing = image("icon" = wear_mask.sprite_sheets[species.get_bodytype(src)], "icon_state" = "[wear_mask.icon_state]")
else
standing = image("icon" = 'icons/mob/mask.dmi', "icon_state" = "[wear_mask.icon_state]")
- standing.color = wear_mask.color
+ if(wear_mask.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = wear_mask.addblends)
+ if(wear_mask.color)
+ base.Blend(wear_mask.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = wear_mask.color
if( !istype(wear_mask, /obj/item/clothing/mask/smokable/cigarette) && wear_mask.blood_DNA )
var/image/bloodsies = image("icon" = species.get_blood_mask(src), "icon_state" = "maskblood")
@@ -918,7 +1007,15 @@ var/global/list/damage_icon_parts = list()
//apply color
var/image/standing = image(icon = overlay_icon, icon_state = overlay_state)
- standing.color = back.color
+ if(back.addblends)
+ var/icon/base = new/icon("icon" = standing.icon, "icon_state" = standing.icon_state)
+ var/addblend_icon = new/icon("icon" = standing.icon, "icon_state" = back.addblends)
+ if(back.color)
+ base.Blend(back.color, ICON_MULTIPLY)
+ base.Blend(addblend_icon, ICON_ADD)
+ standing = image(base)
+ else
+ standing.color = back.color
//create the image
overlays_standing[BACK_LAYER] = standing
@@ -1082,19 +1179,22 @@ var/global/list/damage_icon_parts = list()
if(!tail_icon)
//generate a new one
var/species_tail_anim = species.get_tail_animation(src)
- if(species.icobase_tail) species_tail_anim = species.icobase //VOREStation Code
- if(!species_tail_anim) species_tail_anim = 'icons/effects/species.dmi'
+ var/species_tail_anim_a = species.get_tail_animation_a(src)
+ if(!species_tail_anim)
+ species_tail_anim = 'icons/effects/species.dmi'
+ if(!species_tail_anim_a)
+ species_tail_anim_a = 'icons/effects/species_a.dmi'
tail_icon = new/icon(species_tail_anim)
- //VOREStation Code Start
- if(species.color_mult)
- tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_MULTIPLY)
- else
- tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
+ var/tail_icon_a = new/icon(species_tail_anim_a)
+ tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_MULTIPLY)
+ tail_icon.Blend(tail_icon_a, ICON_ADD)
// The following will not work with animated tails.
var/use_species_tail = species.get_tail_hair(src)
if(use_species_tail)
var/icon/hair_icon = icon('icons/effects/species.dmi', "[species.get_tail(src)]_[use_species_tail]")
- hair_icon.Blend(rgb(r_hair, g_hair, b_hair), ICON_MULTIPLY) //VOREStation Edit
+ var/icon/hair_icon_a = icon('icons/effects/species_a.dmi', "[species.get_tail(src)]_[use_species_tail]")
+ hair_icon.Blend(rgb(r_hair, g_hair, b_hair), ICON_MULTIPLY)
+ hair_icon.Blend(hair_icon_a, ICON_ADD)
tail_icon.Blend(hair_icon, ICON_OVERLAY)
tail_icon_cache[icon_key] = tail_icon
diff --git a/code/modules/mob/living/carbon/human/update_icons_vr.dm b/code/modules/mob/living/carbon/human/update_icons_vr.dm
index b440cf0f00..64e2d2ceb5 100644
--- a/code/modules/mob/living/carbon/human/update_icons_vr.dm
+++ b/code/modules/mob/living/carbon/human/update_icons_vr.dm
@@ -63,3 +63,9 @@
if(update_icons)
update_icons()
return
+
+/mob/proc/stop_flying(var/update_icons=1)
+ flying = 0
+
+ if(update_icons)
+ update_icons()
\ No newline at end of file
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 22289c6b43..07997851ef 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -34,6 +34,8 @@
adjustCloneLoss(damage * blocked)
if(HALLOSS)
adjustHalLoss(damage * blocked)
+ if(ELECTROCUTE)
+ electrocute_act(damage, used_weapon, 1.0, def_zone)
flash_weak_pain()
updatehealth()
return 1
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 97859f874c..5536da02be 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -146,7 +146,7 @@ default behaviour is:
..()
if (!istype(AM, /atom/movable) || AM.anchored)
//VOREStation Edit - object-specific proc for running into things
- if((confused || is_blind()) && stat == CONSCIOUS && prob(50) && m_intent=="run")
+ if(((confused || is_blind()) && stat == CONSCIOUS && prob(50) && m_intent=="run") || flying)
AM.stumble_into(src)
//VOREStation Edit End
/* VOREStation Removal - See above
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4e18aa64e9..e6929e59ae 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -9,7 +9,7 @@
health = 200
mob_bump_flag = ROBOT
- mob_swap_flags = ROBOT|MONKEY|SLIME|SIMPLE_ANIMAL
+ mob_swap_flags = ~HEAVY
mob_push_flags = ~HEAVY //trundle trundle
var/lights_on = 0 // Is our integrated light on?
diff --git a/code/modules/mob/living/simple_animal/animals/mouse_vr.dm b/code/modules/mob/living/simple_animal/animals/mouse_vr.dm
index 396d43a68b..0c8bfeb648 100644
--- a/code/modules/mob/living/simple_animal/animals/mouse_vr.dm
+++ b/code/modules/mob/living/simple_animal/animals/mouse_vr.dm
@@ -1,8 +1,8 @@
/mob/living/simple_animal/mouse
no_vore = 1 //Mice can't eat others due to the amount of bugs caused by it.
-
-
+/mob/living/simple_animal/mouse/Bump(atom/movable/AM, yes)
+ return
/mob/living/simple_animal/mouse/attack_hand(mob/living/hander)
src.get_scooped(hander) //For one-click mouse scooping under any conditions. They knew what they were getting into!
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 92aefe6923..25b7f94dae 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -107,7 +107,9 @@
var/friendly = "nuzzles" // What mobs do to people when they aren't really hostile
var/attack_sound = null // Sound to play when I attack
var/environment_smash = 0 // How much environment damage do I do when I hit stuff?
- var/melee_miss_chance = 25 // percent chance to miss a melee attack.
+ var/melee_miss_chance = 15 // percent chance to miss a melee attack.
+ var/melee_attack_minDelay = 5 // How long between attacks at least
+ var/melee_attack_maxDelay = 10 // How long between attacks at most
//Special attacks
var/spattack_prob = 0 // Chance of the mob doing a special attack (0 for never)
@@ -1175,7 +1177,7 @@
if(!Adjacent(target_mob))
return
if(!client)
- sleep(rand(8) + 8)
+ sleep(rand(melee_attack_minDelay, melee_attack_maxDelay))
if(isliving(target_mob))
var/mob/living/L = target_mob
@@ -1455,6 +1457,19 @@
agonyDam += agony_amount * 0.5
adjustFireLoss(agonyDam)
+/mob/living/simple_animal/emp_act(severity)
+ if(!isSynthetic())
+ return
+ switch(severity)
+ if(1)
+ adjustFireLoss(rand(15, 25))
+ if(2)
+ adjustFireLoss(rand(10, 18))
+ if(3)
+ adjustFireLoss(rand(5, 12))
+ if(4)
+ adjustFireLoss(rand(1, 6))
+
// Force it to target something
/mob/living/simple_animal/proc/taunt(var/mob/living/new_target, var/forced = FALSE)
if(intelligence_level == SA_HUMANOID && !forced)
diff --git a/code/modules/mob/mob_defines_vr.dm b/code/modules/mob/mob_defines_vr.dm
index 89dcd717df..df9e1f8edd 100644
--- a/code/modules/mob/mob_defines_vr.dm
+++ b/code/modules/mob/mob_defines_vr.dm
@@ -1,2 +1,3 @@
/mob
- var/vantag_hud = 0 // Do I have the HUD enabled?
\ No newline at end of file
+ var/vantag_hud = 0 // Do I have the HUD enabled?
+ var/flying = 0 //Allows flight
\ No newline at end of file
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index e73d316433..6838ddc071 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -517,6 +517,8 @@
return dense_object
/mob/proc/Check_Shoegrip()
+ if(flying) //VOREStation Edit. Checks to see if they and are flying.
+ return 1 //VOREStation Edit. Checks to see if they are flying. Mostly for this to be ported to Polaris.
return 0
/mob/proc/Process_Spaceslipping(var/prob_slip = 5)
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 8b32ab96ca..202b72c0fc 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -259,7 +259,7 @@
mannequin.delete_inventory(TRUE)
dress_preview_mob(mannequin)
- preview_icon = icon('icons/effects/effects.dmi', "nothing")
+ preview_icon = icon('icons/effects/128x48.dmi', bgstate)
preview_icon.Scale(48+32, 16+32)
mannequin.dir = NORTH
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index f301a36848..0b91e3e39b 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -45,7 +45,8 @@
/datum/sprite_accessory/hair
- icon = 'icons/mob/Human_face.dmi' // default icon for all hairs
+ icon = 'icons/mob/Human_face_m.dmi' // default icon for all hairs
+ var/icon_add = 'icons/mob/human_face.dmi'
bald
name = "Bald"
diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm
index 8fa9e2b169..e3e5cf6198 100644
--- a/code/modules/mob/new_player/sprite_accessories_vr.dm
+++ b/code/modules/mob/new_player/sprite_accessories_vr.dm
@@ -7,12 +7,14 @@
/datum/sprite_accessory/hair
icon = 'icons/mob/human_face_or_vr.dmi'
+ //var/icon_add = 'icons/mob/human_face.dmi' //Already defined in sprite_accessories.dm line 49.
var/color_blend_mode = ICON_MULTIPLY
species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid", "Vasilissan", "Rapala") //This lets all races use the default hairstyles.
awoohair
name = "Shoulder-length Messy"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "momijihair"
citheronia
@@ -25,36 +27,42 @@
citheronia_colorable
name = "Citheronia Hair"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "citheronia_hair_c"
do_colouration = 1
sergal_plain
name = "Sergal Plain"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "serg_plain"
species_allowed = list("Sergal")
sergal_medicore
name = "Sergal Medicore"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "serg_medicore"
species_allowed = list("Sergal")
sergal_tapered
name = "Sergal Tapered"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "serg_tapered"
species_allowed = list("Sergal")
sergal_fairytail
name = "Sergal Fairytail"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "serg_fairytail"
species_allowed = list("Sergal")
braid
name = "Floorlength Braid"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "hair_braid"
bald
@@ -66,12 +74,14 @@
ponytail6_fixed //Eggnerd's done with waiting for upstream fixes lmao.
name = "Ponytail 6 but fixed"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "hair_ponytail6"
species_allowed = list("Human","Skrell","Unathi","Tajara", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid", "Rapala")
una_hood
name = "Cobra Hood"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "soghun_hood"
una_spines_long
@@ -123,6 +133,7 @@
una_doublehorns
name = "Double Unathi Horns"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "soghun_dubhorns"
species_allowed = list("Unathi", "Xenochimera")
@@ -221,6 +232,7 @@
vulp_hair_kajam
name = "Kajam"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "kajam"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -228,6 +240,7 @@
vulp_hair_keid
name = "Keid"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "keid"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -235,6 +248,7 @@
vulp_hair_adhara
name = "Adhara"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "adhara"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -242,6 +256,7 @@
vulp_hair_kleeia
name = "Kleeia"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "kleeia"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -249,6 +264,7 @@
vulp_hair_mizar
name = "Mizar"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "mizar"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -256,6 +272,7 @@
vulp_hair_apollo
name = "Apollo"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "apollo"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -263,6 +280,7 @@
vulp_hair_belle
name = "Belle"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "belle"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -270,6 +288,7 @@
vulp_hair_bun
name = "Bun"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "bun"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -277,6 +296,7 @@
vulp_hair_jagged
name = "Jagged"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "jagged"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -284,6 +304,7 @@
vulp_hair_curl
name = "Curl"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "curl"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -291,6 +312,7 @@
vulp_hair_hawk
name = "Hawk"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "hawk"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -298,6 +320,7 @@
vulp_hair_anita
name = "Anita"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "anita"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -305,6 +328,7 @@
vulp_hair_short
name = "Short"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "short"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -312,6 +336,7 @@
vulp_hair_spike
name = "Spike"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "spike"
species_allowed = list("Vulpkanin", "Xenochimera", "Tajara", "Sergal", "Flatland Zorren", "Highlander Zorren")
gender = NEUTER
@@ -320,6 +345,7 @@
xeno_head_drone_color
name = "Drone dome"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "cxeno_drone"
species_allowed = list("Xenomorph Hybrid")
gender = NEUTER
@@ -327,6 +353,7 @@
xeno_head_sentinel_color
name = "Sentinal dome"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "cxeno_sentinel"
species_allowed = list("Xenomorph Hybrid")
gender = NEUTER
@@ -334,6 +361,7 @@
xeno_head_queen_color
name = "Queen dome"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "cxeno_queen"
species_allowed = list("Xenomorph Hybrid")
gender = NEUTER
@@ -341,6 +369,7 @@
xeno_head_hunter_color
name = "Hunter dome"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "cxeno_hunter"
species_allowed = list("Xenomorph Hybrid")
gender = NEUTER
@@ -348,6 +377,7 @@
xeno_head_praetorian_color
name = "Praetorian dome"
icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "cxeno_praetorian"
species_allowed = list("Xenomorph Hybrid")
gender = NEUTER
diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index ba05eec77e..f9a662e2e8 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -23,12 +23,12 @@
if(!istype(start))
to_chat(src, "You are unable to move from here.")
return 0
-
+
var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src)
if(!destination)
to_chat(src, "There is nothing of interest in this direction.")
return 0
-
+
if(!start.CanZPass(src, direction))
to_chat(src, "\The [start] is in the way.")
return 0
@@ -49,6 +49,25 @@
else
to_chat(src, "You gave up on pulling yourself up.")
return 0
+ else if(ismob(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying??
+ var/mob/H = src
+ if(H.flying)
+ if(H.incapacitated(INCAPACITATION_ALL))
+ to_chat(src, "You can't fly in your current state.")
+ H.stop_flying() //Should already be done, but just in case.
+ return 0
+ var/fly_time = max(7 SECONDS + (H.movement_delay() * 10), 1) //So it's not too useful for combat. Could make this variable somehow, but that's down the road.
+ to_chat(src, "You begin to fly upwards...")
+ destination.audible_message("You hear the flapping of wings.")
+ H.audible_message("[H] begins to flap \his wings, preparing to move upwards!")
+ if(do_after(H, fly_time) && H.flying)
+ to_chat(src, "You fly upwards.")
+ else
+ to_chat(src, "You stopped flying upwards.")
+ return 0
+ else
+ to_chat(src, "Gravity stops you from moving upward.")
+ return 0 //VOREStation Edit End.
else
to_chat(src, "Gravity stops you from moving upward.")
return 0
@@ -85,6 +104,9 @@
if(incapacitated())
return 0
+ if(flying) //VOREStation Edit. Allows movement up/down with wings.
+ return 1 //VOREStation Edit
+
if(Process_Spacemove())
return 1
@@ -140,6 +162,38 @@
if(throwing)
return
+ if(ismob(src))
+ var/mob/H = src //VOREStation Edit Start. Flight on mobs.
+ if(H.flying) //Some other checks are done in the wings_toggle proc
+ if(H.nutrition > 2)
+ H.nutrition -= 2 //You use up 2 nutrition per TILE and tick of flying above open spaces. If people wanna flap their wings in the hallways, shouldn't penalize them for it.
+ if(H.incapacitated(INCAPACITATION_ALL))
+ H.stop_flying()
+ //Just here to see if the person is KO'd, stunned, etc. If so, it'll move onto can_fall.
+ else if (H.nutrition > 1000) //Eat too much while flying? Get fat and fall.
+ to_chat(H, "You're too heavy! Your wings give out and you plummit to the ground!")
+ H.stop_flying() //womp womp.
+ else if(H.nutrition < 300 && H.nutrition > 289) //290 would be risky, as metabolism could mess it up. Let's do 289.
+ to_chat(H, "You are starting to get fatigued... You probably have a good minute left in the air, if that. Even less if you continue to fly around! You should get to the ground soon!") //Ticks are, on average, 3 seconds. So this would most likely be 90 seconds, but lets just say 60.
+ H.nutrition -= 10
+ return
+ else if(H.nutrition < 100 && H.nutrition > 89)
+ to_chat(H, "You're seriously fatigued! You need to get to the ground immediately and eat before you fall!")
+ return
+ else if(H.nutrition < 2) //Should have listened to the warnings!
+ to_chat(H, "You lack the strength to keep yourself up in the air...")
+ H.stop_flying()
+ else
+ return
+ else if(ishuman(H)) //Needed to prevent 2 people from grabbing eachother in the air.
+ var/mob/living/carbon/human/F = H
+ if(F.grabbed_by.len) //If you're grabbed (presumably by someone flying) let's not have you fall. This also allows people to grab onto you while you jump over a railing to prevent you from falling!
+ var/obj/item/weapon/grab/G = F.get_active_hand()
+ var/obj/item/weapon/grab/J = F.get_inactive_hand()
+ if(istype(G) || istype(J))
+ //fall
+ else
+ return
if(can_fall())
// We spawn here to let the current move operation complete before we start falling. fall() is normally called from
@@ -147,7 +201,7 @@
// or normal movement so other move behavior can continue.
var/mob/M = src
var/is_client_moving = (ismob(M) && M.client && M.client.moving)
- spawn(0)
+ spawn(0)
if(is_client_moving) M.client.moving = 1
handle_fall(below)
if(is_client_moving) M.client.moving = 0
diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm
index 89d4b36da1..d9a1ca6225 100644
--- a/code/modules/organs/organ_icon.dm
+++ b/code/modules/organs/organ_icon.dm
@@ -89,11 +89,13 @@ var/global/list/limb_icon_cache = list()
overlays |= facial_s
if(owner.h_style && !(owner.head && (owner.head.flags_inv & BLOCKHEADHAIR)))
- var/datum/sprite_accessory/hair_style = hair_styles_list[owner.h_style]
+ var/datum/sprite_accessory/hair/hair_style = hair_styles_list[owner.h_style]
if(hair_style && (species.get_bodytype(owner) in hair_style.species_allowed))
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
+ var/icon/hair_s_add = new/icon("icon" = hair_style.icon_add, "icon_state" = "[hair_style.icon_state]_s")
if(hair_style.do_colouration && islist(h_col) && h_col.len >= 3)
- hair_s.Blend(rgb(h_col[1], h_col[2], h_col[3]), ICON_MULTIPLY) // VOREStation edit
+ hair_s.Blend(rgb(h_col[1], h_col[2], h_col[3]), ICON_MULTIPLY)
+ hair_s.Blend(hair_s_add, ICON_ADD)
overlays |= hair_s
return mob_icon
@@ -143,7 +145,9 @@ var/global/list/limb_icon_cache = list()
var/cache_key = "[body_hair]-[icon_name]-[h_col[1]][h_col[2]][h_col[3]]"
if(!limb_icon_cache[cache_key])
var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]")
- I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit
+ var/icon/IA = icon(species.get_icobase_a(owner), "[icon_name]_[body_hair]")
+ I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY)
+ I.Blend(IA, ICON_ADD)
limb_icon_cache[cache_key] = I
mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY)
@@ -176,10 +180,7 @@ var/global/list/limb_icon_cache = list()
if(nonsolid)
applying.MapColors("#4D4D4D","#969696","#1C1C1C", "#000000")
- if(species && species.get_bodytype(owner) != "Human")
- applying.SetIntensity(1) // Unathi, Taj and Skrell have -very- dark base icons. VOREStation edit fixes this and brings the number back to 1
- else
- applying.SetIntensity(1) //VOREStation edit to make Prometheans not look like shit with mob coloring.
+ applying.SetIntensity(0.7)
else if(status & ORGAN_DEAD)
icon_cache_key += "_dead"
@@ -193,12 +194,14 @@ var/global/list/limb_icon_cache = list()
applying.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
icon_cache_key += "_tone_[s_tone]"
else if(s_col && s_col.len >= 3)
- //VOREStation Edit - Support for species.color_mult
- if(species && species.color_mult)
- applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_MULTIPLY)
- else
- applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD)
- //VOREStation Edit End
+ applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_MULTIPLY)
+ var/gender = "f"
+ if(owner && owner.gender == MALE)
+ gender = "m"
+ var/icon_a = new /icon(species.get_icobase_a(owner), "[icon_name][gendered_icon ? "_[gender]" : ""]")
+ applying.Blend(icon_a, ICON_ADD)
+ icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]"
+
// Translucency.
if(nonsolid) applying += rgb(,,,180) // SO INTUITIVE TY BYOND
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
new file mode 100644
index 0000000000..bb37a380b6
--- /dev/null
+++ b/code/modules/paperwork/paperplane.dm
@@ -0,0 +1,102 @@
+// Ported from TG. Known issue: Throw hit can possibly double-proc. Seems to be throw code.
+/obj/item/weapon/paperplane
+ name = "paper plane"
+ desc = "Paper folded into the shape of a plane."
+ icon = 'icons/obj/bureaucracy.dmi'
+ icon_state = "paperplane"
+ throw_range = 7
+ throw_speed = 1
+ throwforce = 0
+ w_class = ITEMSIZE_TINY
+
+ var/obj/item/weapon/paper/internalPaper
+
+/obj/item/weapon/paperplane/New(loc, obj/item/weapon/paper/newPaper)
+ . = ..()
+ pixel_y = rand(-8, 8)
+ pixel_x = rand(-9, 9)
+ if(newPaper)
+ internalPaper = newPaper
+ flags = newPaper.flags
+ color = newPaper.color
+ newPaper.forceMove(src)
+ else
+ internalPaper = new /obj/item/weapon/paper(src)
+ update_icon()
+
+/obj/item/weapon/paperplane/Destroy()
+ if(internalPaper)
+ qdel(internalPaper)
+ internalPaper = null
+ return ..()
+
+/obj/item/weapon/paperplane/update_icon()
+ overlays.Cut()
+ var/list/stamped = internalPaper.stamped
+ if(!stamped)
+ stamped = new
+ else if(stamped)
+ for(var/S in stamped)
+ var/obj/item/weapon/stamp/ = S
+ var/image/stampoverlay = image('icons/obj/bureaucracy.dmi', "paperplane_[initial(stamp.icon_state)]")
+ overlays += stampoverlay
+
+/obj/item/weapon/paperplane/attack_self(mob/user)
+ to_chat(user, "You unfold [src].")
+ var/atom/movable/internal_paper_tmp = internalPaper
+ internal_paper_tmp.forceMove(loc)
+ internalPaper = null
+ qdel(src)
+ user.put_in_hands(internal_paper_tmp)
+
+/obj/item/weapon/paperplane/attackby(obj/item/P, mob/living/carbon/human/user, params)
+ ..()
+ if(istype(P, /obj/item/weapon/pen))
+ to_chat(user, "You should unfold [src] before changing it.")
+ return
+
+ else if(istype(P, /obj/item/weapon/stamp)) //we don't randomize stamps on a paperplane
+ internalPaper.attackby(P, user) //spoofed attack to update internal paper.
+ update_icon()
+
+ else if(is_hot(P))
+ if(user.disabilities & CLUMSY && prob(10))
+ user.visible_message("[user] accidentally ignites themselves!", \
+ "You miss the [src] and accidentally light yourself on fire!")
+ user.unEquip(P)
+ user.adjust_fire_stacks(1)
+ user.IgniteMob()
+ return
+
+ if(!(in_range(user, src))) //to prevent issues as a result of telepathically lighting a paper
+ return
+ user.unEquip(src)
+ user.visible_message("[user] lights [src] ablaze with [P]!", "You light [src] on fire!")
+ fire_act()
+
+ add_fingerprint(user)
+
+/obj/item/weapon/paperplane/throw_impact(atom/hit_atom)
+ if(..() || !ishuman(hit_atom))//if the plane is caught or it hits a nonhuman
+ return
+ var/mob/living/carbon/human/H = hit_atom
+ if(prob(2))
+ if((H.head && H.head.body_parts_covered & EYES) || (H.wear_mask && H.wear_mask.body_parts_covered & EYES) || (H.glasses && H.glasses.body_parts_covered & EYES))
+ return
+ visible_message("\The [src] hits [H] in the eye!")
+ H.eye_blurry += 10
+ var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
+ if(E)
+ E.damage += 2.5
+ H.emote("scream")
+
+/obj/item/weapon/paper/AltClick(mob/living/carbon/user, obj/item/I)
+ if ( istype(user) )
+ if( (!in_range(src, user)) || user.stat || user.restrained() )
+ return
+ to_chat(user, "You fold [src] into the shape of a plane!")
+ user.unEquip(src)
+ I = new /obj/item/weapon/paperplane(user, src)
+ user.put_in_hands(I)
+ else
+ to_chat(user, " You lack the dexterity to fold \the [src]. ")
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index bed1bdccba..73ea40f12d 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -681,13 +681,10 @@
else
flick("apc-spark", src)
if (do_after(user,6))
- if(prob(50))
- emagged = 1
- locked = 0
- to_chat(user,"You emag the APC interface.")
- update_icon()
- else
- to_chat(user,"The APC interface refused to unlock.")
+ emagged = 1
+ locked = 0
+ to_chat(user,"You emag the APC interface.")
+ update_icon()
return 1
/obj/machinery/power/apc/attack_hand(mob/user)
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm
index 181f103b55..b530b9834e 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm
@@ -5,4 +5,26 @@
M.nutrition = max(M.nutrition - 20 * removed, 0)
M.overeatduration = 0
if(M.nutrition < 0)
- M.nutrition = 0
\ No newline at end of file
+ M.nutrition = 0
+
+/datum/reagent/ethanol/deathbell
+ name = "Deathbell"
+ id = "deathbell"
+ description = "A successful experiment to make the most alcoholic thing possible."
+ taste_description = "your brains smashed out by a smooth brick of hard, ice cold alcohol"
+ color = "#9f6aff"
+ taste_mult = 5
+ strength = 10
+ adj_temp = 10
+ targ_temp = 330
+
+ glass_name = "Deathbell"
+ glass_desc = "The perfect blend of the most alcoholic things a bartender can get their hands on."
+
+/datum/reagent/ethanol/deathbell/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+ ..()
+
+ if(dose * strength >= strength) // Early warning
+ M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects.
+ if(dose * strength >= strength * 2.5) // Slurring takes longer. Again, intentional.
+ M.slurring = max(M.slurring, 30)
diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm
index 5679c4b6ec..2071e54172 100644
--- a/code/modules/reagents/Chemistry-Recipes_vr.dm
+++ b/code/modules/reagents/Chemistry-Recipes_vr.dm
@@ -89,6 +89,13 @@
result = "grubshake"
required_reagents = list("shockchem" = 5, "water" = 25)
result_amount = 30
+
+/datum/chemical_reaction/drinks/deathbell
+ name = "Deathbell"
+ id = "deathbell"
+ result = "deathbell"
+ required_reagents = list("antifreeze" = 1, "gargleblaster" = 1, "syndicatebomb" =1)
+ result_amount = 3
///////////////////////////////
//SLIME CORES BELOW HERE///////
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 5c5d0cc3a6..604eaa6a3a 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -60,7 +60,57 @@
used = !used
return
+//A vial-loaded hypospray. Cartridge-based!
+/obj/item/weapon/reagent_containers/hypospray/vial
+ name = "hypospray mkII"
+ desc = "A new development from DeForest Medical, this new hypospray takes 30-unit vials as the drug supply for easy swapping."
+ var/obj/item/weapon/reagent_containers/glass/beaker/vial/loaded_vial //Wow, what a name.
+ volume = 0
+/obj/item/weapon/reagent_containers/hypospray/vial/New()
+ ..()
+ loaded_vial = new /obj/item/weapon/reagent_containers/glass/beaker/vial(src) //Comes with an empty vial
+ volume = loaded_vial.volume
+ reagents.maximum_volume = loaded_vial.reagents.maximum_volume
+
+/obj/item/weapon/reagent_containers/hypospray/vial/attack_hand(mob/user as mob)
+ if(user.get_inactive_hand() == src)
+ if(loaded_vial)
+ reagents.trans_to_holder(loaded_vial.reagents,volume)
+ reagents.maximum_volume = 0
+ loaded_vial.update_icon()
+ user.put_in_hands(loaded_vial)
+ loaded_vial = null
+ user << "You remove the vial from the [src]."
+ update_icon()
+ playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1)
+ return
+ ..()
+ else
+ return ..()
+
+/obj/item/weapon/reagent_containers/hypospray/vial/attackby(obj/item/weapon/W, mob/user as mob)
+ if(istype(W, /obj/item/weapon/reagent_containers/glass/beaker/vial))
+ if(!loaded_vial)
+ user.visible_message("[user] begins loading [W] into \the [src].","You start loading [W] into \the [src].")
+ if(!do_after(user,30) || loaded_vial || !(W in user))
+ return 0
+ if(W.is_open_container())
+ W.flags ^= OPENCONTAINER
+ W.update_icon()
+ user.drop_item()
+ W.loc = src
+ loaded_vial = W
+ reagents.maximum_volume = loaded_vial.reagents.maximum_volume
+ loaded_vial.reagents.trans_to_holder(reagents,volume)
+ user.visible_message("[user] has loaded [W] into \the [src].","You have loaded [W] into \the [src].")
+ update_icon()
+ playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
+ else
+ user << "\The [src] already has a vial."
+ else
+ ..()
+
/obj/item/weapon/reagent_containers/hypospray/autoinjector
name = "autoinjector"
desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel."
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 8e531ad687..db06449d18 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -405,7 +405,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
return
/obj/machinery/computer/rdconsole/proc/GetResearchLevelsInfo()
- var/dat
+ var/list/dat = list()
dat += ""
for(var/datum/tech/T in files.known_tech)
if(T.level < 1)
@@ -416,23 +416,23 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "- Level: [T.level]"
dat += "
- Summary: [T.desc]"
dat += "
"
- return dat
+ return dat.Join()
/obj/machinery/computer/rdconsole/proc/GetResearchListInfo()
- var/dat
+ var/list/dat = list()
dat += ""
for(var/datum/design/D in files.known_designs)
if(D.build_path)
dat += "- [D.name]: [D.desc]"
dat += "
"
- return dat
+ return dat.Join()
/obj/machinery/computer/rdconsole/attack_hand(mob/user as mob)
if(stat & (BROKEN|NOPOWER))
return
user.set_machine(src)
- var/dat = ""
+ var/list/dat = list()
files.RefreshResearch()
switch(screen) //A quick check to make sure you get the right screen when a device is disconnected.
if(2 to 2.9)
@@ -774,7 +774,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "List of Researched Technologies and Designs:"
dat += GetResearchListInfo()
- user << browse("Research and Development Console
[dat]", "window=rdconsole;size=850x600")
+ user << browse("Research and Development Console
[dat.Join()]", "window=rdconsole;size=850x600")
onclose(user, "rdconsole")
/obj/machinery/computer/rdconsole/robotics
diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm
index c36f32f109..a5db850472 100644
--- a/code/modules/resleeving/machines.dm
+++ b/code/modules/resleeving/machines.dm
@@ -105,6 +105,16 @@
return 1
/obj/machinery/clonepod/transhuman/process()
+
+ var/visible_message = 0
+ for(var/obj/item/weapon/reagent_containers/food/snacks/meat in range(1, src))
+ qdel(meat)
+ biomass += 50
+ visible_message = 1 // Prevent chatspam if multiple meat are near
+
+ if(visible_message)
+ visible_message("[src] sucks in and processes the nearby biomass.")
+
if(stat & NOPOWER)
if(occupant)
locked = 0
diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm
index 2bddb5af32..f1988ee8c6 100644
--- a/code/modules/shieldgen/shield_capacitor.dm
+++ b/code/modules/shieldgen/shield_capacitor.dm
@@ -4,7 +4,7 @@
/obj/machinery/shield_capacitor
name = "shield capacitor"
- desc = "Machine that charges a shield generator."
+ desc = "A machine that charges a shield generator."
icon = 'icons/obj/machines/shielding.dmi'
icon_state = "capacitor"
var/active = 0
@@ -19,6 +19,12 @@
var/charge_rate = 100000 //100 kW
var/obj/machinery/shield_gen/owned_gen
+/obj/machinery/shield_capacitor/advanced
+ name = "advanced shield capacitor"
+ desc = "A machine that charges a shield generator. This version can store, input, and output more electricity."
+ max_charge = 12e6
+ max_charge_rate = 600000
+
/obj/machinery/shield_capacitor/emag_act(var/remaining_charges, var/mob/user)
if(prob(75))
src.locked = !src.locked
diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm
index 32d34365b4..fd8e3bf0ca 100644
--- a/code/modules/shieldgen/shield_gen.dm
+++ b/code/modules/shieldgen/shield_gen.dm
@@ -1,6 +1,6 @@
/obj/machinery/shield_gen
name = "bubble shield generator"
- desc = "Machine that generates an impenetrable field of energy when activated."
+ desc = "A machine that generates a field of energy optimized for blocking meteorites when activated."
icon = 'icons/obj/machines/shielding.dmi'
icon_state = "generator0"
var/active = 0
@@ -20,10 +20,15 @@
var/target_field_strength = 10
var/max_field_strength = 10
var/time_since_fail = 100
- var/energy_conversion_rate = 0.0002 //how many renwicks per watt?
+ var/energy_conversion_rate = 0.0002 //how many renwicks per watt? Higher numbers equals more effiency.
var/z_range = 0 // How far 'up and or down' to extend the shield to, in z-levels. Only works on MultiZ supported z-levels.
use_power = 0 //doesn't use APC power
+/obj/machinery/shield_gen/advanced
+ name = "advanced bubble shield generator"
+ desc = "A machine that generates a field of energy optimized for blocking meteorites when activated. This version comes with a more efficent shield matrix."
+ energy_conversion_rate = 0.0004
+
/obj/machinery/shield_gen/New()
spawn(1 SECOND)
if(anchored)
@@ -259,11 +264,14 @@
/obj/machinery/shield_gen/update_icon()
if(stat & BROKEN)
icon_state = "broke"
+ set_light(0)
else
if (src.active)
icon_state = "generator1"
+ set_light(4, 2, "#00CCFF")
else
icon_state = "generator0"
+ set_light(0)
//grab the border tiles in a circle around this machine
/obj/machinery/shield_gen/proc/get_shielded_turfs()
diff --git a/code/modules/shieldgen/shield_gen_external.dm b/code/modules/shieldgen/shield_gen_external.dm
index 27b1def271..fa4702feee 100644
--- a/code/modules/shieldgen/shield_gen_external.dm
+++ b/code/modules/shieldgen/shield_gen_external.dm
@@ -7,8 +7,11 @@
/turf/space,
/turf/simulated/floor/outdoors,
)
-/obj/machinery/shield_gen/external/New()
- ..()
+
+/obj/machinery/shield_gen/external/advanced
+ name = "advanced hull shield generator"
+ desc = "A machine that generates a field of energy optimized for blocking meteorites when activated. This version comes with a more efficent shield matrix."
+ energy_conversion_rate = 0.0004
//Search for space turfs within range that are adjacent to a simulated turf.
/obj/machinery/shield_gen/external/get_shielded_turfs_on_z_level(var/turf/gen_turf)
diff --git a/code/modules/vore/eating/belly_vr.dm b/code/modules/vore/eating/belly_vr.dm
index 90560a26e7..13a7842ff4 100644
--- a/code/modules/vore/eating/belly_vr.dm
+++ b/code/modules/vore/eating/belly_vr.dm
@@ -266,7 +266,9 @@
// Indigestable items are removed, and M is deleted.
/datum/belly/proc/digestion_death(var/mob/living/M)
is_full = 1
- M.death(1)
+ //M.death(1) // "Stop it he's already dead..." Basically redundant and the reason behind screaming mouse carcasses.
+ if(M.ckey)
+ message_admins("[key_name(owner)] has digested [key_name(M)] in their [name] ([owner ? "JMP" : "null"])")
internal_contents -= M
// If digested prey is also a pred... anyone inside their bellies gets moved up.
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index 70528b11f6..2021b88ae0 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -666,7 +666,8 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
//WickedTempest: Chakat Tempest
/obj/item/weapon/implant/reagent_generator/tempest
- generated_reagent = "milk"
+ generated_reagents = list("milk" = 2)
+ reagent_name = "milk"
usable_volume = 1000
empty_message = list("Your breasts are almost completely drained!")
@@ -683,7 +684,8 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
//Hottokeeki: Belle Day
/obj/item/weapon/implant/reagent_generator/belle
- generated_reagent = "milk"
+ generated_reagents = list("milk" = 2)
+ reagent_name = "milk"
usable_volume = 5000
empty_message = list("Your breasts and or udder feel almost completely drained!", "You're feeling a liittle on the empty side...")
@@ -702,7 +704,8 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
/obj/item/weapon/implant/reagent_generator/eldi
name = "lactation implant"
desc = "This is an implant that allows the user to lactate."
- generated_reagent = "milk"
+ generated_reagents = list("milk" = 2)
+ reagent_name = "milk"
usable_volume = 1000
empty_message = list("Your breasts feel unusually empty.", "Your chest feels lighter - your milk supply is empty!", "Your milk reserves have run dry.", "Your grateful nipples ache as the last of your milk leaves them.")
@@ -718,7 +721,8 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
//Vorrarkul: Theodora Lindt
/obj/item/weapon/implant/reagent_generator/vorrarkul
- generated_reagent = "chocolate_milk"
+ generated_reagents = list("chocolate_milk" = 2)
+ reagent_name = "chocalate milk"
usable_volume = 1000
empty_message = list("Your nipples are sore from being milked!")
@@ -739,7 +743,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
/obj/item/weapon/implant/reagent_generator/roiz
name = "egg laying implant"
desc = "This is an implant that allows the user to lay eggs."
- generated_reagent = "egg"
+ generated_reagents = list("egg" = 2)
usable_volume = 500
transfer_amount = 50
@@ -801,12 +805,12 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
if(prob(15))
src.visible_message("[src] [pick(rimplant.random_emote)].") // M-mlem.
- rimplant.reagents.remove_reagent(rimplant.generated_reagent, rimplant.transfer_amount)
+ rimplant.reagents.remove_any(rimplant.transfer_amount)
/obj/item/weapon/implant/reagent_generator/pumila_apple
name = "apple laying implant"
desc = "This is an implant that allows the user to grow apples."
- generated_reagent = "sugar" //This actually allows them to.
+ generated_reagents = list("sugar" = 2) //This actually allows them to.
usable_volume = 250 //Five apples. Let's not get /too/ crazy here.
transfer_amount = 50
@@ -866,10 +870,11 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
src.visible_message("[src] [pick(rimplant.short_emote_descriptor)] an apple.",
"You [pick(rimplant.self_emote_descriptor)] an apple.")
- rimplant.reagents.remove_reagent(rimplant.generated_reagent, rimplant.transfer_amount)
+ rimplant.reagents.remove_any(rimplant.transfer_amount)
/*
/obj/item/weapon/implant/reagent_generator/pumila_nectar //Bugged. Two implants at once messes things up.
- generated_reagent = "honey"
+ generated_reagents = list("honey" = 2)
+ reagent_name = "honey"
usable_volume = 5000
empty_message = list("You appear to be all out of nectar", "You feel as though you are lacking a majority of your nectar.")
diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm
index b2fd8d35e6..3559e4c46e 100644
--- a/code/modules/vore/fluffstuff/custom_items_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_items_yw.dm
@@ -154,7 +154,6 @@
/obj/item/weapon/implant/reagent_generator/roiz/anoki
name = "egg laying implant"
desc = "This is an implant that allows the user to lay eggs."
- generated_reagent = "egg"
usable_volume = 500
transfer_amount = 50
@@ -209,7 +208,6 @@
/obj/item/weapon/implant/reagent_generator/yw/mira
name = "lactation implant"
desc = "This is an implant that allows the user to lactate."
- generated_reagent = "milk"
usable_volume = 1000
empty_message = list("Your breasts feel unusually empty.", "Your chest feels lighter - your milk supply is empty!", "Your milk reserves have run dry.", "Your grateful nipples ache as the last of your milk leaves them.")
@@ -228,7 +226,6 @@
/obj/item/weapon/implant/reagent_generator/yw/natalya
name = "lactation implant"
desc = "This is an implant that allows the user to lactate."
- generated_reagent = "milk"
usable_volume = 1000
empty_message = list("Your breasts feel unusually empty.", "Your chest feels lighter - your milk supply is empty!", "Your milk reserves have run dry.", "Your grateful nipples ache as the last of your milk leaves them.")
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index 8e4bf21b12..09beabb7b0 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -141,6 +141,8 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
now_pushing = 0
if(src.get_effective_size() > tmob.get_effective_size())
var/mob/living/carbon/human/H = src
+ if(H.flying)
+ return 1 //Silently pass without a message.
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
src << "You carefully slither around [tmob]."
tmob << "[src]'s huge tail slithers past beside you!"
@@ -166,6 +168,14 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
*/
/mob/living/proc/handle_micro_bump_other(var/mob/living/tmob)
ASSERT(istype(tmob)) // Baby don't hurt me
+ if(ishuman(src))
+ var/mob/living/carbon/human/P = src
+ if(P.flying) //If they're flying, don't do any special interactions.
+ return
+ if(ishuman(tmob))
+ var/mob/living/carbon/human/D = tmob
+ if(D.flying) //if the prey is flying, don't smush them.
+ return
if(src.a_intent == I_DISARM && src.canmove && !src.buckled)
// If bigger than them by at least 0.75, move onto them and print message.
@@ -190,7 +200,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
tmob.apply_damage(damage, HALLOSS)
tmob.resting = 1
var/mob/living/carbon/human/H = src
- log_and_message_admins("has stomped on, [tmob] pinning them to the ground and dealing [damage] HALLOSS.") //Both humans and mobs, since stepping on mobs can be abused.
+ log_and_message_admins("has stomped on [tmob], pinning them to the ground and dealing [damage] HALLOSS.") //Both humans and mobs, since stepping on mobs can be abused.
admin_attack_log(src, tmob, "Pinned [tmob.name] under foot for [damage] HALLOSS.", "Was pinned under foot by [src.name] for [damage] HALLOSS.", "Pinned [tmob.name] under foot for [damage] HALLOSS.")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
src << "You push down on [tmob] with your tail, pinning them down under you!"
diff --git a/icons/effects/128x48.dmi b/icons/effects/128x48.dmi
new file mode 100644
index 0000000000..71038ffdbf
Binary files /dev/null and b/icons/effects/128x48.dmi differ
diff --git a/icons/effects/128x72_vr.dmi b/icons/effects/128x72_vr.dmi
new file mode 100644
index 0000000000..2f1f2d2263
Binary files /dev/null and b/icons/effects/128x72_vr.dmi differ
diff --git a/icons/effects/species_a.dmi b/icons/effects/species_a.dmi
new file mode 100644
index 0000000000..927ec7c82e
Binary files /dev/null and b/icons/effects/species_a.dmi differ
diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi
index 14823c7801..88caed94c8 100644
Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 48ff6e0103..79b56e487c 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
index 0197a18e01..f50c46167d 100644
Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index f723644373..9947dec006 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/human_face_m.dmi b/icons/mob/human_face_m.dmi
new file mode 100644
index 0000000000..fda6c68b48
Binary files /dev/null and b/icons/mob/human_face_m.dmi differ
diff --git a/icons/mob/human_face_vr_add.dmi b/icons/mob/human_face_vr_add.dmi
new file mode 100644
index 0000000000..db641e74fe
Binary files /dev/null and b/icons/mob/human_face_vr_add.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/DSILizard/dsi_lizard.dmi b/icons/mob/human_races/cyberlimbs/DSILizard/dsi_lizard.dmi
index 40ba3dd59c..60e5589805 100644
Binary files a/icons/mob/human_races/cyberlimbs/DSILizard/dsi_lizard.dmi and b/icons/mob/human_races/cyberlimbs/DSILizard/dsi_lizard.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/DSILizard/dsi_lizard_a.dmi b/icons/mob/human_races/cyberlimbs/DSILizard/dsi_lizard_a.dmi
new file mode 100644
index 0000000000..c02075001f
Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/DSILizard/dsi_lizard_a.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/DSITajaran/dsi_tajaran.dmi b/icons/mob/human_races/cyberlimbs/DSITajaran/dsi_tajaran.dmi
index a4028b0856..2f277619ec 100644
Binary files a/icons/mob/human_races/cyberlimbs/DSITajaran/dsi_tajaran.dmi and b/icons/mob/human_races/cyberlimbs/DSITajaran/dsi_tajaran.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/DSITajaran/dsi_tajaran_a.dmi b/icons/mob/human_races/cyberlimbs/DSITajaran/dsi_tajaran_a.dmi
new file mode 100644
index 0000000000..a4028b0856
Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/DSITajaran/dsi_tajaran_a.dmi differ
diff --git a/icons/mob/human_races/r_def_lizard.dmi b/icons/mob/human_races/r_def_lizard.dmi
index 6c1f4d94fc..3ebace3090 100644
Binary files a/icons/mob/human_races/r_def_lizard.dmi and b/icons/mob/human_races/r_def_lizard.dmi differ
diff --git a/icons/mob/human_races/r_def_skrell.dmi b/icons/mob/human_races/r_def_skrell.dmi
index 7b24ba3b4d..3e6a40f3ae 100644
Binary files a/icons/mob/human_races/r_def_skrell.dmi and b/icons/mob/human_races/r_def_skrell.dmi differ
diff --git a/icons/mob/human_races/r_def_tajaran.dmi b/icons/mob/human_races/r_def_tajaran.dmi
index 44cda2ea86..64b1a2d30d 100644
Binary files a/icons/mob/human_races/r_def_tajaran.dmi and b/icons/mob/human_races/r_def_tajaran.dmi differ
diff --git a/icons/mob/human_races/r_lizard_a.dmi b/icons/mob/human_races/r_lizard_a.dmi
new file mode 100644
index 0000000000..94dfe1ed32
Binary files /dev/null and b/icons/mob/human_races/r_lizard_a.dmi differ
diff --git a/icons/mob/human_races/r_lizard_m.dmi b/icons/mob/human_races/r_lizard_m.dmi
new file mode 100644
index 0000000000..ee4fd41995
Binary files /dev/null and b/icons/mob/human_races/r_lizard_m.dmi differ
diff --git a/icons/mob/human_races/r_seromi_a.dmi b/icons/mob/human_races/r_seromi_a.dmi
new file mode 100644
index 0000000000..24d49ef1eb
Binary files /dev/null and b/icons/mob/human_races/r_seromi_a.dmi differ
diff --git a/icons/mob/human_races/r_seromi_m.dmi b/icons/mob/human_races/r_seromi_m.dmi
new file mode 100644
index 0000000000..9864106bd4
Binary files /dev/null and b/icons/mob/human_races/r_seromi_m.dmi differ
diff --git a/icons/mob/human_races/r_skrell_a.dmi b/icons/mob/human_races/r_skrell_a.dmi
new file mode 100644
index 0000000000..7da571bf1e
Binary files /dev/null and b/icons/mob/human_races/r_skrell_a.dmi differ
diff --git a/icons/mob/human_races/r_skrell_m.dmi b/icons/mob/human_races/r_skrell_m.dmi
new file mode 100644
index 0000000000..224fb25eae
Binary files /dev/null and b/icons/mob/human_races/r_skrell_m.dmi differ
diff --git a/icons/mob/human_races/r_tajaran_a.dmi b/icons/mob/human_races/r_tajaran_a.dmi
new file mode 100644
index 0000000000..d70bb0b715
Binary files /dev/null and b/icons/mob/human_races/r_tajaran_a.dmi differ
diff --git a/icons/mob/human_races/r_tajaran_m.dmi b/icons/mob/human_races/r_tajaran_m.dmi
new file mode 100644
index 0000000000..29f6b04e39
Binary files /dev/null and b/icons/mob/human_races/r_tajaran_m.dmi differ
diff --git a/icons/mob/items/lefthand_gloves.dmi b/icons/mob/items/lefthand_gloves.dmi
index 0c12bda3d5..c00dd71eb0 100644
Binary files a/icons/mob/items/lefthand_gloves.dmi and b/icons/mob/items/lefthand_gloves.dmi differ
diff --git a/icons/mob/items/righthand_gloves.dmi b/icons/mob/items/righthand_gloves.dmi
index 25b41e25ec..8ad72028b5 100644
Binary files a/icons/mob/items/righthand_gloves.dmi and b/icons/mob/items/righthand_gloves.dmi differ
diff --git a/icons/mob/mask_vr.dmi b/icons/mob/mask_vr.dmi
index eb440af136..4dd1712531 100644
Binary files a/icons/mob/mask_vr.dmi and b/icons/mob/mask_vr.dmi differ
diff --git a/icons/mob/species/akula/mask_vr.dmi b/icons/mob/species/akula/mask_vr.dmi
index 454acd3d2a..37661c10c8 100644
Binary files a/icons/mob/species/akula/mask_vr.dmi and b/icons/mob/species/akula/mask_vr.dmi differ
diff --git a/icons/mob/species/fennec/mask_vr.dmi b/icons/mob/species/fennec/mask_vr.dmi
index 4099d68eba..d7ef6d6b78 100644
Binary files a/icons/mob/species/fennec/mask_vr.dmi and b/icons/mob/species/fennec/mask_vr.dmi differ
diff --git a/icons/mob/species/fox/mask_vr.dmi b/icons/mob/species/fox/mask_vr.dmi
index b6b6409cbe..68d2cc31db 100644
Binary files a/icons/mob/species/fox/mask_vr.dmi and b/icons/mob/species/fox/mask_vr.dmi differ
diff --git a/icons/mob/species/nevrean/mask_vr.dmi b/icons/mob/species/nevrean/mask_vr.dmi
index 06f026c025..bbe1b658d5 100644
Binary files a/icons/mob/species/nevrean/mask_vr.dmi and b/icons/mob/species/nevrean/mask_vr.dmi differ
diff --git a/icons/mob/species/sergal/mask_vr.dmi b/icons/mob/species/sergal/mask_vr.dmi
index 72e3532e9c..5ccc61cc52 100644
Binary files a/icons/mob/species/sergal/mask_vr.dmi and b/icons/mob/species/sergal/mask_vr.dmi differ
diff --git a/icons/mob/species/seromi/masks_vr.dmi b/icons/mob/species/seromi/masks_vr.dmi
index 4522be6f96..d3b17eb7da 100644
Binary files a/icons/mob/species/seromi/masks_vr.dmi and b/icons/mob/species/seromi/masks_vr.dmi differ
diff --git a/icons/mob/species/tajaran/mask_vr.dmi b/icons/mob/species/tajaran/mask_vr.dmi
index 2e840c8763..55d1371622 100644
Binary files a/icons/mob/species/tajaran/mask_vr.dmi and b/icons/mob/species/tajaran/mask_vr.dmi differ
diff --git a/icons/mob/species/tajaran/tail_a.dmi b/icons/mob/species/tajaran/tail_a.dmi
new file mode 100644
index 0000000000..1a4245611b
Binary files /dev/null and b/icons/mob/species/tajaran/tail_a.dmi differ
diff --git a/icons/mob/species/tajaran/tail_m.dmi b/icons/mob/species/tajaran/tail_m.dmi
new file mode 100644
index 0000000000..159ca49b32
Binary files /dev/null and b/icons/mob/species/tajaran/tail_m.dmi differ
diff --git a/icons/mob/species/unathi/mask_vr.dmi b/icons/mob/species/unathi/mask_vr.dmi
index 835f2a3a73..c5f8c9d634 100644
Binary files a/icons/mob/species/unathi/mask_vr.dmi and b/icons/mob/species/unathi/mask_vr.dmi differ
diff --git a/icons/mob/species/unathi/tail_a.dmi b/icons/mob/species/unathi/tail_a.dmi
new file mode 100644
index 0000000000..cf3e861a5d
Binary files /dev/null and b/icons/mob/species/unathi/tail_a.dmi differ
diff --git a/icons/mob/species/unathi/tail_m.dmi b/icons/mob/species/unathi/tail_m.dmi
new file mode 100644
index 0000000000..b944c3e37b
Binary files /dev/null and b/icons/mob/species/unathi/tail_m.dmi differ
diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/mob/species/vulpkanin/mask.dmi
index af27473ced..1ddf1cccfc 100644
Binary files a/icons/mob/species/vulpkanin/mask.dmi and b/icons/mob/species/vulpkanin/mask.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 9db8ef1fc5..0f88d8fd04 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi
index 2c17ab4a32..9fd6cba6df 100644
Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index f121d14ca4..4dd885d30b 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 42fac1ec7a..b621d05474 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 3618369771..bc4e1880c6 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/masks_vr.dmi b/icons/obj/clothing/masks_vr.dmi
index d5e2f1e544..d6f75cdb69 100644
Binary files a/icons/obj/clothing/masks_vr.dmi and b/icons/obj/clothing/masks_vr.dmi differ
diff --git a/icons/obj/furniture.dmi b/icons/obj/furniture.dmi
index 0e6659ae4f..42697f358d 100644
Binary files a/icons/obj/furniture.dmi and b/icons/obj/furniture.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 5e1ad9e8e0..9cbb46748a 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/maps/tether/tether-01-surface.dmm b/maps/tether/tether-01-surface.dmm
index 02c4f8ac4f..0e11ed3819 100644
--- a/maps/tether/tether-01-surface.dmm
+++ b/maps/tether/tether-01-surface.dmm
@@ -26,7 +26,7 @@
"aaz" = (/obj/structure/plasticflaps/mining,/obj/machinery/conveyor{dir = 1; id = "mining_inbound"},/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery)
"aaA" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{dir = 4},/turf/simulated/floor/tiled,/area/tether/surfacebase/mining_main/airlock)
"aaB" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/turf/simulated/floor/tiled,/area/tether/surfacebase/mining_main/airlock)
-"aaC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery)
+"aaC" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery)
"aaD" = (/obj/machinery/conveyor{dir = 1; id = "mining_outbound"},/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery)
"aaE" = (/obj/machinery/conveyor{dir = 1; id = "mining_inbound"},/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery)
"aaF" = (/obj/random/maintenance/cargo,/obj/random/junk,/obj/random/junk,/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery)
@@ -42,7 +42,7 @@
"aaP" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{dir = 4},/turf/simulated/floor/tiled,/area/tether/surfacebase/mining_main/airlock)
"aaQ" = (/obj/machinery/embedded_controller/radio/airlock/phoron{id_tag = "mining_airlock"; pixel_x = 25},/obj/machinery/airlock_sensor/phoron{id_tag = "mining_airlock_sensor"; pixel_x = 25; pixel_y = 11},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/turf/simulated/floor/tiled,/area/tether/surfacebase/mining_main/airlock)
"aaR" = (/obj/machinery/mineral/unloading_machine,/turf/simulated/floor/tiled/techfloor,/area/tether/surfacebase/mining_main/refinery)
-"aaS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery)
+"aaS" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery)
"aaT" = (/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 2; id = "mining_interior"},/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery)
"aaU" = (/turf/simulated/wall,/area/maintenance/lower/trash_pit)
"aaV" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_external{frequency = 1379; icon_state = "door_locked"; id_tag = "mining_airlock_inner"; locked = 1},/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/turf/simulated/floor/tiled/steel_grid,/area/tether/surfacebase/mining_main/airlock)
@@ -88,7 +88,7 @@
"abJ" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/brown/border{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/cargo{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/tether/surfacebase/mining_main/storage)
"abK" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/brown/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/tether/surfacebase/mining_main/storage)
"abL" = (/turf/simulated/wall,/area/tether/surfacebase/mining_main/eva)
-"abM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/eva)
+"abM" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/eva)
"abN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass_mining{name = "Production Area"; req_access = list(48)},/turf/simulated/floor/tiled/steel_grid,/area/tether/surfacebase/mining_main/eva)
"abO" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_mining{name = "Production Area"; req_access = list(48)},/turf/simulated/floor/tiled/steel_grid,/area/tether/surfacebase/mining_main/eva)
"abP" = (/turf/simulated/wall,/area/tether/surfacebase/mining_main/uxstorage)
@@ -375,7 +375,7 @@
"ahk" = (/obj/machinery/atmospherics/pipe/tank/air,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/storage/surface_eva)
"ahl" = (/turf/simulated/wall,/area/hallway/lower/first_west)
"ahm" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/glass{name = "Primary Tool Storage"},/turf/simulated/floor/tiled/steel_grid,/area/storage/primary)
-"ahn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/storage/primary)
+"ahn" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/storage/primary)
"aho" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass{name = "Primary Tool Storage"},/turf/simulated/floor/tiled/steel_grid,/area/storage/primary)
"ahp" = (/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/cargo,/turf/simulated/floor/tiled/techfloor,/area/maintenance/lower/mining_eva)
"ahq" = (/obj/structure/railing{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/maintenance/lower/mining_eva)
@@ -441,7 +441,7 @@
"aiy" = (/turf/simulated/wall,/area/storage/surface_eva/external)
"aiz" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/storage/surface_eva)
"aiA" = (/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 4},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/storage/surface_eva)
-"aiB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/tether/surfacebase/security/common)
+"aiB" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/tether/surfacebase/security/common)
"aiC" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 9; icon_state = "intact"; tag = "icon-intact-f (NORTHWEST)"},/obj/machinery/floodlight,/turf/simulated/floor/plating,/area/storage/surface_eva)
"aiD" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/hallway/lower/first_west)
"aiE" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/hallway/lower/first_west)
@@ -530,15 +530,15 @@
"akj" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/obj/machinery/door/window/southleft,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/weapon/tank/emergency/oxygen/engi,/turf/simulated/floor/tiled/dark,/area/storage/surface_eva)
"akk" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/obj/machinery/door/window/southright,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/weapon/tank/emergency/oxygen/engi,/turf/simulated/floor/tiled/dark,/area/storage/surface_eva)
"akl" = (/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/effect/floor_decal/corner/paleblue/border{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{dir = 1; pixel_y = 24; req_access = list()},/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/lobby)
-"akm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/storage/surface_eva)
+"akm" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/storage/surface_eva)
"akn" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/hallway/lower/first_west)
"ako" = (/turf/simulated/floor/tiled,/area/hallway/lower/first_west)
"akp" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/hallway/lower/first_west)
-"akq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hallway/lower/first_west)
+"akq" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hallway/lower/first_west)
"akr" = (/obj/machinery/door/airlock/multi_tile/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 8},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/monofloor{dir = 8},/area/hallway/lower/first_west)
"aks" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/monofloor{dir = 4},/area/hallway/lower/first_west)
"akt" = (/turf/simulated/wall,/area/storage/art)
-"aku" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/storage/art)
+"aku" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/storage/art)
"akv" = (/obj/machinery/door/airlock/glass{name = "Art Storage"},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/steel_grid,/area/storage/art)
"akw" = (/obj/structure/sign/directions/evac{name = "\improper Secondary Evacuation Route"},/turf/simulated/wall,/area/tether/surfacebase/north_stairs_one)
"akx" = (/obj/machinery/door/airlock/maintenance/common,/obj/machinery/door/firedoor/glass,/obj/structure/catwalk,/turf/simulated/floor/tiled/techfloor,/area/tether/surfacebase/north_stairs_one)
@@ -719,7 +719,7 @@
"anQ" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/machinery/light_switch{pixel_x = 25},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/tiled,/area/tether/surfacebase/security/common)
"anR" = (/obj/structure/table/glass,/obj/item/weapon/storage/firstaid/regular,/obj/random/medical/lite,/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/first_aid_west)
"anS" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/newscaster{layer = 3.3; pixel_x = 28},/obj/structure/bed/roller,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/first_aid_west)
-"anT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/medical/first_aid_west)
+"anT" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/medical/first_aid_west)
"anU" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/hallway/lower/first_west)
"anV" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 10},/turf/simulated/floor/tiled,/area/hallway/lower/first_west)
"anW" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 1},/turf/simulated/floor/tiled/monofloor{dir = 1},/area/hallway/lower/first_west)
@@ -733,12 +733,12 @@
"aoe" = (/turf/simulated/wall,/area/crew_quarters/locker)
"aof" = (/obj/machinery/door/airlock/maintenance/common{name = "Locker Room Maintenance"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/crew_quarters/locker)
"aog" = (/obj/structure/table/standard,/obj/machinery/computer/atmoscontrol/laptop{monitored_alarm_ids = list("isolation_one","isolation_two"); req_one_access = list(47,24,11)},/turf/simulated/floor/tiled,/area/rnd/anomaly_lab)
-"aoh" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rnd/anomaly_lab/containment_one)
-"aoi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/atmospherics/pipe/simple/visible/yellow,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rnd/anomaly_lab/containment_one)
+"aoh" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rnd/anomaly_lab/containment_one)
+"aoi" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/atmospherics/pipe/simple/visible/yellow,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rnd/anomaly_lab/containment_one)
"aoj" = (/obj/machinery/door/airlock/glass_external{name = "Isolation Room 1"; req_access = list(65); req_one_access = list(47)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/rnd/anomaly_lab/containment_one)
"aok" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_external{name = "Isolation Room 2"; req_access = list(65); req_one_access = list(47)},/turf/simulated/floor/tiled,/area/rnd/anomaly_lab/containment_two)
-"aol" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/atmospherics/pipe/simple/visible/yellow,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rnd/anomaly_lab/containment_two)
-"aom" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rnd/anomaly_lab/containment_two)
+"aol" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/atmospherics/pipe/simple/visible/yellow,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rnd/anomaly_lab/containment_two)
+"aom" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rnd/anomaly_lab/containment_two)
"aon" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/hallway/lower/first_west)
"aoo" = (/obj/item/device/radio/beacon,/turf/simulated/floor/tiled,/area/hallway/lower/first_west)
"aop" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 5},/turf/simulated/floor/tiled,/area/hallway/lower/first_west)
@@ -940,7 +940,7 @@
"asd" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/effect/floor_decal/corner/green{dir = 10},/obj/effect/floor_decal/corner/green{dir = 5},/turf/simulated/floor/tiled,/area/rnd/anomaly_lab)
"ase" = (/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/rnd/anomaly_lab)
"asf" = (/obj/machinery/camera/network/research,/obj/structure/closet/firecloset,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/rnd/anomaly_lab)
-"asg" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/anomaly_lab)
+"asg" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/anomaly_lab)
"ash" = (/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/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/rnd/hallway)
"asi" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/rnd/hallway)
"asj" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/turf/simulated/floor/tiled,/area/rnd/hallway)
@@ -1014,7 +1014,7 @@
"atz" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled,/area/rnd/anomaly_lab)
"atA" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled,/area/rnd/anomaly_lab)
"atB" = (/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{dir = 9},/turf/simulated/floor/tiled,/area/rnd/anomaly_lab)
-"atC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/sign/department/anomaly,/turf/simulated/floor/plating,/area/rnd/anomaly_lab)
+"atC" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/sign/department/anomaly,/turf/simulated/floor/plating,/area/rnd/anomaly_lab)
"atD" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 8},/turf/simulated/floor/tiled,/area/rnd/hallway)
"atE" = (/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/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/mauve/bordercorner,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/rnd/hallway)
"atF" = (/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/mauve/border{dir = 6},/turf/simulated/floor/tiled,/area/rnd/hallway)
@@ -1107,7 +1107,7 @@
"avo" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/mauve/border{dir = 1},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 28},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora)
"avp" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/mauve/border{dir = 1},/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora)
"avq" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/mauve/border{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 5},/obj/structure/closet/crate/hydroponics/prespawned,/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora)
-"avr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora/lab_atmos)
+"avr" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora/lab_atmos)
"avs" = (/obj/structure/window/reinforced,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/industrial/danger{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora/lab_atmos)
"avt" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora/lab_atmos)
"avu" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora/lab_atmos)
@@ -1252,7 +1252,7 @@
"ayd" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_one)
"aye" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/beacon,/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_one)
"ayf" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_one)
-"ayg" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/tram)
+"ayg" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/tram)
"ayh" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 1},/obj/effect/landmark/tram,/turf/simulated/floor/tiled,/area/tether/surfacebase/tram)
"ayi" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/tether/surfacebase/tram)
"ayj" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/landmark/tram,/turf/simulated/floor/tiled,/area/tether/surfacebase/tram)
@@ -1326,7 +1326,7 @@
"azz" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora)
"azA" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora)
"azB" = (/obj/machinery/biogenerator,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/mauve/border{dir = 4},/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora)
-"azC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora/lab_atmos)
+"azC" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora/lab_atmos)
"azD" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
"azE" = (/obj/effect/decal/cleanable/dirt,/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
"azF" = (/obj/effect/decal/cleanable/dirt,/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
@@ -1334,9 +1334,9 @@
"azH" = (/obj/random/trash_pile,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
"azI" = (/turf/simulated/wall,/area/maintenance/lower/atmos)
"azJ" = (/obj/structure/catwalk,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/obj/machinery/atmospherics/pipe/simple/visible/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/techfloor,/area/maintenance/lower/atmos)
-"azK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/crew_quarters/locker/laundry_arrival)
+"azK" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/crew_quarters/locker/laundry_arrival)
"azL" = (/obj/machinery/door/airlock/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/structure/cable{icon_state = "1-2"},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/locker/laundry_arrival)
-"azM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/locker/laundry_arrival)
+"azM" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/locker/laundry_arrival)
"azN" = (/obj/machinery/washing_machine,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/locker/laundry_arrival)
"azO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 6},/turf/simulated/floor/tiled,/area/crew_quarters/locker/laundry_arrival)
"azP" = (/obj/structure/grille,/obj/structure/railing{dir = 1},/turf/simulated/floor/tiled/techmaint,/area/tether/surfacebase/atrium_one)
@@ -1351,7 +1351,7 @@
"azY" = (/obj/structure/window/reinforced,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology)
"azZ" = (/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = 0; pixel_y = 32},/obj/structure/table/standard,/obj/item/weapon/gun/energy/taser/xeno,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/mauve/border{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology)
"aAa" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/camera/network/northern_star,/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/item/device/radio/intercom{dir = 1; pixel_y = 24; req_access = list()},/turf/simulated/floor/tiled,/area/tether/surfacebase/north_stairs_one)
-"aAb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/outpost/research/xenobiology)
+"aAb" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/outpost/research/xenobiology)
"aAc" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/machinery/camera/network/research{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/rnd/hallway)
"aAd" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/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/disposalpipe/junction{icon_state = "pipe-j2"; dir = 2},/turf/simulated/floor/tiled,/area/rnd/hallway)
"aAe" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/glass_research{name = "Xenoflora Research"; req_access = list(55)},/turf/simulated/floor/tiled/steel_grid,/area/rnd/xenobiology/xenoflora)
@@ -1394,7 +1394,7 @@
"aAP" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/mauve/border{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology)
"aAQ" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/rnd/hallway)
"aAR" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/mauve/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 6},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/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,/turf/simulated/floor/tiled,/area/rnd/hallway)
-"aAS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora)
+"aAS" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora)
"aAT" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 8},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora)
"aAU" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/grass,/area/rnd/xenobiology/xenoflora)
"aAV" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/mauve/border{dir = 9},/turf/simulated/floor/tiled/steel_grid,/area/outpost/research/xenobiology)
@@ -1493,7 +1493,7 @@
"aCK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/tether/surfacebase/tram)
"aCL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable{icon_state = "1-2"},/turf/simulated/floor/tiled,/area/tether/surfacebase/tram)
"aCM" = (/obj/structure/sign/electricshock,/turf/simulated/wall,/area/maintenance/lower/solars)
-"aCN" = (/obj/structure/cable/heavyduty{icon_state = "1-2"},/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/maintenance/lower/solars)
+"aCN" = (/obj/structure/cable/heavyduty{icon_state = "1-2"},/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/maintenance/lower/solars)
"aCO" = (/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "xenobio1"; name = "Containment Blast Doors"; opacity = 0},/obj/machinery/door/window/brigdoor/westright{name = "Containment Pen"; req_access = list(55)},/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology)
"aCP" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology)
"aCQ" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/industrial/danger{dir = 8},/turf/simulated/floor/tiled/steel_grid,/area/outpost/research/xenobiology)
@@ -1533,7 +1533,7 @@
"aDy" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table/glass,/turf/simulated/floor/tiled,/area/outpost/research/xenobiology)
"aDz" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology)
"aDA" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/mauve/border{dir = 4},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology)
-"aDB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/outpost/research/xenobiology)
+"aDB" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/outpost/research/xenobiology)
"aDC" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/rnd/hallway)
"aDD" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/mauve/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/junction,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/rnd/hallway)
"aDE" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass_research{name = "Xenoflora Research"; req_access = list(55)},/turf/simulated/floor/tiled/steel_grid,/area/rnd/xenobiology/xenoflora)
@@ -1840,7 +1840,7 @@
"aJt" = (/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
"aJu" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; icon_state = "map_injector"; tag = "icon-map_injector (EAST)"; use_power = 1; volume_rate = 700},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
"aJv" = (/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
-"aJw" = (/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/obj/machinery/door/firedoor,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/engineering/atmos/processing)
+"aJw" = (/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/obj/machinery/door/firedoor,/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/engineering/atmos/processing)
"aJx" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/machinery/atmospherics/binary/passive_gate{dir = 8; name = "Scrubber Purge Valve"; target_pressure = 4500},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aJy" = (/obj/machinery/atmospherics/pipe/manifold/visible/red{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aJz" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
@@ -1883,7 +1883,7 @@
"aKk" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
"aKl" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
"aKm" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
-"aKn" = (/obj/machinery/atmospherics/pipe/simple/visible/black{dir = 4},/obj/machinery/door/firedoor,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/engineering/atmos/processing)
+"aKn" = (/obj/machinery/atmospherics/pipe/simple/visible/black{dir = 4},/obj/machinery/door/firedoor,/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/engineering/atmos/processing)
"aKo" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/machinery/atmospherics/pipe/manifold4w/visible/black,/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aKp" = (/obj/machinery/atmospherics/pipe/cap/visible{tag = "icon-cap (WEST)"; icon_state = "cap"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aKq" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/zpipe/up,/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
@@ -1915,7 +1915,7 @@
"aKQ" = (/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 1},/obj/machinery/atmospherics/pipe/simple/visible/yellow,/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aKR" = (/obj/machinery/atmospherics/pipe/manifold/visible/black{dir = 8},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/machinery/meter,/turf/simulated/floor/tiled/techmaint,/area/engineering/atmos/processing)
"aKS" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
-"aKT" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/machinery/door/firedoor,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/engineering/atmos/processing)
+"aKT" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/machinery/door/firedoor,/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/engineering/atmos/processing)
"aKU" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/machinery/atmospherics/binary/passive_gate{dir = 8; name = "Waste Purge Valve"; target_pressure = 4500},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aKV" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aKW" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
@@ -1926,7 +1926,7 @@
"aLb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aLc" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aLd" = (/obj/machinery/atmospherics/unary/vent_scrubber{tag = "icon-map_scrubber_off (EAST)"; icon_state = "map_scrubber_off"; dir = 4},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
-"aLe" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor/plating,/area/engineering/atmos/processing)
+"aLe" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor/plating,/area/engineering/atmos/processing)
"aLf" = (/obj/effect/floor_decal/techfloor/corner{dir = 1},/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aLg" = (/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow,/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aLh" = (/obj/machinery/atmospherics/unary/heater{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
@@ -1936,7 +1936,7 @@
"aLl" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aLm" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/camera/network/engineering{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aLn" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
-"aLo" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/engineering/atmos/processing)
+"aLo" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/engineering/atmos/processing)
"aLp" = (/obj/effect/floor_decal/techfloor,/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aLq" = (/obj/effect/floor_decal/techfloor,/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/camera/network/engineering{dir = 1},/obj/machinery/atmospherics/pipe/manifold/visible/yellow,/obj/machinery/meter,/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
"aLr" = (/obj/effect/floor_decal/techfloor,/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing)
@@ -2636,7 +2636,7 @@
"aYJ" = (/obj/structure/grille,/obj/structure/railing{dir = 1},/turf/simulated/floor/tiled/techmaint,/area/tether/surfacebase/atrium_two)
"aYK" = (/turf/simulated/wall,/area/engineering/lower/lobby)
"aYL" = (/obj/machinery/door/airlock/glass{name = "Atmospherics"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/engineering/lower/lobby)
-"aYM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/engineering/lower/lobby)
+"aYM" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/engineering/lower/lobby)
"aYN" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass{name = "Atmospherics"},/turf/simulated/floor/tiled/steel_grid,/area/engineering/lower/lobby)
"aYO" = (/turf/simulated/wall,/area/engineering/lower/breakroom)
"aYP" = (/turf/simulated/wall,/area/janitor)
@@ -2667,7 +2667,7 @@
"aZo" = (/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/structure/disposalpipe/sortjunction{dir = 1; icon_state = "pipe-j1s"; name = "Atmospherics"; sortType = "Atmospherics"},/turf/simulated/floor/tiled,/area/engineering/lower/lobby)
"aZp" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 4},/obj/machinery/alarm{pixel_y = 22},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/engineering/lower/lobby)
"aZq" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/yellow/border{dir = 5},/obj/machinery/computer/guestpass{pixel_x = 0; pixel_y = 28},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/engineering/lower/lobby)
-"aZr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/engineering/lower/breakroom)
+"aZr" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/engineering/lower/breakroom)
"aZs" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/yellow/border{dir = 9},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/tiled,/area/engineering/lower/breakroom)
"aZt" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled,/area/engineering/lower/breakroom)
"aZu" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/machinery/light_switch{pixel_y = 25},/turf/simulated/floor/tiled,/area/engineering/lower/breakroom)
@@ -2706,7 +2706,7 @@
"bab" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/lower/lobby)
"bac" = (/turf/simulated/floor/tiled,/area/engineering/lower/lobby)
"bad" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/turf/simulated/floor/tiled,/area/engineering/lower/lobby)
-"bae" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/engineering/lower/breakroom)
+"bae" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/engineering/lower/breakroom)
"baf" = (/turf/simulated/floor/carpet,/area/engineering/lower/breakroom)
"bag" = (/obj/structure/bed/chair,/turf/simulated/floor/carpet,/area/engineering/lower/breakroom)
"bah" = (/turf/simulated/floor/tiled,/area/engineering/lower/breakroom)
@@ -2799,7 +2799,7 @@
"bbQ" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/structure/reagent_dispensers/acid{pixel_x = -32},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled/techfloor,/area/rnd/workshop)
"bbR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techfloor,/area/rnd/workshop)
"bbS" = (/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor/tiled/techfloor,/area/rnd/workshop)
-"bbT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/workshop)
+"bbT" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/workshop)
"bbU" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 10},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/rnd/lockers)
"bbV" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/rnd/lockers)
"bbW" = (/obj/effect/floor_decal/steeldecal/steel_decals5,/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/simulated/floor/tiled,/area/rnd/lockers)
@@ -2807,7 +2807,7 @@
"bbY" = (/turf/simulated/open,/area/rnd/lockers)
"bbZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/rnd/lockers)
"bca" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/mauve/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 5},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/turf/simulated/floor/tiled,/area/rnd/lockers)
-"bcb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/sign/department/rnd,/turf/simulated/floor/plating,/area/rnd/research)
+"bcb" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/sign/department/rnd,/turf/simulated/floor/plating,/area/rnd/research)
"bcc" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 10},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research)
"bcd" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j2"},/turf/simulated/floor/tiled,/area/rnd/research)
"bce" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research)
@@ -2934,8 +2934,8 @@
"bev" = (/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers,/obj/machinery/atmospherics/pipe/zpipe/up/supply,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/structure/cable/cyan{d2 = 2; icon_state = "0-2"},/obj/structure/cable/cyan{d1 = 16; d2 = 0; icon_state = "16-0"},/obj/structure/railing,/turf/simulated/floor/plating,/area/engineering/atmos/hallway)
"bew" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics"; req_access = list(24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/atmos/hallway)
"bex" = (/turf/simulated/wall,/area/engineering/atmos/monitoring)
-"bey" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/engineering/atmos/monitoring)
-"bez" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/engineering/atmos/monitoring)
+"bey" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/engineering/atmos/monitoring)
+"bez" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/engineering/atmos/monitoring)
"beA" = (/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/firedoor/glass,/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics Monitoring Room"; req_access = list(24)},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring)
"beB" = (/obj/structure/cable/cyan{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -30},/turf/simulated/floor/tiled/techfloor,/area/tether/surfacebase/emergency_storage/atrium)
"beC" = (/obj/machinery/space_heater,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/techfloor,/area/tether/surfacebase/emergency_storage/atrium)
@@ -2971,7 +2971,7 @@
"bfg" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals5,/turf/simulated/floor/tiled,/area/engineering/atmos/hallway)
"bfh" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals5,/obj/machinery/camera/network/engineering,/turf/simulated/floor/tiled,/area/engineering/atmos/hallway)
"bfi" = (/obj/structure/ladder/updown,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/machinery/status_display{pixel_y = 30},/turf/simulated/floor/tiled,/area/engineering/atmos/hallway)
-"bfj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/engineering/atmos/hallway)
+"bfj" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/engineering/atmos/hallway)
"bfk" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/yellow/border{dir = 9},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 1},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 10},/obj/machinery/light_switch{pixel_y = 25},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/engineering/atmos/hallway)
"bfl" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos/hallway)
"bfm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 4},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 1},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos/hallway)
@@ -3044,8 +3044,8 @@
"bgB" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/yellow/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled,/area/engineering/atmos/hallway)
"bgC" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/machinery/light_switch{pixel_x = 25},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/atmos/hallway)
"bgD" = (/turf/simulated/wall,/area/engineering/lower/atmos_lockers)
-"bgE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/engineering/lower/atmos_lockers)
-"bgF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plating,/area/engineering/lower/atmos_lockers)
+"bgE" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/engineering/lower/atmos_lockers)
+"bgF" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plating,/area/engineering/lower/atmos_lockers)
"bgG" = (/obj/effect/floor_decal/corner/yellow{dir = 6},/obj/effect/floor_decal/corner/yellow{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/machinery/vending/engivend,/turf/simulated/floor/tiled/monotile,/area/engineering/atmos/hallway)
"bgH" = (/obj/effect/floor_decal/corner/yellow{dir = 6},/obj/effect/floor_decal/corner/yellow{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/machinery/vending/tool,/turf/simulated/floor/tiled/monotile,/area/engineering/atmos/hallway)
"bgI" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/yellow/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled,/area/engineering/atmos/hallway)
@@ -3194,9 +3194,9 @@
"bjv" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics"; req_access = list(24)},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/steel_grid,/area/engineering/atmos)
"bjw" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics"; req_access = list(24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/atmos)
"bjx" = (/turf/simulated/wall,/area/engineering/atmos)
-"bjy" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/turf/simulated/floor/plating,/area/engineering/atmos)
+"bjy" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/turf/simulated/floor/plating,/area/engineering/atmos)
"bjz" = (/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics"; req_access = list(24)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/engineering/atmos)
-"bjA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor/plating,/area/engineering/atmos)
+"bjA" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor/plating,/area/engineering/atmos)
"bjB" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable/cyan,/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -30},/turf/simulated/floor,/area/engineering/atmos/storage)
"bjC" = (/obj/structure/closet/firecloset,/turf/simulated/floor/tiled/steel_dirty,/area/rnd/research_storage)
"bjD" = (/obj/structure/closet/secure_closet/scientist,/obj/item/weapon/handcuffs/fuzzy,/turf/simulated/floor/tiled/steel_dirty,/area/rnd/research_storage)
@@ -3523,7 +3523,7 @@
"bpM" = (/obj/machinery/camera/network/telecom,/obj/structure/sign/electricshock{pixel_y = 32},/turf/simulated/floor/tiled,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bpN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bpO" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled,/area/tcomsat{name = "\improper Telecomms Lobby"})
-"bpP" = (/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/tcomsat{name = "\improper Telecomms Lobby"})
+"bpP" = (/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bpQ" = (/turf/simulated/floor/tiled,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bpR" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bpS" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/item/device/radio/intercom{dir = 8; pixel_x = -24},/turf/simulated/floor/wood,/area/crew_quarters/bar)
@@ -3562,7 +3562,7 @@
"bqz" = (/obj/machinery/alarm{dir = 1; pixel_y = -25},/turf/simulated/floor/tiled,/area/tcommsat/entrance{name = "\improper Telecomms Entrance"})
"bqA" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bqB" = (/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,/turf/simulated/floor/tiled,/area/tcomsat{name = "\improper Telecomms Lobby"})
-"bqC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/cable/green,/turf/simulated/floor/plating,/area/tcomsat{name = "\improper Telecomms Lobby"})
+"bqC" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/cable/green,/turf/simulated/floor/plating,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bqD" = (/obj/machinery/porta_turret{dir = 6},/turf/simulated/floor/tiled,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bqE" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -28},/obj/structure/cable/green,/turf/simulated/floor/tiled,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bqF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled,/area/tcomsat{name = "\improper Telecomms Lobby"})
@@ -3576,16 +3576,16 @@
"bqN" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/porta_turret{dir = 6},/turf/simulated/floor/tiled/dark,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bqO" = (/turf/simulated/floor/tiled/dark,/area/tcomsat{name = "\improper Telecomms Lobby"})
"bqP" = (/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,/turf/simulated/floor/tiled/dark,/area/tcomsat{name = "\improper Telecomms Lobby"})
-"bqQ" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 6},/turf/simulated/floor/plating,/area/tcommsat/chamber)
-"bqR" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/manifold/hidden/black,/turf/simulated/floor/plating,/area/tcommsat/chamber)
-"bqS" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/chamber)
-"bqT" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/chamber)
-"bqU" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 10},/turf/simulated/floor/plating,/area/tcommsat/chamber)
+"bqQ" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 6},/turf/simulated/floor/plating,/area/tcommsat/chamber)
+"bqR" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/manifold/hidden/black,/turf/simulated/floor/plating,/area/tcommsat/chamber)
+"bqS" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/chamber)
+"bqT" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/chamber)
+"bqU" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 10},/turf/simulated/floor/plating,/area/tcommsat/chamber)
"bqV" = (/obj/machinery/door/airlock/maintenance_hatch{frequency = 1381; icon_state = "door_locked"; id_tag = "server_access_inner"; locked = 1; name = "Telecoms Server Access"; req_access = list(61)},/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber)
"bqW" = (/obj/effect/floor_decal/industrial/warning/dust{dir = 10},/obj/effect/floor_decal/industrial/warning/dust/corner{dir = 4},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
"bqX" = (/obj/effect/floor_decal/industrial/warning/dust,/obj/effect/floor_decal/industrial/warning/dust{dir = 1},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake)
"bqY" = (/turf/simulated/wall/r_wall,/area/tcomfoyer{name = "\improper Telecomms Storage"})
-"bqZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tcomfoyer{name = "\improper Telecomms Storage"})
+"bqZ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tcomfoyer{name = "\improper Telecomms Storage"})
"bra" = (/obj/machinery/door/airlock/glass{name = "Telecomms Storage"; req_access = list(61); req_one_access = newlist()},/obj/structure/cable/green{d1 = 1; 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,/turf/simulated/floor/tiled/dark,/area/tcomfoyer{name = "\improper Telecomms Storage"})
"brb" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber)
"brc" = (/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/power/apc/super/critical{dir = 1; name = "north bump"; pixel_y = 24},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber)
@@ -3657,9 +3657,9 @@
"bsq" = (/turf/simulated/floor/outdoors/grass/sif/virgo3b,/area/tether/surfacebase/outside/outside3)
"bsr" = (/obj/machinery/camera/network/northern_star{dir = 1},/turf/simulated/floor/outdoors/grass/sif/virgo3b,/area/tether/surfacebase/outside/outside3)
"bss" = (/turf/simulated/wall,/area/vacant/vacant_site2)
-"bst" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/vacant/vacant_site2)
+"bst" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/vacant/vacant_site2)
"bsu" = (/turf/simulated/wall,/area/tether/surfacebase/medical/triage)
-"bsv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/medical/triage)
+"bsv" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/medical/triage)
"bsw" = (/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/wood,/area/vacant/vacant_site2)
"bsx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/random/trash_pile,/turf/simulated/floor/wood,/area/vacant/vacant_site2)
"bsy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/closet,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/clean,/obj/random/junk,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum{desc = "TASTE DEMOCRACY"; name = "Managed Democra-cider"},/obj/random/contraband,/obj/random/cigarettes,/turf/simulated/floor/wood,/area/vacant/vacant_site2)
@@ -3671,7 +3671,7 @@
"bsE" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/effect/floor_decal/corner/paleblue/border{dir = 1},/obj/effect/floor_decal/borderfloorwhite/corner2{dir = 1},/obj/effect/floor_decal/corner/paleblue/bordercorner2{dir = 1},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/triage)
"bsF" = (/obj/structure/ladder{layer = 3.3; pixel_y = 16},/obj/effect/floor_decal/industrial/outline/blue,/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/triage)
"bsG" = (/obj/effect/floor_decal/borderfloorwhite{dir = 5},/obj/effect/floor_decal/corner/paleblue/border{dir = 5},/obj/effect/floor_decal/borderfloorwhite/corner2{dir = 4},/obj/effect/floor_decal/corner/paleblue/bordercorner2{dir = 4},/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/triage)
-"bsH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/medical/triage)
+"bsH" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/medical/triage)
"bsI" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/random/junk,/turf/simulated/floor/wood,/area/vacant/vacant_site2)
"bsJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/vacant/vacant_site2)
"bsK" = (/turf/simulated/floor/plating,/area/vacant/vacant_site2)
@@ -3709,20 +3709,20 @@
"btq" = (/obj/machinery/body_scanconsole,/obj/effect/floor_decal/corner_steel_grid{dir = 10},/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/triage)
"btr" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 8},/obj/machinery/camera/network/medbay{dir = 8},/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/triage)
"bts" = (/turf/simulated/wall,/area/tether/surfacebase/reading_room)
-"btt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
+"btt" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
"btu" = (/obj/machinery/camera/network/security{dir = 9},/turf/simulated/floor/outdoors/grass/sif/virgo3b,/area/tether/surfacebase/outside/outside3)
"btv" = (/turf/simulated/wall/r_wall,/area/gateway/prep_room)
"btw" = (/turf/simulated/wall/r_wall,/area/tether/surfacebase/security/armory)
"btx" = (/turf/simulated/wall/r_wall,/area/tether/surfacebase/security/common)
-"bty" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/security/common)
+"bty" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/security/common)
"btz" = (/turf/simulated/wall/r_wall,/area/tether/surfacebase/security/breakroom)
-"btA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/security/breakroom)
+"btA" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/security/breakroom)
"btB" = (/turf/simulated/wall/r_wall,/area/vacant/vacant_site2)
"btC" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/maintenance/engi,/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,/turf/simulated/floor/tiled/techfloor/grid,/area/vacant/vacant_site2)
"btD" = (/obj/structure/table/glass,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/item/device/sleevemate,/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/triage)
"btE" = (/obj/structure/disposalpipe/segment,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/triage)
"btF" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 1},/obj/structure/closet/hydrant{pixel_x = 32},/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/triage)
-"btG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
+"btG" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
"btH" = (/obj/structure/table/glass,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/wood,/area/tether/surfacebase/reading_room)
"btI" = (/obj/structure/table/glass,/turf/simulated/floor/wood,/area/tether/surfacebase/reading_room)
"btJ" = (/turf/simulated/open,/area/gateway/prep_room)
@@ -3861,7 +3861,7 @@
"bwm" = (/obj/item/device/radio/intercom{dir = 8; pixel_x = 24},/turf/simulated/floor/carpet/blue,/area/tether/surfacebase/security/breakroom)
"bwn" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/random/junk,/turf/simulated/floor/tiled/techfloor/grid,/area/vacant/vacant_site2)
"bwo" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/techfloor/grid,/area/vacant/vacant_site2)
-"bwp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/medical/triage)
+"bwp" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/medical/triage)
"bwq" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/airlock/multi_tile/glass{name = "Emergency Treatment Centre"; req_access = list(5)},/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 8},/turf/simulated/floor/tiled/monofloor{dir = 8},/area/tether/surfacebase/medical/triage)
"bwr" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 4},/turf/simulated/floor/tiled/monofloor{dir = 4},/area/tether/surfacebase/medical/triage)
"bws" = (/obj/machinery/camera/network/civilian{dir = 4},/turf/simulated/floor/wood,/area/tether/surfacebase/reading_room)
@@ -3876,8 +3876,8 @@
"bwB" = (/obj/machinery/door/blast/shutters{dir = 2; id = "PubPrep"; layer = 3.3; name = "Public Access Shutter"},/turf/simulated/floor/tiled,/area/gateway/prep_room)
"bwC" = (/obj/machinery/recharge_station,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/gateway/prep_room)
"bwD" = (/obj/machinery/suit_cycler/mining{req_access = null},/turf/simulated/floor/tiled/dark,/area/gateway/prep_room)
-"bwE" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/dark,/area/tether/surfacebase/security/common)
-"bwF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable/green,/obj/structure/cable/green{icon_state = "0-8"},/turf/simulated/floor/tiled/dark,/area/tether/surfacebase/security/common)
+"bwE" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/dark,/area/tether/surfacebase/security/common)
+"bwF" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable/green,/obj/structure/cable/green{icon_state = "0-8"},/turf/simulated/floor/tiled/dark,/area/tether/surfacebase/security/common)
"bwG" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/machinery/camera/network/engineering,/obj/item/device/radio/intercom{dir = 1; pixel_y = 24; req_access = list()},/turf/simulated/floor/tiled,/area/engineering/lower/breakroom)
"bwH" = (/obj/structure/table/standard,/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/mauve/border{dir = 5},/obj/item/device/radio/intercom{dir = 1; pixel_y = 24; req_access = list()},/obj/item/weapon/extinguisher,/turf/simulated/floor/tiled,/area/outpost/research/xenobiology)
"bwI" = (/obj/machinery/vending/snack,/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/red/border{dir = 10},/turf/simulated/floor/tiled,/area/tether/surfacebase/security/breakroom)
@@ -3906,7 +3906,7 @@
"bxf" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/mauve/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 9},/obj/machinery/light,/obj/item/device/radio/intercom{dir = 2; pixel_y = -24},/turf/simulated/floor/tiled,/area/rnd/reception_desk)
"bxg" = (/obj/structure/table/glass,/obj/item/weapon/book/codex,/turf/simulated/floor/wood,/area/tether/surfacebase/reading_room)
"bxh" = (/obj/structure/table/glass,/obj/item/device/flashlight/lamp/green,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/wood,/area/tether/surfacebase/reading_room)
-"bxi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
+"bxi" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
"bxj" = (/obj/structure/railing{dir = 4},/obj/effect/floor_decal/corner_oldtile/green{dir = 9},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/tether/surfacebase/outside/outside3)
"bxk" = (/obj/structure/railing{dir = 8},/obj/effect/floor_decal/corner_oldtile/green{dir = 6},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/tether/surfacebase/outside/outside3)
"bxl" = (/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor/tiled,/area/gateway/prep_room)
@@ -3923,12 +3923,12 @@
"bxw" = (/obj/machinery/light/small{dir = 8},/obj/structure/toilet{pixel_y = 16},/obj/structure/symbol/lo{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/crew_quarters/recreation_area_restroom)
"bxx" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled/dark,/area/tether/surfacebase/security/common)
"bxy" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/tether/surfacebase/security/common)
-"bxz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/dark,/area/tether/surfacebase/security/common)
+"bxz" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/dark,/area/tether/surfacebase/security/common)
"bxA" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/machinery/r_n_d/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/obj/item/device/radio/intercom{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/techfloor,/area/rnd/workshop)
-"bxB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/cable/green{icon_state = "0-4"},/turf/simulated/floor/plating,/area/tether/surfacebase/security/breakroom)
+"bxB" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/cable/green{icon_state = "0-4"},/turf/simulated/floor/plating,/area/tether/surfacebase/security/breakroom)
"bxC" = (/obj/machinery/door/firedoor/glass,/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/disposalpipe/segment,/obj/machinery/door/airlock/glass_security{name = "Break Room"; req_access = list(1)},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/steel_grid,/area/tether/surfacebase/security/breakroom)
-"bxD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{icon_state = "0-4"},/turf/simulated/floor/plating,/area/tether/surfacebase/security/breakroom)
-"bxE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/cable/green{icon_state = "0-8"},/turf/simulated/floor/plating,/area/tether/surfacebase/security/breakroom)
+"bxD" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{icon_state = "0-4"},/turf/simulated/floor/plating,/area/tether/surfacebase/security/breakroom)
+"bxE" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/cable/green{icon_state = "0-8"},/turf/simulated/floor/plating,/area/tether/surfacebase/security/breakroom)
"bxF" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor/grid,/area/vacant/vacant_site2)
"bxG" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/techfloor/grid,/area/vacant/vacant_site2)
"bxH" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled/techfloor/grid,/area/vacant/vacant_site2)
@@ -3940,12 +3940,12 @@
"bxN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/lobby)
"bxO" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/lobby)
"bxP" = (/obj/structure/reagent_dispensers/water_cooler/full,/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/lobby)
-"bxQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/medical/lobby)
+"bxQ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/medical/lobby)
"bxR" = (/obj/machinery/camera/network/northern_star{dir = 8},/turf/simulated/floor/outdoors/grass/sif/virgo3b,/area/tether/surfacebase/outside/outside3)
-"bxS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
+"bxS" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
"bxT" = (/obj/machinery/door/airlock{name = "Reading Room"},/obj/machinery/door/firedoor/glass,/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/disposalpipe/segment,/turf/simulated/floor/tiled/steel_grid,/area/tether/surfacebase/reading_room)
-"bxU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
-"bxV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
+"bxU" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
+"bxV" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room)
"bxW" = (/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -28},/obj/structure/cable{icon_state = "0-4"},/obj/structure/cable{icon_state = "2-4"},/turf/simulated/floor/tiled,/area/gateway/prep_room)
"bxX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/gateway/prep_room)
"bxY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/gateway/prep_room)
@@ -3959,7 +3959,7 @@
"byg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/tether/surfacebase/security/common)
"byh" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/tether/surfacebase/security/common)
"byi" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 5},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/vending/security,/turf/simulated/floor/tiled,/area/tether/surfacebase/security/common)
-"byj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/tether/surfacebase/security/lobby)
+"byj" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/tether/surfacebase/security/lobby)
"byk" = (/obj/effect/landmark/carved_pumpkin_spawn,/turf/simulated/floor/tiled,/area/tether/surfacebase/tram)
"byl" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/tether/surfacebase/security/lobby)
"bym" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/tether/surfacebase/security/lobby)
@@ -3976,11 +3976,11 @@
"byx" = (/obj/structure/table/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/lobby)
"byy" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/lobby)
"byz" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/cups,/obj/item/weapon/storage/box/cups,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/turf/simulated/floor/tiled/white,/area/tether/surfacebase/medical/lobby)
-"byA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/surfacebase/atrium_three)
+"byA" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/surfacebase/atrium_three)
"byB" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/lightgrey/border{dir = 9},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"byC" = (/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/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"byD" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/lightgrey/border{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
-"byE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/atrium_three)
+"byE" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/atrium_three)
"byF" = (/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 4},/obj/effect/floor_decal/corner_oldtile/green/full,/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/tether/surfacebase/outside/outside3)
"byG" = (/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 1},/obj/effect/floor_decal/corner_oldtile/green{dir = 10},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/tether/surfacebase/outside/outside3)
"byH" = (/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 1},/obj/effect/floor_decal/corner_oldtile/green/full{dir = 4},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/tether/surfacebase/outside/outside3)
@@ -4063,9 +4063,9 @@
"bAg" = (/obj/machinery/door/airlock/multi_tile/metal{name = "Gateway Prep Room"},/obj/machinery/door/blast/shutters{dir = 2; id = "PubPrepFront"; layer = 3.3; name = "Gateway Prep Shutter"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 8},/turf/simulated/floor/tiled/monofloor{dir = 8},/area/gateway/prep_room)
"bAh" = (/obj/machinery/door/blast/shutters{dir = 2; id = "PubPrepFront"; layer = 3.3; name = "Gateway Prep Shutter"},/obj/machinery/door/firedoor,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 4},/turf/simulated/floor/tiled/monofloor{dir = 4},/area/gateway/prep_room)
"bAi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Unisex Restrooms"},/obj/structure/cable{icon_state = "1-2"},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/recreation_area_restroom)
-"bAj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/surfacebase/security/common)
-"bAk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/security/common)
-"bAl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/cable/green,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/security/common)
+"bAj" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/surfacebase/security/common)
+"bAk" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/security/common)
+"bAl" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/cable/green,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/security/common)
"bAm" = (/obj/structure/sign/directions/evac{dir = 4},/turf/simulated/wall/r_wall,/area/tether/surfacebase/security/lobby)
"bAn" = (/obj/machinery/door/airlock/multi_tile/glass{name = "Security Lobby"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 8},/turf/simulated/floor/tiled/monofloor{dir = 8},/area/tether/surfacebase/security/lobby)
"bAo" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 4},/turf/simulated/floor/tiled/monofloor{dir = 4},/area/tether/surfacebase/security/lobby)
@@ -4073,11 +4073,11 @@
"bAq" = (/obj/machinery/door/airlock/maintenance/common,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/techfloor/grid,/area/vacant/vacant_site2)
"bAr" = (/obj/structure/sign/directions/evac{dir = 8},/turf/simulated/wall,/area/tether/surfacebase/medical/lobby)
"bAs" = (/obj/structure/sign/directions/medical{dir = 4; pixel_y = 8},/obj/structure/sign/directions/science{dir = 8; pixel_y = 3},/obj/structure/sign/directions/security{dir = 8; pixel_y = -4},/obj/structure/sign/directions/engineering{dir = 8; pixel_y = -10},/turf/simulated/wall,/area/tether/surfacebase/medical/lobby)
-"bAt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/medical/lobby)
+"bAt" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/medical/lobby)
"bAu" = (/obj/machinery/door/airlock/multi_tile/glass{name = "Emergency Treatment Centre lobby"},/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 8},/turf/simulated/floor/tiled/monofloor{dir = 8},/area/tether/surfacebase/medical/lobby)
"bAv" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 4},/turf/simulated/floor/tiled/monofloor{dir = 4},/area/tether/surfacebase/medical/lobby)
"bAw" = (/obj/structure/sign/greencross,/turf/simulated/wall,/area/tether/surfacebase/medical/lobby)
-"bAx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/atrium_three)
+"bAx" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/atrium_three)
"bAy" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bAz" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bAA" = (/obj/machinery/door/firedoor/glass/hidden/steel{dir = 1},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_one)
@@ -4216,13 +4216,13 @@
"bDd" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"bDe" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/floor_decal/techfloor/hole{dir = 4},/obj/effect/floor_decal/techfloor/hole/right{dir = 4},/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -2; pixel_y = 0},/obj/effect/floor_decal/industrial/outline/blue,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"bDf" = (/turf/simulated/wall,/area/crew_quarters/pool)
-"bDg" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/pool)
+"bDg" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/pool)
"bDh" = (/obj/machinery/door/airlock/multi_tile/glass{name = "Pool"},/obj/machinery/door/firedoor,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 8},/turf/simulated/floor/tiled/monofloor{dir = 8},/area/crew_quarters/pool)
"bDi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 4},/turf/simulated/floor/tiled/monofloor{dir = 4},/area/crew_quarters/pool)
-"bDj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/pool)
-"bDk" = (/obj/structure/disposalpipe/segment,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/pool)
+"bDj" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/pool)
+"bDk" = (/obj/structure/disposalpipe/segment,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/pool)
"bDl" = (/turf/simulated/wall,/area/crew_quarters/recreation_area)
-"bDm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/recreation_area)
+"bDm" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/recreation_area)
"bDn" = (/obj/structure/bed/chair{dir = 1},/obj/effect/floor_decal/corner/lightgrey{dir = 10},/obj/effect/floor_decal/corner/lightgrey{dir = 5},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bDo" = (/obj/structure/bed/chair{dir = 1},/obj/effect/floor_decal/corner/lightgrey{dir = 10},/obj/effect/floor_decal/corner/lightgrey{dir = 5},/obj/structure/closet/hydrant{pixel_x = 32},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bDp" = (/turf/simulated/wall,/area/tether/surfacebase/north_stairs_three)
@@ -4245,7 +4245,7 @@
"bDG" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"bDH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"bDI" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
-"bDJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/crew_quarters/pool)
+"bDJ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/crew_quarters/pool)
"bDK" = (/obj/structure/closet/secure_closet/personal,/obj/effect/floor_decal/spline/plain{dir = 9},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
"bDL" = (/obj/structure/closet/secure_closet/personal,/obj/effect/floor_decal/spline/plain{dir = 1},/obj/machinery/status_display{pixel_y = 30},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
"bDM" = (/obj/structure/closet/secure_closet/personal,/obj/effect/floor_decal/spline/plain{dir = 1},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/camera/network/civilian,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
@@ -4264,7 +4264,7 @@
"bDZ" = (/obj/machinery/camera/network/civilian,/turf/simulated/floor/wood,/area/crew_quarters/recreation_area)
"bEa" = (/obj/machinery/workout,/turf/simulated/floor/wood,/area/crew_quarters/recreation_area)
"bEb" = (/obj/structure/closet/athletic_mixed,/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/item/clothing/shoes/boots/jackboots{armor = list("melee" = 69, "bullet" = 69, "laser" = 69, "energy" = 69, "bomb" = 69, "bio" = 69, "rad" = 69); desc = "This pair of Jackboots look worn and freshly used. They have several claw markings inside and you can read the initials D and M at the bottom"; name = "Dhaeleena's Jackboots"},/turf/simulated/floor/wood,/area/crew_quarters/recreation_area)
-"bEc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/atrium_three)
+"bEc" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/atrium_three)
"bEd" = (/obj/machinery/light_switch{pixel_y = 25},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30; tag = "icon-extinguisher_closed (EAST)"},/turf/simulated/floor/tiled,/area/tether/surfacebase/north_stairs_three)
"bEe" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/tether/surfacebase/north_stairs_three)
"bEf" = (/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled,/area/tether/surfacebase/north_stairs_three)
@@ -4276,7 +4276,7 @@
"bEl" = (/turf/simulated/open,/area/tether/surfacebase/atrium_three)
"bEm" = (/obj/structure/railing{dir = 4},/turf/simulated/open,/area/tether/surfacebase/atrium_three)
"bEn" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
-"bEo" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/atrium_three)
+"bEo" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/atrium_three)
"bEp" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/wood,/area/tether/surfacebase/atrium_three)
"bEq" = (/obj/structure/table/glass,/obj/item/weapon/material/ashtray/plastic,/obj/item/device/radio/intercom{dir = 8; pixel_x = 24},/turf/simulated/floor/wood,/area/tether/surfacebase/atrium_three)
"bEr" = (/obj/machinery/washing_machine,/obj/effect/floor_decal/techfloor{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
@@ -4299,7 +4299,7 @@
"bEI" = (/turf/simulated/floor/tiled,/area/crew_quarters/pool)
"bEJ" = (/turf/simulated/floor/wood,/area/crew_quarters/recreation_area)
"bEK" = (/obj/machinery/light_switch{pixel_x = 25},/turf/simulated/floor/wood,/area/crew_quarters/recreation_area)
-"bEL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/surfacebase/north_stairs_three)
+"bEL" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/surfacebase/north_stairs_three)
"bEM" = (/obj/structure/cable{icon_state = "0-4"},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -28},/turf/simulated/floor/tiled,/area/tether/surfacebase/north_stairs_three)
"bEN" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/turf/simulated/floor/tiled,/area/tether/surfacebase/north_stairs_three)
"bEO" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/mauve/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/item/device/radio/intercom{dir = 2; pixel_y = -24},/turf/simulated/floor/tiled,/area/rnd/lockers)
@@ -4322,12 +4322,12 @@
"bFf" = (/obj/effect/floor_decal/spline/plain{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
"bFg" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/pool)
"bFh" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/camera/network/civilian{dir = 9},/turf/simulated/floor/tiled,/area/crew_quarters/pool)
-"bFi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/recreation_area)
+"bFi" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/recreation_area)
"bFj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/recreation_area)
"bFk" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/recreation_area)
"bFl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/wood,/area/crew_quarters/recreation_area)
"bFm" = (/obj/structure/table/woodentable,/obj/item/clothing/glasses/threedglasses,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/recreation_area)
-"bFn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/recreation_area)
+"bFn" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/recreation_area)
"bFo" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock{name = "Secondary Janitorial Closet"; req_access = list(26)},/turf/simulated/floor/tiled/steel_grid,/area/tether/surfacebase/north_stairs_three)
"bFp" = (/obj/effect/landmark/carved_pumpkin_spawn,/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/lightgrey/border{dir = 6},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_one)
"bFq" = (/turf/simulated/floor/tiled,/area/tether/surfacebase/north_stairs_three)
@@ -4421,12 +4421,12 @@
"bHa" = (/obj/structure/flora/ausbushes/grassybush,/turf/simulated/floor/grass,/area/hydroponics/cafegarden)
"bHb" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/grass,/area/hydroponics/cafegarden)
"bHc" = (/obj/machinery/camera/network/civilian,/turf/simulated/floor/grass,/area/hydroponics/cafegarden)
-"bHd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hydroponics/cafegarden)
+"bHd" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hydroponics/cafegarden)
"bHe" = (/obj/effect/floor_decal/spline/plain{dir = 10},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
"bHf" = (/obj/effect/floor_decal/spline/plain,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
"bHg" = (/obj/effect/floor_decal/spline/plain{dir = 6},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
"bHh" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Recreation Area"},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/recreation_area)
-"bHi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/cable{icon_state = "1-2"},/turf/simulated/floor/plating,/area/crew_quarters/recreation_area)
+"bHi" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/cable{icon_state = "1-2"},/turf/simulated/floor/plating,/area/crew_quarters/recreation_area)
"bHj" = (/turf/simulated/wall,/area/crew_quarters/recreation_area_restroom{name = "\improper Recreation Area Showers"})
"bHk" = (/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -30},/obj/structure/cable{icon_state = "0-4"},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bHl" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
@@ -4508,7 +4508,7 @@
"bIJ" = (/obj/effect/floor_decal/spline/plain{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
"bIK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/crew_quarters/pool)
"bIL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/camera/network/civilian{dir = 9},/turf/simulated/floor/tiled,/area/crew_quarters/pool)
-"bIM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/pool)
+"bIM" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/pool)
"bIN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/lightgrey/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bIO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bIP" = (/obj/machinery/light,/obj/structure/cable{icon_state = "1-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
@@ -4550,9 +4550,9 @@
"bJz" = (/obj/machinery/camera/network/northern_star{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bJA" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bJB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance/int{name = "Fire/Phoron Shelter"},/turf/simulated/floor/tiled/techfloor,/area/vacant/vacant_shop)
-"bJC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "freezer"; name = "Freezer Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/crew_quarters/freezer)
+"bJC" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "freezer"; name = "Freezer Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/crew_quarters/freezer)
"bJD" = (/obj/machinery/door/firedoor/glass,/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"},/obj/machinery/door/airlock/freezer{name = "Kitchen cold room"; req_access = list(28)},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/freezer)
-"bJE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
+"bJE" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
"bJF" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass{name = "Garden"; req_access = list(28)},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bJG" = (/turf/simulated/wall,/area/crew_quarters/kitchen)
"bJH" = (/obj/structure/bed/chair{dir = 4},/obj/effect/floor_decal/spline/plain{dir = 10},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
@@ -4563,7 +4563,7 @@
"bJM" = (/obj/effect/floor_decal/spline/plain{dir = 6},/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
"bJN" = (/obj/structure/closet/lasertag/red,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/pool)
"bJO" = (/obj/structure/closet/lasertag/blue,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/pool)
-"bJP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/pool)
+"bJP" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/pool)
"bJQ" = (/obj/machinery/vending/cola,/obj/effect/floor_decal/corner/lightgrey{dir = 9},/obj/effect/floor_decal/corner/lightgrey{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9,/turf/simulated/floor/tiled/monotile,/area/tether/surfacebase/atrium_three)
"bJR" = (/obj/machinery/vending/fitness,/obj/effect/floor_decal/corner/lightgrey{dir = 9},/obj/effect/floor_decal/corner/lightgrey{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9,/turf/simulated/floor/tiled/monotile,/area/tether/surfacebase/atrium_three)
"bJS" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/corner/lightgrey/bordercorner{dir = 4},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
@@ -4580,8 +4580,8 @@
"bKd" = (/obj/effect/floor_decal/corner/grey/diagonal,/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bKe" = (/obj/effect/floor_decal/corner/grey/diagonal,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bKf" = (/obj/effect/floor_decal/corner/grey/diagonal,/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
-"bKg" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/crew_quarters/pool)
-"bKh" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/pool)
+"bKg" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/crew_quarters/pool)
+"bKh" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/pool)
"bKi" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bKj" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/corner/lightgrey/bordercorner{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bKk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
@@ -4617,10 +4617,10 @@
"bKO" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bKP" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/glass/hidden/steel{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bKQ" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 30},/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/mauve/border{dir = 5},/obj/effect/landmark/carved_pumpkin_spawn,/turf/simulated/floor/tiled,/area/rnd/research)
-"bKR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/bar)
+"bKR" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/bar)
"bKS" = (/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"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar)
"bKT" = (/obj/structure/table/bench/wooden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar)
-"bKU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/blast/shutters{dir = 8; id = "kitchen"; layer = 3.1; name = "Kitchen Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
+"bKU" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/blast/shutters{dir = 8; id = "kitchen"; layer = 3.1; name = "Kitchen Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
"bKV" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/obj/structure/table/standard,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bKW" = (/obj/effect/floor_decal/corner/grey/diagonal,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bKX" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/grey/diagonal,/obj/item/weapon/book/manual/chef_recipes,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
@@ -4628,7 +4628,7 @@
"bKZ" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/grey/diagonal,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bLa" = (/obj/effect/floor_decal/corner/grey/diagonal,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bLb" = (/obj/machinery/cooker/grill,/obj/effect/floor_decal/industrial/warning/dust{dir = 9},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
-"bLc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
+"bLc" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
"bLd" = (/obj/structure/table/bench/wooden,/obj/effect/landmark/carved_pumpkin_spawn,/turf/simulated/floor/wood,/area/crew_quarters/bar)
"bLe" = (/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/lightgrey/bordercorner{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bLf" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
@@ -4636,7 +4636,7 @@
"bLh" = (/obj/machinery/door/airlock/glass,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/bar)
"bLi" = (/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/wood,/area/crew_quarters/bar)
"bLj" = (/turf/simulated/floor/wood,/area/crew_quarters/bar)
-"bLk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/machinery/door/blast/shutters{dir = 8; id = "kitchen"; layer = 3.1; name = "Kitchen Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
+"bLk" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/machinery/door/blast/shutters{dir = 8; id = "kitchen"; layer = 3.1; name = "Kitchen Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
"bLl" = (/obj/effect/floor_decal/corner/grey/diagonal,/obj/structure/table/standard,/obj/item/weapon/material/kitchen/rollingpin,/obj/item/weapon/material/knife/butch,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bLm" = (/obj/structure/table/standard,/obj/machinery/reagentgrinder,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bLn" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/grey/diagonal,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
@@ -4644,7 +4644,7 @@
"bLp" = (/obj/structure/disposalpipe/junction{dir = 1},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bLq" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/glass/hidden/steel{dir = 8},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bLr" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/beige/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/beige/bordercorner2{dir = 5},/obj/effect/floor_decal/corner/beige/bordercorner2{dir = 6},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
-"bLs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/sign/department/bar,/turf/simulated/floor/plating,/area/crew_quarters/bar)
+"bLs" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/sign/department/bar,/turf/simulated/floor/plating,/area/crew_quarters/bar)
"bLt" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar)
"bLu" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/bar)
"bLv" = (/obj/effect/floor_decal/corner/grey/diagonal,/obj/machinery/vending/dinnerware,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
@@ -4666,10 +4666,10 @@
"bLL" = (/obj/machinery/smartfridge,/turf/simulated/wall,/area/crew_quarters/kitchen)
"bLM" = (/obj/machinery/cooker/fryer,/obj/effect/floor_decal/industrial/warning/dust{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bLN" = (/turf/simulated/wall,/area/rnd/breakroom)
-"bLO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/rnd/breakroom)
-"bLP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/rnd/breakroom)
+"bLO" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/rnd/breakroom)
+"bLP" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/rnd/breakroom)
"bLQ" = (/turf/simulated/wall/r_wall,/area/rnd/breakroom)
-"bLR" = (/obj/machinery/door/firedoor,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/rnd/breakroom)
+"bLR" = (/obj/machinery/door/firedoor,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/rnd/breakroom)
"bLS" = (/turf/simulated/wall/r_wall,/area/hallway/lower/third_south)
"bLT" = (/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{scrub_id = "atrium"},/turf/simulated/floor/tiled/techmaint,/area/hallway/lower/third_south)
"bLU" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
@@ -4694,7 +4694,7 @@
"bMn" = (/obj/machinery/vending/snack,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/simulated/floor/tiled/monotile,/area/rnd/breakroom)
"bMo" = (/obj/machinery/atmospherics/pipe/zpipe/up,/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers,/obj/machinery/atmospherics/pipe/zpipe/up/supply,/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/cable{icon_state = "16-0"},/obj/structure/cable{icon_state = "0-2"},/obj/effect/decal/cleanable/dirt,/obj/structure/disposalpipe/up{dir = 1},/turf/simulated/floor/plating,/area/rnd/breakroom)
"bMp" = (/turf/simulated/shuttle/wall/voidcraft/green{hard_corner = 1},/area/hallway/lower/third_south)
-"bMq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/lower/third_south)
+"bMq" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/lower/third_south)
"bMr" = (/obj/structure/grille,/obj/structure/railing,/turf/simulated/floor/tiled/techmaint,/area/hallway/lower/third_south)
"bMs" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bMt" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
@@ -4706,7 +4706,7 @@
"bMz" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/corner/grey/diagonal,/obj/machinery/chemical_dispenser/bar_soft/full,/obj/machinery/door/blast/shutters{dir = 2; id = "kitchen"; layer = 3.3; name = "Kitchen Shutters"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bMA" = (/obj/machinery/door/blast/shutters{dir = 2; id = "kitchen"; layer = 3.3; name = "Kitchen Shutters"},/obj/effect/floor_decal/corner/grey/diagonal,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bMB" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/corner/grey/diagonal,/obj/machinery/door/blast/shutters{dir = 2; id = "kitchen"; layer = 3.3; name = "Kitchen Shutters"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
-"bMC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/rnd/breakroom)
+"bMC" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/rnd/breakroom)
"bMD" = (/obj/structure/bed/chair/comfy,/turf/simulated/floor/wood,/area/rnd/breakroom)
"bME" = (/obj/structure/table/glass,/turf/simulated/floor/wood,/area/rnd/breakroom)
"bMF" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/rnd/breakroom)
@@ -4777,12 +4777,12 @@
"bNS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/sortjunction{dir = 4; icon_state = "pipe-j1s"; name = "Hydroponics"; sortType = "Hydroponics"},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bNT" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
"bNU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j2"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_three)
-"bNV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/bar)
+"bNV" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/bar)
"bNW" = (/obj/structure/table/bench/wooden,/obj/machinery/light{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar)
"bNX" = (/obj/structure/table/bench/wooden,/obj/machinery/status_display{pixel_y = 30},/turf/simulated/floor/wood,/area/crew_quarters/bar)
"bNY" = (/obj/effect/floor_decal/corner/beige{dir = 9},/obj/effect/floor_decal/spline/plain{dir = 8},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/crew_quarters/bar)
"bNZ" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/crew_quarters/bar)
-"bOa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/bar)
+"bOa" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/bar)
"bOb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/wood,/area/rnd/breakroom)
"bOc" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/wood,/area/rnd/breakroom)
"bOd" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/rnd/breakroom)
@@ -4822,7 +4822,7 @@
"bOL" = (/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/disposalpipe/segment,/turf/simulated/floor/wood,/area/rnd/breakroom)
"bOM" = (/obj/machinery/light,/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/rnd/breakroom)
"bON" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/vending/cigarette,/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/simulated/floor/tiled/monotile,/area/rnd/breakroom)
-"bOO" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rnd/breakroom)
+"bOO" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rnd/breakroom)
"bOP" = (/obj/effect/decal/cleanable/dirt,/obj/structure/disposalpipe/up{dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/railing{dir = 1},/turf/simulated/floor/plating,/area/rnd/breakroom)
"bOQ" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/structure/closet/firecloset,/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"bOR" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/lightgrey/bordercorner{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
@@ -4835,16 +4835,16 @@
"bOY" = (/obj/structure/sign/directions/medical{dir = 4; pixel_y = 8},/obj/structure/sign/directions/science{dir = 8; pixel_y = 3},/obj/structure/sign/directions/security{dir = 8; pixel_y = -4},/obj/structure/sign/directions/engineering{dir = 8; pixel_y = -10},/turf/simulated/wall,/area/maintenance/lower/atrium)
"bOZ" = (/obj/machinery/door/airlock/maintenance/common,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/maintenance/lower/atrium)
"bPa" = (/turf/simulated/wall,/area/hydroponics)
-"bPb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/hydroponics)
-"bPc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hydroponics)
+"bPb" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/hydroponics)
+"bPc" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hydroponics)
"bPd" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lime/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"bPe" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"bPf" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/beige/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"bPg" = (/obj/structure/table/bench/wooden,/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30; tag = "icon-extinguisher_closed (EAST)"},/turf/simulated/floor/wood,/area/crew_quarters/bar)
-"bPh" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/breakroom)
+"bPh" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/breakroom)
"bPi" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_research{name = "Research Lounge"; req_access = list(47)},/turf/simulated/floor/tiled/steel_grid,/area/rnd/breakroom)
"bPj" = (/obj/machinery/door/firedoor/glass,/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/disposalpipe/segment,/obj/machinery/door/airlock/glass_research{name = "Research Lounge"; req_access = list(47)},/turf/simulated/floor/tiled/steel_grid,/area/rnd/breakroom)
-"bPk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/rnd/breakroom)
+"bPk" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/rnd/breakroom)
"bPl" = (/turf/simulated/wall/r_wall,/area/rnd/reception_desk)
"bPm" = (/turf/simulated/wall,/area/rnd/reception_desk)
"bPn" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
@@ -4880,7 +4880,7 @@
"bPR" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/mauve/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/rnd/research)
"bPS" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/mauve/border{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/rnd/research)
"bPT" = (/obj/machinery/light,/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/mauve/border{dir = 10},/obj/effect/landmark/carved_pumpkin_spawn,/turf/simulated/floor/tiled,/area/rnd/lockers)
-"bPU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/research)
+"bPU" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/research)
"bPV" = (/obj/structure/table/glass,/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/mauve/border{dir = 9},/obj/machinery/camera/network/research,/turf/simulated/floor/tiled,/area/rnd/reception_desk)
"bPW" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/mauve/border{dir = 1},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 28},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/rnd/reception_desk)
"bPX" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/mauve/border{dir = 1},/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled,/area/rnd/reception_desk)
@@ -5012,7 +5012,7 @@
"bSt" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research)
"bSu" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research)
"bSv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research)
-"bSw" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/reception_desk)
+"bSw" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/reception_desk)
"bSx" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor/southleft{name = "Research Desk"; req_access = list(47)},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/monotile,/area/rnd/reception_desk)
"bSy" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/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},/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"bSz" = (/obj/structure/table/rack,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/tech_supply,/turf/simulated/floor/plating,/area/maintenance/engineering/pumpstation)
@@ -5143,7 +5143,7 @@
"bUU" = (/obj/machinery/light_switch{pixel_x = 25},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/mauve/border{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/recharge_station,/turf/simulated/floor/tiled,/area/rnd/research)
"bUV" = (/turf/simulated/wall,/area/assembly/robotics)
"bUW" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass_research{name = "Robotics Lab"; req_access = list(29,47)},/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
-"bUX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/sign/department/robo,/turf/simulated/floor/plating,/area/assembly/robotics)
+"bUX" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/sign/department/robo,/turf/simulated/floor/plating,/area/assembly/robotics)
"bUY" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass_research{name = "Robotics Lab"; req_access = list(29,47)},/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
"bUZ" = (/turf/simulated/wall,/area/assembly/chargebay)
"bVa" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
@@ -5201,7 +5201,7 @@
"bWa" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/rnd/research)
"bWb" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research)
"bWc" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/mauve/border{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/rnd/research)
-"bWd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/assembly/robotics)
+"bWd" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/assembly/robotics)
"bWe" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/structure/table/standard,/obj/machinery/cell_charger,/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
"bWf" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
"bWg" = (/obj/effect/landmark/start{name = "Roboticist"},/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
@@ -5365,13 +5365,13 @@
"bZj" = (/obj/effect/floor_decal/industrial/loading{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
"bZk" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/mauve/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 6},/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 4},/obj/machinery/mecha_part_fabricator{dir = 8},/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
"bZl" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_research{name = "Robotics Lab"; req_access = list(29,47)},/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
-"bZm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/lower/third_south)
-"bZn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hallway/lower/third_south)
+"bZm" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/lower/third_south)
+"bZn" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hallway/lower/third_south)
"bZo" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"bZp" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"bZq" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
-"bZr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/bar)
-"bZs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/bar)
+"bZr" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/bar)
+"bZs" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/bar)
"bZt" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/polarized{dir = 8},/obj/structure/window/reinforced/polarized/full,/turf/simulated/floor/plating,/area/rnd/rdoffice)
"bZu" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/device/megaphone,/obj/item/weapon/paper/monitorkey,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/turf/simulated/floor/tiled,/area/rnd/rdoffice)
"bZv" = (/obj/structure/table/glass,/obj/item/weapon/folder/white_rd,/obj/item/weapon/stamp/rd,/turf/simulated/floor/tiled,/area/rnd/rdoffice)
@@ -5393,10 +5393,10 @@
"bZL" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/mauve/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 1},/obj/structure/sink{pixel_y = 24},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
"bZM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
"bZN" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/mauve/border{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 4},/obj/machinery/light_switch{pixel_x = 25},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics)
-"bZO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/hallway/lower/third_south)
+"bZO" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/hallway/lower/third_south)
"bZP" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"bZQ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
-"bZR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/lower/third_south)
+"bZR" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/lower/third_south)
"bZS" = (/obj/structure/filingcabinet/chestdrawer,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/turf/simulated/floor/tiled,/area/rnd/rdoffice)
"bZT" = (/obj/structure/bed/chair/office/light{dir = 1},/obj/machinery/button/windowtint{pixel_x = 32; pixel_y = 16},/obj/effect/landmark/start{name = "Research Director"},/turf/simulated/floor/tiled,/area/rnd/rdoffice)
"bZU" = (/obj/structure/table/glass,/obj/machinery/photocopier/faxmachine{department = "Research Director's Office"},/turf/simulated/floor/tiled,/area/rnd/rdoffice)
@@ -5442,9 +5442,9 @@
"caI" = (/obj/structure/symbol/es,/turf/simulated/wall,/area/hallway/lower/third_south)
"caJ" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"caK" = (/turf/simulated/wall,/area/tether/surfacebase/shuttle_pad)
-"caL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
+"caL" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
"caM" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/polarized,/obj/structure/window/reinforced/polarized/full,/turf/simulated/floor/plating,/area/rnd/rdoffice)
-"caN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/assembly/robotics)
+"caN" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/assembly/robotics)
"caO" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"caP" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/status_display{pixel_x = 32; pixel_y = 0},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"caQ" = (/obj/structure/closet/firecloset,/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
@@ -5452,11 +5452,11 @@
"caS" = (/obj/machinery/computer/shuttle_control/tether_backup,/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "tether_pad_sensor"; pixel_x = -11; pixel_y = 28},/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "tether_pad_airlock"; pixel_x = 0; pixel_y = 28; tag_door = "tether_pad_hatch"},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"caT" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"caU" = (/obj/structure/frame/computer,/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
-"caV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
+"caV" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
"caW" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"caX" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"caY" = (/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
-"caZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
+"caZ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
"cba" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"cbb" = (/turf/simulated/shuttle/wall,/area/shuttle/tether/surface)
"cbc" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating/airless,/area/shuttle/tether/surface)
@@ -5486,7 +5486,7 @@
"cbA" = (/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -30},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"cbB" = (/turf/simulated/floor/reinforced,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/carry,/area/shuttle/tether/surface)
"cbC" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
-"cbD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
+"cbD" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
"cbE" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 4},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"cbF" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"cbG" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
@@ -5507,10 +5507,10 @@
"cbV" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"cbW" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/hallway/lower/third_south)
"cbX" = (/turf/simulated/floor/tiled/steel_grid,/area/hallway/lower/third_south)
-"cbY" = (/obj/structure/sign/warning/internals_required,/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
+"cbY" = (/obj/structure/sign/warning/internals_required,/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
"cbZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/steel_grid,/area/tether/surfacebase/shuttle_pad)
"cca" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/steel_grid,/area/tether/surfacebase/shuttle_pad)
-"ccb" = (/obj/structure/sign/warning/nosmoking_1,/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
+"ccb" = (/obj/structure/sign/warning/nosmoking_1,/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
"ccc" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"ccd" = (/obj/machinery/camera/network/civilian{dir = 1},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"cce" = (/obj/machinery/door/airlock/glass_external{frequency = 1379; icon_state = "door_locked"; id_tag = "rnd_s_airlock_outer"; locked = 1},/turf/simulated/floor/tiled/steel_grid,/area/rnd/external)
@@ -5522,8 +5522,8 @@
"cck" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"ccl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"ccm" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
-"ccn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/hallway/lower/third_south)
-"cco" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
+"ccn" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/hallway/lower/third_south)
+"cco" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/surfacebase/shuttle_pad)
"ccp" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/reinforced,/area/tether/surfacebase/shuttle_pad)
"ccq" = (/turf/simulated/floor/tiled/techfloor,/area/tether/surfacebase/shuttle_pad)
"ccr" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/tether/surfacebase/shuttle_pad)
diff --git a/maps/tether/tether-03-station.dmm b/maps/tether/tether-03-station.dmm
index 04d0f5074c..70c2a1d2dd 100644
--- a/maps/tether/tether-03-station.dmm
+++ b/maps/tether/tether-03-station.dmm
@@ -4,9 +4,9 @@
"aad" = (/obj/structure/grille,/obj/structure/lattice,/obj/structure/lattice,/turf/space,/area/hallway/secondary/escape/fore_escape_pod_hallway)
"aae" = (/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/hallway/secondary/escape/fore_escape_pod_hallway)
"aaf" = (/obj/structure/lattice,/obj/structure/grille/broken,/turf/space,/area/hallway/secondary/escape/fore_escape_pod_hallway)
-"aag" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/maintenance/station/eng_lower)
+"aag" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"aah" = (/turf/simulated/wall/r_wall,/area/hallway/secondary/escape/fore_escape_pod_hallway)
-"aai" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor,/area/maintenance/station/eng_lower)
+"aai" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"aaj" = (/turf/simulated/shuttle/wall,/area/shuttle/large_escape_pod2/station{base_turf = /turf/simulated/mineral/floor})
"aak" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod2/station{base_turf = /turf/simulated/mineral/floor})
"aal" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station{base_turf = /turf/simulated/mineral/floor})
@@ -63,8 +63,8 @@
"abk" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/space,/area/space)
"abl" = (/obj/machinery/atmospherics/pipe/manifold/visible/black{tag = "icon-map (NORTH)"; icon_state = "map"; dir = 1},/obj/structure/lattice,/turf/space,/area/space)
"abm" = (/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{frequency = 1380; id_tag = "large_escape_pod_2"; pixel_x = 26; pixel_y = -26; tag_door = "large_escape_pod_2_hatch"},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station{base_turf = /turf/simulated/mineral/floor})
-"abn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/maintenance/station/eng_lower)
-"abo" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/maintenance/station/eng_lower)
+"abn" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/maintenance/station/eng_lower)
+"abo" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"abp" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/structure/lattice,/turf/space,/area/space)
"abq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/spline/plain{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/Dorm_7)
"abr" = (/obj/machinery/button/remote/airlock{id = "dorm7"; name = "Room 7 Lock"; pixel_x = 26; pixel_y = -4; specialfunctions = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/Dorm_7)
@@ -92,7 +92,7 @@
"abN" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/Dorm_8)
"abO" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/Dorm_8)
"abP" = (/obj/machinery/shower{dir = 1},/obj/structure/curtain/open/shower,/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/Dorm_8)
-"abQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor,/area/maintenance/station/eng_lower)
+"abQ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor,/area/maintenance/station/eng_lower)
"abR" = (/obj/structure/table/steel,/obj/random/action_figure,/turf/simulated/floor,/area/maintenance/station/eng_lower)
"abS" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"abT" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor,/area/maintenance/station/eng_lower)
@@ -103,14 +103,14 @@
"abY" = (/turf/simulated/wall,/area/crew_quarters/sleep/Dorm_6)
"abZ" = (/turf/simulated/wall/r_wall,/area/engineering/atmos/backup)
"aca" = (/obj/structure/table/steel,/obj/item/weapon/deck/cards,/turf/simulated/floor,/area/maintenance/station/eng_lower)
-"acb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/maintenance/station/eng_lower)
+"acb" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"acc" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/space,/area/space)
"acd" = (/obj/machinery/light/small{dir = 8; pixel_y = 0},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"ace" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"acf" = (/obj/machinery/atmospherics/pipe/simple/visible/black,/turf/simulated/wall/r_wall,/area/engineering/engine_room)
"acg" = (/turf/simulated/wall/r_wall,/area/engineering/engine_gas)
"ach" = (/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/maintenance/station/eng_lower)
-"aci" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineBlast"; name = "Engine Monitoring Room Blast Doors"; opacity = 0},/turf/simulated/floor,/area/engineering/engine_monitoring)
+"aci" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineBlast"; name = "Engine Monitoring Room Blast Doors"; opacity = 0},/turf/simulated/floor,/area/engineering/engine_monitoring)
"acj" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/station/eng_lower)
"ack" = (/turf/simulated/floor,/area/maintenance/station/eng_lower)
"acl" = (/obj/random/junk,/turf/simulated/floor,/area/maintenance/station/eng_lower)
@@ -294,12 +294,12 @@
"afH" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 10},/turf/simulated/floor,/area/engineering/engine_room)
"afI" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/engineering/engine_room)
"afJ" = (/obj/structure/table/reinforced,/obj/item/weapon/book/manual/supermatter_engine,/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/industrial/danger{tag = "icon-danger (NORTHWEST)"; icon_state = "danger"; dir = 9},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
-"afK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/visible/green{dir = 4},/turf/simulated/floor,/area/engineering/engine_room)
+"afK" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/visible/green{dir = 4},/turf/simulated/floor,/area/engineering/engine_room)
"afL" = (/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"afM" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"afN" = (/obj/machinery/computer/general_air_control/supermatter_core{dir = 1; frequency = 1438; input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; pressure_setting = 100; sensors = list("engine_sensor" = "Engine Core"); throwpass = 1},/obj/item/device/radio/intercom{dir = 1; pixel_y = 24; req_access = list()},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 1},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"afO" = (/obj/machinery/light_switch{pixel_y = 24},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
-"afP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/engine_monitoring)
+"afP" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/engine_monitoring)
"afQ" = (/obj/machinery/light{dir = 1},/obj/machinery/recharge_station,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 4},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"afR" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/turf/simulated/floor/tiled,/area/engineering/hallway)
"afS" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/hallway)
@@ -380,7 +380,7 @@
"ahp" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera/network/engineering{dir = 1},/turf/simulated/floor,/area/maintenance/substation/engineering)
"ahq" = (/obj/random/trash_pile,/turf/simulated/floor,/area/maintenance/station/eng_lower)
"ahr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/random/junk,/turf/simulated/floor,/area/maintenance/station/eng_lower)
-"ahs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineBlast"; name = "Engine Monitoring Room Blast Doors"; opacity = 0},/turf/simulated/floor,/area/engineering/engine_monitoring)
+"ahs" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineBlast"; name = "Engine Monitoring Room Blast Doors"; opacity = 0},/turf/simulated/floor,/area/engineering/engine_monitoring)
"aht" = (/obj/machinery/atmospherics/pipe/simple/visible/green{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/yellow,/turf/simulated/floor,/area/engineering/engine_room)
"ahu" = (/obj/machinery/computer/power_monitor{dir = 4; throwpass = 1},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/industrial/danger{tag = "icon-danger (WEST)"; icon_state = "danger"; dir = 8},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"ahv" = (/obj/machinery/atmospherics/pipe/manifold/visible/green{dir = 1},/obj/machinery/meter,/turf/simulated/floor,/area/engineering/engine_room)
@@ -414,7 +414,7 @@
"ahX" = (/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/cable/yellow,/obj/machinery/power/sensor{name = "Powernet Sensor - Engine Output"; name_tag = "Engine Output"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor,/area/engineering/engine_room)
"ahY" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow,/turf/simulated/floor,/area/engineering/engine_room)
"ahZ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 5},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
-"aia" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 4},/turf/simulated/floor,/area/engineering/engine_room)
+"aia" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 4},/turf/simulated/floor,/area/engineering/engine_room)
"aib" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"aic" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/table/reinforced,/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for the engine charging port."; id = "SupermatterPort"; name = "Reactor Blast Doors"; pixel_x = -6; pixel_y = 7; req_access = list(10)},/obj/machinery/button/remote/emitter{desc = "A remote control-switch for the engine emitter."; id = "EngineEmitter"; name = "Engine Emitter"; pixel_x = 6; pixel_y = 7; req_access = list(10)},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for the engine control room blast doors."; id = "EngineBlast"; name = "Engine Monitoring Room Blast Doors"; pixel_x = 0; pixel_y = -3; req_access = list(10)},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"aid" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
@@ -444,7 +444,7 @@
"aiB" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/space,/area/space)
"aiC" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/random/junk,/obj/random/maintenance/engineering,/turf/simulated/floor,/area/maintenance/station/eng_lower)
"aiD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/station/eng_lower)
-"aiE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; opacity = 0},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/engine_room)
+"aiE" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; opacity = 0},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/engine_room)
"aiF" = (/obj/machinery/atmospherics/binary/pump,/turf/simulated/floor,/area/engineering/engine_room)
"aiG" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 10},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor,/area/engineering/engine_room)
"aiH" = (/obj/machinery/atmospherics/binary/pump{dir = 1},/turf/simulated/floor,/area/engineering/engine_room)
@@ -485,7 +485,7 @@
"ajq" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/engineering/engine_room)
"ajr" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/obj/machinery/light/small{dir = 1},/obj/machinery/airlock_sensor{frequency = 1379; id_tag = "eng_al_c_snsr"; pixel_x = -25; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1379; id_tag = "engine_airlock_pump"},/turf/simulated/floor/plating,/area/engineering/engine_airlock)
"ajs" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"; tag = "icon-intact-f (SOUTHWEST)"},/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/engineering/engine_airlock)
-"ajt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/engineering/engine_airlock)
+"ajt" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/engineering/engine_airlock)
"aju" = (/obj/machinery/atmospherics/pipe/manifold/visible/yellow{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engineering/engine_room)
"ajv" = (/obj/machinery/computer/rcon{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/industrial/danger{tag = "icon-danger (WEST)"; icon_state = "danger"; dir = 8},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"ajw" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 6},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
@@ -620,14 +620,14 @@
"alV" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor/northleft{name = "Special Weapons"; req_access = list(1)},/obj/structure/closet/crate/secure/large/reinforced{anchored = 1; desc = "A hefty, reinforced metal crate with an electronic locking system. It's securely bolted to the floor and cannot be moved."; name = "gun safe"; req_access = list(1)},/obj/item/weapon/gun/energy/ionrifle/pistol,/obj/item/weapon/gun/energy/ionrifle,/obj/item/weapon/gun/energy/sniperrifle,/obj/item/weapon/gun/energy/sniperrifle,/turf/simulated/floor/tiled/dark,/area/security/armoury)
"alW" = (/obj/machinery/camera/network/security{dir = 1},/obj/structure/window/reinforced,/obj/structure/table/rack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/door/window/brigdoor/northright,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/armoury)
"alX" = (/obj/machinery/light,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/table/rack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/door/window/brigdoor/eastleft{dir = 1},/obj/item/weapon/gun/projectile/shotgun/pump{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/projectile/shotgun/pump,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/dark,/area/security/armoury)
-"alY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
+"alY" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
"alZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/tiled/dark,/area/security/armoury)
"ama" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/random/junk,/obj/structure/symbol/lo{pixel_x = -32},/turf/simulated/floor,/area/maintenance/station/eng_lower)
-"amb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
+"amb" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
"amc" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/tiled,/area/security/prison)
"amd" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/structure/stairs/south,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/tiled,/area/security/prison)
"ame" = (/obj/item/clothing/suit/ianshirt,/obj/machinery/computer/arcade/orion_trail,/obj/structure/symbol/ca{pixel_x = -32},/turf/simulated/floor/tiled/steel_dirty,/area/security/brig)
-"amf" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/holodeck_control)
+"amf" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/holodeck_control)
"amg" = (/turf/simulated/floor/reinforced{name = "Holodeck Projector Floor"},/area/holodeck/alphadeck)
"amh" = (/turf/simulated/wall,/area/holodeck/alphadeck)
"ami" = (/obj/machinery/atmospherics/pipe/simple/visible/red{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor,/area/engineering/engine_room)
@@ -654,13 +654,13 @@
"amD" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/random/junk,/obj/random/tool,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency4)
"amE" = (/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency4)
"amF" = (/obj/effect/floor_decal/rust,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/shield_gen/external,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/engineering/storage)
-"amG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/security/brig)
+"amG" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/security/brig)
"amH" = (/obj/structure/window/reinforced,/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/corner/red/bordercorner{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/tiled,/area/security/prison)
"amI" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled/white,/area/security/security_bathroom)
-"amJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/security/brig)
-"amK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/security/brig)
-"amL" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor,/area/engineering/atmos/backup)
-"amM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/holodeck_control)
+"amJ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/security/brig)
+"amK" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/security/brig)
+"amL" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor,/area/engineering/atmos/backup)
+"amM" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/holodeck_control)
"amN" = (/obj/structure/table/standard,/obj/machinery/light{dir = 4},/obj/machinery/camera/network/civilian,/turf/simulated/floor/tiled,/area/holodeck_control)
"amO" = (/obj/structure/dispenser,/turf/simulated/floor,/area/engineering/storage)
"amP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/closet/crate/radiation,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/turf/simulated/floor,/area/engineering/storage)
@@ -697,9 +697,9 @@
"anu" = (/obj/machinery/atmospherics/pipe/manifold/visible/black,/obj/machinery/meter,/turf/simulated/floor,/area/engineering/engine_room)
"anv" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/structure/stairs/north,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/tiled,/area/security/prison)
"anw" = (/obj/effect/landmark{name = "carpspawn"},/turf/simulated/mineral/floor,/area/mine/explored/upper_level)
-"anx" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/atmospherics/pipe/simple/visible/red{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor,/area/engineering/atmos/backup)
-"any" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
-"anz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
+"anx" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/atmospherics/pipe/simple/visible/red{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor,/area/engineering/atmos/backup)
+"any" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
+"anz" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
"anA" = (/obj/structure/noticeboard,/turf/simulated/wall/r_wall,/area/security/range)
"anB" = (/obj/machinery/light{dir = 8},/obj/effect/floor_decal/borderfloorblack{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/obj/structure/table/steel,/obj/machinery/photocopier/faxmachine,/obj/item/device/radio/intercom/department/security{dir = 8; icon_state = "secintercom"; pixel_x = -24; pixel_y = 0; tag = "icon-secintercom (WEST)"},/turf/simulated/floor/tiled/dark,/area/security/warden)
"anC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/dirt,/obj/machinery/door/airlock/maintenance/engi,/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/maintenance/station/eng_lower)
@@ -784,7 +784,7 @@
"apd" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/engineering/hallway)
"ape" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/junction,/turf/simulated/floor/tiled,/area/engineering/hallway)
"apf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/computer/guestpass{pixel_y = 32},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
-"apg" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/break_room)
+"apg" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/break_room)
"aph" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/maintenance/station/eng_lower)
"api" = (/obj/effect/decal/cleanable/dirt,/obj/random/trash_pile,/turf/simulated/floor,/area/maintenance/station/eng_lower)
"apj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/station/eng_lower)
@@ -832,7 +832,7 @@
"apZ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos/backup)
"aqa" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/turf/simulated/floor/tiled,/area/engineering/atmos/backup)
"aqb" = (/obj/machinery/atmospherics/pipe/simple/visible/red{tag = "icon-intact (SOUTHEAST)"; icon_state = "intact"; dir = 6},/turf/simulated/floor/tiled,/area/engineering/atmos/backup)
-"aqc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/atmospherics/pipe/simple/hidden/red{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/atmos/backup)
+"aqc" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/atmospherics/pipe/simple/hidden/red{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/atmos/backup)
"aqd" = (/obj/machinery/atmospherics/pipe/simple/visible/red{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -32},/obj/structure/cable/green,/turf/simulated/floor/tiled,/area/engineering/atmos/backup)
"aqe" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/hallway)
"aqf" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/yellow/border{dir = 10},/turf/simulated/floor/tiled,/area/engineering/hallway)
@@ -869,7 +869,7 @@
"aqK" = (/obj/machinery/pipedispenser,/turf/simulated/floor/tiled,/area/engineering/atmos/backup)
"aqL" = (/obj/machinery/atmospherics/pipe/simple/visible/red,/turf/simulated/floor/tiled,/area/engineering/atmos/backup)
"aqM" = (/turf/simulated/wall,/area/engineering/workshop)
-"aqN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/workshop)
+"aqN" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/workshop)
"aqO" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Workshop"; req_access = newlist(); req_one_access = list(14,24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/workshop)
"aqP" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Workshop"; req_access = newlist(); req_one_access = list(14,24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/workshop)
"aqQ" = (/obj/machinery/atmospherics/pipe/manifold/hidden/red{tag = "icon-map (EAST)"; icon_state = "map"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/hallway)
@@ -1018,7 +1018,7 @@
"atD" = (/obj/structure/railing{dir = 1},/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/engineering/shaft)
"atE" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/engineering/shaft)
"atF" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/engineering/shaft)
-"atG" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/foyer)
+"atG" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/foyer)
"atH" = (/obj/structure/sign/department/eng,/turf/simulated/wall/r_wall,/area/engineering/foyer)
"atI" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/grass,/area/crew_quarters/visitor_dining)
"atJ" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/grass,/area/crew_quarters/visitor_dining)
@@ -1167,14 +1167,14 @@
"aww" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/button/remote/blast_door{id = "ArmorAc2"; name = "Armory Quick Deploy"; pixel_x = -23; pixel_y = 0; req_access = newlist(); req_one_access = list(1)},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/turf/simulated/floor/tiled,/area/security/armoury)
"awx" = (/obj/effect/floor_decal/borderfloorblack{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/closet/secure_closet/warden,/obj/effect/floor_decal/industrial/outline/grey,/obj/item/weapon/gun/projectile/shotgun/pump/combat{ammo_type = /obj/item/ammo_casing/a12g/beanbag; desc = "Built for close quarters combat, the Hesphaistos Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. This one has 'Property of the Warden' inscribed on the stock."; name = "warden's shotgun"},/turf/simulated/floor/tiled/dark,/area/security/warden)
"awy" = (/turf/simulated/wall/r_wall,/area/bridge)
-"awz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/bridge)
+"awz" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/bridge)
"awA" = (/obj/structure/sign/department/bridge,/turf/simulated/wall/r_wall,/area/bridge_hallway)
"awB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/machinery/door/airlock/command{name = "Bridge"; req_access = list(19)},/turf/simulated/floor/tiled/steel_grid,/area/bridge_hallway)
"awC" = (/obj/structure/sign/nanotrasen,/turf/simulated/wall/r_wall,/area/bridge_hallway)
"awD" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/machinery/door/airlock/command{name = "Bridge"; req_access = list(19)},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/steel_grid,/area/bridge_hallway)
"awE" = (/turf/simulated/wall/r_wall,/area/bridge_hallway)
"awF" = (/obj/effect/floor_decal/industrial/loading{dir = 1},/obj/machinery/camera/network/northern_star{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
-"awG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/crew_quarters/heads/hop)
+"awG" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/crew_quarters/heads/hop)
"awH" = (/obj/effect/floor_decal/industrial/loading,/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
"awI" = (/turf/simulated/wall/r_wall,/area/crew_quarters/heads/hop)
"awJ" = (/obj/machinery/door/airlock/maintenance/command{req_one_access = list(12)},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/maintenance/station/bridge)
@@ -1317,7 +1317,7 @@
"azq" = (/obj/machinery/computer/ordercomp{dir = 8},/turf/simulated/floor/tiled/dark,/area/bridge)
"azr" = (/obj/machinery/computer/crew{dir = 4},/turf/simulated/floor/tiled/dark,/area/bridge)
"azs" = (/obj/machinery/computer/transhuman/resleeving{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark,/area/bridge)
-"azt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/bridge)
+"azt" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/bridge)
"azu" = (/obj/structure/disposalpipe/sortjunction/flipped{name = "HoP Office"; sortType = "HoP Office"},/turf/simulated/floor/tiled/monotile,/area/bridge_hallway)
"azv" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/blue/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/bridge_hallway)
"azw" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/window/reinforced/polarized{dir = 10; icon_state = "fwindow"; id = "hop_office"},/turf/simulated/floor/plating,/area/crew_quarters/heads/hop)
@@ -1464,7 +1464,7 @@
"aCh" = (/obj/machinery/photocopier/faxmachine{department = "Bridge"},/obj/structure/table/reinforced,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/bridge)
"aCi" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled/dark,/area/bridge)
"aCj" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/light_switch{pixel_y = -26},/turf/simulated/floor/tiled/dark,/area/bridge)
-"aCk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/bridge)
+"aCk" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/bridge)
"aCl" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/blue/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/blue/bordercorner2{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/bridge_hallway)
"aCm" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/monotile,/area/bridge_hallway)
"aCn" = (/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway)
@@ -1489,15 +1489,15 @@
"aCG" = (/obj/machinery/door/airlock/glass,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled/steel_grid,/area/tether/station/dock_one)
"aCH" = (/obj/machinery/door/airlock/glass,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/tether/station/dock_one)
"aCI" = (/obj/machinery/door/airlock/glass,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/tether/station/dock_one)
-"aCJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/hallway/station/docks)
+"aCJ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/hallway/station/docks)
"aCK" = (/turf/simulated/wall,/area/tether/station/dock_two)
"aCL" = (/obj/machinery/door/airlock/glass,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled/steel_grid,/area/tether/station/dock_two)
"aCM" = (/obj/machinery/door/airlock/glass,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/tether/station/dock_two)
"aCN" = (/obj/machinery/door/airlock/glass,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/tether/station/dock_two)
"aCO" = (/turf/simulated/wall/r_wall,/area/crew_quarters/captain)
"aCP" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/command{id_tag = "captaindoor"; name = "Colony Director's Office"; req_access = list(20)},/turf/simulated/floor/tiled/dark,/area/crew_quarters/captain)
-"aCQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 2; id = "cap_office"; layer = 3.1; name = "Colony Directo's Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/captain)
-"aCR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 2; id = "cap_office"; layer = 3.1; name = "Colony Directo's Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/captain)
+"aCQ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 2; id = "cap_office"; layer = 3.1; name = "Colony Directo's Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/captain)
+"aCR" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 2; id = "cap_office"; layer = 3.1; name = "Colony Directo's Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/captain)
"aCS" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/blue/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/camera/network/command{dir = 4},/turf/simulated/floor/tiled,/area/bridge_hallway)
"aCT" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/monotile,/area/bridge_hallway)
"aCU" = (/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway)
@@ -1529,7 +1529,7 @@
"aDu" = (/turf/simulated/floor/wood,/area/crew_quarters/captain)
"aDv" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/machinery/door/window/northleft{name = "Engineering Hardsuits"; req_access = list(11)},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/engineering/taur,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/engineering,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/engineering,/turf/simulated/floor/tiled,/area/engineering/engine_eva)
"aDw" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/wood,/area/crew_quarters/captain)
-"aDx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 8; id = "cap_office"; layer = 3.1; name = "Colony Directo's Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/captain)
+"aDx" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 8; id = "cap_office"; layer = 3.1; name = "Colony Directo's Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/captain)
"aDy" = (/obj/structure/sign/department/conference_room,/turf/simulated/wall/r_wall,/area/bridge_hallway)
"aDz" = (/turf/simulated/wall/r_wall,/area/maintenance/substation/command)
"aDA" = (/turf/simulated/wall/r_wall,/area/maintenance/station/bridge)
@@ -1539,7 +1539,7 @@
"aDE" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/tether/station/dock_one)
"aDF" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/tether/station/dock_one)
"aDG" = (/turf/simulated/floor/tiled,/area/tether/station/dock_one)
-"aDH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"aDH" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
"aDI" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/table/standard,/obj/random/soap,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/engi_wash)
"aDJ" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/tether/station/dock_two)
"aDK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/tether/station/dock_two)
@@ -1551,7 +1551,7 @@
"aDQ" = (/obj/item/device/flashlight/lamp/green,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/captain)
"aDR" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/crew_quarters/captain)
"aDS" = (/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 4},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/crew_quarters/captain)
-"aDT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 8; id = "cap_office"; layer = 3.1; name = "Colony Directo's Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/captain)
+"aDT" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable/green,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 8; id = "cap_office"; layer = 3.1; name = "Colony Directo's Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/captain)
"aDU" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/blue/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/bridge_hallway)
"aDV" = (/obj/machinery/cell_charger,/obj/structure/table/steel,/obj/machinery/light/small{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/substation/command)
"aDW" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/corner/red/border,/obj/item/weapon/storage/secure/safe{pixel_x = 6; pixel_y = -28},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/paper{desc = ""; info = "In the event that more weapon permits are needed, please fax Central Command to request more. Please also include a reason for the request. Blank permits will be shipped to cargo for pickup. If long-term permits are desired, please contact your NanoTrasen Employee Representitive for more information."; name = "note from CentCom about permits"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos)
@@ -1655,13 +1655,13 @@
"aFQ" = (/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"aFR" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"aFS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/lightgrey/bordercorner2,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
-"aFT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
-"aFU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"aFT" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"aFU" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
"aFV" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/tether/station/dock_one)
"aFW" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/tether/station/dock_one)
"aFX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/camera/network/northern_star{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
-"aFY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
-"aFZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"aFY" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"aFZ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
"aGa" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/tether/station/dock_two)
"aGb" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
"aGc" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/photo_album{pixel_y = -10},/obj/item/weapon/reagent_containers/food/drinks/flask{pixel_x = 8},/turf/simulated/floor/wood,/area/crew_quarters/captain)
@@ -1701,7 +1701,7 @@
"aGK" = (/turf/simulated/wall/r_wall,/area/teleporter)
"aGL" = (/turf/simulated/wall,/area/library_conference_room)
"aGM" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Library Meeting Room"},/turf/simulated/floor/wood,/area/library_conference_room)
-"aGN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/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,/turf/simulated/floor/plating,/area/library_conference_room)
+"aGN" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/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,/turf/simulated/floor/plating,/area/library_conference_room)
"aGO" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass{name = "Library Meeting Room"},/turf/simulated/floor/wood,/area/library_conference_room)
"aGP" = (/obj/structure/cable{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/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"aGQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
@@ -1713,10 +1713,10 @@
"aGW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/blue/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"aGX" = (/obj/structure/cable{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/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/machinery/door/firedoor/glass/hidden/steel{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"aGY" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{name = "Break Room"},/turf/simulated/floor/tiled/steel_grid,/area/security/breakroom)
-"aGZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"aGZ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
"aHa" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/tether/station/dock_one)
"aHb" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{name = "Break Room"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/steel_grid,/area/security/breakroom)
-"aHc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"aHc" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
"aHd" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/tether/station/dock_two)
"aHe" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 2; frequency = 1379; id_tag = "sec_fore_pump"},/turf/simulated/floor,/area/maintenance/station/sec_upper)
"aHf" = (/obj/machinery/shieldwallgen,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/teleporter)
@@ -1801,7 +1801,7 @@
"aIG" = (/obj/machinery/photocopier,/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/wood,/area/library_conference_room)
"aIH" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/maintenance/station/sec_upper)
"aII" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
-"aIJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/library_conference_room)
+"aIJ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/library_conference_room)
"aIK" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{name = "Security EVA"; req_access = newlist(); req_one_access = list(1,2,18)},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/maintenance/station/sec_upper)
"aIL" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/station/sec_upper)
"aIM" = (/obj/effect/floor_decal/sign/dock/one,/turf/simulated/floor/tiled,/area/tether/station/dock_one)
@@ -1826,13 +1826,13 @@
"aJf" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"; tag = "icon-manifold-f (WEST)"},/turf/simulated/floor/tiled/dark,/area/tether/station/dock_one)
"aJg" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"; tag = "icon-intact-f (SOUTHWEST)"},/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1380; id_tag = "trade_shuttle_dock_airlock"; pixel_x = 28; pixel_y = 0; req_one_access = list(13); tag_airpump = "trade_shuttle_dock_pump"; tag_chamber_sensor = "trade_shuttle_dock_sensor"; tag_exterior_door = "trade_shuttle_dock_outer"; tag_interior_door = "trade_shuttle_dock_inner"},/turf/simulated/floor/tiled/dark,/area/tether/station/dock_one)
"aJh" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/blue/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/blue/bordercorner2{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
-"aJi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"aJi" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
"aJj" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/camera/network/northern_star{dir = 4},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1380; id_tag = "trade_shuttle_dock_pump"},/turf/simulated/floor/tiled/dark,/area/tether/station/dock_one)
"aJk" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1380; id_tag = "trade_shuttle_dock_pump"},/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "trade_shuttle_dock_sensor"; pixel_x = 30; pixel_y = 8},/turf/simulated/floor/tiled/dark,/area/tether/station/dock_one)
"aJl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/tiled,/area/engineering/engine_eva)
"aJm" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "trade_shuttle_dock_outer"; locked = 1; name = "Dock One External Access"},/turf/simulated/floor/tiled/dark,/area/tether/station/dock_one)
"aJn" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1380; master_tag = "trade_shuttle_dock_airlock"; name = "exterior access button"; pixel_x = 28; pixel_y = -6; req_access = list(13)},/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "trade_shuttle_dock_outer"; locked = 1; name = "Dock One External Access"},/turf/simulated/floor/tiled/dark,/area/tether/station/dock_one)
-"aJo" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"aJo" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
"aJp" = (/obj/structure/cable{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/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"aJq" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/wood,/area/security/breakroom)
"aJr" = (/turf/space,/area/shuttle/trade/station)
@@ -1857,7 +1857,7 @@
"aJK" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled,/area/security/prison)
"aJL" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled,/area/security/prison)
"aJM" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/red/border{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 5},/turf/simulated/floor/tiled,/area/security/prison)
-"aJN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/security/brig/visitation)
+"aJN" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/security/brig/visitation)
"aJO" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/security/brig/visitation)
"aJP" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/brig/visitation)
"aJQ" = (/obj/machinery/camera/network/security{c_tag = "SEC - Warden's Office"},/turf/simulated/floor/tiled,/area/security/brig/visitation)
@@ -1899,12 +1899,12 @@
"aKA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/blue/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/blue/bordercorner2,/obj/effect/floor_decal/corner/blue/bordercorner2{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"aKB" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/window/brigdoor/southleft{dir = 1; icon_state = "leftsecure"; id = "Cell 4"; name = "Cell 4"; req_access = list(2); tag = "icon-leftsecure (NORTH)"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/tiled/dark,/area/security/brig)
"aKC" = (/obj/structure/cable{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/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
-"aKD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-4"},/obj/structure/cable/green,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
-"aKE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
-"aKF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
-"aKG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig/visitation)
-"aKH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-4"},/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig/visitation)
-"aKI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig/visitation)
+"aKD" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-4"},/obj/structure/cable/green,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
+"aKE" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
+"aKF" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
+"aKG" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig/visitation)
+"aKH" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-4"},/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig/visitation)
+"aKI" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig/visitation)
"aKJ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/station/sec_lower)
"aKK" = (/turf/simulated/wall,/area/chapel/chapel_morgue)
"aKL" = (/obj/effect/floor_decal/corner/yellow{dir = 6},/obj/effect/floor_decal/corner/yellow{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/machinery/vending/snack,/turf/simulated/floor/tiled,/area/engineering/foyer_mezzenine)
@@ -2055,7 +2055,7 @@
"aNA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue)
"aNB" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue)
"aNC" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue)
-"aND" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/chapel/chapel_morgue)
+"aND" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/chapel/chapel_morgue)
"aNE" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/engineering/foyer_mezzenine)
"aNF" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor/tiled{tag = "icon-monotile"; icon_state = "monotile"},/area/engineering/hallway)
"aNG" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/security/prison)
@@ -2095,10 +2095,10 @@
"aOo" = (/obj/structure/cable{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/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/lightgrey/bordercorner2,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"aOp" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/window/brigdoor/southleft{id = "Cell 2"; name = "Cell 2"; req_access = list(2)},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/tiled/dark,/area/security/brig)
"aOq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
-"aOr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/security/brig)
-"aOs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{icon_state = "0-4"},/obj/structure/disposalpipe/segment,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
-"aOt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
-"aOu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
+"aOr" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/security/brig)
+"aOs" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{icon_state = "0-4"},/obj/structure/disposalpipe/segment,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
+"aOt" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
+"aOu" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig)
"aOv" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp{pixel_y = 10},/obj/machinery/camera/network/civilian{dir = 4},/turf/simulated/floor/lino,/area/chapel/office)
"aOw" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen/blue{pixel_x = 5; pixel_y = 5},/turf/simulated/floor/lino,/area/chapel/office)
"aOx" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/fancy/crayons,/obj/structure/cable/pink{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/lino,/area/chapel/office)
@@ -2183,7 +2183,7 @@
"aPY" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"; tag = "icon-manifold-f (WEST)"},/obj/machinery/meter{frequency = 1443; id = "dist_aux_meter"; name = "Distribution Loop"},/obj/machinery/camera/network/engineering{dir = 4},/turf/simulated/floor/tiled/dark,/area/engineering/engineering_airlock)
"aPZ" = (/obj/structure/noticeboard,/turf/simulated/wall,/area/quartermaster/office)
"aQa" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/machinery/door/window/northright{name = "Engineering Hardsuits"; req_access = list(11)},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/engineering,/turf/simulated/floor/tiled,/area/engineering/engine_eva)
-"aQb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/security/prison)
+"aQb" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/security/prison)
"aQc" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass_security{name = "Security Processing"; req_access = list(1)},/turf/simulated/floor/tiled/steel_grid,/area/security/prison)
"aQd" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/camera/network/security{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/evidence_storage)
"aQe" = (/turf/simulated/floor/tiled/dark,/area/security/evidence_storage)
@@ -2314,7 +2314,7 @@
"aSz" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"aSA" = (/obj/machinery/light{dir = 1},/obj/machinery/mech_recharger,/turf/simulated/floor/tiled/dark,/area/security/security_equiptment_storage)
"aSB" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/obj/item/clothing/suit/space/void/security,/obj/item/clothing/suit/space/void/security,/obj/item/clothing/head/helmet/space/void/security,/obj/item/clothing/head/helmet/space/void/security,/obj/effect/floor_decal/industrial/outline/grey,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/brigdoor/eastright{tag = "icon-rightsecure"; icon_state = "rightsecure"; dir = 2},/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/turf/simulated/floor/tiled/dark,/area/security/armoury)
-"aSC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/engine_eva)
+"aSC" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/engine_eva)
"aSD" = (/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/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineering{name = "Engineering EVA Storage"; req_one_access = list(11,24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/engine_eva)
"aSE" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Workshop"; req_access = newlist(); req_one_access = list(14,24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/workshop)
"aSF" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{tag = "icon-intact (NORTHWEST)"; icon_state = "intact"; dir = 9},/turf/simulated/floor/tiled,/area/engineering/hallway)
@@ -2389,7 +2389,7 @@
"aTW" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/station/sec_lower)
"aTX" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/station/sec_lower)
"aTY" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/maintenance/station/sec_lower)
-"aTZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/engineering_airlock)
+"aTZ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/engineering_airlock)
"aUa" = (/obj/effect/floor_decal/chapel{dir = 8},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main)
"aUb" = (/obj/effect/floor_decal/chapel,/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main)
"aUc" = (/turf/simulated/wall/r_wall,/area/ai_server_room)
@@ -2412,7 +2412,7 @@
"aUt" = (/turf/simulated/wall/r_wall,/area/maintenance/station/eng_upper)
"aUu" = (/turf/simulated/wall/r_wall,/area/maintenance/station/sec_lower)
"aUv" = (/obj/structure/sign/department/chapel,/turf/simulated/wall,/area/chapel/main)
-"aUw" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/chapel/main)
+"aUw" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/chapel/main)
"aUx" = (/obj/machinery/door/airlock/glass{name = "Chapel"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/chapel/main)
"aUy" = (/obj/machinery/door/airlock/glass{name = "Chapel"},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/chapel/main)
"aUz" = (/obj/machinery/message_server,/turf/simulated/floor/tiled/techfloor,/area/ai_server_room)
@@ -2446,7 +2446,7 @@
"aVb" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner_steel_grid{tag = "icon-steel_grid (NORTHWEST)"; icon_state = "steel_grid"; dir = 9},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/effect/floor_decal/corner/yellow/bordercorner,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/machinery/camera/network/engineering{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/engineering/hallway)
"aVc" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1379; id_tag = "eng_starboard_pump"},/obj/machinery/airlock_sensor{frequency = 1379; id_tag = "eng_starboard_sensor"; pixel_x = 24; pixel_y = 10},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1379; id_tag = "eng_starboard_airlock"; pixel_x = 24; pixel_y = 0; req_access = newlist(); req_one_access = list(11,24); tag_airpump = "eng_starboard_pump"; tag_chamber_sensor = "eng_starboard_sensor"; tag_exterior_door = "eng_starboard_outer"; tag_interior_door = "eng_starboard_inner"},/turf/simulated/floor/tiled/dark,/area/engineering/engineering_airlock)
"aVd" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/engineering/hallway)
-"aVe" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor,/area/storage/tech)
+"aVe" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor,/area/storage/tech)
"aVf" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "eng_starboard_airlock"; name = "interior access button"; pixel_x = 24; pixel_y = 25; req_one_access = list(11,24)},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/tiled,/area/engineering/engineering_airlock)
"aVg" = (/turf/simulated/wall,/area/engineering/foyer_mezzenine)
"aVh" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/maintenance/station/eng_upper)
@@ -2474,7 +2474,7 @@
"aVD" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/ai_cyborg_station)
"aVE" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled/dark,/area/lawoffice)
"aVF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/lawoffice)
-"aVG" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/storage/tech)
+"aVG" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/storage/tech)
"aVH" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/engineering/hallway)
"aVI" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/engineering/hallway)
"aVJ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/yellow/bordercorner2,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/engineering/hallway)
@@ -2482,7 +2482,7 @@
"aVL" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/turf/simulated/floor/tiled,/area/engineering/hallway)
"aVM" = (/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/storage/tech)
"aVN" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled,/area/engineering/hallway)
-"aVO" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/storage/tech)
+"aVO" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/storage/tech)
"aVP" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/red/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 9},/obj/item/device/radio/intercom{dir = 2; pixel_y = -24},/turf/simulated/floor/tiled,/area/security/briefing_room)
"aVQ" = (/turf/simulated/wall/r_wall,/area/storage/tech)
"aVR" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/obj/random/maintenance/cargo,/obj/random/junk,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/station/eng_upper)
@@ -2572,7 +2572,7 @@
"aXx" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 4},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -32},/obj/structure/cable/green,/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engineering_airlock)
"aXy" = (/obj/machinery/light/small{dir = 8; pixel_y = 0},/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engineering_airlock)
"aXz" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/structure/window/reinforced{dir = 1},/obj/item/clothing/mask/breath,/obj/item/weapon/rig/ce/equipped,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
-"aXA" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor,/area/storage/tech)
+"aXA" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor,/area/storage/tech)
"aXB" = (/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28},/turf/simulated/floor,/area/storage/tech)
"aXC" = (/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/disposalpipe/segment,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/command{name = "Chief Engineer"; req_access = list(56)},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/heads/chief)
"aXD" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/storage/tech)
@@ -2597,7 +2597,7 @@
"aXW" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/weapon/circuitboard/transhuman_synthprinter{pixel_x = -3; pixel_y = 4},/obj/item/weapon/circuitboard/rdconsole{pixel_x = 0; pixel_y = 2},/obj/item/weapon/circuitboard/destructive_analyzer,/obj/item/weapon/circuitboard/protolathe{pixel_x = 3; pixel_y = -2},/obj/item/weapon/circuitboard/rdserver{pixel_x = 6; pixel_y = -4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/storage/tech)
"aXX" = (/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/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Monitoring Room"; req_one_access = list(11,24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/engine_monitoring)
"aXY" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/security/mining{pixel_x = 1; pixel_y = 3},/obj/item/weapon/circuitboard/autolathe,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/circuitboard/scan_consolenew{pixel_x = 6; pixel_y = -3},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/storage/tech)
-"aXZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/foyer)
+"aXZ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/foyer)
"aYa" = (/obj/structure/table/steel,/obj/item/device/integrated_electronics/debugger{pixel_x = -5; pixel_y = 0},/obj/item/device/integrated_electronics/wirer{pixel_x = 5; pixel_y = 0},/turf/simulated/floor,/area/storage/tech)
"aYb" = (/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/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Hallway"; req_one_access = list(10)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/foyer)
"aYc" = (/obj/structure/disposalpipe/segment,/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"},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/engineering/foyer_mezzenine)
@@ -2648,16 +2648,16 @@
"aYV" = (/turf/simulated/wall/r_wall,/area/medical/virology)
"aYW" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/maintenance/command,/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,/area/maintenance/evahallway)
"aYX" = (/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
-"aYY" = (/obj/structure/grille,/obj/structure/sign/securearea,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"aYY" = (/obj/structure/grille,/obj/structure/sign/securearea,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"aYZ" = (/obj/machinery/door/airlock/glass_command{name = "E.V.A."; req_one_access = list(18)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/ai_monitored/storage/eva)
-"aZa" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"aZa" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced/full,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"aZb" = (/obj/machinery/door/airlock/glass_command{name = "E.V.A."; req_one_access = list(18)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel_grid,/area/ai_monitored/storage/eva)
"aZc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/storage/tech)
"aZd" = (/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/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
"aZe" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/storage/tech)
"aZf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/storage/tech)
"aZg" = (/obj/structure/table/reinforced,/obj/item/device/megaphone,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
-"aZh" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/highsecurity{name = "Secure Tech Storage"; req_access = list(19,23)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/storage/tech)
+"aZh" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/highsecurity{name = "Secure Tech Storage"; req_access = list(19,23); req_one_access = newlist()},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/storage/tech)
"aZi" = (/obj/structure/table/reinforced,/obj/machinery/button/remote/blast_door{id = "atmoslockdown"; name = "Atmospherics Lockdown"; pixel_x = 6; pixel_y = 10; req_one_access = list(10,24)},/obj/machinery/button/remote/blast_door{id = "englockdown"; name = "Engineering Lockdown"; pixel_x = -6; pixel_y = 10; req_access = list(10)},/obj/machinery/recharger,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"aZj" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/storage/tech)
"aZk" = (/obj/structure/table/reinforced,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
@@ -2685,13 +2685,13 @@
"aZG" = (/obj/effect/decal/cleanable/dirt,/obj/random/trash_pile,/turf/simulated/floor,/area/medical/virology)
"aZH" = (/obj/structure/catwalk,/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,/area/maintenance/evahallway)
"aZI" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/medical,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/medical,/obj/item/clothing/suit/space/void/medical/taur,/obj/item/clothing/head/helmet/space/void/medical,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
-"aZJ" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"aZJ" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"aZK" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/requests_console{department = "EVA"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
"aZL" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"aZM" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/button/remote/airlock{desc = "A remote control switch for exiting EVA."; id = "evadoors"; name = "EVA Door Control"; pixel_x = 0; pixel_y = 28},/obj/machinery/camera/network/command{c_tag = "EVA - Fore"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"aZN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"aZO" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
-"aZP" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"aZP" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"aZQ" = (/obj/structure/table/rack,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/security,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/security,/obj/item/clothing/suit/space/void/security/taur,/obj/item/clothing/head/helmet/space/void/security,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"aZR" = (/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/engineering{name = "Engineering Workshop"; req_one_access = list(14,24)},/turf/simulated/floor/plating,/area/engineering/locker_room)
"aZS" = (/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/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer)
@@ -2727,7 +2727,7 @@
"baw" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/engineering/foyer_mezzenine)
"bax" = (/obj/machinery/atmospherics/valve/digital/open,/obj/structure/railing{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"bay" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Chief Engineer"},/obj/machinery/button/windowtint{id = "ce_office"; layer = 3.3; pixel_x = 26; pixel_y = 29},/obj/machinery/button/remote/blast_door{id = "englockdown"; name = "Engineering Lockdown"; pixel_x = 26; pixel_y = -12; req_access = list(10)},/obj/machinery/button/remote/blast_door{id = "atmoslockdown"; name = "Atmospherics Lockdown"; pixel_x = 38; pixel_y = -12; req_access = list(10)},/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
-"baz" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor,/area/storage/tech)
+"baz" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor,/area/storage/tech)
"baA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/table/reinforced,/obj/item/clothing/glasses/meson{pixel_y = 4},/obj/item/clothing/glasses/welding/superior,/obj/item/device/flashlight/lamp,/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
"baB" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
"baC" = (/obj/machinery/requests_console{department = "Tech storage"; pixel_x = -28; pixel_y = 0},/obj/machinery/camera/network/engineering{dir = 4},/turf/simulated/floor,/area/storage/tech)
@@ -2753,7 +2753,7 @@
"baW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/machinery/door/firedoor/glass/hidden/steel{dir = 2},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/turf/simulated/floor/tiled,/area/hallway/station/starboard)
"baX" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/lightgrey/bordercorner{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/turf/simulated/floor/tiled,/area/hallway/station/starboard)
"baY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/station/starboard)
-"baZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/virology)
+"baZ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/virology)
"bba" = (/obj/machinery/door/window/westright{tag = "icon-right (NORTH)"; name = "Virology Isolation Room One"; icon_state = "right"; dir = 1; req_access = list(39)},/obj/machinery/atmospherics/pipe/simple/hidden/black,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/virology)
"bbb" = (/obj/machinery/door/window/westright{dir = 1; icon_state = "right"; name = "Virology Isolation Room Two"; req_access = list(39); tag = "icon-right (NORTH)"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology)
"bbc" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/green,/obj/machinery/camera/network/medbay{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/virologyisolation)
@@ -2813,16 +2813,16 @@
"bce" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"bcf" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"bcg" = (/obj/structure/table/reinforced,/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
-"bch" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"bch" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"bci" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/head/helmet/space/skrell/black,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/skrell/black,/obj/item/clothing/head/helmet/space/skrell/white,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/skrell/white,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"bcj" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/rig/breacher,/obj/item/clothing/mask/breath,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"bck" = (/obj/machinery/atmospherics/valve/open,/obj/structure/railing{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"bcl" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/computer/station_alert/all{tag = "icon-computer (EAST)"; icon_state = "computer"; dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
"bcm" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/turf/simulated/floor/tiled,/area/hallway/station/port)
"bcn" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/structure/table/reinforced,/obj/item/weapon/stamp/ce,/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
-"bco" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/turf/simulated/floor,/area/crew_quarters/heads/chief)
+"bco" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/turf/simulated/floor,/area/crew_quarters/heads/chief)
"bcp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
-"bcq" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/storage/tech)
+"bcq" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/storage/tech)
"bcr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
"bcs" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/structure/disposalpipe/segment,/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for shutters."; id = "hop_office_desk"; layer = 3.3; name = "Desk Privacy Shutter"; pixel_x = -29; pixel_y = 29},/obj/machinery/button/windowtint{id = "ce_office"; layer = 3.3; pixel_x = 26; pixel_y = 29},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
"bct" = (/obj/machinery/status_display{layer = 4; pixel_x = -32; pixel_y = 0},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/storage/tech)
@@ -2849,11 +2849,11 @@
"bcO" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/cups,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/medical/virologyisolation)
"bcP" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering Hardsuits"; req_one_access = list(11,24)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
"bcQ" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/table/reinforced,/obj/machinery/camera/network/security{dir = 8},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/rods{amount = 50},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
-"bcR" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"bcR" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"bcS" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/station/sec_lower)
"bcT" = (/turf/simulated/wall,/area/storage/tech)
"bcU" = (/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/storage/tech)
-"bcV" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/storage/tech)
+"bcV" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/storage/tech)
"bcW" = (/turf/simulated/wall,/area/tether/station/stairs_two)
"bcX" = (/obj/structure/sign/directions/engineering{dir = 1; pixel_y = 8},/obj/structure/sign/directions/elevator{dir = 4},/turf/simulated/wall,/area/tether/station/stairs_two)
"bcY" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/turf/simulated/floor/tiled,/area/tether/station/stairs_two)
@@ -2875,7 +2875,7 @@
"bdo" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"bdp" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"bdq" = (/obj/structure/table/reinforced,/obj/item/stack/material/plasteel{amount = 10},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
-"bdr" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"bdr" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"bds" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled,/area/engineering/hallway)
"bdt" = (/obj/machinery/vending/assist,/turf/simulated/floor,/area/storage/tech)
"bdu" = (/obj/structure/table/reinforced,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/obj/machinery/photocopier/faxmachine{department = "Chief Engineer's Office"},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
@@ -2910,7 +2910,7 @@
"bdX" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"; tag = "icon-intact-f (SOUTHWEST)"},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled,/area/engineering/engineering_airlock)
"bdY" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
"bdZ" = (/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/weapon/storage/briefcase/inflatable{pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = -3},/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
-"bea" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"bea" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"beb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"bec" = (/turf/simulated/floor,/area/storage/tech)
"bed" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Monitoring Room"; req_one_access = list(11,24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/engine_monitoring)
@@ -2971,10 +2971,10 @@
"bfg" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/black,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/virologyisolation)
"bfh" = (/obj/machinery/computer/arcade,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virologyisolation)
"bfi" = (/obj/machinery/suit_cycler/engineering{req_access = null},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
-"bfj" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"bfj" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"bfk" = (/obj/structure/table/reinforced,/obj/item/clothing/head/welding,/obj/item/weapon/storage/belt/utility,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/camera/network/command{dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
"bfl" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
-"bfm" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"bfm" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"bfn" = (/obj/structure/disposalpipe/segment,/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,/area/engineering/foyer_mezzenine)
"bfo" = (/obj/structure/window/reinforced,/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/engineering/foyer)
"bfp" = (/turf/simulated/floor/tiled,/area/engineering/foyer_mezzenine)
@@ -3032,7 +3032,7 @@
"bgp" = (/obj/machinery/door/airlock/glass_medical{name = "Virology Laboratory"; req_access = list(39)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/black,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/virology)
"bgq" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 28},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/atmospherics/pipe/simple/hidden/red{dir = 6; icon_state = "intact"; tag = "icon-intact (SOUTHEAST)"},/turf/simulated/floor/tiled/white,/area/medical/virologyaccess)
"bgr" = (/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/atmospherics/tvalve/bypass,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/plating,/area/medical/virologyaccess)
-"bgs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/virologyaccess)
+"bgs" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/virologyaccess)
"bgt" = (/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1379; icon_state = "door_locked"; id_tag = "virologyq_airlock_exterior"; locked = 1; name = "Virology Quarantine Airlock"; req_access = list(39)},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "virologyq_airlock_control"; name = "Virology Quarantine Access Button"; pixel_x = 24; pixel_y = 0; req_access = list(39)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/black,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/virologyaccess)
"bgu" = (/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/catwalk,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 28},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/maintenance/evahallway)
"bgv" = (/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/maintenance/evahallway)
@@ -3112,7 +3112,7 @@
"bhR" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/wood,/area/bridge/meeting_room)
"bhS" = (/turf/simulated/floor/wood,/area/bridge/meeting_room)
"bhT" = (/obj/machinery/atm{pixel_y = 30},/turf/simulated/floor/wood,/area/bridge/meeting_room)
-"bhU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/bridge/meeting_room)
+"bhU" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/bridge/meeting_room)
"bhV" = (/obj/machinery/atmospherics/unary/freezer{dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/steel,/area/medical/biostorage)
"bhW" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/paleblue/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/paleblue/bordercorner2{dir = 4},/obj/machinery/camera/network/medbay,/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"; tag = "icon-intact-f (SOUTHWEST)"},/turf/simulated/floor/tiled,/area/medical/biostorage)
"bhX" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/paleblue/border{dir = 1},/obj/structure/table/rack,/obj/item/clothing/suit/radiation,/obj/item/clothing/head/radiation,/obj/item/weapon/storage/toolbox/emergency,/obj/item/bodybag/cryobag{pixel_x = -3},/obj/item/bodybag/cryobag{pixel_x = -3},/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/tiled,/area/medical/biostorage)
@@ -3304,7 +3304,7 @@
"blB" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/hallway/secondary/escape/medical_escape_pod_hallway)
"blC" = (/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/medical/virologyaccess)
"blD" = (/turf/simulated/wall,/area/crew_quarters/medbreak)
-"blE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/crew_quarters/medbreak)
+"blE" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/crew_quarters/medbreak)
"blF" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals10,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 1},/obj/machinery/door/airlock/glass_medical{name = "Staff Room"; req_access = list(5)},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"blG" = (/obj/structure/table/rack,/obj/item/device/suit_cooling_unit{pixel_y = -5},/obj/item/weapon/tank/oxygen{pixel_y = -4},/obj/item/device/suit_cooling_unit{pixel_y = -5},/obj/item/weapon/tank/oxygen{pixel_y = -4},/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay)
"blH" = (/obj/effect/floor_decal/borderfloorblack{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay)
@@ -3314,7 +3314,7 @@
"blL" = (/obj/structure/table/rack,/obj/item/weapon/rig/medical/equipped,/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay)
"blM" = (/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/hallway/secondary/escape/medical_escape_pod_hallway)
"blN" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/hallway/secondary/escape/medical_escape_pod_hallway)
-"blO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/hallway/secondary/escape/medical_escape_pod_hallway)
+"blO" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/hallway/secondary/escape/medical_escape_pod_hallway)
"blP" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/medical/virologyaccess)
"blQ" = (/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/disposaloutlet{dir = 4},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/medical/virologyaccess)
"blR" = (/turf/simulated/wall,/area/crew_quarters/medical_restroom)
@@ -3329,7 +3329,7 @@
"bma" = (/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay)
"bmb" = (/obj/structure/closet/secure_closet/paramedic,/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/industrial/outline/blue,/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay)
"bmc" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 5; icon_state = "intact"; tag = "icon-intact (NORTHEAST)"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/hallway/secondary/escape/medical_escape_pod_hallway)
-"bmd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/turf/simulated/floor/plating,/area/hallway/secondary/escape/medical_escape_pod_hallway)
+"bmd" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/turf/simulated/floor/plating,/area/hallway/secondary/escape/medical_escape_pod_hallway)
"bme" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/medical/virologyaccess)
"bmf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 140; external_pressure_bound_default = 140; icon_state = "map_vent_out"; pressure_checks = 1; pressure_checks_default = 1; use_power = 1},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/medical/virologyaccess)
"bmg" = (/obj/structure/curtain/open/shower,/obj/machinery/shower{pixel_y = 10},/obj/effect/floor_decal/steeldecal/steel_decals5,/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 6},/turf/simulated/floor/tiled/white,/area/crew_quarters/medical_restroom)
@@ -3371,10 +3371,10 @@
"bmQ" = (/obj/structure/bed/chair,/obj/effect/floor_decal/corner/paleblue/diagonal,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"bmR" = (/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"bmS" = (/obj/machinery/vending/coffee,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
-"bmT" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/obj/structure/cable/green,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor,/area/storage/tech)
+"bmT" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/obj/structure/cable/green,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor,/area/storage/tech)
"bmU" = (/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/structure/closet/crate/secure{name = "Silver Crate"; req_access = list(19)},/obj/item/weapon/coin/silver,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage)
-"bmV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/vacant/vacant_restaurant_upper)
-"bmW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/hallway/station/port)
+"bmV" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/vacant/vacant_restaurant_upper)
+"bmW" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/hallway/station/port)
"bmX" = (/turf/simulated/mineral/floor,/area/hallway/secondary/escape/medical_escape_pod_hallway)
"bmY" = (/obj/structure/mirror{pixel_y = 30},/obj/structure/sink{pixel_y = 24},/turf/simulated/floor/tiled/white,/area/crew_quarters/medical_restroom)
"bmZ" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled/white,/area/crew_quarters/medical_restroom)
@@ -3390,13 +3390,13 @@
"bnj" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"bnk" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"bnl" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/hallway/station/port)
-"bnm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/sign/warning/secure_area{pixel_x = -32},/turf/simulated/floor/plating,/area/hallway/station/upper)
+"bnm" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/sign/warning/secure_area{pixel_x = -32},/turf/simulated/floor/plating,/area/hallway/station/upper)
"bnn" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/requests_console{announcementConsole = 1; department = "Chief Engineer's Desk"; departmentType = 6; name = "Chief Engineer RC"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
"bno" = (/obj/structure/noticeboard{pixel_y = -32},/obj/structure/cable{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/borderfloor,/obj/effect/floor_decal/corner/blue/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/blue/bordercorner2,/obj/effect/floor_decal/corner/blue/bordercorner2{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"bnp" = (/obj/structure/table/standard,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/qm)
-"bnq" = (/obj/structure/grille,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/bridge)
-"bnr" = (/obj/structure/grille,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/bridge)
-"bns" = (/obj/structure/grille,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/bridge)
+"bnq" = (/obj/structure/grille,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/bridge)
+"bnr" = (/obj/structure/grille,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/bridge)
+"bns" = (/obj/structure/grille,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/bridge)
"bnt" = (/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor/glass/hidden/steel{dir = 2},/turf/simulated/floor/tiled,/area/tether/station/stairs_two)
"bnu" = (/obj/machinery/door/firedoor/glass/hidden/steel{dir = 1},/turf/simulated/floor/tiled,/area/tether/station/stairs_two)
"bnv" = (/obj/structure/noticeboard{pixel_x = -32},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/blue/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/corner/blue/bordercorner2{dir = 10},/obj/effect/floor_decal/corner/blue/bordercorner2{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/bridge_hallway)
@@ -3416,7 +3416,7 @@
"bnJ" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/catwalk,/turf/simulated/floor,/area/maintenance/station/medbay)
"bnK" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/chainofcommand,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/item/weapon/coin/phoron,/turf/simulated/floor/wood,/area/crew_quarters/captain)
"bnL" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/engineering{dir = 1},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for engine core."; id = "EngineVent"; name = "Engine Ventillatory Control"; pixel_x = 6; pixel_y = -32},/obj/machinery/button/remote/airlock{desc = "A remote control-switch for the engine core airlock hatch bolts."; id = "engine_access_hatch"; name = "Engine Hatch Bolt Control"; pixel_x = -6; pixel_y = -32; specialfunctions = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
-"bnM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/medical_restroom)
+"bnM" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/medical_restroom)
"bnN" = (/obj/structure/flora/skeleton{name = "\proper Wilhelm"},/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/machinery/camera/network/medbay{c_tag = "MED - Surgery Hallway"; dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"bnO" = (/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"bnP" = (/obj/structure/bed/chair{dir = 1},/obj/effect/floor_decal/corner/paleblue/diagonal,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
@@ -3424,8 +3424,8 @@
"bnR" = (/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/effect/floor_decal/spline/plain{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"bnS" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"bnT" = (/obj/machinery/light_switch{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
-"bnU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
-"bnV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"bnU" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"bnV" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
"bnW" = (/obj/machinery/computer/communications,/obj/machinery/keycard_auth{pixel_x = -28},/turf/simulated/floor/wood,/area/crew_quarters/captain)
"bnX" = (/obj/machinery/alarm{pixel_y = 22},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/substation/command)
"bnY" = (/obj/machinery/light{dir = 8},/obj/structure/bed/chair/office/dark{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/effect/landmark/start{name = "Colony Director"},/obj/item/weapon/storage/secure/safe{pixel_x = -28},/turf/simulated/floor/wood,/area/crew_quarters/captain)
@@ -3434,8 +3434,8 @@
"bob" = (/obj/machinery/camera/network/medbay{dir = 1},/obj/effect/floor_decal/corner/paleblue/diagonal,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"boc" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/effect/floor_decal/corner/paleblue/diagonal,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
"bod" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
-"boe" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
-"bof" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/medbreak)
+"boe" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"bof" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/medbreak)
"bog" = (/turf/simulated/wall/r_wall,/area/security/security_equiptment_storage)
"boh" = (/turf/simulated/wall/r_wall,/area/security/armoury)
"boi" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/deployable/barrier,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/tiled/dark,/area/security/security_equiptment_storage)
@@ -3511,7 +3511,7 @@
"bpA" = (/obj/machinery/door/blast/regular{id = "ArmorAc1"; name = "Quick Deployment"},/turf/simulated/floor/tiled/steel_grid,/area/security/armoury)
"bpB" = (/obj/effect/floor_decal/rust,/obj/random/junk,/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/maintenance/station/sec_lower)
"bpC" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
-"bpD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"bpD" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
"bpE" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/maintenance/substation/security)
"bpF" = (/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/maintenance/substation/security)
"bpG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/substation/security)
@@ -3537,8 +3537,8 @@
"bqa" = (/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30; tag = "icon-extinguisher_closed (EAST)"},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"bqb" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"bqc" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
-"bqd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/station/dock_one)
-"bqe" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"bqd" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"bqe" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_two)
"bqf" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
"bqg" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/structure/closet{name = "Lost and Found"},/turf/simulated/floor/tiled,/area/security/lobby)
"bqh" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/turf/simulated/floor/tiled,/area/security/lobby)
@@ -3575,9 +3575,9 @@
"bqM" = (/obj/structure/cable/cyan{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 28},/turf/simulated/floor/bluegrid,/area/ai)
"bqN" = (/obj/effect/landmark/start{name = "AI"},/obj/machinery/requests_console{department = "AI"; departmentType = 5; pixel_x = 30; pixel_y = 32},/obj/machinery/newscaster/security_unit{pixel_x = -32; pixel_y = 32},/turf/simulated/floor/bluegrid,/area/ai)
"bqO" = (/turf/simulated/wall/r_wall,/area/security/warden)
-"bqP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
+"bqP" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
"bqQ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/door/airlock/security{name = "Equipment Storage"; req_access = list(3)},/turf/simulated/floor/tiled/dark,/area/security/warden)
-"bqR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
+"bqR" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
"bqS" = (/obj/structure/sign/department/armory,/turf/simulated/wall/r_wall,/area/security/warden)
"bqT" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{dir = 8; id = "ArmorAc2"; layer = 3.3; name = "Quick Deployment"},/turf/simulated/floor/tiled/steel_grid,/area/security/armoury)
"bqU" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{dir = 8; id = "ArmorAc2"; layer = 3.3; name = "Quick Deployment"},/turf/simulated/floor/tiled/steel_grid,/area/security/armoury)
@@ -3600,7 +3600,7 @@
"brl" = (/obj/effect/floor_decal/borderfloorblack{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 1},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden)
"brm" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/security/warden)
"brn" = (/obj/effect/floor_decal/borderfloorblack{dir = 5},/obj/effect/floor_decal/corner/red/border{dir = 5},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 4},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 4},/obj/machinery/computer/security,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden)
-"bro" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
+"bro" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
"brp" = (/turf/simulated/open,/area/security/prison)
"brq" = (/obj/machinery/light{dir = 1},/turf/simulated/open,/area/security/prison)
"brr" = (/obj/machinery/camera/network/security,/turf/simulated/open,/area/security/prison)
@@ -3639,7 +3639,7 @@
"brY" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloorblack{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 5},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 5},/obj/item/weapon/clipboard,/obj/item/weapon/folder/red,/obj/item/weapon/pen,/obj/item/device/binoculars,/turf/simulated/floor/tiled/dark,/area/security/warden)
"brZ" = (/obj/structure/catwalk,/turf/simulated/open,/area/security/prison)
"bsa" = (/obj/structure/railing{dir = 8},/turf/simulated/open,/area/security/prison)
-"bsb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/security/breakroom)
+"bsb" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/security/breakroom)
"bsc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/wood,/area/security/breakroom)
"bsd" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/wood,/area/security/breakroom)
"bse" = (/obj/structure/table/glass,/obj/item/weapon/deck/cards,/turf/simulated/floor/wood,/area/security/breakroom)
@@ -3723,10 +3723,10 @@
"btE" = (/turf/space,/area/shuttle/antag_space/north)
"btF" = (/obj/structure/table/steel,/obj/machinery/door/firedoor/glass,/obj/machinery/door/window/brigdoor/eastleft{dir = 2; name = "Warden's Desk"; req_access = list(1)},/obj/machinery/door/window/brigdoor/westleft{dir = 1; name = "Warden's Desk"; req_access = list(3)},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/tiled/dark,/area/security/warden)
"btG" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{name = "Warden's Office"; req_access = list(3)},/turf/simulated/floor/tiled/dark,/area/security/warden)
-"btH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
-"btI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
+"btH" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
+"btI" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
"btJ" = (/turf/simulated/wall/r_wall,/area/security/hallway)
-"btK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/security/hallway)
+"btK" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/security/hallway)
"btL" = (/obj/structure/sign/department/prison,/turf/simulated/wall/r_wall,/area/security/hallway)
"btM" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{name = "Security Cells"; req_access = list(1)},/turf/simulated/floor/tiled/steel_grid,/area/security/prison)
"btN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/security/hallway)
@@ -3826,7 +3826,7 @@
"bvD" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/red/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/red/bordercorner2,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/hallway)
"bvE" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/red/border,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/security/hallway)
"bvF" = (/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/red/border{dir = 6},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 6},/turf/simulated/floor/tiled,/area/security/hallway)
-"bvG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/security/detectives_office)
+"bvG" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/security/detectives_office)
"bvH" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/photo_album{pixel_y = -10},/obj/item/device/camera_film,/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; pixel_x = 2; pixel_y = 3},/turf/simulated/floor/lino,/area/security/detectives_office)
"bvI" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/lino,/area/security/detectives_office)
"bvJ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/carpet,/area/security/detectives_office)
@@ -3872,12 +3872,12 @@
"bwx" = (/obj/machinery/disposal,/obj/effect/floor_decal/borderfloorblack{dir = 5},/obj/effect/floor_decal/corner/red/border{dir = 5},/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos)
"bwy" = (/obj/effect/floor_decal/borderfloorwhite/cee{dir = 1},/obj/effect/floor_decal/corner/red/bordercee,/obj/structure/closet{name = "Evidence Closet"},/obj/item/weapon/storage/box/gloves,/obj/item/weapon/storage/box/evidence,/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/storage/briefcase/crimekit,/obj/item/weapon/storage/briefcase/crimekit,/turf/simulated/floor/tiled/white,/area/security/forensics)
"bwz" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{id_tag = "detdoor"; name = "Detective"; req_access = list(4)},/turf/simulated/floor/tiled/white,/area/security/forensics)
-"bwA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/security/forensics)
+"bwA" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/security/forensics)
"bwB" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/maintenance/cargo)
"bwC" = (/obj/structure/disposalpipe/tagger{dir = 8; name = "package tagger - Trash"; sort_tag = "Trash"},/obj/structure/railing,/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor,/area/maintenance/cargo)
"bwD" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/cargo)
"bwE" = (/obj/random/trash_pile,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/maintenance/cargo)
-"bwF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/security/range)
+"bwF" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/security/range)
"bwG" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/security/hallway)
"bwH" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/security/hallway)
"bwI" = (/obj/structure/table/standard,/obj/item/clothing/accessory/badge/holo,/obj/item/clothing/accessory/badge/holo,/obj/item/clothing/accessory/badge/holo/cord,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/security/briefing_room)
@@ -3957,7 +3957,7 @@
"bye" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/security/forensics)
"byf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/security/forensics)
"byg" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/white,/area/security/forensics)
-"byh" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/recoveryrestroom)
+"byh" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/recoveryrestroom)
"byi" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/swabs{layer = 5},/obj/item/weapon/folder/yellow{pixel_y = -5},/obj/item/weapon/folder/blue{pixel_y = -3},/obj/item/weapon/folder/red,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled/white,/area/security/forensics)
"byj" = (/obj/machinery/computer/secure_data{dir = 1},/turf/simulated/floor/tiled/white,/area/security/forensics)
"byk" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/spray/luminol,/obj/item/device/uv_light,/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled/white,/area/security/forensics)
@@ -4124,7 +4124,7 @@
"bBp" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/tiled,/area/quartermaster/office)
"bBq" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/office)
"bBr" = (/obj/structure/table/standard,/obj/item/weapon/material/ashtray/glass,/obj/machinery/newscaster{pixel_x = 28; pixel_y = 0},/obj/item/weapon/deck/cards,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/brown/border{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office)
-"bBs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/hallway)
+"bBs" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/hallway)
"bBt" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{id_tag = "BrigFoyer"; layer = 2.8; name = "Security Wing"; req_access = list(1)},/turf/simulated/floor/tiled/steel_grid,/area/security/hallway)
"bBu" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass_security{id_tag = "BrigFoyer"; layer = 2.8; name = "Security Wing"; req_access = list(1)},/turf/simulated/floor/tiled/steel_grid,/area/security/hallway)
"bBv" = (/obj/structure/grille,/obj/structure/cable/green{icon_state = "0-4"},/obj/structure/cable/green,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/polarized{dir = 10; icon_state = "fwindow"; id = "sec_bief"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/briefing_room)
@@ -4148,7 +4148,7 @@
"bBN" = (/turf/simulated/floor/tiled,/area/quartermaster/delivery)
"bBO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/delivery)
"bBP" = (/obj/structure/table/steel,/obj/item/weapon/wrapping_paper,/obj/item/weapon/wrapping_paper,/obj/item/weapon/wrapping_paper,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/brown/border{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/delivery)
-"bBQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/quartermaster/delivery)
+"bBQ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/quartermaster/delivery)
"bBR" = (/obj/machinery/computer/guestpass{pixel_y = 32},/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/brown/border{dir = 9},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
"bBS" = (/obj/machinery/alarm{pixel_y = 22},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/brown/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/brown/bordercorner2{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
"bBT" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
@@ -4168,7 +4168,7 @@
"bCh" = (/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{frequency = 1380; id_tag = "large_escape_pod_1"; pixel_x = -26; pixel_y = 26; tag_door = "large_escape_pod_1_hatch"},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor})
"bCi" = (/obj/structure/bed/chair,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/turf/simulated/floor/tiled,/area/security/lobby)
"bCj" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/red/border{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/table/standard,/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor/tiled,/area/security/lobby)
-"bCk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/security/lobby)
+"bCk" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/security/lobby)
"bCl" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/red/border{dir = 9},/obj/effect/floor_decal/borderfloor/corner2{dir = 10; icon_state = "borderfloorcorner2"; pixel_x = 0; tag = "icon-borderfloorcorner2 (SOUTHWEST)"},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 10},/obj/machinery/computer/security,/turf/simulated/floor/tiled,/area/security/lobby)
"bCm" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/floor/tiled,/area/security/lobby)
"bCn" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass/hidden/steel,/turf/simulated/floor/tiled,/area/hallway/station/upper)
@@ -4229,7 +4229,7 @@
"bDq" = (/obj/structure/bed/chair,/obj/effect/landmark/start{name = "Cargo Technician"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/turf/simulated/floor/tiled,/area/quartermaster/delivery)
"bDr" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/machinery/camera/network/cargo{dir = 1; name = "security camera"},/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/brown/border{dir = 6},/turf/simulated/floor/tiled,/area/quartermaster/delivery)
"bDs" = (/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/quartermaster/foyer)
-"bDt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/quartermaster/office)
+"bDt" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/quartermaster/office)
"bDu" = (/obj/machinery/computer/supplycomp{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/brown/border{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/office)
"bDv" = (/obj/machinery/autolathe,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/brown/border{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office)
"bDw" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
@@ -4241,7 +4241,7 @@
"bDC" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/security/lobby)
"bDD" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor/tiled,/area/security/lobby)
"bDE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals6,/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 4},/turf/simulated/floor/tiled,/area/security/lobby)
-"bDF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/crew_quarters/medical_restroom)
+"bDF" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/plating,/area/crew_quarters/medical_restroom)
"bDG" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Security Officer"},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/security/lobby)
"bDH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/security/lobby)
"bDI" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/lobby)
@@ -4258,11 +4258,11 @@
"bDT" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/quartermaster/delivery)
"bDU" = (/obj/structure/sign/department/mail,/turf/simulated/wall,/area/quartermaster/delivery)
"bDV" = (/obj/machinery/door/airlock/glass_mining{name = "Delivery Office"; req_access = list(50); req_one_access = list()},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/delivery)
-"bDW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/delivery)
+"bDW" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/delivery)
"bDX" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/machinery/door/window/northright{name = "Mailing Room"; req_access = list(50)},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/quartermaster/delivery)
"bDY" = (/obj/machinery/newscaster{layer = 3.3; pixel_x = -27; pixel_y = 0},/obj/machinery/camera/network/northern_star{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/brown/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
"bDZ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
-"bEa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"bEa" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/station/dock_two)
"bEb" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
"bEc" = (/obj/structure/filingcabinet/filingcabinet,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/brown/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/corner/brown/bordercorner2{dir = 10},/turf/simulated/floor/tiled,/area/quartermaster/office)
"bEd" = (/obj/structure/table/standard,/obj/fiftyspawner/steel,/obj/item/device/multitool,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/brown/border{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office)
@@ -4271,7 +4271,7 @@
"bEg" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/lobby)
"bEh" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/security/lobby)
"bEi" = (/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 6},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 5},/turf/simulated/floor/tiled,/area/security/lobby)
-"bEj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green,/turf/simulated/floor/plating,/area/security/lobby)
+"bEj" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green,/turf/simulated/floor/plating,/area/security/lobby)
"bEk" = (/obj/machinery/computer/security{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 10},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 8},/turf/simulated/floor/tiled,/area/security/lobby)
"bEl" = (/obj/structure/table/steel,/turf/simulated/floor/tiled,/area/security/lobby)
"bEm" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/security/lobby)
@@ -4347,7 +4347,7 @@
"bFE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/quartermaster/office)
"bFF" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/quartermaster/office)
"bFG" = (/obj/structure/table/standard,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 28},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/brown/border{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office)
-"bFH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/lobby)
+"bFH" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/security/lobby)
"bFI" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/obj/machinery/door/airlock/multi_tile/glass{name = "Security Lobby"},/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 8},/turf/simulated/floor/tiled/monofloor{dir = 8},/area/security/lobby)
"bFJ" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 4},/turf/simulated/floor/tiled/monofloor{dir = 4},/area/security/lobby)
"bFK" = (/obj/structure/reagent_dispensers/fueltank,/obj/structure/railing{dir = 1},/turf/simulated/floor,/area/maintenance/station/elevator)
@@ -4409,14 +4409,14 @@
"bGO" = (/obj/machinery/vending/cola,/obj/effect/floor_decal/corner/lightgrey{dir = 9},/obj/effect/floor_decal/corner/lightgrey{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/simulated/floor/tiled,/area/hallway/station/upper)
"bGP" = (/obj/machinery/vending/cigarette,/obj/effect/floor_decal/corner/lightgrey{dir = 9},/obj/effect/floor_decal/corner/lightgrey{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/simulated/floor/tiled,/area/hallway/station/upper)
"bGQ" = (/obj/structure/sign/poster{pixel_x = 0; pixel_y = 0},/turf/simulated/wall,/area/quartermaster/qm)
-"bGR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/quartermaster/qm)
+"bGR" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/quartermaster/qm)
"bGS" = (/turf/simulated/wall,/area/quartermaster/qm)
"bGT" = (/obj/machinery/door/airlock/glass_mining{name = "Quartermaster"; req_access = list(41); req_one_access = list()},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/qm)
"bGU" = (/turf/simulated/wall,/area/quartermaster/storage)
"bGV" = (/obj/structure/extinguisher_cabinet{pixel_x = 25},/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/red/border{dir = 5},/obj/structure/flora/pottedplant/tropical,/turf/simulated/floor/tiled,/area/hallway/station/upper)
"bGW" = (/obj/machinery/door/airlock/glass_mining{name = "Cargo Bay"; req_access = list(31); req_one_access = list()},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/office)
"bGX" = (/obj/machinery/door/airlock/glass_mining{name = "Cargo Bay"; req_access = list(31); req_one_access = list()},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/office)
-"bGY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/office)
+"bGY" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/office)
"bGZ" = (/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/turf/simulated/floor/tiled,/area/hallway/station/upper)
"bHa" = (/obj/machinery/light,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/paleblue/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/paleblue/bordercorner2,/turf/simulated/floor/tiled,/area/hallway/station/upper)
"bHb" = (/turf/simulated/wall/r_wall,/area/security/nuke_storage)
@@ -4430,7 +4430,7 @@
"bHj" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/station/upper)
"bHk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled,/area/hallway/station/upper)
"bHl" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor/glass/hidden/steel{dir = 8},/turf/simulated/floor/tiled,/area/hallway/station/upper)
-"bHm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/medical_restroom)
+"bHm" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/medical_restroom)
"bHn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/turf/simulated/floor/tiled,/area/hallway/station/upper)
"bHo" = (/obj/structure/filingcabinet/medical{desc = "A large cabinet with hard copy medical records."; name = "Medical Records"},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/cable{icon_state = "2-4"},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage)
"bHp" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/station/upper)
@@ -4444,7 +4444,7 @@
"bHx" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/paleblue/bordercorner2{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/hallway/station/upper)
"bHy" = (/obj/structure/grille,/obj/structure/window/reinforced/polarized{dir = 10; icon_state = "fwindow"; id = "psych-tint"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/psych)
"bHz" = (/obj/structure/table/woodentable,/obj/structure/plushie/ian{dir = 8; icon_state = "ianplushie"; pixel_y = 6},/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/wood,/area/medical/psych)
-"bHA" = (/obj/structure/table/woodentable,/obj/item/toy/therapy_blue,/obj/item/weapon/storage/secure/safe{pixel_x = 5; pixel_y = 28},/turf/simulated/floor/wood,/area/medical/psych)
+"bHA" = (/obj/structure/table/woodentable,/obj/item/toy/plushie/therapy/blue,/obj/item/weapon/storage/secure/safe{pixel_x = 5; pixel_y = 28},/turf/simulated/floor/wood,/area/medical/psych)
"bHB" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/medical/psych)
"bHC" = (/obj/structure/flora/pottedplant/fern,/turf/simulated/floor/wood,/area/medical/psych)
"bHD" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/door/airlock/maintenance/common,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/maintenance/station/cargo)
@@ -4464,7 +4464,7 @@
"bHR" = (/obj/structure/closet/secure_closet/cargotech,/obj/item/weapon/storage/backpack/dufflebag,/obj/item/weapon/stamp/cargo,/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bHS" = (/obj/structure/closet/emcloset,/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bHT" = (/obj/structure/closet/emcloset,/obj/machinery/status_display/supply_display{pixel_y = 32},/turf/simulated/floor/tiled,/area/quartermaster/storage)
-"bHU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"bHU" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/storage)
"bHV" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/wrench,/obj/random/medical/lite,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor})
"bHW" = (/obj/structure/filingcabinet/security{name = "Security Records"},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage)
"bHX" = (/obj/machinery/atmospherics/binary/passive_gate/on{dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
@@ -4488,8 +4488,8 @@
"bIp" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/medical{id_tag = "mentaldoor"; name = "Mental Health"; req_access = list(64)},/turf/simulated/floor/wood,/area/medical/psych)
"bIq" = (/turf/simulated/floor/wood,/area/medical/psych)
"bIr" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/wood,/area/medical/psych)
-"bIs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/sign/warning/high_voltage,/turf/simulated/floor/plating,/area/hallway/station/upper)
-"bIt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/sign/warning/secure_area{pixel_x = -32},/obj/structure/cable{icon_state = "0-4"},/turf/simulated/floor/plating,/area/hallway/station/upper)
+"bIs" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/sign/warning/high_voltage,/turf/simulated/floor/plating,/area/hallway/station/upper)
+"bIt" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/sign/warning/secure_area{pixel_x = -32},/obj/structure/cable{icon_state = "0-4"},/turf/simulated/floor/plating,/area/hallway/station/upper)
"bIu" = (/obj/structure/cable{icon_state = "4-8"},/turf/simulated/wall/r_wall,/area/security/nuke_storage)
"bIv" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage)
"bIw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage)
@@ -4505,16 +4505,16 @@
"bIG" = (/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bIH" = (/turf/simulated/wall/r_wall,/area/teleporter/departing)
"bII" = (/turf/simulated/wall,/area/teleporter/departing)
-"bIJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/teleporter/departing)
+"bIJ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/teleporter/departing)
"bIK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/airlock/glass{name = "Long-Range Teleporter Access"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/teleporter/departing)
-"bIL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/sign/directions/medical{dir = 4; pixel_x = 32; pixel_y = 0},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/teleporter/departing)
+"bIL" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/sign/directions/medical{dir = 4; pixel_x = 32; pixel_y = 0},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/teleporter/departing)
"bIM" = (/obj/structure/sign/directions/cargo{dir = 4; pixel_y = -8},/obj/structure/sign/directions/security{dir = 1; icon_state = "direction_sec"; pixel_y = 8; tag = "icon-direction_sec (WEST)"},/turf/simulated/wall,/area/teleporter/departing)
"bIN" = (/turf/simulated/wall,/area/tether/station/stairs_three)
"bIO" = (/obj/machinery/door/airlock/multi_tile/glass{name = "Stairwell"},/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 8},/turf/simulated/floor/tiled/monofloor{dir = 8},/area/tether/station/stairs_three)
"bIP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 4},/turf/simulated/floor/tiled/monofloor{dir = 4},/area/tether/station/stairs_three)
"bIQ" = (/obj/structure/sign/directions/security{dir = 1; icon_state = "direction_sec"; pixel_y = 8; tag = "icon-direction_sec (WEST)"},/obj/structure/sign/directions/cargo{dir = 4; pixel_y = -8},/turf/simulated/wall,/area/tether/station/stairs_three)
"bIR" = (/obj/structure/sign/department/medbay,/turf/simulated/wall,/area/medical/reception)
-"bIS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "medbayquar"; name = "Medbay Emergency Lockdown Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/medical/reception)
+"bIS" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "medbayquar"; name = "Medbay Emergency Lockdown Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/medical/reception)
"bIT" = (/turf/simulated/wall,/area/medical/reception)
"bIU" = (/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/paleblue/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/paleblue/bordercorner2{dir = 9},/turf/simulated/floor/tiled,/area/hallway/station/upper)
"bIV" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 8},/turf/simulated/floor/tiled,/area/hallway/station/upper)
@@ -4541,9 +4541,9 @@
"bJq" = (/obj/effect/floor_decal/rust,/obj/random/trash_pile,/turf/simulated/floor/plating,/area/maintenance/station/eng_upper)
"bJr" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bJs" = (/obj/machinery/conveyor_switch/oneway{convdir = -1; id = "QMLoad2"},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/tiled,/area/quartermaster/storage)
-"bJt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/quartermaster/storage)
-"bJu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
-"bJv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"bJt" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/quartermaster/storage)
+"bJu" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"bJv" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
"bJw" = (/obj/structure/table/standard,/obj/item/weapon/storage/fancy/cigarettes{pixel_y = 2},/obj/item/weapon/deck/cards,/obj/item/weapon/book/codex,/obj/machinery/atm{pixel_y = 30},/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -28},/obj/structure/cable{icon_state = "0-4"},/obj/effect/floor_decal/corner_steel_grid,/turf/simulated/floor/tiled,/area/teleporter/departing)
"bJx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner_steel_grid{dir = 10},/obj/machinery/camera/network/civilian,/turf/simulated/floor/tiled,/area/teleporter/departing)
"bJy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner_steel_grid{dir = 10},/turf/simulated/floor/tiled,/area/teleporter/departing)
@@ -4560,7 +4560,7 @@
"bJJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "medbayquar"; name = "Medbay Emergency Lockdown Shutters"; opacity = 0},/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 4},/turf/simulated/floor/tiled/monofloor{dir = 4},/area/medical/reception)
"bJK" = (/obj/structure/sign/department/medbay,/turf/simulated/wall/r_wall,/area/medical/chemistry)
"bJL" = (/turf/simulated/wall/r_wall,/area/medical/chemistry)
-"bJM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 1; id = "chemistry"; layer = 3.1; name = "Chemistry Shutters"},/turf/simulated/floor/plating,/area/medical/chemistry)
+"bJM" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 1; id = "chemistry"; layer = 3.1; name = "Chemistry Shutters"},/turf/simulated/floor/plating,/area/medical/chemistry)
"bJN" = (/obj/structure/sign/department/operational,/turf/simulated/wall,/area/medical/surgery_hallway)
"bJO" = (/obj/machinery/door/airlock/medical{name = "Psych/Surgery Waiting Room"; req_one_access = list()},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway)
"bJP" = (/turf/simulated/wall,/area/medical/surgery_hallway)
@@ -4643,7 +4643,7 @@
"bLo" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/reception)
"bLp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/reception)
"bLq" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/reception)
-"bLr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 8; id = "chemistry"; layer = 3.1; name = "Chemistry Shutters"},/turf/simulated/floor/plating,/area/medical/chemistry)
+"bLr" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 8; id = "chemistry"; layer = 3.1; name = "Chemistry Shutters"},/turf/simulated/floor/plating,/area/medical/chemistry)
"bLs" = (/obj/machinery/chem_master,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
"bLt" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
"bLu" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/beakers,/turf/simulated/floor/tiled/white,/area/medical/chemistry)
@@ -4665,7 +4665,7 @@
"bLK" = (/turf/simulated/wall,/area/quartermaster/warehouse)
"bLL" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/cargo/trolley,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bLM" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "cargo_bay"; layer = 3.3; name = "cargo bay hatch controller"; pixel_x = 30; pixel_y = 0; req_one_access = list(13,31); tag_door = "cargo_bay_door"},/obj/machinery/camera/network/cargo{dir = 9; c_tag = "CRG - Mining Airlock"},/turf/simulated/floor/tiled,/area/quartermaster/storage)
-"bLN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"bLN" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
"bLO" = (/obj/effect/floor_decal/techfloor/orange{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/teleporter/departing)
"bLP" = (/obj/effect/floor_decal/techfloor/orange,/obj/effect/floor_decal/techfloor/hole,/turf/simulated/floor/tiled/techfloor,/area/teleporter/departing)
"bLQ" = (/obj/effect/floor_decal/techfloor/orange,/turf/simulated/floor/tiled/techfloor,/area/teleporter/departing)
@@ -4784,8 +4784,8 @@
"bNZ" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bOa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bOb" = (/obj/machinery/conveyor{dir = 1; id = "QMLoad"},/turf/simulated/floor,/area/quartermaster/storage)
-"bOc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/quartermaster/storage)
-"bOd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/quartermaster/storage)
+"bOc" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/quartermaster/storage)
+"bOd" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/quartermaster/storage)
"bOe" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/security_starboard)
"bOf" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/random/maintenance/clean,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/medical/lite,/obj/random/tool,/obj/random/maintenance/medical,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/security_starboard)
"bOg" = (/obj/structure/closet/crate,/obj/random/maintenance/clean,/obj/random/maintenance/medical,/obj/random/junk,/obj/random/firstaid,/obj/random/medical/lite,/obj/random/maintenance/medical,/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/maintenance/security_starboard)
@@ -4968,7 +4968,7 @@
"bRB" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/sleeper)
"bRC" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/sleeper)
"bRD" = (/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/effect/floor_decal/borderfloorwhite/corner2{dir = 6},/obj/effect/floor_decal/corner/paleblue/bordercorner2{dir = 6},/obj/item/device/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/space)
-"bRE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/medbay_primary_storage)
+"bRE" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/medbay_primary_storage)
"bRF" = (/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/item/weapon/storage/toolbox/emergency,/obj/effect/floor_decal/borderfloorwhite/corner2{dir = 8},/obj/effect/floor_decal/corner/paleblue/bordercorner2{dir = 8},/obj/item/weapon/storage/box/nifsofts_medical,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage)
"bRG" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage)
"bRH" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage)
@@ -4983,7 +4983,7 @@
"bRQ" = (/obj/structure/table/standard,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/surgicaldrill,/obj/effect/floor_decal/borderfloorwhite{dir = 5},/obj/effect/floor_decal/corner/white/border{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/surgery2)
"bRR" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/obj/structure/railing{dir = 4},/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/random/maintenance/cargo,/obj/random/maintenance/clean,/obj/random/junk,/obj/random/maintenance/cargo,/obj/random/maintenance/medical,/turf/simulated/floor,/area/maintenance/station/medbay)
"bRS" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk,/turf/simulated/floor,/area/maintenance/station/medbay)
-"bRT" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"bRT" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/station/dock_two)
"bRU" = (/obj/machinery/computer/transhuman/resleeving{dir = 1},/obj/effect/floor_decal/borderfloorwhite{dir = 10},/obj/effect/floor_decal/corner/paleblue/border{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/resleeving)
"bRV" = (/obj/item/weapon/book/manual/resleeving,/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled/white,/area/medical/resleeving)
"bRW" = (/obj/machinery/clonepod/transhuman,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled/white,/area/medical/resleeving)
@@ -5093,7 +5093,7 @@
"bTW" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/sleeper)
"bTX" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/sleeper)
"bTY" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/white,/area/medical/sleeper)
-"bTZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/medical/surgery_hallway)
+"bTZ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/medical/surgery_hallway)
"bUa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway)
"bUb" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway)
"bUc" = (/obj/structure/railing,/turf/simulated/open,/area/medical/surgery_hallway)
@@ -5174,7 +5174,7 @@
"bVz" = (/turf/simulated/wall,/area/medical/patient_c)
"bVA" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/polarized{dir = 10; icon_state = "fwindow"; id = "pr3_window_tint"},/turf/simulated/floor,/area/medical/patient_c)
"bVB" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/airlock/medical{name = "Patient Room C"; req_one_access = list()},/obj/effect/floor_decal/steeldecal/steel_decals10,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/patient_c)
-"bVC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/surgery_hallway)
+"bVC" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/surgery_hallway)
"bVD" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/recoveryrestroom)
"bVE" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/recoveryrestroom)
"bVF" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/recoveryrestroom)
@@ -5251,7 +5251,7 @@
"bWY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/polarized{dir = 10; icon_state = "fwindow"; id = "pr1_window_tint"},/turf/simulated/floor/plating,/area/medical/patient_a)
"bWZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/polarized{dir = 10; icon_state = "fwindow"; id = "pr2_window_tint"},/turf/simulated/floor/plating,/area/medical/patient_b)
"bXa" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/polarized{dir = 10; icon_state = "fwindow"; id = "pr3_window_tint"},/turf/simulated/floor/plating,/area/medical/patient_c)
-"bXb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/recoveryrestroom)
+"bXb" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/medical/recoveryrestroom)
"bXc" = (/obj/structure/bed/chair{dir = 4},/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/ward)
"bXd" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/medical/ward)
"bXe" = (/obj/machinery/camera/network/northern_star,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/turf/simulated/floor/tiled,/area/hallway/station/upper)
@@ -5261,9 +5261,9 @@
"bXi" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced,/obj/structure/window/reinforced/polarized{dir = 10; icon_state = "fwindow"; id = "mrecovery-tint"},/turf/simulated/floor/plating,/area/medical/ward)
"bXj" = (/obj/effect/landmark/map_data/virgo3b,/turf/space,/area/space)
"bXk" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"; tag = "icon-intact-f (NORTHEAST)"},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
-"bXl" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"bXl" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/tether/station/dock_two)
"bXm" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/tether/station/dock_two)
-"bXn" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"bXn" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/station/dock_two)
"bXo" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
"bXp" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "nuke_shuttle_dock_inner"; locked = 1; name = "Docking Port Airlock"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/tether/station/dock_two)
"bXq" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "nuke_shuttle_dock_inner"; locked = 1; name = "Docking Port Airlock"},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
@@ -5271,9 +5271,9 @@
"bXs" = (/obj/structure/closet/crate,/obj/item/clothing/mask/gas,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/obj/random/action_figure,/obj/item/clothing/mask/gas,/obj/machinery/atmospherics/binary/passive_gate/on,/turf/simulated/floor/plating,/area/hallway/station/docks)
"bXt" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1380; id_tag = "nuke_shuttle_dock_pump"},/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "nuke_shuttle_dock_sensor"; pixel_x = -30; pixel_y = 8},/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
"bXu" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1380; id_tag = "nuke_shuttle_dock_pump"},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
-"bXv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"bXv" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
"bXw" = (/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
-"bXx" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"bXx" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/station/dock_two)
"bXy" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "nuke_shuttle_dock_outer"; locked = 1; name = "Docking Port Airlock"},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
"bXz" = (/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/pink/border{dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/device/radio/intercom{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/white,/area/medical/patient_a)
"bXA" = (/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/pink/border{dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/device/radio/intercom{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/white,/area/medical/patient_b)
@@ -5291,17 +5291,17 @@
"bXM" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/corner/yellow/bordercorner{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/turf/simulated/floor/tiled,/area/engineering/foyer_mezzenine)
"bXN" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"bXO" = (/turf/simulated/floor/plating,/area/vacant/vacant_restaurant_upper)
-"bXP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"bXP" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/tether/station/dock_one)
"bXQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/hatch{name = "Server Room"; req_access = list(59); req_one_access = list(19)},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief)
"bXR" = (/obj/structure/window/basic{dir = 1},/obj/machinery/button/remote/driver{id = "enginecore"; name = "Emergency Core Eject"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/heads/chief)
"bXS" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/vacant/vacant_restaurant_upper)
"bXT" = (/obj/effect/floor_decal/rust,/obj/random/cigarettes,/turf/simulated/floor/plating,/area/vacant/vacant_restaurant_upper)
-"bXU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/engineering/foyer_mezzenine)
+"bXU" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/engineering/foyer_mezzenine)
"bXV" = (/obj/machinery/light_switch{dir = 8; pixel_x = 24},/turf/simulated/floor/plating,/area/vacant/vacant_restaurant_upper)
"bXW" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/obj/machinery/door/airlock/glass_engineering{name = "Engineering Lobby"; req_one_access = newlist()},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel_grid,/area/engineering/foyer)
-"bXX" = (/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/foyer)
+"bXX" = (/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/foyer)
"bXY" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/obj/machinery/door/airlock/glass_engineering{name = "Engineering Lobby"; req_one_access = newlist()},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/steel_grid,/area/engineering/foyer)
-"bXZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/turf/simulated/floor,/area/engineering/foyer)
+"bXZ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/turf/simulated/floor,/area/engineering/foyer)
"bYa" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Mezzenine"; req_one_access = list()},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel_grid,/area/engineering/foyer_mezzenine)
"bYb" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "eva_port_airlock"; name = "interior access button"; pixel_x = 26; pixel_y = 26; req_one_access = list(18)},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"; tag = "icon-intact-f (NORTHEAST)"},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
"bYc" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering Mezzenine"; req_one_access = list()},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/engineering/foyer_mezzenine)
@@ -5322,12 +5322,12 @@
"bYr" = (/turf/space,/area/syndicate_station/arrivals_dock)
"bYs" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/engineering{name = "Tech Storage"; req_access = list(23); req_one_access = newlist()},/turf/simulated/floor/plating,/area/storage/tech)
"bYt" = (/obj/structure/window/reinforced,/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/carpet,/area/engineering/foyer)
-"bYu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor,/area/crew_quarters/visitor_dining)
+"bYu" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor,/area/crew_quarters/visitor_dining)
"bYv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/quartermaster/warehouse)
"bYw" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/machinery/door/firedoor/glass/hidden/steel{dir = 2},/turf/simulated/floor/tiled,/area/hallway/station/port)
"bYx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/visitor_dining)
"bYy" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/quartermaster/warehouse)
-"bYz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor,/area/hallway/station/docks)
+"bYz" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor,/area/hallway/station/docks)
"bYA" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/station/port)
"bYB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 1},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 4},/turf/simulated/floor/tiled,/area/hallway/station/port)
"bYC" = (/turf/simulated/floor,/area/hallway/station/docks)
@@ -5402,7 +5402,7 @@
"bZT" = (/obj/structure/stairs/west,/turf/simulated/floor,/area/vacant/vacant_restaurant_lower)
"bZU" = (/obj/random/toolbox,/turf/simulated/floor/plating,/area/vacant/vacant_restaurant_upper)
"bZV" = (/obj/machinery/light,/turf/simulated/open,/area/vacant/vacant_restaurant_upper)
-"bZW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/vacant/vacant_restaurant_upper)
+"bZW" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/vacant/vacant_restaurant_upper)
"bZX" = (/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/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/turf/simulated/floor/tiled,/area/engineering/engine_eva)
"bZY" = (/obj/structure/reagent_dispensers/water_cooler/full,/turf/simulated/floor/tiled,/area/hallway/station/docks)
"bZZ" = (/obj/structure/bed/chair,/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/hallway/station/docks)
@@ -5529,7 +5529,7 @@
"ccs" = (/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1380; id_tag = "nuke_shuttle_dock"; pixel_x = -28; pixel_y = 0; req_one_access = list(13); tag_airpump = null; tag_chamber_sensor = null; tag_exterior_door = null; tag_interior_door = null},/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"; tag = "icon-manifold-f (WEST)"},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
"cct" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"; tag = "icon-intact-f (SOUTHWEST)"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
"ccu" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "nuke_shuttle_dock_outer"; locked = 1; name = "Docking Port Airlock"},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1380; master_tag = "nuke_shuttle_dock"; name = "exterior access button"; pixel_x = -28; pixel_y = -6; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
-"ccv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/turf/simulated/floor/plating,/area/tether/station/dock_two)
+"ccv" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/turf/simulated/floor/plating,/area/tether/station/dock_two)
"ccw" = (/obj/machinery/light/small,/obj/structure/closet/emcloset,/turf/simulated/floor/wood,/area/library)
"ccx" = (/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/blue/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/blue/bordercorner2{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/structure/closet/emcloset,/turf/simulated/floor/tiled,/area/bridge_hallway)
"ccy" = (/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = 26},/obj/structure/closet/emcloset,/turf/simulated/floor/wood,/area/library_conference_room)
diff --git a/maps/tether/tether-04-mining.dmm b/maps/tether/tether-04-mining.dmm
index 6ff4e01ac7..2cdb993879 100644
--- a/maps/tether/tether-04-mining.dmm
+++ b/maps/tether/tether-04-mining.dmm
@@ -24,8 +24,8 @@
"ax" = (/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/effect/floor_decal/industrial/warning/dust{dir = 8},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/outpost/mining_main/storage)
"ay" = (/turf/simulated/wall/r_wall,/area/outpost/engineering/atmospherics)
"az" = (/turf/simulated/wall/r_wall,/area/outpost/mining_main/break_room)
-"aA" = (/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/grille,/turf/simulated/floor/plating,/area/outpost/mining_main/break_room)
-"aB" = (/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/grille,/turf/simulated/floor/plating,/area/outpost/mining_main/break_room)
+"aA" = (/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/grille,/turf/simulated/floor/plating,/area/outpost/mining_main/break_room)
+"aB" = (/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/glass,/obj/structure/grille,/turf/simulated/floor/plating,/area/outpost/mining_main/break_room)
"aC" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/outpost/mining_main/storage)
"aD" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -32},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/outpost/mining_main/storage)
"aE" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall,/area/outpost/mining_main/break_room)
@@ -38,7 +38,7 @@
"aL" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 10},/obj/effect/floor_decal/techfloor{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"aM" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/brown/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/structure/table/woodentable,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/outpost/mining_main/break_room)
"aN" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/brown/border{dir = 5},/obj/structure/table/woodentable,/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/item/weapon/storage/excavation,/obj/item/weapon/storage/excavation,/obj/item/weapon/storage/belt,/obj/machinery/recharger,/turf/simulated/floor/tiled,/area/outpost/mining_main/break_room)
-"aO" = (/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/structure/grille,/turf/simulated/floor/plating,/area/outpost/mining_main/break_room)
+"aO" = (/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/glass,/obj/structure/grille,/turf/simulated/floor/plating,/area/outpost/mining_main/break_room)
"aP" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/portables_connector{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"aQ" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/cyan,/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"aR" = (/obj/machinery/atmospherics/omni/atmos_filter{tag_east = 1; tag_north = 3; tag_south = 2},/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
@@ -65,7 +65,7 @@
"bm" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/mining{name = "Utility Room"},/turf/simulated/floor/tiled,/area/outpost/engineering/atmospherics)
"bn" = (/turf/simulated/wall/r_wall,/area/outpost/mining_main/airlock)
"bo" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; icon_state = "map_vent_out"; name = "Large Waste Vent"; pressure_checks = 2; pressure_checks_default = 2; use_power = 1},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/outpost/engineering/atmospherics)
-"bp" = (/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/outpost/engineering/atmospherics)
+"bp" = (/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/outpost/engineering/atmospherics)
"bq" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"br" = (/obj/structure/cable/green{icon_state = "0-8"},/obj/structure/cable/green{icon_state = "0-4"},/obj/machinery/power/sensor{long_range = 1; name = "Powernet Sensor - Mining Station"; name_tag = "Mining Station"},/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"bs" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 9},/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
diff --git a/maps/tether/tether-05-solars.dmm b/maps/tether/tether-05-solars.dmm
index 8d2115c57d..c944a55de7 100644
--- a/maps/tether/tether-05-solars.dmm
+++ b/maps/tether/tether-05-solars.dmm
@@ -19,7 +19,7 @@
"as" = (/obj/effect/floor_decal/industrial/warning/dust{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/tether/outpost/solars_outside)
"at" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 28},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/outdoors/dirt/virgo3b,/area/tether/outpost/solars_outside)
"au" = (/turf/simulated/wall,/area/tether/outpost/solars_shed)
-"av" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/virgo3b_indoors,/area/tether/outpost/solars_shed)
+"av" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced/full,/turf/simulated/floor/virgo3b_indoors,/area/tether/outpost/solars_shed)
"aw" = (/obj/machinery/power/tracker,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/virgo3b,/area/tether/outpost/solars_outside)
"ax" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/virgo3b,/area/tether/outpost/solars_outside)
"ay" = (/obj/structure/grille,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/virgo3b_indoors,/area/tether/outpost/solars_shed)
@@ -201,7 +201,7 @@
"dS" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/item/weapon/screwdriver,/obj/item/device/assembly_holder/timer_igniter,/obj/machinery/camera/network/research_outpost{dir = 4},/obj/machinery/light_switch{dir = 1; pixel_x = 4; pixel_y = -24},/turf/simulated/floor/tiled,/area/rnd/outpost/testing)
"dT" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/rnd/outpost/testing)
"dU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/rnd/outpost/testing)
-"dV" = (/obj/machinery/vending/phoronresearch{name = "Toximate 2556"; products = list(/obj/item/device/assembly/timer = 6, /obj/item/device/assembly/signaler = 6, /obj/item/device/assembly/prox_sensor = 6, /obj/item/device/assembly/igniter = 12)},/turf/simulated/floor/tiled,/area/rnd/outpost/testing)
+"dV" = (/obj/machinery/vending/phoronresearch{name = "Toximate 2556"; products = list(/obj/item/device/transfer_valve = 3, /obj/item/device/assembly/timer = 6, /obj/item/device/assembly/signaler = 6, /obj/item/device/assembly/prox_sensor = 6, /obj/item/device/assembly/igniter = 12)},/turf/simulated/floor/tiled,/area/rnd/outpost/testing)
"dW" = (/obj/machinery/requests_console/preset/research{pixel_y = -30},/turf/simulated/floor/tiled,/area/rnd/outpost/testing)
"dX" = (/obj/machinery/door/window/southright{name = "Science Outpost EVA"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals5,/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 1},/obj/machinery/door/firedoor/glass/hidden/steel{dir = 8},/turf/simulated/floor/tiled,/area/rnd/outpost/eva)
"dY" = (/obj/machinery/door/window/southleft{name = "Science Outpost EVA"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/steeldecal/steel_decals5,/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 1},/obj/machinery/door/firedoor/glass/hidden/steel,/obj/machinery/light_switch{dir = 4; pixel_x = -28},/turf/simulated/floor/tiled,/area/rnd/outpost/eva)
diff --git a/maps/tether/tether-07-misc.dmm b/maps/tether/tether-07-misc.dmm
index 9ab629cd7b..754fe684d7 100644
--- a/maps/tether/tether-07-misc.dmm
+++ b/maps/tether/tether-07-misc.dmm
@@ -28,9 +28,9 @@
"aB" = (/turf/simulated/mineral,/area/space)
"aC" = (/turf/simulated/shuttle/wall/dark,/area/syndicate_station/start)
"aD" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/hos,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_w = 0; pixel_x = 0; pixel_y = 32},/obj/effect/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{tag = "icon-cult"; name = "plating"; icon_state = "cult"},/area/antag/antag_base)
-"aE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "smindicate"; name = "Outer Airlock"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"aE" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "smindicate"; name = "Outer Airlock"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
"aF" = (/obj/structure/table/glass,/turf/unsimulated/floor{tag = "icon-cult"; name = "plating"; icon_state = "cult"},/area/antag/antag_base)
-"aG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 1; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"aG" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 1; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
"aH" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1331; id_tag = "merc_shuttle_pump"},/obj/machinery/airlock_sensor{frequency = 1331; id_tag = "merc_shuttle_sensor"; pixel_x = 8; pixel_y = 25},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"aI" = (/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/wall,/area/space)
"aJ" = (/turf/simulated/floor/holofloor/desert,/area/holodeck/source_desert)
@@ -119,7 +119,7 @@
"co" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start)
"cp" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1331; id_tag = "merc_shuttle_pump"},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"cq" = (/obj/machinery/atmospherics/pipe/manifold4w/visible,/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
-"cr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"cr" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/syndicate_station/start)
"cs" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "supply_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"},/turf/simulated/shuttle/floor,/area/supply/dock)
"ct" = (/obj/structure/holostool,/obj/effect/floor_decal/carpet{dir = 8},/turf/simulated/floor/holofloor/carpet,/area/holodeck/source_theatre)
"cu" = (/obj/structure/holostool,/turf/simulated/floor/holofloor/carpet,/area/holodeck/source_theatre)
@@ -139,7 +139,7 @@
"cI" = (/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1331; id_tag = "merc_shuttle"; pixel_x = 0; pixel_y = 0; req_access = list(150)},/turf/simulated/shuttle/wall/dark,/area/syndicate_station/start)
"cJ" = (/turf/simulated/shuttle/wall/dark/hard_corner,/area/syndicate_station/start)
"cK" = (/obj/machinery/door/airlock/glass_external{frequency = 1331; id_tag = "merc_shuttle_inner"; name = "Ship External Access"; req_access = list(150)},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1331; master_tag = "merc_shuttle"; name = "interior access button"; pixel_x = -25; pixel_y = 0; req_access = list(150)},/turf/simulated/shuttle/floor{tag = "icon-floor_dred"; icon_state = "floor_dred"},/area/syndicate_station/start)
-"cL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/floor/plating,/area/syndicate_station/start)
+"cL" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/floor/plating,/area/syndicate_station/start)
"cM" = (/obj/machinery/door/airlock/glass_external{frequency = 1331; id_tag = "merc_shuttle_inner"; name = "Ship External Access"; req_access = list(150)},/turf/simulated/shuttle/floor{tag = "icon-floor_dred"; icon_state = "floor_dred"},/area/syndicate_station/start)
"cN" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"cO" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "supply_shuttle"; pixel_x = -25; pixel_y = 0; req_one_access = list(13,31); tag_door = "supply_shuttle_hatch"},/turf/simulated/shuttle/floor,/area/supply/dock)
@@ -230,10 +230,10 @@
"ev" = (/obj/machinery/door/window/holowindoor{base_state = "right"; dir = 2; icon_state = "right"; name = "Red Corner"},/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt)
"ew" = (/obj/structure/window/reinforced/holowindow,/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt)
"ex" = (/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
-"ey" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"ey" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/syndicate_station/start)
"ez" = (/obj/structure/closet/secure_closet/medical_wall{pixel_x = 0; pixel_y = 32; req_access = list(150)},/obj/item/stack/medical/splint,/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/firstaid/combat,/obj/machinery/light{dir = 4},/obj/item/device/defib_kit/compact/combat/loaded,/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"eA" = (/obj/structure/bed/chair/comfy/black{dir = 1},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
-"eB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/sign/nosmoking_1,/turf/simulated/floor/plating,/area/syndicate_station/start)
+"eB" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/sign/nosmoking_1,/turf/simulated/floor/plating,/area/syndicate_station/start)
"eC" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/cautery,/obj/item/weapon/surgical/retractor,/obj/item/stack/nanopaste,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/shuttle/floor,/area/syndicate_station/start)
"eD" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"eE" = (/obj/machinery/door/window{dir = 1; name = "Surgery"; req_access = list(150)},/turf/simulated/shuttle/floor,/area/syndicate_station/start)
@@ -342,12 +342,12 @@
"gD" = (/obj/structure/closet/crate,/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/syndicate_mothership{name = "\improper Trader Base"})
"gE" = (/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Trader Base"})
"gF" = (/obj/item/weapon/storage/firstaid/toxin{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = 1},/obj/item/weapon/storage/firstaid/fire{pixel_x = 1},/obj/item/weapon/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/regular,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start)
-"gG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/sign/department/medbay,/turf/simulated/floor/plating,/area/syndicate_station/start)
+"gG" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/sign/department/medbay,/turf/simulated/floor/plating,/area/syndicate_station/start)
"gH" = (/obj/machinery/iv_drip,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/shuttle/floor,/area/syndicate_station/start)
"gI" = (/obj/item/roller,/obj/item/roller,/obj/item/roller,/obj/structure/table/reinforced,/obj/item/bodybag/cryobag,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start)
"gJ" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/structure/table/standard,/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/stack/medical/advanced/bruise_pack,/turf/simulated/shuttle/floor,/area/syndicate_station/start)
"gK" = (/obj/machinery/optable,/turf/simulated/shuttle/floor,/area/syndicate_station/start)
-"gL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"gL" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
"gM" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m380,/obj/item/ammo_magazine/m380,/obj/item/ammo_magazine/m380,/obj/item/ammo_magazine/m380,/obj/item/ammo_magazine/m380,/obj/item/weapon/gun/projectile/giskard,/obj/item/clothing/accessory/holster,/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"gN" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/holofloor/desert,/area/holodeck/holodorm/source_desert)
"gO" = (/turf/simulated/floor/holofloor/desert,/area/holodeck/holodorm/source_desert)
@@ -362,8 +362,8 @@
"gX" = (/turf/unsimulated/mineral{icon = 'icons/turf/transit_vr.dmi'; icon_state = "rock"},/area/centcom/ferry)
"gY" = (/obj/machinery/recharger,/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"gZ" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
-"ha" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
-"hb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"ha" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"hb" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
"hc" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{id = "syndieshutters"; name = "remote shutter control"; req_access = list(150)},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"hd" = (/obj/structure/sign/department/bridge,/turf/simulated/shuttle/wall/dark/hard_corner,/area/syndicate_station/start)
"he" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor{tag = "icon-floor_white"; icon_state = "floor_white"},/area/syndicate_station/start)
@@ -408,7 +408,7 @@
"hR" = (/obj/structure/table/holotable,/obj/item/clothing/gloves/boxing/hologlove{icon_state = "boxinggreen"; item_state = "boxinggreen"},/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/holodorm/source_boxing)
"hS" = (/obj/structure/table/standard,/obj/item/weapon/soap/deluxe,/turf/simulated/shuttle/floor,/area/syndicate_mothership{name = "\improper Trader Base"})
"hT" = (/obj/structure/undies_wardrobe,/turf/simulated/shuttle/floor,/area/syndicate_mothership{name = "\improper Trader Base"})
-"hU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/sign/department/telecoms,/turf/simulated/floor/plating,/area/syndicate_station/start)
+"hU" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/sign/department/telecoms,/turf/simulated/floor/plating,/area/syndicate_station/start)
"hV" = (/obj/structure/closet,/turf/simulated/shuttle/floor{tag = "icon-floor_yellow"; icon_state = "floor_yellow"},/area/syndicate_station/start)
"hW" = (/obj/structure/closet,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/turf/simulated/shuttle/floor{tag = "icon-floor_yellow"; icon_state = "floor_yellow"},/area/syndicate_station/start)
"hX" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/structure/closet,/turf/simulated/shuttle/floor{tag = "icon-floor_yellow"; icon_state = "floor_yellow"},/area/syndicate_station/start)
@@ -424,7 +424,7 @@
"ih" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/syndicate_station/start)
"ii" = (/obj/machinery/computer/security/nuclear{dir = 4; icon_state = "computer"},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"ij" = (/obj/machinery/computer/shuttle_control/multi/tether_antag_space,/turf/simulated/shuttle/floor/darkred,/area/shuttle/antag_space/base{base_turf = /turf/unsimulated/floor/techfloor_grid})
-"ik" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"ik" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
"il" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{id = "smindicate"; name = "ship lockdown control"; pixel_x = 0},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"im" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "trade_shuttle_bay"; name = "shuttle bay controller"; pixel_x = 25; pixel_y = 0; tag_door = "trade_shuttle_bay_door"},/turf/unsimulated/floor{icon_state = "steel"},/area/syndicate_mothership{name = "\improper Trader Base"})
"in" = (/obj/effect/floor_decal/transit/orange{dir = 8},/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/unsimulated/floor/techfloor_grid{icon = 'icons/turf/transit_vr.dmi'},/area/centcom/ferry)
@@ -791,9 +791,9 @@
"pk" = (/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"pl" = (/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 32},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"pm" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/xray,/obj/item/weapon/gun/energy/xray,/obj/effect/floor_decal/corner/red{dir = 6},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
-"pn" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
-"po" = (/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
-"pp" = (/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
+"pn" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
+"po" = (/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
+"pp" = (/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
"pq" = (/turf/unsimulated/mineral{icon = 'icons/turf/transit_vr.dmi'; icon_state = "rock"},/area/space)
"pr" = (/obj/structure/closet/syndicate,/obj/item/clothing/mask/gas/wwii,/obj/item/clothing/head/helmet,/obj/item/clothing/shoes/boots/jackboots,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/under/syndicate,/obj/item/clothing/gloves/black,/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/syndicate_station/start)
"ps" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 4; start_pressure = 740.5},/obj/machinery/door/window,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start)
@@ -820,7 +820,7 @@
"pN" = (/obj/machinery/embedded_controller/radio/airlock/phoron{id_tag = "merc_south_airlock"; pixel_x = 0; pixel_y = 0},/turf/simulated/shuttle/wall/dark,/area/syndicate_station/start)
"pO" = (/obj/machinery/access_button/airlock_exterior{command = "cycle_interior"; master_tag = "merc_south_airlock"; pixel_x = -25; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/door/airlock/glass_external/public{frequency = 1379; icon_state = "door_locked"; id_tag = "merc_south_airlock_inner"; locked = 1},/turf/simulated/shuttle/floor{tag = "icon-floor_dred"; icon_state = "floor_dred"},/area/syndicate_station/start)
"pP" = (/obj/machinery/door/airlock/glass_external/public{frequency = 1379; icon_state = "door_locked"; id_tag = "merc_south_airlock_inner"; locked = 1},/turf/simulated/shuttle/floor{tag = "icon-floor_dred"; icon_state = "floor_dred"},/area/syndicate_station/start)
-"pQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "syndieshutters_workshop"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"pQ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "syndieshutters_workshop"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
"pR" = (/turf/unsimulated/floor/techfloor_grid{icon = 'icons/turf/transit_vr.dmi'},/area/shuttle/antag_ground/transit)
"pS" = (/obj/structure/table/rack,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"pT" = (/obj/structure/table/rack,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/melee/energy/sword/red,/obj/item/weapon/melee/energy/sword/red,/obj/item/weapon/melee/energy/sword/red,/obj/item/weapon/melee/energy/sword/red,/obj/item/weapon/melee/energy/sword/red,/obj/item/weapon/melee/energy/sword/red,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
@@ -909,7 +909,7 @@
"ry" = (/obj/structure/table/rack,/obj/item/weapon/storage/firstaid/combat,/obj/item/weapon/storage/firstaid/combat,/obj/item/weapon/storage/firstaid/combat,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/obj/effect/floor_decal/borderfloorblack{dir = 1},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 4},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"rz" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/security{name = "black belt"},/obj/item/weapon/storage/belt/security{name = "black belt"},/obj/item/weapon/storage/belt/security{name = "black belt"},/obj/item/weapon/storage/belt/security{name = "black belt"},/obj/item/weapon/storage/belt/security{name = "black belt"},/obj/item/weapon/storage/belt/security{name = "black belt"},/obj/item/weapon/storage/belt/security{name = "black belt"},/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical/bandolier,/obj/item/weapon/storage/belt/security/tactical/bandolier,/obj/item/weapon/storage/belt/security/tactical/bandolier,/obj/item/weapon/storage/belt/security/tactical/bandolier,/obj/item/weapon/storage/belt/security/tactical/bandolier,/obj/item/weapon/storage/belt/security/tactical/bandolier,/obj/effect/floor_decal/borderfloorblack{dir = 1},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"rA" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/effect/floor_decal/borderfloorblack{dir = 5},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
-"rB" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
+"rB" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
"rC" = (/obj/machinery/vending/cigarette{name = "Breach Corp cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{tag = "icon-cult"; name = "plating"; icon_state = "cult"},/area/antag/antag_base)
"rD" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/unsimulated/floor{tag = "icon-cult"; name = "plating"; icon_state = "cult"},/area/antag/antag_base)
"rE" = (/obj/structure/toilet{dir = 4},/obj/effect/floor_decal/rust,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
@@ -958,9 +958,9 @@
"sv" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 5},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/syndicate_station/start)
"sw" = (/obj/structure/toilet{dir = 4},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"sx" = (/obj/structure/bed,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
-"sy" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
+"sy" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced/full,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
"sz" = (/obj/item/weapon/handcuffs,/obj/item/weapon/handcuffs,/obj/item/weapon/handcuffs,/obj/item/weapon/handcuffs/fuzzy,/obj/item/weapon/handcuffs/fuzzy,/obj/item/weapon/handcuffs,/obj/structure/table/steel,/obj/effect/floor_decal/borderfloorblack{dir = 4},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 5},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
-"sA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
+"sA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced/full,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
"sB" = (/obj/effect/floor_decal/borderfloorblack{dir = 8},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 10},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"sC" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "antag_ground_dock_hatch"; locked = 1; name = "Land Crawler Hatch"},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"sD" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "antag_space_dock_hatch"; locked = 1; name = "Proto Shuttle Hatch"},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
@@ -974,7 +974,7 @@
"sL" = (/obj/effect/floor_decal/borderfloorblack{dir = 1},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 4},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"sM" = (/mob/living/simple_animal/fox/syndicate{name = "Rick"},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"sN" = (/obj/effect/floor_decal/borderfloorblack{dir = 4},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 6},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
-"sO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
+"sO" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/antag/antag_base)
"sP" = (/obj/structure/flora/pottedplant{icon_state = "plant-22"},/obj/effect/floor_decal/borderfloorblack{dir = 10},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 8},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"sQ" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/borderfloorblack/corner2{dir = 9},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
"sR" = (/obj/effect/floor_decal/borderfloorblack,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/antag/antag_base)
@@ -989,7 +989,7 @@
"ta" = (/obj/machinery/button/remote/blast_door{id = "syndieshutters_workshop"; name = "remote shutter control"; pixel_x = 0; pixel_y = -25},/turf/simulated/shuttle/floor{tag = "icon-floor_black"; icon_state = "floor_black"},/area/syndicate_station/start)
"tb" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/shuttle/floor{tag = "icon-floor_dred"; icon_state = "floor_dred"},/area/syndicate_station/start)
"tc" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/antag/antag_base)
-"td" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "smindicate"; name = "Outer Airlock"; opacity = 0},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "smindicate"; name = "Outer Airlock"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"td" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "smindicate"; name = "Outer Airlock"; opacity = 0},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "smindicate"; name = "Outer Airlock"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
"te" = (/obj/structure/toilet,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/antag/antag_base)
"tf" = (/obj/structure/closet/secure_closet/freezer/kitchen{req_access = list(150)},/turf/unsimulated/floor{icon_state = "white"},/area/antag/antag_base)
"tg" = (/turf/unsimulated/floor{icon_state = "white"},/area/antag/antag_base)
@@ -1020,7 +1020,7 @@
"tF" = (/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/antag/antag_base)
"tG" = (/obj/machinery/washing_machine,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/antag/antag_base)
"tH" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{dir = 4; pixel_x = 28; pixel_y = 0},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/antag/antag_base)
-"tI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "syndieshutters_workshop"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
+"tI" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "syndieshutters_workshop"; name = "Blast Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/syndicate_station/start)
"tJ" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{pixel_x = 3; pixel_y = 12},/obj/item/weapon/reagent_containers/food/drinks/bottle/wine{pixel_x = -1; pixel_y = 8},/turf/unsimulated/floor{icon_state = "white"},/area/antag/antag_base)
"tK" = (/obj/structure/table/reinforced,/obj/machinery/microwave{pixel_x = -1; pixel_y = 8},/turf/unsimulated/floor{icon_state = "white"},/area/antag/antag_base)
"tL" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/unsimulated/floor{icon_state = "white"},/area/antag/antag_base)
diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm
index 772a2ea845..17182ad03a 100644
--- a/maps/tether/tether_things.dm
+++ b/maps/tether/tether_things.dm
@@ -1,12 +1,7 @@
-/obj/structure/window/reinforced/full
- dir = 5
- icon_state = "fwindow"
- maxhealth = 60
-
/obj/structure/window/reinforced/polarized/full
- dir = 5
+ dir = SOUTHWEST
icon_state = "fwindow"
- maxhealth = 60
+ maxhealth = 80
//Special map objects
/obj/effect/landmark/map_data/virgo3b
diff --git a/vorestation.dme b/vorestation.dme
index 19fb8d1d9a..28ffc53bc6 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -672,6 +672,7 @@
#include "code\game\machinery\turret_control.dm"
#include "code\game\machinery\vending.dm"
#include "code\game\machinery\vending_vr.dm"
+#include "code\game\machinery\vr_console.dm"
#include "code\game\machinery\wall_frames.dm"
#include "code\game\machinery\washing_machine.dm"
#include "code\game\machinery\wishgranter.dm"
@@ -1929,6 +1930,7 @@
#include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral.dm"
#include "code\modules\mob\living\carbon\human\species\station\traits_vr\positive.dm"
#include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm"
+#include "code\modules\mob\living\carbon\human\species\virtual_reality\avatar.dm"
#include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_powers.dm"
#include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_species.dm"
#include "code\modules\mob\living\carbon\human\species\xenomorphs\xenomorphs.dm"
@@ -2190,6 +2192,7 @@
#include "code\modules\paperwork\paper.dm"
#include "code\modules\paperwork\paper_bundle.dm"
#include "code\modules\paperwork\paperbin.dm"
+#include "code\modules\paperwork\paperplane.dm"
#include "code\modules\paperwork\papershredder.dm"
#include "code\modules\paperwork\pen.dm"
#include "code\modules\paperwork\photocopier.dm"