From 26a7aa1ec34845498af6f67c4085bd8ab4801581 Mon Sep 17 00:00:00 2001 From: Jordie Date: Mon, 15 Sep 2014 20:12:14 +1000 Subject: [PATCH 1/4] Updates grille damages --- code/game/objects/structures/grille.dm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index a526f7ec191..3cb2fdf38ca 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 @@ -172,11 +172,7 @@ health -= W.force * 0.1 else if(!shock(user, 70)) playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) - switch(W.damtype) - if("fire") - health -= W.force - if("brute") - health -= W.force * 0.1 + health -= W.force * 0.3 healthcheck() ..() return From 73c5ef4459406153777028771561bb8b4d1e0e11 Mon Sep 17 00:00:00 2001 From: Jordie Date: Mon, 15 Sep 2014 20:37:21 +1000 Subject: [PATCH 2/4] == > != --- code/game/objects/structures/grille.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 3cb2fdf38ca..4063b280113 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -94,7 +94,7 @@ if(!Proj) return ..() - if((!Proj.damage_type == STAMINA)) //Grilles can't be exhausted to death + if((Proj.damage_type != STAMINA)) //Grilles can't be exhausted to death src.health -= Proj.damage*0.3 healthcheck() return From c9b31c4fea55c5b1ebebcd953eadbe9ba57a791b Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Tue, 16 Sep 2014 12:57:34 +1000 Subject: [PATCH 3/4] Adds new changelog --- html/changelogs/Jordie0608-PR-4838.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/Jordie0608-PR-4838.yml 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 From cbdf479b5dcfe1d00123d8e70e149a4f91858dc5 Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Thu, 18 Sep 2014 20:05:46 +1000 Subject: [PATCH 4/4] hitsound uses burn else instead of checking brute --- code/game/objects/structures/grille.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 7d2ad8390d7..340933e8184 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -175,7 +175,7 @@ switch(W.damtype) if(BURN) playsound(loc, 'sound/items/welder.ogg', 80, 1) - if(BRUTE) + else playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) health -= W.force * 0.3