From da8a1a32f7b5410a6f97ba95abb03e3c12501dff Mon Sep 17 00:00:00 2001 From: Xhuis Date: Sun, 4 Oct 2015 15:35:22 -0400 Subject: [PATCH] Removes Blasto gang effects --- code/modules/mob/living/carbon/human/human.dm | 6 ++---- html/changelogs/Xhuis-SleepingCarp.yml | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 9d55f66a0c1..32b0f7eec12 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -110,8 +110,6 @@ /mob/living/carbon/human/ex_act(severity, ex_target) - if(is_in_gang(src, "Blasto")) //The Blasto gang doesn't take damage from explosions. Too much...? - return 0 var/b_loss = null var/f_loss = null switch (severity) @@ -178,8 +176,8 @@ return /mob/living/carbon/human/bullet_act() - if(martial_art && martial_art.name == "The Sleeping Carp") //People with the Sleeping Carp learned can deflect projecitles! - if(!src.lying) + if(martial_art && martial_art.name == "The Sleeping Carp") //People with the Sleeping Carp learned can deflect projectiles! + if(!src.lying && dna && !dna.check_mutation(HULK)) //But only if they're not lying down, and hulks can't do it src.visible_message("[src] deflects the projectile!", "You deflect the projectile!") return 0 ..() diff --git a/html/changelogs/Xhuis-SleepingCarp.yml b/html/changelogs/Xhuis-SleepingCarp.yml index b8679492744..03917f406cf 100644 --- a/html/changelogs/Xhuis-SleepingCarp.yml +++ b/html/changelogs/Xhuis-SleepingCarp.yml @@ -6,4 +6,3 @@ changes: - tweak: "Members of the Sleeping Carp gang are now able to deflect all ranged projectiles." - tweak: "Members of the Sleeping Carp gang are now uanble to use any type of ranged weaponry. Doing so would be dishonorable." - tweak: "The Sleeping Carp martial art's effects are more damaging, and many stuns have been increased in duration." - - tweak: "The Blasto gang has been working in the shadows and accidentally discovered a way to protect themselves from explosions. Blasto members no longer take damage from explosions."