work

code/game/objects/structures/crates_lockers/closets/l3closet.dm

@@ -67,6 +67,11 @@
 	new /obj/item/clothing/suit/bio_suit/scientist(src)
 	new /obj/item/clothing/head/bio_hood/scientist(src)
 
+/obj/structure/closet/l3closet/scientist/double/New()
+	..()
+	new /obj/item/clothing/suit/bio_suit/scientist(src)
+	new /obj/item/clothing/head/bio_hood/scientist(src)
+
 
 /obj/structure/closet/l3closet/medical
 	icon_state = "bio_scientist"

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -88,6 +88,15 @@
 	new /obj/item/weapon/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 
+/obj/structure/closet/firecloset/full/double/New()
+	..()
+	new /obj/item/clothing/suit/fire/firefighter(src)
+	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/device/flashlight(src)
+	new /obj/item/weapon/tank/oxygen/red(src)
+	new /obj/item/weapon/extinguisher(src)
+	new /obj/item/clothing/head/hardhat/red(src)
+
 /obj/structure/closet/firecloset/update_icon()
 	if(!opened)
 		icon_state = icon_closed
@@ -175,6 +184,12 @@
 	new /obj/item/clothing/shoes/black( src )
 	new /obj/item/clothing/head/bomb_hood( src )
 
+/obj/structure/closet/bombcloset/double/New() // Makes two suits.
+	..()
+	new /obj/item/clothing/suit/bomb_suit( src )
+	new /obj/item/clothing/under/color/black( src )
+	new /obj/item/clothing/shoes/black( src )
+	new /obj/item/clothing/head/bomb_hood( src )
 
 /obj/structure/closet/bombclosetsecurity
 	name = "\improper EOD closet"

code/game/objects/structures/window.dm

@@ -59,10 +59,13 @@
 			playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
 		if(health < maxhealth / 4 && initialhealth >= maxhealth / 4)
 			visible_message("[src] looks like it's about to shatter!" )
+			update_icon()
 		else if(health < maxhealth / 2 && initialhealth >= maxhealth / 2)
 			visible_message("[src] looks seriously damaged!" )
+			update_icon()
 		else if(health < maxhealth * 3/4 && initialhealth >= maxhealth * 3/4)
 			visible_message("Cracks begin to appear in [src]!" )
+			update_icon()
 	return
 
 /obj/structure/window/proc/apply_silicate(var/amount)
@@ -204,6 +207,8 @@
 		return
 	if(damage >= 10)
 		visible_message("<span class='danger'>[user] smashes into [src]!</span>")
+		if(reinf)
+			damage = damage / 2
 		take_damage(damage)
 	else
 		visible_message("<span class='notice'>\The [user] bonks \the [src] harmlessly.</span>")
@@ -212,6 +217,24 @@
 
 /obj/structure/window/attackby(obj/item/W as obj, mob/user as mob)
 	if(!istype(W)) return//I really wish I did not need this
+
+	// Fixing.
+	if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent == I_HELP)
+		var/obj/item/weapon/weldingtool/WT = W
+		if(health < maxhealth)
+			if(WT.remove_fuel(1 ,user))
+				to_chat(user, "<span class='notice'>You begin repairing [src]...</span>")
+				playsound(src, WT.usesound, 50, 1)
+				if(do_after(user, 40 * WT.toolspeed, target = src))
+					health = maxhealth
+			//		playsound(src, 'sound/items/Welder.ogg', 50, 1)
+					update_icon()
+					to_chat(user, "<span class='notice'>You repair [src].</span>")
+		else
+			to_chat(user, "<span class='warning'>[src] is already in good condition!</span>")
+		return
+
+	// Slamming.
 	if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
 		var/obj/item/weapon/grab/G = W
 		if(istype(G.affecting,/mob/living))
@@ -408,6 +431,15 @@
 		var/image/I = image(icon, "[basestate][connections[i]]", dir = 1<<(i-1))
 		overlays += I
 
+	// Damage overlays.
+	var/ratio = health / maxhealth
+	ratio = Ceiling(ratio * 4) * 25
+
+	if(ratio > 75)
+		return
+	var/image/I = image(icon, "damage[ratio]", layer + 0.1)
+	overlays += I
+
 	return
 
 /obj/structure/window/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
@@ -437,6 +469,10 @@
 	damage_per_fire_tick = 1.0
 	maxhealth = 40.0
 
+/obj/structure/window/phoronbasic/full
+	dir = SOUTHWEST
+	maxhealth = 80
+
 /obj/structure/window/phoronreinforced
 	name = "reinforced borosilicate window"
 	desc = "A borosilicate alloy window, with rods supporting it. It seems to be very strong."
@@ -449,6 +485,9 @@
 	damage_per_fire_tick = 1.0 // This should last for 80 fire ticks if the window is not damaged at all. The idea is that borosilicate windows have something like ablative layer that protects them for a while.
 	maxhealth = 80.0
 
+/obj/structure/window/phoronreinforced/full
+	dir = SOUTHWEST
+	maxhealth = 160
 
 /obj/structure/window/reinforced
 	name = "reinforced window"
@@ -470,9 +509,9 @@
 		state = 0
 
 /obj/structure/window/reinforced/full
-	dir = 5
+	dir = SOUTHWEST
 	icon_state = "fwindow"
-	maxhealth = 60
+	maxhealth = 80
 
 /obj/structure/window/reinforced/tinted
 	name = "tinted window"