Merge pull request #3551 from dylanstrategie/Window

Update window code

code/WorkInProgress/Cael_Aislinn/sculpture.dm

@@ -144,7 +144,7 @@
 		spawn()
 			while(get_turf(src) != target_turf && num_turfs > 0)
 				for(var/obj/structure/window/W in next_turf)
-					W.destroy()
+					W.Destroy()
 					sleep(5)
 				for(var/obj/structure/table/O in next_turf)
 					O.ex_act(1)
@@ -191,7 +191,7 @@
 		spawn()
 			while(get_turf(src) != target_turf && num_turfs > 0)
 				for(var/obj/structure/window/W in next_turf)
-					W.destroy()
+					W.Destroy()
 					sleep(5)
 				for(var/obj/structure/table/O in next_turf)
 					O.ex_act(1)

code/game/gamemodes/vampire/vampire_powers.dm

@@ -281,7 +281,7 @@
 			C.Stun(8)
 			C.Jitter(150)
 		for(var/obj/structure/window/W in view(4))
-			W.destroy()
+			W.Destroy()
 		playsound(M.current.loc, 'sound/effects/creepyshriek.ogg', 100, 1)
 		M.current.remove_vampire_blood(10)
 		M.current.verbs -= /client/proc/vampire_screech

code/game/machinery/doors/airlock.dm

@@ -1178,7 +1178,7 @@ About the new airlock wires panel:
 	for(var/turf/T in loc)
 		var/obj/structure/window/W = locate(/obj/structure/window) in T
 		if (W)
-			W.destroy()
+			W.Destroy()
 
 	..()
 	return

code/game/objects/items/stacks/sheets/glass.dm

@@ -9,8 +9,8 @@
 /obj/item/stack/sheet/glass
 	w_type = RECYK_GLASS
 	melt_temperature = MELTPOINT_GLASS
-	var/created_window = /obj/structure/window/basic
-	var/full_window = /obj/structure/window/full/basic
+	var/created_window = /obj/structure/window
+	var/full_window = /obj/structure/window/full
 	var/windoor = null
 	var/reinforced = 0
 	var/rglass = 0
@@ -76,8 +76,8 @@
 					if(!found)
 						dir_to_set = direction
 						break
-				var/obj/structure/window/W = new created_window( user.loc, 0 )
-				W.state = 0
+				var/obj/structure/window/W = new created_window(user.loc, 0)
+				W.d_state = 0
 				W.dir = dir_to_set
 				W.ini_dir = W.dir
 				W.anchored = 0
@@ -92,7 +92,7 @@
 					user << "<span class='warning'>There is a window in the way.</span>"
 					return 1
 				var/obj/structure/window/W = new full_window( user.loc, 0 )
-				W.state = 0
+				W.d_state = 0
 				W.dir = SOUTHWEST
 				W.ini_dir = SOUTHWEST
 				W.anchored = 0
@@ -157,7 +157,7 @@
 						dir_to_set = direction
 						break
 				var/obj/structure/window/W = new created_window( user.loc, 0 )
-				W.state = 0
+				W.d_state = 0
 				W.dir = dir_to_set
 				W.ini_dir = W.dir
 				W.anchored = 0
@@ -172,7 +172,7 @@
 					user << "<span class='warning'>There is a window in the way.</span>"
 					return 1
 				var/obj/structure/window/W = new full_window( user.loc, 0 )
-				W.state = 0
+				W.d_state = 0
 				W.dir = SOUTHWEST
 				W.ini_dir = SOUTHWEST
 				W.anchored = 0
@@ -246,6 +246,7 @@
 /*
  * Plasma Glass sheets
  */
+
 /obj/item/stack/sheet/glass/plasmaglass
 	name = "plasma glass"
 	desc = "A very strong and very resistant sheet of a plasma-glass alloy."
@@ -254,11 +255,11 @@
 	sname = "plasma"
 	g_amt=CC_PER_SHEET_GLASS
 	origin_tech = "materials=3;plasmatech=2"
-	created_window = /obj/structure/window/plasmabasic
-	full_window = /obj/structure/window/full/plasmabasic
+	created_window = /obj/structure/window/plasma
+	full_window = /obj/structure/window/full/plasma
 	rglass = /obj/item/stack/sheet/glass/plasmarglass
 	perunit = 2875 //average of plasma and glass
-	melt_temperature = MELTPOINT_STEEL+500
+	melt_temperature = MELTPOINT_STEEL + 500
 	glass_quality = 1.15 //Can you imagine a world in which plasmaglass is worse than rglass
 	shealth = 20
 	shard_type = /obj/item/weapon/shard/plasma
@@ -281,8 +282,8 @@
 	m_amt = 1875
 	melt_temperature = MELTPOINT_STEEL+500 // I guess...?
 	origin_tech = "materials=4;plasmatech=2"
-	created_window = /obj/structure/window/plasmareinforced
-	full_window = /obj/structure/window/full/plasmareinforced
+	created_window = /obj/structure/window/reinforced/plasma
+	full_window = /obj/structure/window/full/reinforced/plasma
 	windoor = /obj/structure/windoor_assembly/plasma
 	perunit = 2875
 	reinforced = 1

code/game/objects/items/weapons/twohanded.dm

@@ -78,7 +78,7 @@
 				message_admins("[A] with pdiff [pdiff] fire-axed by [user.real_name] ([formatPlayerPanel(user,user.ckey)]) at [formatJumpTo(A.loc)]!")
 				log_admin("[A] with pdiff [pdiff] fire-axed by [user.real_name] ([user.ckey]) at [A.loc]!")
 			var/obj/structure/window/W = A
-			W.destroy()
+			W.Destroy()
 		else
 			del(A)
 

code/game/objects/structures/fullwindow.dm

@@ -1,90 +1,108 @@
+#define WINDOWLOOSE 0
+#define WINDOWLOOSEFRAME 1
+#define WINDOWUNSECUREFRAME 2
+#define WINDOWSECURE 3
+
 /obj/structure/window/full
-	sheets = 2
-	dir=SOUTHWEST
-	mouse_opacity=2 // Complete opacity.
+
+	name = "window"
+	icon_state = "window"
+	sheetamount = 2
+	mouse_opacity = 2 // Complete opacity //What in the name of everything is this variable ?
 	layer = 3.21 // Windows are at 3.2.
 
+	cracked_base = "fcrack"
+
 /obj/structure/window/full/New(loc)
+
 	..(loc)
 	flags &= ~ON_BORDER
 
 /obj/structure/window/full/CheckExit(atom/movable/O as mob|obj, target as turf)
+
 	return 1
 
-/obj/structure/window/full/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0)
+/obj/structure/window/full/CanPass(atom/movable/mover, turf/target, height = 1.5, air_group = 0)
+
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return 1
 	return 0
 
+/obj/structure/window/full/can_be_reached(mob/user)
+
+	return 1 //That about it Captain
+
 /obj/structure/window/full/is_fulltile()
+
 	return 1
 
-//merges adjacent full-tile windows into one (blatant ripoff from game/smoothwall.dm)
+//Merges adjacent full-tile windows into one (blatant ripoff from game/smoothwall.dm)
 /obj/structure/window/full/update_icon()
+
 	//A little cludge here, since I don't know how it will work with slim windows. Most likely VERY wrong.
-	//this way it will only update full-tile ones
+	//This way it will only update full-tile ones
 	//This spawn is here so windows get properly updated when one gets deleted.
-	spawn(2)
-		if(!src) return
-		if(!is_fulltile())
+	spawn()
+		if(!src)
 			return
-		var/junction = 0 //will be used to determine from which side the window is connected to other windows
+		var/junction = 0 //Will be used to determine from which side the window is connected to other windows
 		if(anchored)
-			for(var/obj/structure/window/full/W in orange(src,1))
+			for(var/obj/structure/window/full/W in orange(src, 1))
 				if(W.anchored && W.density) //Only counts anchored, not-destroyed full-tile windows.
-					if(abs(x-W.x)-abs(y-W.y) ) 		//doesn't count windows, placed diagonally to src
+					if(abs(x-W.x)-abs(y-W.y)) 	//Doesn't count windows, placed diagonally to src
 						junction |= get_dir(src,W)
-		icon_state = "[basestate][junction]"
+		icon_state = "[initial(icon_state)][junction]"
 		return
 
-/obj/structure/window/full/basic
-	desc = "It looks thin and flimsy. A few knocks with... anything, really should shatter it."
-	icon_state = "window"
-	basestate = "window"
-
-/obj/structure/window/full/plasmabasic
-	name = "plasma window"
-	desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
-	basestate = "plasmawindow"
-	icon_state = "plasmawindow"
-	shardtype = /obj/item/weapon/shard/plasma
-	health = 120
-
-/obj/structure/window/full/plasmabasic/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > T0C + 32000)
-		hit(round(exposed_volume / 1000), 0)
-	..()
-
-/obj/structure/window/full/plasmareinforced
-	name = "reinforced plasma window"
-	desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
-	basestate = "plasmarwindow"
-	icon_state = "plasmarwindow"
-	shardtype = /obj/item/weapon/shard/plasma
-	reinf = 1
-	health = 160
-
-/obj/structure/window/full/plasmareinforced/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	return
-
 /obj/structure/window/full/reinforced
 	name = "reinforced window"
 	desc = "It looks rather strong. Might take a few good hits to shatter it."
 	icon_state = "rwindow"
-	basestate = "rwindow"
+	sheettype = /obj/item/stack/sheet/glass/rglass
 	health = 40
-	reinf = 1
+	d_state = WINDOWSECURE
+	reinforced = 1
+
+/obj/structure/window/full/plasma
+
+	name = "plasma window"
+	desc = "A window made out of a plasma-silicate alloy. It looks insanely tough to break and burn through."
+	icon_state = "plasmawindow"
+	shardtype = /obj/item/weapon/shard/plasma
+	sheettype = /obj/item/stack/sheet/glass/plasmaglass
+	health = 120
+
+	fire_temp_threshold = 32000
+	fire_volume_mod = 1000
+
+/obj/structure/window/full/reinforced/plasma
+	name = "reinforced plasma window"
+	desc = "A window made out of a plasma-silicate alloy and a rod matrice. It looks hopelessly tough to break and is most likely nigh fireproof."
+	icon_state = "plasmarwindow"
+	shardtype = /obj/item/weapon/shard/plasma
+	sheettype = /obj/item/stack/sheet/glass/plasmarglass
+	health = 160
+
+/obj/structure/window/full/reinforced/plasma/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	return
 
 /obj/structure/window/full/reinforced/tinted
+
 	name = "tinted window"
-	desc = "It looks rather strong and opaque. Might take a few good hits to shatter it."
+	desc = "A window with a rod matrice. Its surface is completely tinted, making it opaque. Why not a wall ?"
 	icon_state = "twindow"
-	basestate = "twindow"
 	opacity = 1
+	sheettype = /obj/item/stack/sheet/glass/rglass //A glass type for this window doesn't seem to exist, so here's to you
 
 /obj/structure/window/full/reinforced/tinted/frosted
+
 	name = "frosted window"
-	desc = "It looks rather strong and frosted over. Looks like it might take a few less hits then a normal reinforced window."
+	desc = "A window with a rod matrice. Its surface is completely tinted, making it opaque, and it's frosty. Why not an ice wall ?"
 	icon_state = "fwindow"
-	basestate = "fwindow"
-	health = 30
+	health = 30
+	sheettype = /obj/item/stack/sheet/glass/rglass //Ditto above
+
+#undef WINDOWLOOSE
+#undef WINDOWLOOSEFRAME
+#undef WINDOWUNSECUREFRAME
+#undef WINDOWSECURE

code/game/objects/structures/grille.dm

@@ -166,7 +166,7 @@
 			WD.dir = dir_to_set
 			WD.ini_dir = dir_to_set
 			WD.anchored = 0
-			WD.state = 0
+			WD.d_state = 0
 			var/obj/item/stack/ST = W
 			ST.use(1)
 			user << "<span class='notice'>You place the [WD] on [src].</span>"

code/game/objects/structures/window.dm

@@ -1,449 +1,529 @@
+//Windows, one of the oldest pieces of code
+//Note : You might wonder where full windows are. Full windows are in fullwindow.dm. Now you know
+//And knowing is half the battle
+
+#define WINDOWLOOSE 0
+#define WINDOWLOOSEFRAME 1
+#define WINDOWUNSECUREFRAME 2
+#define WINDOWSECURE 3
+
 /obj/structure/window
 	name = "window"
-	desc = "A window."
+	desc = "A silicate barrier, used to keep things out and in sight. Fragile."
 	icon = 'icons/obj/structures.dmi'
+	icon_state = "window"
 	density = 1
-	layer = 3.2//Just above doors
+	layer = 3.2 //Just above airlocks //For some reason I guess
 	pressure_resistance = 4*ONE_ATMOSPHERE
-	anchored = 1.0
-	var/health = 14.0
-	var/ini_dir = null
-	var/state = 2
-	var/reinf = 0
-	var/basestate
+	anchored = 1
+	var/health = 10 //This window is so bad blowing on it would break it, sucks for it
+	var/ini_dir = null //This really shouldn't exist, but it does and I don't want to risk deleting it because it's likely mapping-related
+	var/d_state = WINDOWLOOSEFRAME //Normal windows have one step (unanchor), reinforced windows have three
 	var/shardtype = /obj/item/weapon/shard
-	var/sheets = 1 // Number of sheets needed to build this window (determines how much shit is spawned by destroy())
-//	var/silicate = 0 // number of units of silicate
-//	var/icon/silicateIcon = null // the silicated icon
+	var/sheettype = /obj/item/stack/sheet/glass //Used for deconstruction
+	var/sheetamount = 1 //Number of sheets needed to build this window (determines how much shit is spawned by destroy())
+	var/reinforced = 0 //Used for deconstruction steps
+
+	var/icon/damage_overlay
+	var/cracked_base = "crack"
+
+	var/fire_temp_threshold = 800
+	var/fire_volume_mod = 100
 
 /obj/structure/window/New(loc)
+
 	..(loc)
 	flags |= ON_BORDER
-
 	ini_dir = dir
 
 	update_nearby_tiles()
 	update_nearby_icons()
+	update_icon()
 
 /obj/structure/window/examine(mob/user)
+
 	..()
 	if(!anchored)
-		user << "<span class='info'>\the [src] appears to be loose.</span>"
+		user << "It appears to be completely loose and movable"
+	//switch most likely can't take inequalities, so here's that if block
+	if(health >= initial(health)) //Sanity
+		user << "It's in perfect shape, not even a scratch"
+	else if(health >= 0.8*initial(health))
+		user << "It has a few scratches and a small impact"
+	else if(health >= 0.5*initial(health))
+		user << "It has a few impacts and some cracks running from them"
+	else if(health >= 0.2*initial(health))
+		user << "It's covered in impact marks and most of the outer sheet is crackled"
+	else
+		user << "It's completely crackled over multiple layers, it's a miracle it's even standing"
+	if(reinforced) //Normal windows can be loose or not, reinforced windows are more complex
+		switch(d_state)
+			if(WINDOWSECURE)
+				user << "It is firmly secured"
+			if(WINDOWUNSECUREFRAME)
+				user << "It appears it was unfastened from its frame"
+			if(WINDOWLOOSEFRAME)
+				user << "It appears to be loose from its frame"
+
+//Allows us to quickly check if we should break the window, can handle not having an user
+/obj/structure/window/proc/healthcheck(var/mob/M, var/sound = 1)
+
+	if(health <= 0)
+		if(M) //Did someone pass a mob ? If so, perform a pressure check
+			var/pdiff = performWallPressureCheck(src.loc)
+			if(pdiff > 0)
+				message_admins("Window with pdiff [pdiff] at [formatJumpTo(loc)] destroyed by [M.real_name] ([formatPlayerPanel(M,M.ckey)])!")
+				log_admin("Window with pdiff [pdiff] at [loc] destroyed by [M.real_name] ([M.ckey])!")
+		Destroy()
+	else
+		if(sound)
+			playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
+		if(health < initial(health))
+			spawn()
+				var/damage_fraction = Clamp(round((initial(health) - health) / initial(health) * 5) + 1, 1, 5) //gives a number, 1-5, based on damagedness
+				var/new_overlay = icon(src.icon, "[cracked_base]", src.dir, damage_fraction)
+				overlays += new_overlay
+				if(damage_overlay)
+					overlays -= damage_overlay //the icon will be gc'd with no ref
+				damage_overlay = new_overlay
+		else
+			if(damage_overlay)
+				overlays -= damage_overlay
+			damage_overlay = null
 
 /obj/structure/window/bullet_act(var/obj/item/projectile/Proj)
+
 	health -= Proj.damage
 	..()
