Merge branch 'master' into upstream-merge-27344

This commit is contained in:
kevinz000
2017-05-21 17:50:29 -07:00
committed by GitHub
13 changed files with 358 additions and 288 deletions
+2 -1
View File
@@ -298,4 +298,5 @@
if(GLOB.blood_target)
to_chat(B.current,"<span class='cultlarge'><b>The blood mark has expired!</b></span>")
B.current.client.images -= GLOB.blood_target_image
QDEL_NULL(GLOB.blood_target)
QDEL_NULL(GLOB.blood_target_image)
GLOB.blood_target = null