diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm
index e73add9046..9137ab35c1 100644
--- a/code/game/machinery/vending/vendor_types/medical.dm
+++ b/code/game/machinery/vending/vendor_types/medical.dm
@@ -268,6 +268,7 @@
 	)
 
 /obj/structure/machinery/cm_vending/sorted/medical/Destroy()
+	STOP_PROCESSING(SSslowobj, src)
 	QDEL_NULL(last_health_display)
 	. = ..()
 
diff --git a/code/game/objects/structures/gun_rack.dm b/code/game/objects/structures/gun_rack.dm
index 45a63e46f3..40e5bfe17f 100644
--- a/code/game/objects/structures/gun_rack.dm
+++ b/code/game/objects/structures/gun_rack.dm
@@ -53,6 +53,9 @@
 /obj/structure/gun_rack/m41/unloaded
 	populate_type = /obj/item/weapon/gun/rifle/m41aMK1/unloaded
 
+/obj/structure/gun_rack/m41/empty
+	initial_stored = 0
+
 /obj/structure/gun_rack/type71
 	icon_state = "type71"
 	desc = "Some off-branded gun rack. Per SOF and UPPA regulations, weapons should be stored in secure safes and only given out when necessary. Of course, most (but not all!) units overlook this regulation, only storing their firearms in safes when inspection arrives."
@@ -64,6 +67,9 @@
 /obj/structure/gun_rack/type71/unloaded
 	populate_type = /obj/item/weapon/gun/rifle/type71/unloaded
 
+/obj/structure/gun_rack/type71/empty
+	initial_stored = 0
+
 /obj/structure/gun_rack/apc
 	name = "APC ammo compartment"
 	icon_state = "frontal"
@@ -104,6 +110,9 @@
 /obj/structure/gun_rack/flamer/unloaded
 	populate_type = /obj/item/weapon/gun/flamer/unloaded
 
+/obj/structure/gun_rack/flamer/empty
+	initial_stored = 0
+
 /obj/structure/gun_rack/mk221
 	name = "M120 shotgun rack"
 	icon_state = "mk221"
@@ -112,3 +121,6 @@
 	initial_stored = 2
 	allowed_type = /obj/item/weapon/gun/shotgun/combat
 	populate_type = /obj/item/weapon/gun/shotgun/combat
+
+/obj/structure/gun_rack/mk221/empty
+	initial_stored = 0
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 14e15de246..0404d3f09b 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -817,6 +817,15 @@
 	health = 40
 	window_frame = /obj/structure/window_frame/shiva
 
+/obj/structure/window/framed/prefab
+	name = "poly-kevlon framed window"
+	icon = 'icons/turf/walls/ice_colony/shiva_windows.dmi'
+	icon_state = "prefab_window0"
+	basestate = "prefab_window"
+	desc = "A semi-transparent (not entirely opaque) pane of material set into a poly-kevlon frame. Very smashable."
+	health = 40
+	window_frame = /obj/structure/window_frame/prefab
+
 //Solaris windows
 
 /obj/structure/window/framed/solaris
diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm
index ae40be1472..53be33959e 100644
--- a/code/game/objects/structures/window_frame.dm
+++ b/code/game/objects/structures/window_frame.dm
@@ -277,6 +277,12 @@
 	icon_state = "shiva_window0_frame"
 	basestate = "shiva_window"
 
+/obj/structure/window_frame/prefab
+	name = "poly-kevlon window frame"
+	icon = 'icons/turf/walls/ice_colony/shiva_windows.dmi'
+	icon_state = "prefab_window0_frame"
+	basestate = "prefab_window"
+
 //Solaris frames
 
 /obj/structure/window_frame/solaris
diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm
index 9146922bea..881a730bcc 100644
--- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm
+++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm
@@ -557,7 +557,7 @@
 /obj/item/ammo_box/magazine/mk1
 	name = "magazine box (M41A MK1 x 10)"
 	overlay_ammo_type = "_reg_mk1"
-	overlay_gun_type = "_mk1"
+	overlay_gun_type = "_m41"
 	overlay_content = "_reg"
 	magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1
 	allowed_magazines = list(/obj/item/ammo_magazine/rifle/m41aMK1/recon)
diff --git a/icons/turf/walls/ice_colony/shiva_windows.dmi b/icons/turf/walls/ice_colony/shiva_windows.dmi
index 2e65944a09..998900bbfc 100644
Binary files a/icons/turf/walls/ice_colony/shiva_windows.dmi and b/icons/turf/walls/ice_colony/shiva_windows.dmi differ