From f1616814a59e34c0c41f9428ae0f2d9998d203cd Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Sun, 16 Oct 2011 04:03:05 +0000 Subject: [PATCH] Bugfix for some clothing making your hair disappear. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2372 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/chemical/Chemistry-Reagents.dm | 15 ++++++++++++++- code/setup.dm | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index bde4149181f..b6a9b83dff4 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -437,11 +437,24 @@ datum M.druggy = max(M.druggy, 15) if(isturf(M.loc)) if(M.canmove) - step(M, pick(cardinal)) + if(prob(10)) step(M, pick(cardinal)) if(prob(7)) M:emote(pick("twitch","drool","moan","giggle")) holder.remove_reagent(src.id, 0.2) return + serotrotium + name = "Serotrotium" + id = "serotrotium" + description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans." + reagent_state = LIQUID + color = "#202040" // rgb: 20, 20, 40 + + on_mob_life(var/mob/living/M as mob) + if(ishuman(M)) + if(prob(7)) M:emote(pick("twitch","drool","moan","gasp")) + holder.remove_reagent(src.id, 0.1) + return + silicate name = "Silicate" id = "silicate" diff --git a/code/setup.dm b/code/setup.dm index e4ebaf758d5..daa7a02fb60 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -89,8 +89,6 @@ #define HEADSPACE 4 // head wear protects against space -#define BLOCKHAIR 5 // temporarily removes the user's hair icon - #define MASKINTERNALS 8 // mask allows internals #define SUITSPACE 8 // suit protects against space @@ -116,6 +114,8 @@ #define NOREACT 16384 //Reagents dont' react inside this container. +#define BLOCKHAIR 32768 // temporarily removes the user's hair icon + //flags for pass_flags #define PASSTABLE 1 #define PASSGLASS 2