-	if(health <= 0)
-		var/pdiff=performWallPressureCheck(src.loc)
-		if(pdiff>0)
-			message_admins("Window destroyed by [Proj.firer.real_name] ([formatPlayerPanel(Proj.firer,Proj.firer.ckey)]) via \an [Proj]! pdiff = [pdiff] at [formatJumpTo(loc)]!")
-			log_admin("Window destroyed by ([Proj.firer.ckey]) via \an [Proj]! pdiff = [pdiff] at [loc]!")
-		destroy()
+	healthcheck(Proj.firer)
 	return
 
-// This should result in the same materials used to make the window.
-/obj/structure/window/proc/destroy()
-	for(var/i=0;i<sheets;i++)
-		getFromPool(shardtype, loc)
+/obj/structure/window/proc/is_fulltile()
 
-		if(reinf)
-			new /obj/item/stack/rods(loc)
-	qdel(src)
+	return 0
 
+//This ex_act just removes health to be fully modular with "bomb-proof" windows
 /obj/structure/window/ex_act(severity)
+
 	switch(severity)
 		if(1.0)
-			qdel(src)
+			health -= rand(100, 150)
+			healthcheck()
 			return
 		if(2.0)
-			destroy()
+			health -= rand(20, 50)
+			healthcheck()
 			return
 		if(3.0)
-			if(prob(50))
-				destroy()
-				return
-
+			health -= rand(5, 15)
+			healthcheck()
+			return
 
 /obj/structure/window/blob_act()
-	destroy()
+
+	health -= rand(30, 50)
+	healthcheck()
 
 /obj/structure/window/meteorhit()
-	destroy()
+
+	health -= rand(100, 150)
+	healthcheck()
 
 /obj/structure/window/CheckExit(var/atom/movable/O, var/turf/target)
+
 	if(istype(O) && O.checkpass(PASSGLASS))
 		return 1
 	if(get_dir(O.loc, target) == dir)
 		return !density
 	return 1
 
-/obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/window/CanPass(atom/movable/mover, turf/target, height = 0)
+
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return 1
-	if(dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST)
-		return 0	//full tile window, you can't move into it!
 	if(get_dir(loc, target) == dir)
 		return !density
-	else
-		return 1
+	return 1
 
+//Someone threw something at us, please advise
 /obj/structure/window/hitby(AM as mob|obj)
+
 	..()
-	visible_message("<span class='danger'>[src] was hit by [AM].</span>")
-	var/tforce = 0
-	var/mob/M=null
 	if(ismob(AM))
-		tforce = 40
-		M=AM
+		var/mob/M = AM //Duh
+		health -= 10 //We estimate just above a slam but under a crush, since mobs can't carry a throwforce variable
+		healthcheck(M)
+		visible_message("<span class='danger'>\The [M] slams into \the [src].</span>", \
+		"<span class='danger'>You slam into \the [src].</span>")
 	else if(isobj(AM))
 		var/obj/item/I = AM
-		tforce = I.throwforce
-	if(reinf) tforce *= 0.25
-	playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
-	health = max(0, health - tforce)
-	if(health <= 7 && !reinf)
-		anchored = 0
-		update_nearby_icons()
-		step(src, get_dir(AM, src))
-		var/pdiff=performWallPressureCheck(src.loc)
-		if(pdiff>0)
-			if(M)
-				message_admins("Window with pdiff [pdiff] at [formatJumpTo(loc)] deanchored by [M.real_name] ([formatPlayerPanel(M,M.ckey)])!")
-				log_admin("Window with pdiff [pdiff] at [loc] deanchored by [M.real_name] ([M.ckey])!")
-			else
-				message_admins("Window with pdiff [pdiff] at [formatJumpTo(loc)] deanchored by [AM]!")
-				log_admin("Window with pdiff [pdiff] at [loc] deanchored by [AM]!")
-	if(health <= 0)
-		var/pdiff=performWallPressureCheck(src.loc)
-		if(pdiff>0)
-			if(M)
-				message_admins("Window with pdiff [pdiff] at [formatJumpTo(loc)] destroyed by [M.real_name] ([formatPlayerPanel(M,M.ckey)])!")
-				log_admin("Window with pdiff [pdiff] at [loc] destroyed by [M.real_name] ([M.ckey])!")
-			else
-				message_admins("Window with pdiff [pdiff] at [formatJumpTo(loc)] destroyed by [AM]!")
-				log_admin("Window with pdiff [pdiff] at [loc] destroyed by [AM]!")
-		destroy()
-
+		health -= I.throwforce
+		healthcheck()
+		visible_message("<span class='danger'>\The [I] slams into \the [src].</span>")
 
 /obj/structure/window/attack_hand(mob/user as mob)
+
 	if(M_HULK in user.mutations)
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
-		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
-		var/pdiff=performWallPressureCheck(src.loc)
-		if(pdiff>0)
-			message_admins("Window destroyed by hulk [user.real_name] ([formatPlayerPanel(user,user.ckey)]) with pdiff [pdiff] at [formatJumpTo(loc)]!")
-			log_admin("Window destroyed by hulk [user.real_name] ([user.ckey]) with pdiff [pdiff] at [loc]!")
+		user.visible_message("<span class='danger'>[user] smashes \the [src]!</span>")
+		health -= 25
+		healthcheck()
 		user.delayNextAttack(8)
-		destroy()
-	else if (usr.a_intent == I_HURT)
-		user.delayNextAttack(8) // not so polite
-		playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
-		usr.visible_message("<span class='warning'>[usr.name] bangs against the [src.name]!</span>", \
-							"<span class='warning'>You bang against the [src.name]!</span>", \
-							"You hear a banging sound.")
+
+	//Bang against the window
+	else if(usr.a_intent == I_HURT)
+		user.delayNextAttack(10)
+		playsound(get_turf(src), 'sound/effects/glassknock.ogg', 100, 1)
+		user.visible_message("<span class='warning'>[user] bangs against \the [src]!</span>", \
+		"<span class='warning'>You bang against \the [src]!</span>", \
+		"You hear banging.")
+
+	//Knock against it
 	else
 		user.delayNextAttack(10)
-		playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
-		usr.visible_message("[usr.name] knocks on the [src.name].", \
-							"You knock on the [src.name].", \
-							"You hear a knocking sound.")
+		playsound(get_turf(src), 'sound/effects/glassknock.ogg', 50, 1)
+		user.visible_message("<span class='notice'>[user] knocks on \the [src].</span>", \
+		"<span class='notice'>You knock on \the [src].</span>", \
+		"You hear knocking.")
 	return
 
-
 /obj/structure/window/attack_paw(mob/user as mob)
+
 	return attack_hand(user)
 
 /obj/structure/window/proc/attack_generic(mob/user as mob, damage = 0)	//used by attack_alien, attack_animal, and attack_slime
+
 	user.delayNextAttack(10)
 	health -= damage
-	user.delayNextAttack(8)
-	if(health <= 0)
-		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
-		var/pdiff=performWallPressureCheck(src.loc)
-		if(pdiff>0)
-			message_admins("Window destroyed by [user.real_name] ([formatPlayerPanel(user,user.ckey)]) with pdiff [pdiff] at [formatJumpTo(loc)]!")
-		destroy()
-	else	//for nicer text~
-		user.visible_message("<span class='danger'>[user] smashes into [src]!</span>")
-		playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
-
+	user.visible_message("<span class='danger'>\The [user] smashes into \the [src]!</span>", \
+	"<span class='warning'>You smash into \the [src]!</span>")
+	healthcheck(user)
 
 /obj/structure/window/attack_alien(mob/user as mob)
-	if(islarva(user)) return
+
+	if(islarva(user))
+		return
 	attack_generic(user, 15)
 
 /obj/structure/window/attack_animal(mob/user as mob)
-	if(!isanimal(user)) return
+
 	var/mob/living/simple_animal/M = user
-	if(M.melee_damage_upper <= 0) return
+	if(M.melee_damage_upper <= 0)
+		return
 	attack_generic(M, M.melee_damage_upper)
 
-
 /obj/structure/window/attack_slime(mob/user as mob)
-	if(!isslimeadult(user)) return
+
+	if(!isslimeadult(user))
+		return
 	attack_generic(user, rand(10, 15))
 
-
 /obj/structure/window/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(!istype(W)) return//I really wish I did not need this
 
-	if (istype(W, /obj/item/weapon/grab) && Adjacent(user))
+	if(istype(W, /obj/item/weapon/grab) && Adjacent(user))
 		var/obj/item/weapon/grab/G = W
-		if (istype(G.affecting, /mob/living))
+		if(istype(G.affecting, /mob/living))
 			var/mob/living/M = G.affecting
-			var/state = G.state
-			qdel(W)	//gotta delete it here because if window breaks, it won't get deleted
-			var/damage
-			switch (state)
+			var/gstate = G.state
+			del(W)	//Gotta delete it here because if window breaks, it won't get deleted
+			switch(gstate)
 				if(GRAB_PASSIVE)
-					M.apply_damage(4)
-					damage = 4
-					hit(5)
-					visible_message("<span class='warning'>[user] slams [M] against \the [src]!</span>")
+					M.apply_damage(5) //Meh, bit of pain, window is fine, just a shove
+					visible_message("<span class='warning'>\The [user] shoves \the [M] into \the [src]!</span>", \
+					"<span class='warning'>You shove \the [M] into \the [src]!</span>")
 				if(GRAB_AGGRESSIVE)
-					if (prob(50))
-						M.Weaken(1)
-					M.apply_damage(7)
-					damage = 7
-					hit(10)
-					visible_message("<span class='danger'>[user] bashes [M] against \the [src]!</span>")
+					M.apply_damage(10) //Nasty, but dazed and concussed at worst
+					health -= 5
+					visible_message("<span class='danger'>\The [user] slams \the [M] into \the [src]!</span>", \
+					"<span class='danger'>You slam \the [M] into \the [src]!</span>")
 				if(GRAB_NECK to GRAB_KILL)
