diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index fa9d9dc2a0..d4f779fba9 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -185,9 +185,9 @@
 		user.do_attack_animation(src)
 		shatter()
 
-	else if (usr.a_intent == I_HURT)
+	else if(usr && usr.a_intent == I_HURT) //CHOMPEdit
 
-		if (istype(usr,/mob/living/carbon/human))
+		if(istype(usr,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = usr
 			if(H.species.can_shred(H))
 				attack_generic(H,25)
diff --git a/icons/_nanomaps/southern_cross_nanomap_z3.png b/icons/_nanomaps/southern_cross_nanomap_z3.png
index 237a10746c..4c72d13a06 100644
Binary files a/icons/_nanomaps/southern_cross_nanomap_z3.png and b/icons/_nanomaps/southern_cross_nanomap_z3.png differ
diff --git a/icons/_nanomaps/southern_cross_nanomap_z5.png b/icons/_nanomaps/southern_cross_nanomap_z5.png
index 4e797c4782..e340e339ea 100644
Binary files a/icons/_nanomaps/southern_cross_nanomap_z5.png and b/icons/_nanomaps/southern_cross_nanomap_z5.png differ