Merge pull request #1437 from comma/master

Bugfixes
This commit is contained in:
CIB
2012-07-06 11:01:04 -07:00
7 changed files with 51 additions and 18 deletions
+3 -2
View File
@@ -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
****************************************************/
@@ -415,6 +415,7 @@ var/list/wound_progressions = list(
var/size = min( max( 1, damage/10 ) , 6)
switch(type)
if(CUT)
src.status |= BLEEDING
var/list/size_names = list("cut", "deep cut", "flesh wound", "gaping wound", "big gaping wound", "massive wound")
wound_name = size_names[size]
if(wound_descs["[update_time]"])