Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/modules/mob/living/living_defense.dm

@@ -57,6 +57,6 @@
 		P.on_hit(src,2)
 		return 2
 	if(!P.nodamage)
-		apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, used_weapon = "Projectile([P.name])")
+		apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone)
 	P.on_hit(src, absorb)
 	return absorb

code/modules/mob/living/silicon/robot/life.dm

@@ -42,10 +42,7 @@
 			uneq_all()
 			src.stat = 1
 		else if (src.cell.charge <= 100)
-			src.module_active = null
-			src.module_state_1 = null
-			src.module_state_2 = null
-			src.module_state_3 = null
+			uneq_all()
 			src.sight_mode = 0
 			src.cell.use(1)
 		else
@@ -161,6 +158,10 @@
 		src.see_in_dark = 8
 		src.see_invisible = SEE_INVISIBLE_LEVEL_TWO
 
+	for(var/image/hud in client.images)  //COPIED FROM the human handle_regular_hud_updates() proc
+		if(copytext(hud.icon_state,1,4) == "hud") //ugly, but icon comparison is worse, I believe
+			del(hud)
+
 	var/obj/item/borg/sight/hud/hud = (locate(/obj/item/borg/sight/hud) in src)
 	if(hud && hud.hud)	hud.hud.process_hud(src)