-					M.Weaken(3)
-					M.apply_damage(15)
-					damage = 15
-					hit(25)
-					visible_message("<big><span class='danger'>[user] crushes [M] against \the [src]!</span></big>")
-			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been window slammed by [user.name] ([user.ckey]) for [damage] damage.</font>")
-			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Window slammed [M.name] for [damage] damage.</font>")
-			msg_admin_attack("[user.name] ([user.ckey]) window slammed [M.name] ([M.ckey]) for [damage] damage (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
-			log_attack("[user.name] ([user.ckey]) window slammed [M.name] ([M.ckey]) for [damage] damage (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
-			return
-	if(istype(W, /obj/item/weapon/screwdriver))
-		if(reinf && state >= 1)
-			state = 3 - state
-			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
-			user << (state == 1 ? "<span class='notice'>You have unfastened the window from the frame.</span>" : "<span class='notice'>You have fastened the window to the frame.</span>")
-		else if(reinf && state == 0)
-			anchored = !anchored
-			update_nearby_icons()
-			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
-			user << (anchored ? "<span class='notice'>You have fastened the frame to the floor.</span>" : "<span class='notice'>You have unfastened the frame from the floor.</span>")
-			if(!anchored)
-				var/pdiff=performWallPressureCheck(src.loc)
-				if(pdiff>0)
-					message_admins("Window with pdiff [pdiff] deanchored by [user.real_name] ([formatPlayerPanel(user,user.ckey)]) at [formatJumpTo(loc)]!")
-					log_admin("Window with pdiff [pdiff] deanchored by [user.real_name] ([user.ckey]) at [loc]!")
-		else if(!reinf)
-			anchored = !anchored
-			update_nearby_icons()
-			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
-			user << (anchored ? "<span class='notice'>You have fastened the window to the floor.</span>" : "<span class='notice'>You have unfastened the window.</span>")
-			if(!anchored)
-				var/pdiff=performWallPressureCheck(src.loc)
-				if(pdiff>0)
-					message_admins("Window with pdiff [pdiff] deanchored by [user.real_name] ([formatPlayerPanel(user,user.ckey)]) at [formatJumpTo(loc)]!")
-					log_admin("Window with pdiff [pdiff] deanchored by [user.real_name] ([user.ckey]) at [loc]!")
-	else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <= 1)
-		state = 1 - state
-		playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
-		user << (state ? "<span class='notice'>You have pried the window into the frame.</span>" : "<span class='notice'>You have pried the window out of the frame.</span>")
-	else if(istype(W, /obj/item/weapon/weldingtool) && !anchored && (!state || !reinf))
-		playsound(get_turf(src), 'sound/items/Ratchet.ogg', 100, 1)
-		user << "<span class='notice'>Now disassembling the window...</span>"
-		var/obj/item/weapon/weldingtool/WT = W
-		if (WT.remove_fuel(0))
-			if(do_after(user,40))
-				if(!user || !src) return
-				visible_message("<span class='notice'>[user] dismantles \the [src].</span>")
-				new /obj/item/stack/sheet/glass/glass(get_turf(src))
-				qdel(src)
-		else
-			user << "Need more welding fuel!"
+					M.Weaken(5) //Almost certainly shoved head or face-first, you're going to need a bit for the lights to come back on
+					M.apply_damage(30) //That got to fucking hurt, you were basically flung into a window, most likely a shattered one at that
+					health -= 20 //Window won't like that
+					visible_message("<span class='danger'>\The [user] crushes \the [M] into \the [src]!</span>", \
+					"<span class='danger'>You crush \the [M] into \the [src]!</span>")
+			healthcheck(user)
+			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been window slammed by [user.name] ([user.ckey]) ([gstate]).</font>")
+			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Window slammed [M.name] ([gstate]).</font>")
+			msg_admin_attack("[user.name] ([user.ckey]) window slammed [M.name] ([M.ckey]) ([gstate]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+			log_attack("[user.name] ([user.ckey]) window slammed [M.name] ([M.ckey]) ([gstate]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 			return
 
+	//Start construction and deconstruction, absolute priority over the other object interactions to avoid hitting the window
+
+	if(reinforced) //Steps for all reinforced window types
+
+		switch(d_state)
+
+			if(WINDOWSECURE) //Reinforced, fully secured
+
+				if(istype(W, /obj/item/weapon/screwdriver))
+					playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+					user.visible_message("<span class='warning'>[user] unfastens \the [src] from its frame.</span>", \
+					"<span class='notice'>You unfasten \the [src] from its frame.</span>")
+					d_state = WINDOWUNSECUREFRAME
+					return
+
+			if(WINDOWUNSECUREFRAME)
+
+				if(istype(W, /obj/item/weapon/screwdriver))
+					playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+					user.visible_message("<span class='notice'>[user] fastens \the [src] to its frame.</span>", \
+					"<span class='notice'>You fasten \the [src] to its frame.</span>")
+					d_state = WINDOWSECURE
+					return
+
+				if(istype(W, /obj/item/weapon/crowbar))
+					playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
+					user.visible_message("<span class='warning'>[user] pries \the [src] from its frame.</span>", \
+					"<span class='notice'>You pry \the [src] from its frame.</span>")
+					d_state = WINDOWLOOSEFRAME
+					return
+
+			if(WINDOWLOOSEFRAME)
+
+				if(istype(W, /obj/item/weapon/crowbar))
+					playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
+					user.visible_message("<span class='warning'>[user] pries \the [src] into its frame.</span>", \
+					"<span class='notice'>You pry \the [src] into its frame.</span>")
+					d_state = WINDOWUNSECUREFRAME
+					return
+
+				if(istype(W, /obj/item/weapon/screwdriver))
+					playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+					user.visible_message("<span class='warning'>[user] unfastens \the [src]'s frame from the floor.</span>", \
+					"<span class='notice'>You unfasten \the [src]'s frame from the floor.</span>")
+					d_state = WINDOWLOOSE
+					anchored = 0
+					update_nearby_tiles() //Needed if it's a full window, since unanchored windows don't link
+					update_nearby_icons()
+					update_icon()
+					//P<>rform pressure check since window no longer blocks air
+					var/pdiff = performWallPressureCheck(src.loc)
+					if(pdiff > 0)
+						message_admins("Window with pdiff [pdiff] deanchored by [user.real_name] ([formatPlayerPanel(user,user.ckey)]) at [formatJumpTo(loc)]!")
+						log_admin("Window with pdiff [pdiff] deanchored by [user.real_name] ([user.ckey]) at [loc]!")
+					return
+
+			if(WINDOWLOOSE)
+
+				if(istype(W, /obj/item/weapon/screwdriver))
+					playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+					user.visible_message("<span class='warning'>[user] fastens \the [src]'s frame to the floor.</span>", \
+					"<span class='notice'>You fasten \the [src]'s frame to the floor.</span>")
+					d_state = WINDOWLOOSEFRAME
+					anchored = 1
+					update_nearby_tiles() //Ditto above, but in reverse
+					update_nearby_icons()
+					update_icon()
+					return
+
+				if(istype(W, /obj/item/weapon/weldingtool))
+					var/obj/item/weapon/weldingtool/WT = W
+					if(WT.remove_fuel(0))
+						playsound(src, 'sound/items/Welder.ogg', 100, 1)
+						user.visible_message("<span class='warning'>[user] starts disassembling \the [src].</span>", \
+						"<span class='notice'>You start disassembling \the [src].</span>")
+						if(do_after(user, 40) && d_state == WINDOWLOOSE) //Extra condition needed to avoid cheesing
+							playsound(src, 'sound/items/Welder.ogg', 100, 1)
+							user.visible_message("<span class='warning'>[user] disassembles \the [src].</span>", \
+							"<span class='notice'>You disassemble \the [src].</span>")
+							getFromPool(sheettype, get_turf(src), sheetamount)
+							qdel(src)
+							return
+					else
+						user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
+						return
+
+	else if(!reinforced) //Normal window steps
+
+		if(istype(W, /obj/item/weapon/screwdriver))
+			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+			user.visible_message("<span class='[d_state ? "warning":"notice"]'>[user] [d_state ? "un":""]fastens \the [src].</span>", \
+			"<span class='notice'>You [d_state ? "un":""]fasten \the [src].</span>")
+			d_state = !d_state
+			anchored = !anchored
+			update_nearby_tiles() //Ditto above
+			update_nearby_icons()
+			update_icon()
+			return
+
+		if(istype(W, /obj/item/weapon/weldingtool) && !d_state)
+			var/obj/item/weapon/weldingtool/WT = W
+			if(WT.remove_fuel(0))
+				playsound(src, 'sound/items/Welder.ogg', 100, 1)
+				user.visible_message("<span class='warning'>[user] starts disassembling \the [src].</span>", \
+				"<span class='notice'>You start disassembling \the [src].</span>")
+				if(do_after(user, 40) && d_state == WINDOWLOOSE) //Ditto above
+					playsound(src, 'sound/items/Welder.ogg', 100, 1)
+					user.visible_message("<span class='warning'>[user] disassembles \the [src].</span>", \
+					"<span class='notice'>You disassemble \the [src].</span>")
+					getFromPool(sheettype, get_turf(src), sheetamount)
+					qdel(src)
+					return
+			else
+				user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
+				return
+
+	if(W.damtype == BRUTE || W.damtype == BURN)
+		user.delayNextAttack(10)
+		health -= W.force
+		user.visible_message("<span class='warning'>\The [user] hits \the [src] with \the [W].</span>", \
+		"<span class='warning'>You hit \the [src] with \the [W].</span>")
+		healthcheck(user)
+		return
 	else
-		if(W.damtype == BRUTE || W.damtype == BURN)
-			user.delayNextAttack(10)
-			hit(W.force)
-			if(health <= 7)
-				anchored = 0
-				update_nearby_icons()
-				step(src, get_dir(user, src))
-				var/pdiff=performWallPressureCheck(src.loc)
-				if(pdiff>0)
-					message_admins("Window with pdiff [pdiff] deanchored by [user.real_name] ([formatPlayerPanel(user,user.ckey)]) at [formatJumpTo(loc)]!")
-					log_admin("Window with pdiff [pdiff] deanchored by [user.real_name] ([user.ckey]) at [loc]!")
-		else
-			playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
+		playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		..()
+
 	return
 
 /obj/structure/window/proc/can_be_reached(mob/user)
+
 	if(!is_fulltile())
-		if(get_dir(user,src) & dir)
+		if(get_dir(user, src) & dir)
 			for(var/obj/O in loc)
 				if(!O.CanPass(user, user.loc, 1, 0))
 					return 0
 	return 1
 
-/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
-	if(reinf) damage *= 0.5
-	health = max(0, health - damage)
-	if(sound_effect)
-		playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
-	if(health <= 0)
-		var/pdiff=performWallPressureCheck(src.loc)
-		if(pdiff>0)
-			message_admins("Window with pdiff [pdiff] broken at [formatJumpTo(loc)]!")
-		destroy()
-		return
-
-
 /obj/structure/window/verb/rotate()
+
 	set name = "Rotate Window Counter-Clockwise"
 	set category = "Object"
 	set src in oview(1)
 
 	if(anchored)
-		usr << "It is fastened to the floor therefore you can't rotate it!"
+		usr << "<span class='warning'>Is fastened to the floor, therefore you can't rotate it!</span>"
 		return 0
 
 	update_nearby_tiles() //Compel updates before
 	dir = turn(dir, 90)
-//	updateSilicate()
 	update_nearby_tiles()
 	ini_dir = dir
 	return
 
-
 /obj/structure/window/verb/revrotate()
+
 	set name = "Rotate Window Clockwise"
 	set category = "Object"
 	set src in oview(1)
 
 	if(anchored)
-		usr << "It is fastened to the floor therefore you can't rotate it!"
+		usr << "<span class='warning'>Is fastened to the floor, therefore you can't rotate it!</span>"
 		return 0
 
 	update_nearby_tiles() //Compel updates before
 	dir = turn(dir, 270)
-//	updateSilicate()
 	update_nearby_tiles()
 	ini_dir = dir
 	return
 
-
-/*
-/obj/structure/window/proc/updateSilicate()
-	if(silicateIcon && silicate)
-		icon = initial(icon)
-
-		var/icon/I = icon(icon,icon_state,dir)
-
-		var/r = (silicate / 100) + 1
-		var/g = (silicate / 70) + 1
-		var/b = (silicate / 50) + 1
-		I.SetIntensity(r,g,b)
-		icon = I
-		silicateIcon = I
-*/
-
 /obj/structure/window/Destroy()
-	density = 0
+
+	density = 0 //Sanity while we do the rest
 	update_nearby_tiles()
 	if(loc)
 		playsound(get_turf(src), "shatter", 70, 1)
 	update_nearby_icons()
+	getFromPool(shardtype, loc, sheetamount)
+	if(reinforced)
+		getFromPool(/obj/item/stack/rods, loc, sheetamount)
 	..()
 
-
 /obj/structure/window/Move()
+
 	update_nearby_tiles()
 	..()
 	dir = ini_dir
 	update_nearby_tiles()
 
-
 //This proc has to do with airgroups and atmos, it has nothing to do with smoothwindows, that's update_nearby_tiles().
 /obj/structure/window/proc/update_nearby_tiles()
-	if (isnull(air_master))
+
+	if(isnull(air_master))
 		return 0
 
 	var/T = get_turf(src)
 
-	if (isturf(T))
+	if(isturf(T))
 		air_master.mark_for_update(T)
 
 	return 1
 
-//checks if this window is full-tile one
-/obj/structure/window/proc/is_fulltile()
-	return 0
-
 //This proc is used to update the icons of nearby windows. It should not be confused with update_nearby_tiles(), which is an atmos proc!
 /obj/structure/window/proc/update_nearby_icons()
-	if(!loc) return 0
+
+	if(!loc)
+		return 0
+
 	update_icon()
+
 	for(var/direction in cardinal)
-		for(var/obj/structure/window/W in get_step(src,direction) )
+		for(var/obj/structure/window/W in get_step(src,direction))
 			W.update_icon()
 
 /obj/structure/window/update_icon()
+
 	return
 
 /obj/structure/window/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > T0C + 800)
-		hit(round(exposed_volume / 100), 0)
+
+	if(exposed_temperature > T0C + fire_temp_threshold)
+		health -= round(exposed_volume/fire_volume_mod)
+		healthcheck(sound = 0)
 	..()
 
-/obj/structure/window/basic
-	desc = "It looks thin and flimsy. A few knocks with... anything, really should shatter it."
-	icon_state = "window"
-	basestate = "window"
-
-/obj/structure/window/plasmabasic
-	name = "plasma window"
-	desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
-	basestate = "plasmawindow"
-	icon_state = "plasmawindow"
-	shardtype = /obj/item/weapon/shard/plasma
-	health = 120
-
-/obj/structure/window/plasmabasic/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > T0C + 32000)
-		hit(round(exposed_volume / 1000), 0)
-	..()
-
-/obj/structure/window/plasmareinforced
-	name = "reinforced plasma window"
-	desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
-	basestate = "plasmarwindow"
-	icon_state = "plasmarwindow"
-	shardtype = /obj/item/weapon/shard/plasma
-	reinf = 1
-	health = 160
-
-/obj/structure/window/plasmareinforced/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	return
-
 /obj/structure/window/reinforced
 	name = "reinforced window"
-	desc = "It looks rather strong. Might take a few good hits to shatter it."
+	desc = "A window with a rod matrice. It looks more solid than the average window."
 	icon_state = "rwindow"
-	basestate = "rwindow"
+	sheettype = /obj/item/stack/sheet/glass/rglass
 	health = 40
-	reinf = 1
+	d_state = WINDOWSECURE
+	reinforced = 1
+
+/obj/structure/window/plasma
+
+	name = "plasma window"
+	desc = "A window made out of a plasma-silicate alloy. It looks insanely tough to break and burn through."
+	icon_state = "plasmawindow"
+	shardtype = /obj/item/weapon/shard/plasma
+	sheettype = /obj/item/stack/sheet/glass/plasmaglass
+	health = 120
+
+	fire_temp_threshold = 32000
+	fire_volume_mod = 1000
+
+/obj/structure/window/reinforced/plasma
+
+	name = "reinforced plasma window"
+	desc = "A window made out of a plasma-silicate alloy and a rod matrice. It looks hopelessly tough to break and is most likely nigh fireproof."
+	icon_state = "plasmarwindow"
+	shardtype = /obj/item/weapon/shard/plasma
+	sheettype = /obj/item/stack/sheet/glass/plasmarglass
+	health = 160
+
+/obj/structure/window/reinforced/plasma/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	return
 
 /obj/structure/window/reinforced/tinted
+
 	name = "tinted window"
-	desc = "It looks rather strong and opaque. Might take a few good hits to shatter it."
+	desc = "A window with a rod matrice. Its surface is completely tinted, making it opaque. Why not a wall ?"
 	icon_state = "twindow"
-	basestate = "twindow"
 	opacity = 1
+	sheettype = /obj/item/stack/sheet/glass/rglass //A glass type for this window doesn't seem to exist, so here's to you
 
 /obj/structure/window/reinforced/tinted/frosted
+
 	name = "frosted window"
-	desc = "It looks rather strong and frosted over. Looks like it might take a few less hits then a normal reinforced window."
+	desc = "A window with a rod matrice. Its surface is completely tinted, making it opaque, and it's frosty. Why not an ice wall ?"
 	icon_state = "fwindow"
-	basestate = "fwindow"
 	health = 30
+	sheettype = /obj/item/stack/sheet/glass/rglass //Ditto above
+
+#undef WINDOWLOOSE
+#undef WINDOWLOOSEFRAME
+#undef WINDOWUNSECUREFRAME
+#undef WINDOWSECURE

maps/defficiency.dmm

@@ -1891,7 +1891,7 @@
 "aKs" = (/obj/effect/decal/warning_stripes{tag = "icon-loading_area"; icon_state = "loading_area"; dir = 2},/turf/simulated/floor,/area/hallway/primary/fore)
 "aKt" = (/obj/structure/table,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/storage/box/masks,/obj/item/weapon/storage/box/gloves,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "aKu" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/closet/hydrant{pixel_x = -32},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
-"aKv" = (/obj/structure/grille,/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
+"aKv" = (/obj/structure/grille,/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "aKw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/fore)
 "aKx" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/derelictparts/fore)
 "aKy" = (/obj/machinery/light_construct/small,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating,/area/derelictparts/fore)
@@ -1915,7 +1915,7 @@
 "aKQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics)
 "aKR" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics)
 "aKS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics)
-"aKT" = (/obj/structure/grille,/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
+"aKT" = (/obj/structure/grille,/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "aKU" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/mob/living/carbon/monkey,/turf/simulated/floor,/area/medical/genetics)
 "aKV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/medical/genetics)
 "aKW" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor,/area/hallway/primary/fore)
@@ -1934,7 +1934,7 @@
 "aLj" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/hallway/primary/fore)
 "aLk" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/hallway/primary/fore)
 "aLl" = (/turf/simulated/floor{icon_state = "green"; dir = 4},/area/hallway/primary/fore)
-"aLm" = (/obj/structure/grille,/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
+"aLm" = (/obj/structure/grille,/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "aLn" = (/obj/structure/stool,/turf/simulated/floor,/area/hydroponics)
 "aLo" = (/turf/simulated/floor{dir = 1; icon_state = "green"},/area/hydroponics)
 "aLp" = (/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor{dir = 1; icon_state = "green"},/area/hydroponics)
@@ -2451,10 +2451,10 @@
 "aVg" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engineering/ce)
 "aVh" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/turf/simulated/floor/plating,/area/engineering/ce)
 "aVi" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/light{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/engineering/engine)
