Merge pull request #4838 from Jordie0608/breakingrillesisagreatwaytoruinabarbeque

Updates grille damages Fixes #796

code/game/objects/structures/grille.dm

@@ -37,7 +37,7 @@
 	if(HULK in user.mutations)
 		health -= 5
 	else
-		health -= 3
+		health -= rand(1,2)
 	healthcheck()
 
 /obj/structure/grille/attack_alien(mob/user as mob)
@@ -62,7 +62,7 @@
 						 "<span class='warning'>You smash against [src].</span>", \
 						 "You hear twisting metal.")
 
-	health -= rand(2,3)
+	health -= rand(1,2)
 	healthcheck()
 	return
 
@@ -94,8 +94,8 @@
 	if(!Proj)
 		return
 	..()
-	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
-		src.health -= Proj.damage*0.2
+	if((Proj.damage_type != STAMINA)) //Grilles can't be exhausted to death
+		src.health -= Proj.damage*0.3
 		healthcheck()
 	return
 
@@ -174,11 +174,10 @@
 	else if(!shock(user, 70))
 		switch(W.damtype)
 			if(BURN)
-				health -= W.force
 				playsound(loc, 'sound/items/welder.ogg', 80, 1)
-			if(BRUTE)
-				health -= W.force * 0.1
+			else
 				playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+		health -= W.force * 0.3
 
 	healthcheck()
 	..()