Fix Conflicts and Sync with Upstream

Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172

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

@@ -155,13 +155,13 @@
 				qdel(src)
 
 /obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
-	health -= Proj.damage
 	..()
-	if(health <= 0)
-		for(var/atom/movable/A as mob|obj in src)
-			A.loc = src.loc
-		del(src)
-
+	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+		health -= Proj.damage
+		if(health <= 0)
+			for(var/atom/movable/A as mob|obj in src)
+				A.loc = src.loc
+			del(src)
 	return
 
 /obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob)
@@ -273,7 +273,7 @@
 	else if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if(src == user.loc)
-			user << "<span class='notice'>You can not [welded?"unweld":"weld"] the locker from inside.</span>"			
+			user << "<span class='notice'>You can not [welded?"unweld":"weld"] the locker from inside.</span>"
 			return
 		if(!WT.remove_fuel(0,user))
 			user << "<span class='notice'>You need more welding fuel to complete this task.</span>"

code/game/objects/structures/displaycase.dm

@@ -69,16 +69,16 @@
 
 /obj/structure/displaycase/captains_laser
 	name = "captain's display case"
-	desc = "A display case for the captain's antique laser gun. It taunts you to kick it."	
+	desc = "A display case for the captain's antique laser gun. It taunts you to kick it."
 
 /obj/structure/displaycase/captains_laser/New()
 	req_access = list(access_captain)
 	occupant = new /obj/item/weapon/gun/energy/laser/captain(src)
 	locked = 1
 	update_icon()
-	
+
 /obj/structure/proc/getPrint(mob/user as mob)
-	return md5(user:dna:uni_identity)			
+	return md5(user:dna:uni_identity)
 
 /obj/structure/displaycase/examine()
 	..()
@@ -112,12 +112,12 @@
 
 
 /obj/structure/displaycase/bullet_act(var/obj/item/projectile/Proj)
-	health -= Proj.damage
+	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+		health -= Proj.damage
 	..()
 	src.healthcheck()
 	return
 
-
 /obj/structure/displaycase/blob_act()
 	if (prob(75))
 		getFromPool(/obj/item/weapon/shard, loc)

code/game/objects/structures/grille.dm

@@ -128,16 +128,13 @@
 			return !density
 
 /obj/structure/grille/bullet_act(var/obj/item/projectile/Proj)
-
-	if(!Proj)	return
-
-	//Tasers and the like should not damage grilles.
-	if(Proj.damage_type == STAMINA)
+	if(!Proj)
 		return
-
-	src.health -= Proj.damage*0.2
-	healthcheck()
-	return 0
+	..()
+	if((Proj.damage_type != STAMINA)) //Grilles can't be exhausted to death
+		src.health -= Proj.damage*0.3
+		healthcheck()
+	return
 
 /obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(iswirecutter(W))

code/game/objects/structures/window.dm

@@ -58,11 +58,9 @@ var/global/wcColored
 //	var/icon/silicateIcon = null // the silicated icon
 
 /obj/structure/window/bullet_act(var/obj/item/projectile/Proj)
-	//Tasers and the like should not damage windows.
-	if(Proj.damage_type == STAMINA)
-		return
-
-	health -= Proj.damage
+	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+		health -= Proj.damage
+		update_nearby_icons()
 	..()
 	if(health <= 0)
 		var/pdiff=performWallPressureCheck(src.loc)