-"aVj" = (/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad3"; name = "radiation shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
+"aVj" = (/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad3"; name = "radiation shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "aVk" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "aVl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/engineering/engine)
-"aVm" = (/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/insulated/visible/blue{dir = 4},/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad3"; name = "radiation shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
+"aVm" = (/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 8},/obj/machinery/atmospherics/pipe/simple/insulated/visible/blue{dir = 4},/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad3"; name = "radiation shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "aVn" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "aVo" = (/obj/structure/table,/obj/item/weapon/storage/fancy/crayons{pixel_x = 3; pixel_y = 6},/obj/item/weapon/storage/fancy/crayons,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "aVp" = (/obj/structure/table,/obj/item/weapon/storage/wallet/random{pixel_y = 9},/obj/item/weapon/storage/wallet/random{pixel_y = 6},/obj/item/weapon/storage/wallet/random{pixel_y = 3},/obj/item/weapon/storage/wallet/random,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
@@ -2767,8 +2767,8 @@
 "bbk" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/emitter{anchored = 1; dir = 4; id_tag = "SM_emitter"; state = 2},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "bbl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/engineering/engine)
 "bbm" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/engineering/engine)
-"bbn" = (/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced,/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad3"; name = "radiation shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
-"bbo" = (/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad3"; name = "radiation shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
+"bbn" = (/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma,/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad3"; name = "radiation shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
+"bbo" = (/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 8},/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad3"; name = "radiation shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "bbp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/engineering/engine)
 "bbq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/sortjunction{dir = 1; icon_state = "pipe-j2s"; sortType = 20},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "bbr" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/fsmaint)
@@ -2846,7 +2846,7 @@
 "bcL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "bcM" = (/obj/machinery/cooking/still,/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar)
 "bcN" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
-"bcO" = (/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/insulated/visible{dir = 4},/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad3"; name = "radiation shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
+"bcO" = (/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/insulated/visible{dir = 4},/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad3"; name = "radiation shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "bcP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "yellow"},/area/engineering/engine)
 "bcQ" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/engineering/engine)
 "bcR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/engineering/engine)
@@ -4314,10 +4314,10 @@
 "bEX" = (/obj/effect/decal/cleanable/blood/splatter,/obj/item/clothing/gloves/boxing,/turf/simulated/floor{icon_state = "dark"},/area/derelictparts/port)
 "bEY" = (/obj/effect/decal/cleanable/blood/splatter,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/derelictparts/port)
 "bEZ" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon_state = "right"; name = "Containment Pen"; req_access_txt = "55"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/poddoor{density = 0; opacity = 0; icon_state = "pdoor0"; id_tag = "xenobio1"; name = "containment blast door"},/turf/simulated/floor/engine,/area/science/xenobiology)
-"bFa" = (/obj/machinery/computer/rdconsole/mommi,/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor/bluegrid,/area/construction/mommi_nest)
+"bFa" = (/obj/machinery/computer/rdconsole/mommi,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/bluegrid,/area/construction/mommi_nest)
 "bFb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/window{dir = 4; name = "Containment Pen"; req_access_txt = "55"},/obj/machinery/door/poddoor{density = 0; opacity = 0; icon_state = "pdoor0"; id_tag = "xenobio6"; name = "containment blast door"},/turf/simulated/floor/engine,/area/science/xenobiology)
 "bFc" = (/obj/structure/table/reinforced,/obj/machinery/door/window{base_state = "left"; dir = 8; icon_state = "left"; name = "Robotics Desk"; req_access_txt = "29"},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/machinery/door/poddoor{density = 0; opacity = 0; icon_state = "pdoor0"; id_tag = "robotics"; name = "robotics lab shutters"},/turf/simulated/floor/plating,/area/science/robotics)
-"bFd" = (/obj/structure/window/plasmareinforced{dir = 1},/obj/machinery/media/jukebox/bar,/turf/simulated/floor/bluegrid,/area/construction/mommi_nest)
+"bFd" = (/obj/structure/window/reinforced/plasma{dir = 1},/obj/machinery/media/jukebox/bar,/turf/simulated/floor/bluegrid,/area/construction/mommi_nest)
 "bFe" = (/obj/machinery/r_n_d/fabricator/circuit_imprinter,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/camera{c_tag = "Robotics Lab South"; dir = 1; network = list("SS13","RD")},/turf/simulated/floor,/area/science/robotics)
 "bFf" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/derelictparts/port)
 "bFg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/crew_quarters/sleep)
@@ -4959,7 +4959,7 @@
 "bRs" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/derelictparts/port)
 "bRt" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "bRu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/decal/cleanable/dirt,/obj/item/stack/rods,/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/derelictparts/port)
-"bRv" = (/obj/machinery/r_n_d/fabricator/circuit_imprinter,/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor/bluegrid,/area/construction/mommi_nest)
+"bRv" = (/obj/machinery/r_n_d/fabricator/circuit_imprinter,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/bluegrid,/area/construction/mommi_nest)
 "bRw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/derelictparts/port)
 "bRx" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/derelictparts/diner)
 "bRy" = (/obj/machinery/door/airlock/glass{name = "Derelict Diner"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/derelictparts/diner)
@@ -5040,7 +5040,7 @@
 "bSV" = (/obj/structure/window/reinforced/tinted{dir = 8},/obj/structure/device/piano,/turf/simulated/floor/wood,/area/crew_quarters/theatre)
 "bSW" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/wood,/area/crew_quarters/theatre)
 "bSX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/theatre)
-"bSY" = (/obj/machinery/r_n_d/fabricator/protolathe,/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor/bluegrid,/area/construction/mommi_nest)
+"bSY" = (/obj/machinery/r_n_d/fabricator/protolathe,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/bluegrid,/area/construction/mommi_nest)
 "bSZ" = (/turf/simulated/floor,/area/crew_quarters/theatre)
 "bTa" = (/obj/machinery/status_display{layer = 4; pixel_x = -32},/turf/simulated/floor{icon_state = "neutralcorner"; dir = 1},/area/hallway/primary/port)
 "bTb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/sleep)
@@ -6075,8 +6075,8 @@
 "cmQ" = (/obj/machinery/computer/security,/obj/machinery/light{dir = 1},/obj/machinery/camera{c_tag = "Security Reception Desk"},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/security/brig)
 "cmR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/security/hos)
 "cmS" = (/obj/machinery/door/airlock/external{name = "External Airlock"; req_access_txt = "1"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/security/brig)
-"cmT" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/full/plasmareinforced,/obj/structure/window/plasmareinforced,/turf/simulated/floor/plating,/area/security/brig)
-"cmU" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/full/plasmareinforced,/obj/structure/window/plasmareinforced,/turf/simulated/floor/plating,/area/security/brig)
+"cmT" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/full/reinforced/plasma,/obj/structure/window/reinforced/plasma,/turf/simulated/floor/plating,/area/security/brig)
+"cmU" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/full/reinforced/plasma,/obj/structure/window/reinforced/plasma,/turf/simulated/floor/plating,/area/security/brig)
 "cmV" = (/turf/simulated/wall/r_wall,/area/security/hos)
 "cmW" = (/obj/structure/rack,/obj/item/weapon/grenade/smokebomb,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/unsimulated/floor{icon_state = "engine"},/area/centcom/evac)
 "cmX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/security/hos)
@@ -6369,8 +6369,8 @@
 "csy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "red"},/area/security/brig)
 "csz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/poddoor{density = 0; opacity = 0; icon_state = "pdoor0"; id_tag = "bridge entrance"; name = "bridge blast door"},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{icon_state = "dark"},/area/bridge/meeting_room)
 "csA" = (/obj/machinery/door_control{id_tag = "Secure Gate"; name = "Security Lockdown"; pixel_x = -3; pixel_y = -28; req_access_txt = "3"},/turf/simulated/floor,/area/security/brig)
-"csB" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/obj/structure/window/full/plasmareinforced,/turf/simulated/floor/plating,/area/security/brig)
-"csC" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/obj/structure/window/full/plasmareinforced,/turf/simulated/floor/plating,/area/security/brig)
+"csB" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor/plating,/area/security/brig)
+"csC" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor/plating,/area/security/brig)
 "csD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/security/gas_chamber)
 "csE" = (/obj/structure/table,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/derelictparts/aft)
 "csF" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber)
@@ -7844,7 +7844,7 @@
 "cUR" = (/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "NTrasen"; name = "Outer Airlock"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom)
 "cUS" = (/obj/machinery/door/poddoor{density = 1; icon_state = "pdoor1"; id_tag = "QMLoaddoor2"; name = "supply dock loading door"; opacity = 1},/obj/machinery/conveyor{dir = 4; id_tag = "QMLoad2"},/turf/simulated/shuttle/plating,/area/supply/dock)
 "cUT" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/space,/area/shuttle/specops/centcom)
-"cUU" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/plasmareinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/shuttle/specops/centcom)
+"cUU" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/shuttle/specops/centcom)
 "cUV" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom)
 "cUW" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/security/rec_room)
 "cUX" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom)
@@ -8393,8 +8393,8 @@
 "dfu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dfv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dfw" = (/obj/structure/table,/obj/item/weapon/rack_parts,/turf/simulated/floor,/area/derelict/bridge)
-"dfx" = (/obj/structure/table,/obj/structure/window/basic,/turf/simulated/floor,/area/derelict/bridge)
-"dfy" = (/obj/structure/window/basic,/turf/simulated/floor,/area/derelict/bridge)
+"dfx" = (/obj/structure/table,/obj/structure/window,/turf/simulated/floor,/area/derelict/bridge)
+"dfy" = (/obj/structure/window,/turf/simulated/floor,/area/derelict/bridge)
 "dfz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/djstation)
 "dfA" = (/obj/machinery/telecomms/relay/preset/ruskie,/turf/simulated/floor{icon_state = "dark"},/area/djstation)
 "dfB" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/catwalk,/area/djstation/solars)
@@ -8453,7 +8453,7 @@
 "dgC" = (/turf/simulated/wall/r_wall,/area/derelict/hallway/primary)
 "dgD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dgE" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes{charge = 5e+006},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
-"dgF" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
+"dgF" = (/obj/structure/window{dir = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dgG" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dgH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dgI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
@@ -8462,7 +8462,7 @@
 "dgL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dgM" = (/obj/machinery/power/solar/control{id_tag = "djstationsolar"; name = "DJ Station Solar Panel Control"},/turf/simulated/floor/plating,/area/djstation)
 "dgN" = (/obj/machinery/light/small,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
-"dgO" = (/obj/structure/grille,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/plating/airless,/area)
+"dgO" = (/obj/structure/grille,/obj/structure/window{dir = 8},/turf/simulated/floor/plating/airless,/area)
 "dgP" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/solar/panel{id_tag = "derelictsolar"; name = "Derelict Solar Array"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/derelict_starboard)
 "dgQ" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{pixel_y = -24},/turf/simulated/floor/plating,/area/djstation)
 "dgR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
@@ -8483,7 +8483,7 @@
 "dhg" = (/turf/simulated/wall,/area/derelict/arrival)
 "dhh" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dhi" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_y = 32},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (NORTH)"; icon_state = "warning_corner"; dir = 1},/obj/structure/closet/radiation,/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/djstation)
-"dhj" = (/obj/structure/window/full/basic,/turf/space,/area)
+"dhj" = (/obj/structure/window/full,/turf/space,/area)
 "dhk" = (/obj/structure/table,/turf/simulated/floor,/area/derelict/arrival)
 "dhl" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/derelict/arrival)
 "dhm" = (/turf/simulated/floor,/area/derelict/arrival)
@@ -8493,7 +8493,7 @@
 "dhq" = (/turf/simulated/wall,/area/derelict/medical/chapel)
 "dhr" = (/obj/structure/grille,/turf/space,/area/derelict/singularity_engine)
 "dhs" = (/obj/machinery/light{dir = 4},/obj/machinery/status_display{pixel_x = 0; pixel_y = 32},/obj/machinery/media/jukebox/dj{autoplay = 0},/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/djstation)
-"dht" = (/obj/structure/lattice,/obj/structure/window/basic,/turf/space,/area)
+"dht" = (/obj/structure/lattice,/obj/structure/window,/turf/space,/area)
 "dhu" = (/obj/machinery/vending/coffee,/turf/simulated/floor{icon_state = "bar"},/area/djstation)
 "dhv" = (/turf/simulated/floor/plating/airless,/area/derelict/arrival)
 "dhw" = (/obj/item/weapon/storage/box/donkpockets,/obj/structure/table,/turf/simulated/floor{icon_state = "bar"},/area/djstation)
@@ -8515,9 +8515,9 @@
 "dhM" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "bar"},/area/djstation)
 "dhN" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/medical)
 "dhO" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "grimy"},/area/djstation)
-"dhP" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"dhQ" = (/obj/structure/lattice,/obj/structure/window/basic{dir = 1},/turf/space,/area)
-"dhR" = (/obj/structure/lattice,/obj/structure/lattice,/obj/structure/window/basic{dir = 1},/turf/space,/area)
+"dhP" = (/obj/structure/window{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"dhQ" = (/obj/structure/lattice,/obj/structure/window{dir = 1},/turf/space,/area)
+"dhR" = (/obj/structure/lattice,/obj/structure/lattice,/obj/structure/window{dir = 1},/turf/space,/area)
 "dhS" = (/turf/simulated/floor/plating,/area/derelict/arrival)
 "dhT" = (/obj/machinery/door/airlock/medical{name = "Morgue"; req_access_txt = "6"},/turf/simulated/floor{icon_state = "dark"},/area/derelict/medical/chapel)
 "dhU" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
@@ -8584,8 +8584,8 @@
 "djd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
 "dje" = (/obj/structure/closet/l3closet/general,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
 "djf" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area)
-"djg" = (/obj/structure/window/basic,/turf/space,/area)
-"djh" = (/obj/structure/window/basic{dir = 8},/turf/space,/area)
+"djg" = (/obj/structure/window,/turf/space,/area)
+"djh" = (/obj/structure/window{dir = 8},/turf/space,/area)
 "dji" = (/obj/machinery/light{dir = 8},/turf/simulated/floor,/area/derelict/arrival)
 "djj" = (/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/derelict/arrival)
 "djk" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
@@ -8603,15 +8603,15 @@
 "djw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/research{name = "Toxins Research"; req_access_txt = "7"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "djx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
 "djy" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless,/area)
-"djz" = (/obj/structure/window/basic{dir = 8},/obj/structure/window/basic,/turf/space,/area)
+"djz" = (/obj/structure/window{dir = 8},/obj/structure/window,/turf/space,/area)
 "djA" = (/obj/machinery/door/airlock/external{name = "Arrival Airlock"},/turf/simulated/floor/plating,/area/derelict/arrival)
 "djB" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "djC" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/airless,/area)
 "djD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
