From 6cfbc3f39673c55c8163bf892dc4d995866af65e Mon Sep 17 00:00:00 2001 From: Vi3trice <80771500+Vi3trice@users.noreply.github.com> Date: Thu, 7 Oct 2021 11:33:22 -0400 Subject: [PATCH] Transformation diseases do the jobban check properly (#16881) * Make the jobban check work * Removed gibbed --- code/datums/diseases/transformation.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 4098e15e2af..29efffd6bdf 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -17,6 +17,7 @@ var/list/stage5 = list("Oh the humanity!") var/transformation_text = null var/new_form = /mob/living/carbon/human + var/job_role = null /datum/disease/transformation/stage_act() ..() @@ -40,8 +41,8 @@ if(istype(affected_mob, /mob/living/carbon) && affected_mob.stat != DEAD) if(stage5) to_chat(affected_mob, pick(stage5)) - if(jobban_isbanned(affected_mob, new_form)) - affected_mob.death(1) + if(jobban_isbanned(affected_mob, job_role)) + affected_mob.death() return if(affected_mob.notransform) return @@ -133,6 +134,7 @@ stage4 = list("Your skin feels very loose.", "You can feel... something...inside you.") stage5 = list("Your skin feels as if it's about to burst off!") new_form = /mob/living/silicon/robot + job_role = "Cyborg" /datum/disease/transformation/robot/stage_act() @@ -165,6 +167,7 @@ stage4 = list("Your skin feels very tight.", "Your blood boils!", "You can feel... something...inside you.") stage5 = list("Your skin feels as if it's about to burst off!") new_form = /mob/living/carbon/alien/humanoid/hunter + job_role = ROLE_ALIEN /datum/disease/transformation/xeno/stage_act() ..() @@ -248,3 +251,4 @@ stage5 = list("You have become a morph.") transformation_text = "This transformation does NOT make you an antagonist if you were not one already. If you were not an antagonist, you should not eat any steal objectives or the contents of the armory." new_form = /mob/living/simple_animal/hostile/morph + job_role = ROLE_MORPH