Merge branch 'master' into pumpkin_head

This commit is contained in:
alsoandanswer
2019-11-14 10:49:30 +08:00
committed by GitHub
27 changed files with 1126 additions and 1044 deletions
+1 -1
View File
@@ -213,7 +213,7 @@ BREATH ANALYZER
user.show_message(text("<span class='warning'>Internal bleeding detected. Advanced scanner required for location.</span>"), 1)
if(M:vessel)
var/blood_volume = round(M:vessel.get_reagent_amount("blood"))
var/blood_percent = blood_volume / 560
var/blood_percent = blood_volume / 560
var/blood_type = M.dna.b_type
blood_percent *= 100
if(blood_volume <= 500 && blood_volume > 336)