-"djE" = (/obj/structure/window/basic{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
+"djE" = (/obj/structure/window{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
 "djF" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
 "djG" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
-"djH" = (/obj/structure/window/basic,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
+"djH" = (/obj/structure/window,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
 "djI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/research{name = "Toxins Research"; req_access_txt = "7"},/turf/simulated/floor/airless,/area/derelict/arrival)
 "djJ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/derelict/arrival)
 "djK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/derelict/arrival)
@@ -8621,10 +8621,10 @@
 "djO" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "djP" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "djQ" = (/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
-"djR" = (/obj/structure/window/basic{dir = 1},/turf/space,/area)
-"djS" = (/obj/structure/window/full/basic,/turf/simulated/floor/plating/airless,/area)
-"djT" = (/obj/structure/grille,/obj/structure/window/basic{dir = 1},/turf/space,/area)
-"djU" = (/obj/structure/window/basic{dir = 1},/turf/simulated/floor/plating/airless,/area)
+"djR" = (/obj/structure/window{dir = 1},/turf/space,/area)
+"djS" = (/obj/structure/window/full,/turf/simulated/floor/plating/airless,/area)
+"djT" = (/obj/structure/grille,/obj/structure/window{dir = 1},/turf/space,/area)
+"djU" = (/obj/structure/window{dir = 1},/turf/simulated/floor/plating/airless,/area)
 "djV" = (/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/derelict/research)
 "djW" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor,/area/derelict/arrival)
 "djX" = (/obj/structure/table,/obj/machinery/computer/pod/old{name = "ProComp IIe"; pixel_y = 7; id_tag = "derelict_gun"},/turf/simulated/floor{icon_state = "chapel"},/area/derelict/medical/chapel)
@@ -8639,14 +8639,14 @@
 "dkg" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dkh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall,/area/derelict/hallway/primary)
 "dki" = (/obj/machinery/door/airlock/security{name = "Gas Storage"; req_access = null; req_access_txt = "3"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"dkj" = (/obj/structure/lattice,/obj/structure/window/basic{dir = 4},/turf/space,/area)
-"dkk" = (/obj/structure/girder,/obj/structure/window/basic,/turf/simulated/floor/plating/airless,/area/derelict/arrival)
+"dkj" = (/obj/structure/lattice,/obj/structure/window{dir = 4},/turf/space,/area)
+"dkk" = (/obj/structure/girder,/obj/structure/window,/turf/simulated/floor/plating/airless,/area/derelict/arrival)
 "dkl" = (/obj/structure/stool/bed,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dkm" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dkn" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dko" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dkp" = (/obj/machinery/door/airlock/security{name = "Security"; req_access = null; req_access_txt = "1"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
-"dkq" = (/obj/structure/window/basic{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
+"dkq" = (/obj/structure/window{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
 "dkr" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/derelict/arrival)
 "dks" = (/obj/structure/table,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dkt" = (/obj/structure/table,/obj/item/weapon/cell,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
@@ -8660,7 +8660,7 @@
 "dkB" = (/obj/structure/stool,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dkC" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Access"; req_access_txt = "24"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dkD" = (/obj/structure/closet/wardrobe/orange,/turf/simulated/floor/airless,/area)
-"dkE" = (/obj/structure/window/basic{dir = 4},/turf/space,/area)
+"dkE" = (/obj/structure/window{dir = 4},/turf/space,/area)
 "dkF" = (/obj/structure/grille,/turf/simulated/floor/plating,/area/derelict/arrival)
 "dkG" = (/obj/structure/closet/wardrobe,/turf/simulated/floor,/area/derelict/arrival)
 "dkH" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/research)
@@ -8684,7 +8684,7 @@
 "dkZ" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating/airless,/area)
 "dla" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/wall/r_wall,/area)
 "dlb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/wall/r_wall,/area/derelict/hallway/secondary)
-"dlc" = (/obj/structure/window/basic{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"dlc" = (/obj/structure/window{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
 "dld" = (/obj/structure/grille,/obj/item/weapon/shard,/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area)
 "dle" = (/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating/airless,/area)
 "dlf" = (/obj/structure/girder,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
@@ -8727,8 +8727,8 @@
 "dlQ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research)
 "dlR" = (/obj/machinery/door/airlock/external{name = "Escape Airlock"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
 "dlS" = (/obj/structure/table,/obj/item/stack/sheet/glass/glass{amount = 10},/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station/start)
-"dlT" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"dlU" = (/obj/structure/window/basic{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"dlT" = (/obj/structure/window{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"dlU" = (/obj/structure/window{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
 "dlV" = (/obj/effect/landmark{name = "Syndicate-Uplink"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station/start)
 "dlW" = (/obj/structure/closet/emcloset,/turf/simulated/floor/airless,/area/derelict/hallway/secondary)
 "dlX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
@@ -9160,7 +9160,7 @@
 "duh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/sortjunction{dir = 8; sortType = 7},/turf/simulated/floor,/area/security/brig)
 "dui" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
 "duj" = (/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
-"duk" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/full/plasmareinforced,/turf/simulated/floor/plating,/area/security/armory)
+"duk" = (/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor/plating,/area/security/armory)
 "dul" = (/obj/machinery/alarm{pixel_y = 24; req_one_access = list(24,11,47)},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/entry)
 "dum" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/obj/structure/closet/medical_wall{pixel_y = 32},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/med)
 "dun" = (/obj/machinery/door/firedoor,/obj/structure/window/full/reinforced,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/med)
@@ -9172,10 +9172,10 @@
 "dut" = (/obj/structure/rack,/obj/item/weapon/storage/box/gloves,/turf/simulated/floor{icon_state = "dark"},/area/research_outpost/maintstore2)
 "duu" = (/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
 "duv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
-"duw" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/full/plasmareinforced,/turf/simulated/floor/plating,/area/security/armory)
+"duw" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor/plating,/area/security/armory)
 "dux" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
 "duy" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
-"duz" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/full/plasmareinforced,/turf/simulated/floor/plating,/area/security/armory)
+"duz" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor/plating,/area/security/armory)
 "duA" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/med)
 "duB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/med)
 "duC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/med)
@@ -9219,7 +9219,7 @@
 "dvo" = (/obj/machinery/conveyor_switch/oneway{id_tag = "outpost_sample"},/obj/structure/sign/chemistry{pixel_y = 32},/turf/unsimulated/floor/asteroid,/area/mine/explored)
 "dvp" = (/obj/machinery/conveyor{id_tag = "outpost_sample"},/turf/unsimulated/floor/asteroid,/area/mine/explored)
 "dvq" = (/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 1},/turf/unsimulated/floor/asteroid/plating,/area/mine/explored)
-"dvr" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/full/plasmareinforced,/turf/simulated/floor/plating,/area/security/armory)
+"dvr" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor/plating,/area/security/armory)
 "dvs" = (/obj/structure/disposalpipe/segment,/turf/unsimulated/floor/asteroid/plating,/area/mine/explored)
 "dvt" = (/obj/machinery/light/small{dir = 1},/turf/unsimulated/floor/asteroid,/area/mine/explored)
 "dvu" = (/obj/machinery/light/small{dir = 8},/turf/unsimulated/floor/asteroid,/area/mine/explored)

maps/metaclub.dmm

@@ -1658,7 +1658,7 @@
 "aFT" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/full/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/bridge)
 "aFU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/construction/Storage{name = "Storage Wing"})
 "aFV" = (/turf/simulated/wall,/area/hallway/primary/fore)
-"aFW" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
+"aFW" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
 "aFX" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor{icon_state = "dark"},/area/maintenance/maintcentral)
 "aFY" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/full/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor{icon_state = "dark"},/area/bridge)
 "aFZ" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/light/small,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"})
@@ -1727,7 +1727,7 @@
 "aHk" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/full/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor{icon_state = "dark"},/area/bridge)
 "aHl" = (/obj/machinery/power/emitter{anchored = 1; dir = 4; state = 2},/obj/structure/cable,/obj/machinery/light/small,/turf/simulated/floor/plating/airless,/area/construction/hallway{name = "\improper MiniSat Exterior"})
 "aHm" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor{icon_state = "dark"},/area/maintenance/maintcentral)
-"aHn" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
+"aHn" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
 "aHo" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/full/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "dark"},/area/bridge)
 "aHp" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/fore)
 "aHq" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/fore)
@@ -2626,7 +2626,7 @@
 "aYz" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
 "aYA" = (/obj/machinery/light_switch{pixel_x = -24},/obj/machinery/power/apc{dir = 2; name = "Cargo Bay APC"; pixel_x = 1; pixel_y = -24},/obj/structure/cable/yellow,/turf/simulated/floor{dir = 10; icon_state = "floor"},/area/supply/storage)
 "aYB" = (/turf/simulated/wall,/area/storage/tech)
-"aYC" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/obj/structure/window/plasmareinforced,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
+"aYC" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced/plasma,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
 "aYD" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/engineering/engine)
 "aYE" = (/obj/structure/window/full/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Singularity"; layer = 2.8; name = "Singularity Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/engine)
 "aYF" = (/obj/structure/bookcase/manuals/engineering,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/engineering/ce)
@@ -6001,7 +6001,7 @@
 "clu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/hallway{name = "Research Division"})
 "clv" = (/obj/structure/closet/l3closet/scientist{pixel_x = -2},/obj/machinery/door_control{id_tag = "teleshutt"; name = "Privacy Shutters"; pixel_x = 0; pixel_y = -24; req_access_txt = "28"},/obj/machinery/light_switch{pixel_x = -23; pixel_y = 10},/turf/simulated/floor{tag = "icon-warningcorner (EAST)"; icon_state = "floor"; dir = 4},/area/science/telescience)
 "clw" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor{dir = 2; icon_state = "whitepurple"},/area/science/telescience)
-"clx" = (/obj/structure/window/plasmareinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/turf/simulated/floor/engine,/area/science/telescience)
+"clx" = (/obj/structure/window/reinforced/plasma{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/turf/simulated/floor/engine,/area/science/telescience)
 "cly" = (/obj/machinery/shieldwallgen{req_access = list(55)},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/structure/cable/yellow,/turf/simulated/floor{tag = "icon-warningcorner (EAST)"; icon_state = "floor"; dir = 4},/area/science/telescience)
 "clz" = (/obj/machinery/telepad,/turf/simulated/floor/engine,/area/science/telescience)
 "clA" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/computer/telescience,/turf/simulated/floor{tag = "icon-warningcorner (EAST)"; icon_state = "floor"; dir = 4},/area/science/telescience)
@@ -6907,7 +6907,7 @@
 "cCQ" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/storage)
 "cCR" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/morgue,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/science/robotics)
 "cCS" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"})
-"cCT" = (/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/machinery/door/poddoor/preopen{id_tag = "toxins_blastdoor"; name = "biohazard containment door"},/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"})
+"cCT" = (/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/machinery/door/poddoor/preopen{id_tag = "toxins_blastdoor"; name = "biohazard containment door"},/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"})
 "cCU" = (/turf/simulated/floor/plating,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/aft{name = "Aft Maintenance"})
 "cCV" = (/turf/simulated/wall,/area/medical/morgue)
 "cCW" = (/obj/machinery/door/airlock/maintenance{name = "Morgue Maintenance"; req_access_txt = "6"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"})
@@ -7080,7 +7080,7 @@
 "cGh" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/robotics)
 "cGi" = (/obj/structure/rack,/obj/item/clothing/head/welding{pixel_x = -3; pixel_y = 5},/obj/item/clothing/glasses/welding,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/weapon/packageWrap,/obj/item/borg/upgrade/rename,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/science/robotics)
 "cGj" = (/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room)
-"cGk" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"})
+"cGk" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"})
 "cGl" = (/obj/structure/lattice,/turf/space,/area/science/mixing{name = "\improper Toxins Lab"})
 "cGm" = (/obj/machinery/door/poddoor{id_tag = "mixvent"; name = "Mixer Room Vent"},/turf/simulated/floor/engine/vacuum,/area/science/mixing{name = "\improper Toxins Lab"})
 "cGn" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine/airless,/area/science/mixing{name = "\improper Toxins Lab"})
@@ -7123,7 +7123,7 @@
 "cGY" = (/obj/structure/rack,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = 6},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/machinery/light{dir = 4},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/science/robotics)
 "cGZ" = (/obj/structure/table,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"})
 "cHa" = (/turf/simulated/floor{dir = 1; icon_state = "whitepurplecorner"},/area/science/mixing{name = "\improper Toxins Lab"})
-"cHb" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"})
+"cHb" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"})
 "cHc" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine/airless,/area/science/mixing{name = "\improper Toxins Lab"})
 "cHd" = (/turf/simulated/floor/engine/airless,/area/science/mixing{name = "\improper Toxins Lab"})
 "cHe" = (/obj/machinery/door/airlock/glass_research{autoclose = 0; frequency = 1449; glass = 1; icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "8"},/turf/simulated/floor/engine,/area/science/mixing{name = "\improper Toxins Lab"})
@@ -7182,7 +7182,7 @@
 "cIf" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"})
 "cIg" = (/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"})
 "cIh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room)
-"cIi" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"})
+"cIi" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"})
 "cIj" = (/obj/structure/lattice,/obj/machinery/light/small,/turf/space,/area/science/mixing{name = "\improper Toxins Lab"})
 "cIk" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small,/turf/simulated/floor/engine/airless,/area/science/mixing{name = "\improper Toxins Lab"})
 "cIl" = (/obj/machinery/sparker{dir = 2; id_tag = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; frequency = 1443; id_tag = "air_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/airless,/area/science/mixing{name = "\improper Toxins Lab"})
@@ -9274,9 +9274,9 @@
 "dwr" = (/obj/structure/shuttle/engine/propulsion,/turf/space,/area/shuttle/vox/station)
 "dws" = (/turf/space,/turf/unsimulated/wall/cult,/area/wizard_station)
 "dwt" = (/turf/unsimulated/wall/cult,/area/wizard_station)
-"dwu" = (/obj/structure/window/full/plasmabasic,/turf/unsimulated/wall/fakeglass{dir = 8},/area/wizard_station)
-"dwv" = (/obj/structure/window/full/plasmabasic,/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows2"; dir = 8},/area/wizard_station)
-"dww" = (/obj/structure/window/full/plasmabasic,/turf/unsimulated/wall/fakeglass{dir = 4},/area/wizard_station)
+"dwu" = (/obj/structure/window/full/plasma,/turf/unsimulated/wall/fakeglass{dir = 8},/area/wizard_station)
+"dwv" = (/obj/structure/window/full/plasma,/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows2"; dir = 8},/area/wizard_station)
+"dww" = (/obj/structure/window/full/plasma,/turf/unsimulated/wall/fakeglass{dir = 4},/area/wizard_station)
 "dwx" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/visible{dir = 4},/obj/structure/catwalk,/turf/space,/area/mine/living_quarters)
 "dwy" = (/obj/machinery/vending/magivend,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "dwz" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
@@ -9309,7 +9309,7 @@
 "dxa" = (/obj/structure/table/woodentable,/obj/item/weapon/paper{info = "<p><b>LIST OF SPELLS AVAILABLE</b></p><p>Magic Missile:<br>This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage.</p><p>Fireball:<br>This spell fires a fireball at a target and does not require wizard garb. Be careful not to fire it at people that are standing next to you.</p><p>Disintegrate:</br>This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown.</p><p>Disable Technology:<br>This spell disables all weapons, cameras and most other technology in range.</p><p>Smoke:<br>This spell spawns a cloud of choking smoke at your location and does not require wizard garb.</p><p>Blind:<br>This spell temporarly blinds a single person and does not require wizard garb.<p>Forcewall:<br>This spell creates an unbreakable wall that lasts for 30 seconds and does not require wizard garb.</p><p>Blink:<br>This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience.</p><p>Teleport:<br>This spell teleports you to a type of area of your selection. Very useful if you are in danger, but has a decent cooldown, and is unpredictable.</p><p>Mutate:<br>This spell causes you to turn into a hulk, and gain telekinesis for a short while.</p><p>Ethereal Jaunt:<br>This spell creates your ethereal form, temporarily making you invisible and able to pass through walls.</p><p>Knock:<br>This spell opens nearby doors and does not require wizard garb.</p>"; name = "List of Available Spells (READ)"},/obj/item/trash/tray,/turf/unsimulated/floor{dir = 10; icon_state = "carpetside"},/area/wizard_station)
 "dxb" = (/turf/unsimulated/floor{icon_state = "carpetside"},/area/wizard_station)
 "dxc" = (/obj/structure/table/woodentable,/obj/effect/landmark{name = "Teleport-Scroll"},/turf/unsimulated/floor{dir = 6; icon_state = "carpetside"},/area/wizard_station)
-"dxd" = (/obj/structure/window/full/plasmabasic,/turf/unsimulated/wall/fakeglass{dir = 5},/area/wizard_station)
+"dxd" = (/obj/structure/window/full/plasma,/turf/unsimulated/wall/fakeglass{dir = 5},/area/wizard_station)
 "dxe" = (/obj/structure/showcase,/turf/unsimulated/floor{dir = 1; icon_state = "chapel"},/area/wizard_station)
 "dxf" = (/obj/structure/table/reinforced,/obj/structure/kitchenspike,/turf/unsimulated/floor{dir = 4; icon_state = "chapel"},/area/wizard_station)
 "dxg" = (/obj/structure/table/reinforced,/obj/structure/kitchenspike,/turf/unsimulated/floor{dir = 1; icon_state = "chapel"},/area/wizard_station)
@@ -9317,7 +9317,7 @@
 "dxi" = (/turf/unsimulated/wall/cult,/area)
 "dxj" = (/obj/effect/decal/cleanable/molten_item,/turf/unsimulated/floor{icon_state = "freezerfloor"},/area/wizard_station)
 "dxk" = (/obj/effect/decal/remains/xeno,/turf/unsimulated/floor{icon_state = "freezerfloor"},/area/wizard_station)
-"dxl" = (/obj/structure/window/full/plasmabasic,/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows2"; dir = 1},/area/wizard_station)
+"dxl" = (/obj/structure/window/full/plasma,/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows2"; dir = 1},/area/wizard_station)
 "dxm" = (/obj/item/trash/bustanuts,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "dxn" = (/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station)
 "dxo" = (/turf/unsimulated/floor{icon_state = "chapel"},/area/wizard_station)
@@ -9325,7 +9325,7 @@
 "dxq" = (/obj/machinery/door/poddoor{id_tag = ""; name = "Airlock"},/turf/unsimulated/wall/cult,/area/wizard_station)
 "dxr" = (/mob/living/simple_animal/hostile/creature{name = "Experiment 35b"},/turf/unsimulated/floor{icon_state = "freezerfloor"},/area/wizard_station)
 "dxs" = (/turf/unsimulated/floor{icon_state = "freezerfloor"},/area/wizard_station)
-"dxt" = (/obj/structure/window/full/plasmabasic,/turf/unsimulated/wall/fakeglass,/area/wizard_station)
+"dxt" = (/obj/structure/window/full/plasma,/turf/unsimulated/wall/fakeglass,/area/wizard_station)
 "dxu" = (/turf/unsimulated/floor{dir = 1; icon_state = "chapel"},/area/wizard_station)
 "dxv" = (/turf/unsimulated/floor{dir = 4; icon_state = "chapel"},/area/wizard_station)
 "dxw" = (/obj/effect/decal/cleanable/blood,/turf/unsimulated/floor{dir = 4; icon_state = "chapel"},/area/wizard_station)
@@ -9940,8 +9940,8 @@
 "dJo" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dJp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dJq" = (/obj/structure/table,/obj/item/weapon/rack_parts,/turf/simulated/floor,/area/derelict/bridge)
-"dJr" = (/obj/structure/table,/obj/structure/window/basic,/turf/simulated/floor,/area/derelict/bridge)
-"dJs" = (/obj/structure/window/basic,/turf/simulated/floor,/area/derelict/bridge)
+"dJr" = (/obj/structure/table,/obj/structure/window,/turf/simulated/floor,/area/derelict/bridge)
+"dJs" = (/obj/structure/window,/turf/simulated/floor,/area/derelict/bridge)
 "dJt" = (/obj/structure/table,/obj/structure/cable,/obj/machinery/power/apc{pixel_y = -24},/turf/simulated/floor,/area/derelict/bridge)
 "dJu" = (/obj/structure/table,/obj/machinery/light/small,/obj/item/weapon/stamp/denied,/turf/simulated/floor,/area/derelict/bridge)
 "dJv" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area/derelict/singularity_engine)
@@ -10000,7 +10000,7 @@
 "dKw" = (/turf/simulated/wall/r_wall,/area/derelict/hallway/primary)
 "dKx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dKy" = (/turf/simulated/floor/airless{broken = 1; icon_state = "damaged3"},/area/derelict/hallway/primary)
-"dKz" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
+"dKz" = (/obj/structure/window{dir = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dKA" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area/derelict/singularity_engine)
 "dKB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dKC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
@@ -10009,7 +10009,7 @@
 "dKF" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/airless{broken = 1; icon_state = "damaged3"},/area/derelict/hallway/primary)
 "dKG" = (/turf/simulated/floor/airless{broken = 1; icon_state = "floorscorched2"},/area/derelict/hallway/primary)
 "dKH" = (/obj/machinery/light/small,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
-"dKI" = (/obj/structure/grille,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/plating/airless,/area)
+"dKI" = (/obj/structure/grille,/obj/structure/window{dir = 8},/turf/simulated/floor/plating/airless,/area)
 "dKJ" = (/turf/simulated/floor/airless{broken = 1; icon_state = "floorscorched2"},/area)
 "dKK" = (/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area)
 "dKL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
@@ -10030,7 +10030,7 @@
 "dLa" = (/turf/simulated/wall,/area/derelict/arrival)
 "dLb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dLc" = (/obj/machinery/light/small,/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area/derelict/hallway/primary)
-"dLd" = (/obj/structure/window/full/basic,/turf/space,/area)
+"dLd" = (/obj/structure/window/full,/turf/space,/area)
 "dLe" = (/obj/structure/table,/turf/simulated/floor,/area/derelict/arrival)
 "dLf" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/derelict/arrival)
 "dLg" = (/turf/simulated/floor,/area/derelict/arrival)
@@ -10041,7 +10041,7 @@
 "dLl" = (/obj/item/weapon/shard,/turf/space,/area)
 "dLm" = (/obj/structure/grille,/turf/space,/area/derelict/singularity_engine)
 "dLn" = (/obj/item/weapon/shard,/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area/derelict/singularity_engine)
-"dLo" = (/obj/structure/lattice,/obj/structure/window/basic,/turf/space,/area)
+"dLo" = (/obj/structure/lattice,/obj/structure/window,/turf/space,/area)
 "dLp" = (/turf/simulated/floor/airless{broken = 1; icon_state = "floorscorched2"},/area/derelict/arrival)
 "dLq" = (/turf/simulated/floor/plating/airless,/area/derelict/arrival)
 "dLr" = (/turf/simulated/floor/airless{broken = 1; icon_state = "damaged3"},/area/derelict/arrival)
@@ -10063,9 +10063,9 @@
 "dLH" = (/turf/simulated/floor/airless{broken = 1; icon_state = "damaged3"},/area/derelict/medical)
 "dLI" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/medical)
 "dLJ" = (/obj/machinery/light/small,/turf/simulated/floor/airless{broken = 1; icon_state = "damaged4"},/area/derelict/singularity_engine)
-"dLK" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"dLL" = (/obj/structure/lattice,/obj/structure/window/basic{dir = 1},/turf/space,/area)
-"dLM" = (/obj/structure/lattice,/obj/structure/lattice,/obj/structure/window/basic{dir = 1},/turf/space,/area)
+"dLK" = (/obj/structure/window{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"dLL" = (/obj/structure/lattice,/obj/structure/window{dir = 1},/turf/space,/area)
+"dLM" = (/obj/structure/lattice,/obj/structure/lattice,/obj/structure/window{dir = 1},/turf/space,/area)
 "dLN" = (/turf/simulated/floor/plating,/area/derelict/arrival)
 "dLO" = (/obj/machinery/door/airlock/medical{name = "Morgue"; req_access_txt = "6"},/turf/simulated/floor{icon_state = "dark"},/area/derelict/medical/chapel)
 "dLP" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
@@ -10133,8 +10133,8 @@
 "dMZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
 "dNa" = (/obj/structure/closet/l3closet/general,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
 "dNb" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area)
-"dNc" = (/obj/structure/window/basic,/turf/space,/area)
-"dNd" = (/obj/structure/window/basic{dir = 8},/turf/space,/area)
+"dNc" = (/obj/structure/window,/turf/space,/area)
+"dNd" = (/obj/structure/window{dir = 8},/turf/space,/area)
 "dNe" = (/obj/machinery/light{dir = 8},/turf/simulated/floor,/area/derelict/arrival)
 "dNf" = (/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/derelict/arrival)
 "dNg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
@@ -10152,15 +10152,15 @@
 "dNs" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/research{name = "Toxins Research"; req_access_txt = "7"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dNt" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
 "dNu" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless,/area)
-"dNv" = (/obj/structure/window/basic{dir = 8},/obj/structure/window/basic,/turf/space,/area)
+"dNv" = (/obj/structure/window{dir = 8},/obj/structure/window,/turf/space,/area)
 "dNw" = (/obj/machinery/door/airlock/external{name = "Arrival Airlock"},/turf/simulated/floor/plating,/area/derelict/arrival)
 "dNx" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dNy" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/airless,/area)
 "dNz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
-"dNA" = (/obj/structure/window/basic{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
+"dNA" = (/obj/structure/window{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
 "dNB" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
 "dNC" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
-"dND" = (/obj/structure/window/basic,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
+"dND" = (/obj/structure/window,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
 "dNE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/research{name = "Toxins Research"; req_access_txt = "7"},/turf/simulated/floor/airless,/area/derelict/arrival)
 "dNF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/derelict/arrival)
 "dNG" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/derelict/arrival)
@@ -10170,10 +10170,10 @@
 "dNK" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dNL" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dNM" = (/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
-"dNN" = (/obj/structure/window/basic{dir = 1},/turf/space,/area)
-"dNO" = (/obj/structure/window/full/basic,/turf/simulated/floor/plating/airless,/area)
-"dNP" = (/obj/structure/grille,/obj/structure/window/basic{dir = 1},/turf/space,/area)
-"dNQ" = (/obj/structure/window/basic{dir = 1},/turf/simulated/floor/plating/airless,/area)
+"dNN" = (/obj/structure/window{dir = 1},/turf/space,/area)
+"dNO" = (/obj/structure/window/full,/turf/simulated/floor/plating/airless,/area)
+"dNP" = (/obj/structure/grille,/obj/structure/window{dir = 1},/turf/space,/area)
+"dNQ" = (/obj/structure/window{dir = 1},/turf/simulated/floor/plating/airless,/area)
 "dNR" = (/obj/structure/cable,/obj/machinery/power/apc{pixel_y = -24},/turf/simulated/floor,/area/derelict/arrival)
 "dNS" = (/obj/machinery/power/rad_collector,/turf/simulated/floor,/area/derelict/arrival)
 "dNT" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor,/area/derelict/arrival)
@@ -10189,15 +10189,15 @@
 "dOd" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dOe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall,/area/derelict/hallway/primary)
 "dOf" = (/obj/machinery/door/airlock/security{name = "Gas Storage"; req_access = null; req_access_txt = "3"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"dOg" = (/obj/structure/lattice,/obj/structure/window/basic{dir = 4},/turf/space,/area)
-"dOh" = (/obj/structure/girder,/obj/structure/window/basic,/turf/simulated/floor/plating/airless,/area/derelict/arrival)
+"dOg" = (/obj/structure/lattice,/obj/structure/window{dir = 4},/turf/space,/area)
+"dOh" = (/obj/structure/girder,/obj/structure/window,/turf/simulated/floor/plating/airless,/area/derelict/arrival)
 "dOi" = (/obj/structure/stool/bed,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dOj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dOk" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dOl" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dOm" = (/obj/machinery/door/airlock/security{name = "Security"; req_access = null; req_access_txt = "1"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dOn" = (/obj/item/weapon/cigbutt,/turf/space,/area)
-"dOo" = (/obj/structure/window/basic{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
+"dOo" = (/obj/structure/window{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
 "dOp" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/derelict/arrival)
 "dOq" = (/obj/structure/closet/crate/secure/plasma/prefilled,/turf/simulated/floor,/area/derelict/arrival)
 "dOr" = (/obj/item/weapon/pen,/obj/machinery/power/rad_collector,/turf/simulated/floor,/area/derelict/arrival)
@@ -10214,7 +10214,7 @@
 "dOC" = (/obj/structure/stool,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dOD" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Access"; req_access_txt = "24"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dOE" = (/obj/structure/closet/wardrobe/orange,/turf/simulated/floor/airless,/area)
-"dOF" = (/obj/structure/window/basic{dir = 4},/turf/space,/area)
+"dOF" = (/obj/structure/window{dir = 4},/turf/space,/area)
 "dOG" = (/obj/structure/grille,/turf/simulated/floor/plating,/area/derelict/arrival)
 "dOH" = (/obj/structure/closet/wardrobe,/turf/simulated/floor,/area/derelict/arrival)
 "dOI" = (/turf/simulated/floor/airless{broken = 1; icon_state = "floorscorched1"},/area/derelict/hallway/primary)
@@ -10240,7 +10240,7 @@
 "dPc" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating/airless,/area)
 "dPd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/wall/r_wall,/area)
 "dPe" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/wall/r_wall,/area/derelict/hallway/secondary)
-"dPf" = (/obj/structure/window/basic{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"dPf" = (/obj/structure/window{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
 "dPg" = (/turf/space,/area/shuttle/salvage/derelict)
 "dPh" = (/obj/structure/grille,/obj/item/weapon/shard,/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area)
 "dPi" = (/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating/airless,/area)
@@ -10287,8 +10287,8 @@
 "dPX" = (/obj/machinery/door/airlock/command{name = "AI Upload"; req_access_txt = "16"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/tape/engineering{icon_state = "engineering_door"; layer = 3.2},/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dPY" = (/obj/machinery/door/airlock/external{name = "Escape Airlock"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
 "dPZ" = (/obj/machinery/door/firedoor/border_only{name = "Firelock East"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"dQa" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"dQb" = (/obj/structure/window/basic{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"dQa" = (/obj/structure/window{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"dQb" = (/obj/structure/window{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
 "dQc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dQd" = (/obj/structure/closet/emcloset,/turf/simulated/floor/airless,/area/derelict/hallway/secondary)
 "dQe" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
@@ -10813,7 +10813,7 @@
 "eae" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/clipboard,/obj/item/weapon/pen,/obj/item/weapon/folder,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
 "eaf" = (/obj/structure/table,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/item/device/measuring_tape,/obj/item/weapon/crowbar,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
 "eag" = (/obj/machinery/atmospherics/unary/tank/nitrogen,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
-"eah" = (/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 4},/obj/machinery/door/window{base_state = "left"; dir = 2; name = "Spectroscopy"; req_access_txt = "47"},/obj/machinery/door/window{base_state = "left"; dir = 1; name = "Spectroscopy"; req_access_txt = "47"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
+"eah" = (/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/machinery/door/window{base_state = "left"; dir = 2; name = "Spectroscopy"; req_access_txt = "47"},/obj/machinery/door/window{base_state = "left"; dir = 1; name = "Spectroscopy"; req_access_txt = "47"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
 "eai" = (/obj/machinery/camera{c_tag = "Research Outpost Anomalous Materials Lab"; dir = 8; network = list("RD","SS13")},/obj/machinery/atmospherics/unary/cold_sink/freezer{current_temperature = 273},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
 "eaj" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/sign/science{desc = "A warning sign which reads 'ANOMALOUS MATERIALS'"; name = "\improper ANOMALOUS MATERIALS"; pixel_x = -32},/turf/simulated/floor{dir = 1; icon_state = "whitepurplecorner"},/area/research_outpost/hallway)
 "eak" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{dir = 4; icon_state = "whiteyellow"},/area/research_outpost/hallway)
@@ -10840,9 +10840,9 @@
 "eaI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway)
 "eaJ" = (/obj/machinery/light{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "whitebluecorner"},/area/research_outpost/hallway)
 "eaK" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/research_outpost/anomaly)
-"eaL" = (/obj/machinery/power/emitter{anchored = 1; state = 2},/obj/structure/cable,/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor/plating{dir = 5; icon_state = "floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/anomaly)
-"eaM" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/obj/structure/window/plasmareinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 4; icon_state = "whitered"},/area/research_outpost/anomaly)
-"eaN" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor{dir = 8; icon_state = "whitered"},/area/research_outpost/anomaly)
+"eaL" = (/obj/machinery/power/emitter{anchored = 1; state = 2},/obj/structure/cable,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/plating{dir = 5; icon_state = "floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/anomaly)
+"eaM" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/obj/structure/window/reinforced/plasma{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 4; icon_state = "whitered"},/area/research_outpost/anomaly)
+"eaN" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor{dir = 8; icon_state = "whitered"},/area/research_outpost/anomaly)
 "eaO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/camera{c_tag = "Research Outpost Hallway Engineering"; dir = 4; network = list("RD","SS13")},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway)
 "eaP" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{dir = 4; icon_state = "whiteyellowcorner"},/area/research_outpost/hallway)
 "eaQ" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/research_outpost/power)
@@ -10869,7 +10869,7 @@
 "ebl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway)
 "ebm" = (/obj/machinery/door/window{dir = 8; base_state = "left"; name = "Monkey Pen"; req_access_txt = "47"},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway)
 "ebn" = (/obj/structure/disposalpipe/segment,/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway)
-"ebo" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/turf/simulated/floor/plating{icon_state = "floor"; dir = 6},/area/research_outpost/anomaly)
+"ebo" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/turf/simulated/floor/plating{icon_state = "floor"; dir = 6},/area/research_outpost/anomaly)
 "ebp" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 4; icon_state = "whiteredcorner"},/area/research_outpost/anomaly)
 "ebq" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 1; icon_state = "whitered"},/area/research_outpost/anomaly)
 "ebr" = (/obj/machinery/anomaly/hyperspectral,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/turf/simulated/floor{dir = 1; icon_state = "whiteredcorner"},/area/research_outpost/anomaly)
@@ -11767,7 +11767,7 @@
 "esE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "white"},/area/science/mixing{name = "\improper Toxins Lab"})
 "esF" = (/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor{dir = 10; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"})
 "esG" = (/obj/effect/landmark/start{name = "Scientist"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/mixing{name = "\improper Toxins Lab"})
-"esH" = (/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/poddoor/preopen{id_tag = "toxins_blastdoor"; name = "biohazard containment door"},/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"})
+"esH" = (/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/poddoor/preopen{id_tag = "toxins_blastdoor"; name = "biohazard containment door"},/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"})
 "esI" = (/turf/simulated/floor,/area/science/mixing{name = "\improper Toxins Lab"})
 "esJ" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"})
 "esK" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "white"},/area/science/mixing{name = "\improper Toxins Lab"})

maps/taxistation.dmm

@@ -3031,12 +3031,12 @@
 "bgo" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "white"},/area/science/telescience)
 "bgp" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "white"},/area/science/telescience)
 "bgq" = (/obj/machinery/shieldwallgen,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor{icon_state = "white"},/area/science/telescience)
-"bgr" = (/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing)
-"bgs" = (/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/turf/simulated/floor/plating,/area/science/mixing)
+"bgr" = (/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing)
+"bgs" = (/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/turf/simulated/floor/plating,/area/science/mixing)
 "bgt" = (/obj/machinery/door/airlock/glass_research{name = "Toxins Lab"; req_access_txt = "8"},/obj/machinery/door/firedoor/border_only{dir = 2; name = "hazard door south"},/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/turf/simulated/floor,/area/science/mixing)
-"bgu" = (/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 8},/turf/simulated/floor/plating,/area/science/mixing)
-"bgv" = (/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing)
-"bgw" = (/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/science/mixing)
+"bgu" = (/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 8},/turf/simulated/floor/plating,/area/science/mixing)
+"bgv" = (/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing)
+"bgw" = (/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/science/mixing)
 "bgx" = (/obj/machinery/status_display,/turf/simulated/wall/r_wall,/area/science/xenobiology)
 "bgy" = (/obj/structure/table,/obj/machinery/reagentgrinder,/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology)
 "bgz" = (/obj/machinery/processor{desc = "A machine used to process slimes and retrieve their extract."; name = "Slime Processor"},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology)
@@ -3057,7 +3057,7 @@
 "bgO" = (/turf/simulated/wall/r_wall,/area/prison/closet)
 "bgP" = (/obj/machinery/door/airlock/glass_security{name = "Security Office"; req_access_txt = "1"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/turf/simulated/floor,/area/prison/closet)
 "bgQ" = (/turf/simulated/wall/r_wall,/area/security/detectives_office)
-"bgR" = (/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/turf/simulated/floor/plating,/area/science/telescience)
+"bgR" = (/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/turf/simulated/floor/plating,/area/science/telescience)
 "bgS" = (/obj/machinery/door/poddoor{id_tag = "telelab"; name = "test chamber blast door"},/turf/simulated/floor/engine,/area/science/telescience)
 "bgT" = (/obj/item/device/transfer_valve{pixel_x = -5},/obj/item/device/transfer_valve{pixel_x = -5},/obj/item/device/transfer_valve,/obj/item/device/transfer_valve,/obj/item/device/transfer_valve{pixel_x = 5},/obj/item/device/transfer_valve{pixel_x = 5},/obj/structure/table/reinforced,/obj/machinery/requests_console{department = "Science"; departmentType = 2; dir = 2; name = "Science Requests Console"; pixel_x = 0; pixel_y = 30},/turf/simulated/floor{icon_state = "white"},/area/science/mixing)
 "bgU" = (/obj/item/device/assembly/timer{pixel_x = 5; pixel_y = 4},/obj/item/device/assembly/timer{pixel_x = -4; pixel_y = 2},/obj/item/device/assembly/timer{pixel_x = 6; pixel_y = -4},/obj/item/device/assembly/timer,/obj/structure/table/reinforced,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver{pixel_y = 10},/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor{icon_state = "white"},/area/science/mixing)
@@ -3159,7 +3159,7 @@
 "biM" = (/turf/simulated/wall/r_wall,/area/science/mixing)
 "biN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/research{name = "Toxins Lab"; req_access_txt = "8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/science/mixing)
 "biO" = (/obj/machinery/atmospherics/pipe/simple/insulated/visible,/turf/simulated/wall/r_wall,/area/science/mixing)
-"biP" = (/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/full/plasmareinforced,/turf/simulated/floor/plating,/area/science/mixing)
+"biP" = (/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor/plating,/area/science/mixing)
 "biQ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/structure/sign/deathsposal{pixel_y = -32},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology)
 "biR" = (/obj/machinery/camera{c_tag = "Xenobiology South"; dir = 1},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/door_control{id_tag = "xenobio3"; name = "Containment Blast Doors"; pixel_y = -26; req_access_txt = "55"},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology)
 "biS" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon_state = "right"; name = "Containment Pen"; req_access_txt = "55"},/obj/effect/decal/warning_stripes{icon_state = "3"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/science/xenobiology)
@@ -5945,7 +5945,7 @@
 "ckq" = (/obj/item/weapon/paper/crumpled,/turf/simulated/floor/plating,/area/derelict/bridge)
 "ckr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor,/area/derelict/bridge)
 "cks" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/derelict/bridge)
-"ckt" = (/obj/structure/window/basic,/obj/item/weapon/stamp/denied,/turf/simulated/floor/plating,/area/derelict/bridge)
+"ckt" = (/obj/structure/window,/obj/item/weapon/stamp/denied,/turf/simulated/floor/plating,/area/derelict/bridge)
 "cku" = (/obj/structure/table,/obj/structure/cable,/obj/machinery/power/apc{pixel_y = -24},/turf/simulated/floor,/area/derelict/bridge)
 "ckv" = (/obj/structure/table,/obj/machinery/light/small,/turf/simulated/floor,/area/derelict/bridge)
 "ckw" = (/obj/structure/girder/reinforced,/turf/space,/area/derelict/bridge)

maps/tgstation.dmm

@@ -5003,9 +5003,9 @@
 "bSk" = (/obj/machinery/door/firedoor/border_only{dir = 1; name = "hazard door north"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
 "bSl" = (/obj/machinery/door/firedoor/border_only{dir = 1; name = "hazard door north"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 9; icon_state = "whitehall"},/area/science/hallway)
 "bSm" = (/turf/simulated/wall/r_wall,/area/science/mixing)
-"bSn" = (/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/obj/structure/window/full/plasmareinforced,/turf/simulated/floor/plating,/area/science/mixing)
-"bSo" = (/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced,/obj/structure/grille,/obj/structure/disposalpipe/segment,/obj/structure/window/full/plasmareinforced,/turf/simulated/floor/plating,/area/science/mixing)
-"bSp" = (/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/obj/structure/grille,/obj/structure/window/full/plasmareinforced,/turf/simulated/floor/plating,/area/science/mixing)
+"bSn" = (/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor/plating,/area/science/mixing)
+"bSo" = (/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma,/obj/structure/grille,/obj/structure/disposalpipe/segment,/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor/plating,/area/science/mixing)
+"bSp" = (/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/structure/grille,/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor/plating,/area/science/mixing)
 "bSq" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "bSr" = (/obj/structure/catwalk{icon_state = "catwalk1"},/turf/space,/area)
 "bSs" = (/obj/machinery/door/airlock/external{name = "Toxins Test Chamber"; req_access_txt = "0"},/turf/simulated/floor/plating/airless,/area/science/test_area)
@@ -5085,13 +5085,13 @@
 "bTO" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{icon_state = "dark"},/area/science/storage)
 "bTP" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/science/hallway)
 "bTQ" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
-"bTR" = (/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor/plating,/area/science/mixing)
+"bTR" = (/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/plating,/area/science/mixing)
 "bTS" = (/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor{icon_state = "white"},/area/science/mixing)
 "bTT" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor{icon_state = "white"},/area/science/mixing)
-"bTU" = (/obj/machinery/portable_atmospherics/canister,/obj/machinery/firealarm{pixel_y = 24},/obj/structure/window/plasmareinforced{dir = 8},/turf/simulated/floor{dir = 10; icon_state = "whitepurple"},/area/science/mixing)
+"bTU" = (/obj/machinery/portable_atmospherics/canister,/obj/machinery/firealarm{pixel_y = 24},/obj/structure/window/reinforced/plasma{dir = 8},/turf/simulated/floor{dir = 10; icon_state = "whitepurple"},/area/science/mixing)
 "bTV" = (/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor{icon_state = "whitepurple"},/area/science/mixing)
 "bTW" = (/obj/machinery/portable_atmospherics/scrubber,/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "whitepurple"},/area/science/mixing)
-"bTX" = (/obj/machinery/portable_atmospherics/pump,/obj/structure/window/plasmareinforced{dir = 4},/turf/simulated/floor{icon_state = "whitepurple"},/area/science/mixing)
+"bTX" = (/obj/machinery/portable_atmospherics/pump,/obj/structure/window/reinforced/plasma{dir = 4},/turf/simulated/floor{icon_state = "whitepurple"},/area/science/mixing)
 "bTY" = (/obj/structure/table/reinforced,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver{pixel_y = 10},/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor{dir = 6; icon_state = "whitepurple"},/area/science/mixing)
 "bTZ" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/light{dir = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor{icon_state = "white"},/area/science/mixing)
 "bUa" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHWEST)"; icon_state = "warning"; dir = 9},/turf/simulated/floor{icon_state = "white"},/area/science/mixing)
@@ -5424,11 +5424,11 @@
 "cap" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita,/obj/machinery/light_switch{pixel_y = 25},/turf/simulated/floor{dir = 5; icon_state = "whiteblue"},/area/medical/break_room)
 "caq" = (/obj/structure/table,/obj/item/weapon/circular_saw{pixel_y = 4},/obj/item/weapon/scalpel{pixel_y = 14},/turf/simulated/floor{icon_state = "white"},/area/science/robotics)
 "car" = (/obj/machinery/door/window{base_state = "right"; dir = 1; name = "Test Chamber"; req_access_txt = "47"},/obj/machinery/door/window{dir = 2; base_state = "right"; name = "Test Chamber"; req_access_txt = "47"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine,/area/science/telescience)
-"cas" = (/obj/structure/window/plasmareinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/engine,/area/science/telescience)
-"cat" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/engine,/area/science/telescience)
+"cas" = (/obj/structure/window/reinforced/plasma{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/engine,/area/science/telescience)
+"cat" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/engine,/area/science/telescience)
 "cau" = (/obj/machinery/door/window{base_state = "left"; dir = 1; name = "Test Chamber"; req_access_txt = "47"},/obj/machinery/door/window{dir = 2; base_state = "left"; name = "Test Chamber"; req_access_txt = "47"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine,/area/science/telescience)
 "cav" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/turf/simulated/floor,/area/science/storage)
-"caw" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/disposalpipe/segment,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/engine,/area/science/telescience)
+"caw" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/disposalpipe/segment,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/engine,/area/science/telescience)
 "cax" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 0; scrub_CO2 = 0; scrub_Toxins = 0},/turf/simulated/floor/engine,/area/science/telescience)
 "cay" = (/turf/simulated/wall,/area/science/telescience)
 "caz" = (/obj/machinery/light_switch{pixel_y = -23},/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "floorgrime"},/area/science/storage)
@@ -5510,7 +5510,7 @@
 "cbX" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
 "cbY" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
 "cbZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
-"cca" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing)
+"cca" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing)
 "ccb" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine/airless,/area/science/mixing)
 "ccc" = (/obj/machinery/door/poddoor{id_tag = "toxin_mix"; name = "Mixing Chamber Shutters"},/turf/simulated/floor/engine/vacuum,/area/science/mixing)
 "ccd" = (/obj/machinery/atmospherics/binary/valve{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/mixing)
@@ -5588,7 +5588,7 @@
 "cdx" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/hologram/holopad,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "white"},/area/science/telescience)
 "cdy" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "white"},/area/science/telescience)
 "cdz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/beacon,/turf/simulated/floor{icon_state = "white"},/area/science/telescience)
-"cdA" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/turf/simulated/floor/engine,/area/science/telescience)
+"cdA" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/grille,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/turf/simulated/floor/engine,/area/science/telescience)
 "cdB" = (/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume{frequency = 1449; id_tag = "tox_airlock_pump"},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine,/area/science/mixing)
 "cdC" = (/obj/machinery/door/firedoor/border_only{name = "hazard door east"},/obj/machinery/door/airlock/research{name = "Miscellaneous Research"; req_access_txt = "47"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
 "cdD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
@@ -5598,7 +5598,7 @@
 "cdH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
 "cdI" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
 "cdJ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
-"cdK" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing)
+"cdK" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing)
 "cdL" = (/obj/machinery/sparker{id_tag = "mixingsparker"; pixel_x = 25},/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; frequency = 1443; icon_state = "on"; id_tag = "air_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/airless,/area/science/mixing)
 "cdM" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "cdN" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/closet/firecloset,/obj/item/taperoll/atmos,/obj/item/clothing/gloves/black,/turf/simulated/floor,/area/engineering/atmos_control)
@@ -5661,7 +5661,7 @@
 "ceS" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
 "ceT" = (/obj/machinery/camera{c_tag = "Research Division South"; dir = 1},/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
 "ceU" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
-"ceV" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing)
+"ceV" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/science/mixing)
 "ceW" = (/obj/machinery/camera{c_tag = "Atmospherics Monitoring"; dir = 8},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/computer/general_air_control/atmos_automation,/turf/simulated/floor{icon_state = "caution"; dir = 4},/area/engineering/atmos_control)
 "ceX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/sign/fire{pixel_y = -32},/obj/machinery/atmospherics/binary/pump{dir = 8; icon_state = "intact_on"; on = 1},/obj/machinery/camera{c_tag = "Toxins Mixing"; dir = 1; network = list("SS13")},/obj/machinery/light/small,/turf/simulated/floor/engine,/area/science/mixing)
 "ceY" = (/obj/machinery/atmospherics/binary/valve{dir = 4},/obj/machinery/light,/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/mixing)
@@ -7024,7 +7024,7 @@
 "cFd" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber)
 "cFe" = (/obj/machinery/airlock_sensor{id_tag = "inc_ext_airlock_sensor"; master_tag = "inc_airlock_control"; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber)
 "cFf" = (/obj/machinery/embedded_controller/radio/advanced_airlock_controller{frequency = 1449; id_tag = "inc_airlock_control"; pixel_x = -24; tag_airpump = "inc_airlock_pump"; tag_chamber_sensor = "inc_chamber_airlock_sensor"; tag_exterior_door = "inc_airlock_exterior"; tag_exterior_sensor = "inc_ext_airlock_sensor"; tag_interior_door = "inc_airlock_interior"; tag_interior_sensor = "inc_int_airlock_sensor"},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor,/area/engineering/burn_chamber)
-"cFg" = (/obj/structure/window/full/plasmareinforced,/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
+"cFg" = (/obj/structure/window/full/reinforced/plasma,/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
 "cFh" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/atmospherics/unary/cap/hidden/general{tag = "icon-cap (WEST)"; icon_state = "cap"; dir = 8},/turf/simulated/floor{dir = 9; icon_state = "yellowfull"},/area/engineering/burn_chamber)
 "cFi" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/atmospherics/unary/portables_connector,/turf/simulated/floor{dir = 9; icon_state = "yellowfull"},/area/engineering/burn_chamber)
 "cFj" = (/turf/simulated/floor,/area/engineering/burn_chamber)
@@ -7073,7 +7073,7 @@
 "cGa" = (/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6)
 "cGb" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber)
 "cGc" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; frequency = 1449; id_tag = "inc_in"},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber)
-"cGd" = (/obj/structure/window/full/plasmareinforced,/obj/machinery/atmospherics/pipe/simple/yellow/hidden{dir = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
+"cGd" = (/obj/structure/window/full/reinforced/plasma,/obj/machinery/atmospherics/pipe/simple/yellow/hidden{dir = 4},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
 "cGe" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/manifold/yellow/hidden,/obj/machinery/meter{name = "Fuel Meter"},/turf/simulated/floor{dir = 6; icon_state = "yellow"},/area/engineering/burn_chamber)
 "cGf" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/manifold/yellow/hidden,/turf/simulated/floor{dir = 6; icon_state = "yellow"},/area/engineering/burn_chamber)
 "cGg" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/yellow/hidden{dir = 9},/turf/simulated/floor{dir = 6; icon_state = "yellow"},/area/engineering/burn_chamber)
@@ -7118,7 +7118,7 @@
 "cGT" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6)
 "cGU" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/lattice,/obj/structure/lattice,/turf/space,/area)
 "cGV" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/obj/machinery/air_sensor{frequency = 1449; id_tag = "inc_sensor"; output = 63},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber)
-"cGW" = (/obj/structure/window/full/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
+"cGW" = (/obj/structure/window/full/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
 "cGX" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos)
 "cGY" = (/obj/machinery/door_control{desc = "Lets all the hot gas out very quickly."; id_tag = "Burn Chamber Vent"; name = "Burn Chamber Vent"; pixel_x = -7; pixel_y = 32; req_access_txt = "0"},/obj/machinery/ignition_switch{id_tag = "Burn Chamber Igniter"; pixel_x = 6; pixel_y = 32},/turf/simulated/floor,/area/engineering/burn_chamber)
 "cGZ" = (/obj/machinery/atmospherics/binary/pump{name = "Hot Fill Pump"},/turf/simulated/floor/plating,/area/engineering/burn_chamber)
@@ -7151,7 +7151,7 @@
 "cHA" = (/obj/machinery/door/poddoor{desc = "By gods, release the hounds!"; id_tag = "xenobioout6"; name = "Containment Release"},/obj/machinery/atmospherics/pipe/simple/filtering/hidden,/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6)
 "cHB" = (/obj/structure/sign/biohazard,/turf/simulated/wall/r_wall,/area/science/xenobiology/specimen_6)
 "cHC" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/igniter{id_tag = "Burn Chamber Igniter"},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber)
-"cHD" = (/obj/structure/window/full/plasmareinforced,/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
+"cHD" = (/obj/structure/window/full/reinforced/plasma,/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
 "cHE" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos)
 "cHF" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/decal/warning_stripes/pathmarkers/blue,/obj/effect/decal/warning_stripes/pathmarkers/blue{tag = "icon-pathmarker (NORTH)"; icon_state = "pathmarker"; dir = 1},/turf/simulated/floor,/area/engineering/engine)
 "cHG" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/decal/warning_stripes/pathmarkers/red,/obj/effect/decal/warning_stripes/pathmarkers/red{tag = "icon-pathmarker (NORTH)"; icon_state = "pathmarker"; dir = 1},/turf/simulated/floor,/area/engineering/engine)
@@ -7195,7 +7195,7 @@
 "cIs" = (/obj/machinery/camera{c_tag = "Engine West"; dir = 4},/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 4},/obj/effect/decal/warning_stripes/pathmarkers/red{tag = "icon-pathmarker (WEST)"; icon_state = "pathmarker"; dir = 8},/obj/effect/decal/warning_stripes/pathmarkers/red{tag = "icon-pathmarker (EAST)"; icon_state = "pathmarker"; dir = 4},/turf/simulated/floor,/area/engineering/engine)
 "cIt" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/engineering/burn_chamber)
 "cIu" = (/obj/machinery/atmospherics/pipe/manifold/insulated/hidden{dir = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber)
-"cIv" = (/obj/structure/window/full/plasmareinforced,/obj/machinery/atmospherics/pipe/manifold/insulated/hidden{dir = 1},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/grille,/obj/machinery/meter{name = "Vent Gas Meter"},/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
+"cIv" = (/obj/structure/window/full/reinforced/plasma,/obj/machinery/atmospherics/pipe/manifold/insulated/hidden{dir = 1},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/obj/machinery/meter{name = "Vent Gas Meter"},/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
 "cIw" = (/obj/machinery/atmospherics/binary/valve/digital{dir = 4; name = "Hot Loop Release Valve"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor/plating,/area/engineering/burn_chamber)
 "cIx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 9},/obj/effect/decal/warning_stripes/pathmarkers/red{tag = "icon-pathmarker (NORTH)"; icon_state = "pathmarker"; dir = 1},/obj/effect/decal/warning_stripes/pathmarkers/red{tag = "icon-pathmarker (WEST)"; icon_state = "pathmarker"; dir = 8},/turf/simulated/floor,/area/engineering/engine)
 "cIy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes/pathmarkers/blue,/obj/effect/decal/warning_stripes/pathmarkers/blue{tag = "icon-pathmarker (NORTH)"; icon_state = "pathmarker"; dir = 1},/turf/simulated/floor,/area/engineering/engine)
@@ -7235,7 +7235,7 @@
 "cJg" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 1; icon_state = "intact_on"; name = "Gas filter (Xeno cell 6)"; on = 1; req_access = null; req_access_txt = "55"},/turf/simulated/floor/plating,/area/maintenance/asmaint3)
 "cJh" = (/obj/machinery/atmospherics/pipe/simple/filtering/hidden{dir = 9},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/asmaint3)
 "cJi" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; frequency = 1449; id_tag = "inc_out"; name = "Burn Chamber Scrubber"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber)
-"cJj" = (/obj/structure/window/full/plasmareinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 5},/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
+"cJj" = (/obj/structure/window/full/reinforced/plasma,/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 5},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber)
 "cJk" = (/obj/machinery/atmospherics/binary/valve/digital{dir = 4; name = "Cold Loop Release Valve"},/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor/plating,/area/engineering/burn_chamber)
 "cJl" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/obj/effect/decal/warning_stripes/pathmarkers/blue{tag = "icon-pathmarker (WEST)"; icon_state = "pathmarker"; dir = 8},/obj/effect/decal/warning_stripes/pathmarkers/blue{tag = "icon-pathmarker (EAST)"; icon_state = "pathmarker"; dir = 4},/turf/simulated/floor,/area/engineering/engine)
 "cJm" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "engineering_west_airlock"; name = "interior access button"; pixel_x = -20; pixel_y = -20; req_access_txt = "10;13"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/effect/decal/warning_stripes/pathmarkers/blue{tag = "icon-pathmarker (WEST)"; icon_state = "pathmarker"; dir = 8},/obj/effect/decal/warning_stripes/pathmarkers/blue{tag = "icon-pathmarker (EAST)"; icon_state = "pathmarker"; dir = 4},/turf/simulated/floor,/area/engineering/engine)
