From 3ea5e2dda57f35397c1bc4c5887bd7d1028db728 Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Tue, 15 Jul 2014 15:32:37 +0100 Subject: [PATCH] Replaced Monkeyized() with working method commented out old monkeyized() that was causing the ghosting problems and put a new one in that sends it through the safe method of monkeyizing. Tested with all currently used monkeyize() calls so won't break stuff --- code/modules/genetics/side_effects.dm | 4 +--- code/modules/mob/transform_procs.dm | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm index 6d79ca3a9f6..74837433fc4 100644 --- a/code/modules/genetics/side_effects.dm +++ b/code/modules/genetics/side_effects.dm @@ -58,9 +58,7 @@ finish(mob/living/carbon/human/H) if(!H.reagents.has_reagent("anti_toxin")) - // H.monkeyize() This proc causes the player to be ghosted if their DNA is changed back. Needs fixing. Below is hotfix - H.dna.SetSEState(MONKEYBLOCK,1) - domutcheck(H, null, ) + H.monkeyize() /datum/genetics/side_effect/confuse name = "Confuse" diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index ad0d24209f7..b7f9a04a98d 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -1,3 +1,9 @@ +/mob/living/carbon/human/proc/monkeyize() + var/mob/H = src + H.dna.SetSEState(MONKEYBLOCK,1) + domutcheck(H, null) + +/* /mob/living/carbon/human/proc/monkeyize() if (monkeyizing) return @@ -49,6 +55,7 @@ del(animation) return O +*/ /mob/new_player/AIize() spawning = 1