diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 05d2baedd22..340933e8184 100644 --- a/code/game/objects/structures/grille.dm +++ b/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 @@ "You smash against [src].", \ "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() ..() diff --git a/html/changelogs/Jordie0608-PR-4838.yml b/html/changelogs/Jordie0608-PR-4838.yml new file mode 100644 index 00000000000..efcf16c26b6 --- /dev/null +++ b/html/changelogs/Jordie0608-PR-4838.yml @@ -0,0 +1,6 @@ +author: Jordie0608 + +delete-after: True + +changes: + - tweak: Grille damage update, humans now deal less unarmed damage to grilles while projectiles and items deal more. \ No newline at end of file