@@ -9657,8 +9657,8 @@
 "dDK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dDL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dDM" = (/obj/structure/table,/obj/item/weapon/rack_parts,/turf/simulated/floor,/area/derelict/bridge)
-"dDN" = (/obj/structure/table,/obj/structure/window/basic,/turf/simulated/floor,/area/derelict/bridge)
-"dDO" = (/obj/structure/window/basic,/turf/simulated/floor,/area/derelict/bridge)
+"dDN" = (/obj/structure/table,/obj/structure/window,/turf/simulated/floor,/area/derelict/bridge)
+"dDO" = (/obj/structure/window,/turf/simulated/floor,/area/derelict/bridge)
 "dDP" = (/obj/structure/table,/obj/structure/cable,/obj/machinery/power/apc{pixel_y = -24},/turf/simulated/floor,/area/derelict/bridge)
 "dDQ" = (/obj/structure/table,/obj/machinery/light/small,/obj/item/weapon/stamp/denied,/turf/simulated/floor,/area/derelict/bridge)
 "dDR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless{broken = 1; icon_state = "damaged3"},/area/derelict/hallway/primary)
@@ -9718,7 +9718,7 @@
 "dET" = (/turf/simulated/wall/r_wall,/area/derelict/hallway/primary)
 "dEU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dEV" = (/obj/item/weapon/paper{info = "<b>Objective #1</b>: Destroy the station with a nuclear device."; name = "Objectives of a Nuclear Operative"},/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area/derelict/singularity_engine)
