Merged binary files, adapted chinsky's blood painting procs to function with arbitrary colours.

This commit is contained in:
Zuhayr
2013-12-26 14:48:05 +10:30
parent d97180239b
commit e89fe94af8
5 changed files with 68 additions and 60 deletions

View File

@@ -1326,5 +1326,7 @@ mob/living/carbon/human/yank_out_object()
src << "<span class='warning'>You ran out of blood to write with!</span>"
var/obj/effect/decal/cleanable/blood/writing/W = new(T)
W.basecolor = (hand_blood_color) ? hand_blood_color : "#A10808"
W.update_icon()
W.message = message
W.add_fingerprint(src)
W.add_fingerprint(src)

View File

@@ -56,3 +56,4 @@
var/xylophone = 0 //For the spoooooooky xylophone cooldown
var/mob/remoteview_target = null
var/hand_blood_color

View File

@@ -130,6 +130,7 @@
punch_damage = 5
primitive = /mob/living/carbon/monkey/diona
blood_color = "rainbow"
warning_low_pressure = 50
hazard_low_pressure = -1