Master into dev-freeze.

This commit is contained in:
Zuhayr
2015-03-07 11:33:39 +10:30
10 changed files with 49 additions and 25 deletions
+2 -2
View File
@@ -97,7 +97,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
if(!pale)
pale = 1
update_body()
eye_blurry += 6
eye_blurry = max(eye_blurry,6)
if(oxyloss < 50)
oxyloss += 10
oxyloss += 1
@@ -329,4 +329,4 @@ proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large)
if(source.data["virus2"])
B.virus2 = virus_copylist(source.data["virus2"])
return B
return B