From aeb1ed6007c19a6babeed842069929a40bac5b67 Mon Sep 17 00:00:00 2001 From: datlo Date: Fri, 11 Jan 2019 20:55:12 +0000 Subject: [PATCH] make new proc that actually works --- code/game/gamemodes/miniantags/abduction/abduction.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 8 +++++++- code/modules/response_team/ert.dm | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index e26983454b9..f72b91224d7 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -123,7 +123,7 @@ S = H.dna.species S.team = team_number H.real_name = team_name + " Agent" - H.dna.ResetSE() //No fat/blind/colourblind/epileptic/whatever ayys. + H.cleanSE() //No fat/blind/colourblind/epileptic/whatever ayys. H.overeatduration = 0 H.equipOutfit(/datum/outfit/abductor/agent) greet_agent(agent,team_number) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 0452e37991e..e65b2ebb839 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -169,7 +169,7 @@ proc/issyndicate(mob/living/M as mob) M.set_species(/datum/species/human, TRUE) M.dna.ready_dna(M) // Quadriplegic Nuke Ops won't be participating in the paralympics M.dna.species.create_organs(M) - M.dna.ResetSE() //No fat/blind/colourblind/epileptic/whatever ops. + M.cleanSE() //No fat/blind/colourblind/epileptic/whatever ops. M.overeatduration = 0 var/obj/item/organ/external/head/head_organ = M.get_organ("head") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f681d9e1158..100eefbf517 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -733,7 +733,7 @@ found_record = 1 if(R.fields["criminal"] == "*Execute*") to_chat(usr, "Unable to modify the sec status of a person with an active Execution order. Use a security computer instead.") - else + else var/rank if(ishuman(usr)) var/mob/living/carbon/human/U = usr @@ -1942,3 +1942,9 @@ Eyes need to have significantly high darksight to shine unless the mob has the X /mob/living/carbon/human/proc/special_post_clone_handling() if(mind && mind.assigned_role == "Cluwne") //HUNKE your suffering never stops makeCluwne() + +/mob/living/carbon/human/proc/cleanSE() //remove all disabilities/powers + for(var/block = 1; block <= DNA_SE_LENGTH; block++) + src.dna.SetSEState(block, FALSE, TRUE) + genemutcheck(src, block, null, MUTCHK_FORCED) + src.dna.UpdateSE() diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index 05a331ea27d..d9510d28114 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -145,7 +145,7 @@ var/ert_request_answered = FALSE M.set_species(/datum/species/human, TRUE) M.dna.ready_dna(M) - M.dna.ResetSE() //No fat/blind/colourblind/epileptic/whatever ERT. + M.cleanSE() //No fat/blind/colourblind/epileptic/whatever ERT. M.overeatduration = 0 var/hair_c = pick("#8B4513","#000000","#FF4500","#FFD700") // Brown, black, red, blonde