-"dEW" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
+"dEW" = (/obj/structure/window{dir = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dEX" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor/airless{broken = 1; icon_state = "damaged4"},/area/derelict/singularity_engine)
 "dEY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dEZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
@@ -9727,7 +9727,7 @@
 "dFc" = (/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area/derelict/singularity_engine)
 "dFd" = (/obj/item/weapon/shard,/turf/simulated/floor/airless{broken = 1; icon_state = "damaged5"},/area/derelict/singularity_engine)
 "dFe" = (/obj/machinery/light/small,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
-"dFf" = (/obj/structure/grille,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/plating/airless,/area)
+"dFf" = (/obj/structure/grille,/obj/structure/window{dir = 8},/turf/simulated/floor/plating/airless,/area)
 "dFg" = (/obj/item/weapon/shard,/obj/structure/grille{density = 0; destroyed = 1; health = 0; icon_state = "brokengrille"},/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; name = "Syndicate agent remains"},/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area/derelict/singularity_engine)
 "dFh" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area/derelict/hallway/primary)
 "dFi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
@@ -9748,7 +9748,7 @@
 "dFx" = (/turf/simulated/wall,/area/derelict/arrival)
 "dFy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dFz" = (/obj/item/stack/medical/ointment,/turf/simulated/floor/airless{broken = 1; icon_state = "damaged3"},/area/derelict/medical)
-"dFA" = (/obj/structure/window/full/basic,/turf/space,/area)
+"dFA" = (/obj/structure/window/full,/turf/space,/area)
 "dFB" = (/obj/structure/table,/turf/simulated/floor,/area/derelict/arrival)
 "dFC" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/derelict/arrival)
 "dFD" = (/turf/simulated/floor,/area/derelict/arrival)
