From b1a9b7b66c9ea54a82633995b751c9d2b2ecda00 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Jul 2012 15:09:17 +0300 Subject: [PATCH] Found the cause of lasers not damaging humans Please be more careful with #define names. Fixes issue #1427 --- code/modules/mob/organ/organ.dm | 4 ++-- code/setup.dm | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/organ/organ.dm b/code/modules/mob/organ/organ.dm index 655a828750b..ed424d12ac2 100644 --- a/code/modules/mob/organ/organ.dm +++ b/code/modules/mob/organ/organ.dm @@ -69,11 +69,11 @@ var/list/wound_progressions = list( W.hits = hits W.time_inflicted = time_inflicted return W - +/* fuckign double defines #define CUT 0 #define BRUISE 1 #define BURN 2 - +*/ /**************************************************** EXTERNAL ORGANS ****************************************************/ diff --git a/code/setup.dm b/code/setup.dm index 843bfbbbc26..92e06912af6 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -371,6 +371,8 @@ var/list/global_mutations = list() // list of hidden mutation things //Damage things +#define CUT "cut" +#define BRUISE "bruise" #define BRUTE "brute" #define BURN "fire" #define TOX "tox"