From d8bb31c2f8f0d0b85cfe446312f4d8da185bce6f Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Mon, 14 Jul 2014 19:24:09 +0100 Subject: [PATCH] Fixes #236 Fixes genetic side effect monkeys being turned human, and some of the dna2 procs that weren't working properly because of some bad defines --- code/game/dna/dna2.dm | 8 ++++---- code/modules/genetics/side_effects.dm | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 7a3118229a0..84dc14644b3 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -5,10 +5,10 @@ */ // What each index means: -#define DNA_OFF_LOWERBOUND 0 -#define DNA_OFF_UPPERBOUND 1 -#define DNA_ON_LOWERBOUND 2 -#define DNA_ON_UPPERBOUND 3 +#define DNA_OFF_LOWERBOUND 1 // changed as lists start at 1 not 0 +#define DNA_OFF_UPPERBOUND 2 +#define DNA_ON_LOWERBOUND 3 +#define DNA_ON_UPPERBOUND 4 // Define block bounds (off-low,off-high,on-low,on-high) // Used in setupgame.dm diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm index 74837433fc4..6d79ca3a9f6 100644 --- a/code/modules/genetics/side_effects.dm +++ b/code/modules/genetics/side_effects.dm @@ -58,7 +58,9 @@ finish(mob/living/carbon/human/H) if(!H.reagents.has_reagent("anti_toxin")) - H.monkeyize() + // 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, ) /datum/genetics/side_effect/confuse name = "Confuse"