@@ -9759,7 +9759,7 @@
 "dFI" = (/obj/item/weapon/shard,/turf/space,/area)
 "dFJ" = (/obj/structure/grille,/turf/space,/area/derelict/singularity_engine)
 "dFK" = (/obj/item/stack/medical/bruise_pack,/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area/derelict/medical)
-"dFL" = (/obj/structure/lattice,/obj/structure/window/basic,/turf/space,/area)
+"dFL" = (/obj/structure/lattice,/obj/structure/window,/turf/space,/area)
 "dFM" = (/turf/simulated/floor/airless{broken = 1; icon_state = "damaged5"},/area)
 "dFN" = (/turf/simulated/floor/plating/airless,/area/derelict/arrival)
 "dFO" = (/obj/item/weapon/shard,/obj/structure/grille{density = 0; destroyed = 1; health = 0; icon_state = "brokengrille"},/turf/simulated/floor/plating/airless,/area/derelict/medical)
@@ -9781,9 +9781,9 @@
 "dGe" = (/turf/simulated/floor/plating/airless{broken = 1; icon_state = "platingdmg1"},/area/derelict/hallway/secondary)
 "dGf" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/medical)
 "dGg" = (/turf/simulated/floor/airless{broken = 1; icon_state = "damaged5"},/area/derelict/hallway/primary)
-"dGh" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"dGi" = (/obj/structure/lattice,/obj/structure/window/basic{dir = 1},/turf/space,/area)
-"dGj" = (/obj/structure/lattice,/obj/structure/lattice,/obj/structure/window/basic{dir = 1},/turf/space,/area)
+"dGh" = (/obj/structure/window{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"dGi" = (/obj/structure/lattice,/obj/structure/window{dir = 1},/turf/space,/area)
+"dGj" = (/obj/structure/lattice,/obj/structure/lattice,/obj/structure/window{dir = 1},/turf/space,/area)
 "dGk" = (/turf/simulated/floor/plating,/area/derelict/arrival)
 "dGl" = (/obj/machinery/door/airlock/medical{name = "Morgue"; req_access_txt = "6"},/turf/simulated/floor{icon_state = "dark"},/area/derelict/medical/chapel)
 "dGm" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
@@ -9854,8 +9854,8 @@
 "dHz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
 "dHA" = (/obj/structure/closet/l3closet/general,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
 "dHB" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area)
-"dHC" = (/obj/structure/window/basic,/turf/space,/area)
-"dHD" = (/obj/structure/window/basic{dir = 8},/turf/space,/area)
+"dHC" = (/obj/structure/window,/turf/space,/area)
+"dHD" = (/obj/structure/window{dir = 8},/turf/space,/area)
 "dHE" = (/obj/machinery/light{dir = 8},/turf/simulated/floor,/area/derelict/arrival)
 "dHF" = (/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/derelict/arrival)
 "dHG" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
@@ -9874,15 +9874,15 @@
 "dHT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/research{name = "Toxins Research"; req_access_txt = "7"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dHU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
 "dHV" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless,/area)
-"dHW" = (/obj/structure/window/basic{dir = 8},/obj/structure/window/basic,/turf/space,/area)
+"dHW" = (/obj/structure/window{dir = 8},/obj/structure/window,/turf/space,/area)
 "dHX" = (/obj/machinery/door/airlock/external{name = "Arrival Airlock"},/turf/simulated/floor/plating,/area/derelict/arrival)
 "dHY" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dHZ" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/airless,/area)
 "dIa" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
-"dIb" = (/obj/structure/window/basic{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
+"dIb" = (/obj/structure/window{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
 "dIc" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
 "dId" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area)
-"dIe" = (/obj/structure/window/basic,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
+"dIe" = (/obj/structure/window,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/airless,/area)
 "dIf" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/research{name = "Toxins Research"; req_access_txt = "7"},/turf/simulated/floor/airless,/area/derelict/arrival)
 "dIg" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/derelict/arrival)
 "dIh" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/derelict/arrival)
@@ -9892,10 +9892,10 @@
 "dIl" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dIm" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dIn" = (/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
-"dIo" = (/obj/structure/window/basic{dir = 1},/turf/space,/area)
-"dIp" = (/obj/structure/window/full/basic,/turf/simulated/floor/plating/airless,/area)
-"dIq" = (/obj/structure/grille,/obj/structure/window/basic{dir = 1},/turf/space,/area)
-"dIr" = (/obj/structure/window/basic{dir = 1},/turf/simulated/floor/plating/airless,/area)
+"dIo" = (/obj/structure/window{dir = 1},/turf/space,/area)
+"dIp" = (/obj/structure/window/full,/turf/simulated/floor/plating/airless,/area)
+"dIq" = (/obj/structure/grille,/obj/structure/window{dir = 1},/turf/space,/area)
+"dIr" = (/obj/structure/window{dir = 1},/turf/simulated/floor/plating/airless,/area)
 "dIs" = (/obj/structure/cable,/obj/machinery/power/apc{pixel_y = -24},/turf/simulated/floor,/area/derelict/arrival)
 "dIt" = (/obj/machinery/power/rad_collector,/turf/simulated/floor,/area/derelict/arrival)
 "dIu" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor,/area/derelict/arrival)
@@ -9911,15 +9911,15 @@
 "dIE" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dIF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall,/area/derelict/hallway/primary)
 "dIG" = (/obj/machinery/door/airlock/security{name = "Gas Storage"; req_access = null; req_access_txt = "3"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"dIH" = (/obj/structure/lattice,/obj/structure/window/basic{dir = 4},/turf/space,/area)
-"dII" = (/obj/structure/girder,/obj/structure/window/basic,/turf/simulated/floor/plating/airless,/area/derelict/arrival)
+"dIH" = (/obj/structure/lattice,/obj/structure/window{dir = 4},/turf/space,/area)
+"dII" = (/obj/structure/girder,/obj/structure/window,/turf/simulated/floor/plating/airless,/area/derelict/arrival)
 "dIJ" = (/obj/structure/stool/bed,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dIK" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dIL" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dIM" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dIN" = (/obj/machinery/door/airlock/security{name = "Security"; req_access = null; req_access_txt = "1"},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dIO" = (/obj/item/weapon/cigbutt,/turf/space,/area)
-"dIP" = (/obj/structure/window/basic{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
+"dIP" = (/obj/structure/window{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
 "dIQ" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/derelict/arrival)
 "dIR" = (/obj/structure/closet/crate/secure/plasma/prefilled,/turf/simulated/floor,/area/derelict/arrival)
 "dIS" = (/obj/item/weapon/pen,/obj/machinery/power/rad_collector,/turf/simulated/floor,/area/derelict/arrival)
@@ -9936,7 +9936,7 @@
 "dJd" = (/obj/structure/stool,/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dJe" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Access"; req_access_txt = "24"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
 "dJf" = (/obj/structure/closet/wardrobe/orange,/turf/simulated/floor/airless,/area)
-"dJg" = (/obj/structure/window/basic{dir = 4},/turf/space,/area)
+"dJg" = (/obj/structure/window{dir = 4},/turf/space,/area)
 "dJh" = (/obj/structure/grille,/turf/simulated/floor/plating,/area/derelict/arrival)
 "dJi" = (/obj/structure/closet/wardrobe,/turf/simulated/floor,/area/derelict/arrival)
 "dJj" = (/turf/simulated/floor/airless{broken = 1; icon_state = "damaged2"},/area/derelict/teleporter)
@@ -9962,7 +9962,7 @@
 "dJD" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating/airless,/area)
 "dJE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/wall/r_wall,/area)
 "dJF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/wall/r_wall,/area/derelict/hallway/secondary)
-"dJG" = (/obj/structure/window/basic{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"dJG" = (/obj/structure/window{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
 "dJH" = (/turf/space,/area/shuttle/salvage/derelict)
 "dJI" = (/obj/structure/grille,/obj/item/weapon/shard,/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area)
 "dJJ" = (/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating/airless,/area)
@@ -10009,8 +10009,8 @@
 "dKy" = (/obj/machinery/door/airlock/command{name = "AI Upload"; req_access_txt = "16"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/tape/engineering{icon_state = "engineering_door"; layer = 3.2},/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dKz" = (/obj/machinery/door/airlock/external{name = "Escape Airlock"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
 "dKA" = (/obj/machinery/door/firedoor/border_only{name = "Firelock East"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"dKB" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"dKC" = (/obj/structure/window/basic{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"dKB" = (/obj/structure/window{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"dKC" = (/obj/structure/window{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
 "dKD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dKE" = (/obj/structure/closet/emcloset,/turf/simulated/floor/airless,/area/derelict/hallway/secondary)
 "dKF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
@@ -10331,7 +10331,7 @@
 "dQI" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'MOVING PARTS'."; name = "\improper MOVING PARTS"; pixel_y = 32},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/research_outpost/maint)
 "dQJ" = (/obj/structure/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/mask/breath,/obj/item/clothing/glasses/science,/obj/item/clothing/gloves/latex,/obj/structure/window/reinforced{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/research_outpost/hallway)
 "dQK" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/research_outpost/hallway)
-"dQL" = (/obj/machinery/power/emitter{anchored = 1; state = 2},/obj/structure/cable,/obj/structure/window/plasmareinforced{dir = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor/plating,/area/research_outpost/anomaly)
+"dQL" = (/obj/machinery/power/emitter{anchored = 1; state = 2},/obj/structure/cable,/obj/structure/window/reinforced/plasma{dir = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor/plating,/area/research_outpost/anomaly)
 "dQM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only{dir = 1; layer = 2.6; name = "Firelock North"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway)
 "dQN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{dir = 4; icon_state = "whiteyellow"},/area/research_outpost/hallway)
 "dQO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/wall/r_wall,/area/research_outpost/atmos)
@@ -10349,16 +10349,16 @@
 "dRa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/sign/science{desc = "A warning sign which reads 'MASS SPECTROMETRY'"; name = "\improper MASS SPECTROMETRY"; pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 1; icon_state = "whitegreencorner"},/area/research_outpost/hallway)
 "dRb" = (/obj/structure/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/mask/breath,/obj/item/clothing/glasses/science,/obj/item/clothing/gloves/latex,/obj/machinery/camera{c_tag = "Research Outpost Hallway Starboard"; dir = 8; network = list("RD","SS13")},/obj/machinery/light{dir = 4},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/research_outpost/hallway)
 "dRc" = (/obj/effect/decal/warning_stripes{dir = 2; icon_state = "radiation-w"},/obj/machinery/door/window{dir = 2; icon_state = "right"; name = "Radiation Zone Door"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "dark"},/area/djstation)
-"dRd" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor{dir = 8; icon_state = "whitered"},/area/research_outpost/anomaly)
+"dRd" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor{dir = 8; icon_state = "whitered"},/area/research_outpost/anomaly)
 "dRe" = (/obj/machinery/door/firedoor/border_only{layer = 2.6; name = "Firelock East"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/research_outpost/hallway)
 "dRf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
-"dRg" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/obj/structure/window/plasmareinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 4; icon_state = "whitered"},/area/research_outpost/anomaly)
+"dRg" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/obj/structure/window/reinforced/plasma{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 4; icon_state = "whitered"},/area/research_outpost/anomaly)
 "dRh" = (/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/research_outpost/hallway)
 "dRi" = (/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
 "dRj" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/research_outpost/anomaly)
 "dRk" = (/obj/machinery/light{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "whitebluecorner"},/area/research_outpost/hallway)
 "dRl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway)
-"dRm" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor/plating,/area/research_outpost/anomaly)
+"dRm" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor/plating,/area/research_outpost/anomaly)
 "dRn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/research_outpost/anomaly)
 "dRo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/research_outpost/hallway)
 "dRp" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{dir = 4; icon_state = "whiteyellow"},/area/research_outpost/hallway)
@@ -10372,7 +10372,7 @@
 "dRx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/research_outpost/hallway)
 "dRy" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/research_outpost/hallway)
 "dRz" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/wood,/area/research_outpost/hallway)
-"dRA" = (/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 4},/obj/machinery/door/window{base_state = "left"; dir = 2; name = "Spectroscopy"; req_access_txt = "47"},/obj/machinery/door/window{base_state = "left"; dir = 1; name = "Spectroscopy"; req_access_txt = "47"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
+"dRA" = (/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/machinery/door/window{base_state = "left"; dir = 2; name = "Spectroscopy"; req_access_txt = "47"},/obj/machinery/door/window{base_state = "left"; dir = 1; name = "Spectroscopy"; req_access_txt = "47"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
 "dRB" = (/obj/machinery/atmospherics/unary/tank/nitrogen,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly)
 "dRC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway)
 "dRD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway)
@@ -11673,7 +11673,7 @@
 "eqy" = (/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters)
 "eqz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Sleeper Room"; dir = 1; network = list("MINE")},/obj/machinery/light,/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters)
 "eqA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/mine/living_quarters)
-
+
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa