[MIRROR] Makes bloodcrawl not use a dumb var (#494)

* Makes bloodcrawl not use a dumb var (#52714)

* Makes bloodcrawl not use a dumb var

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-08-24 23:52:27 +02:00
committed by GitHub
co-authored by TiviPlus
parent cc337b429e
commit a9dd5c684c
6 changed files with 15 additions and 6 deletions
+7 -1
View File
@@ -20,6 +20,11 @@
/obj/effect/dummy/phased_mob/slaughter/singularity_act()
return
/obj/effect/dummy/phased_mob/slaughter/proc/deleteself(mob/living/source, obj/effect/decal/cleanable/phase_in_decal)
SIGNAL_HANDLER
qdel(src)
/mob/living/proc/phaseout(obj/effect/decal/cleanable/B)
if(iscarbon(src))
var/mob/living/carbon/C = src
@@ -117,6 +122,7 @@
victim.visible_message("<span class='warning'>[target] violently expels [victim]!</span>")
victim.exit_blood_effect(target)
found_bloodpool = TRUE
break
if(!found_bloodpool)
// Fuck it, just eject them, thanks to some split second cleaning
@@ -168,6 +174,7 @@
return
forceMove(B.loc)
client.eye = src
SEND_SIGNAL(src, COMSIG_LIVING_AFTERPHASEIN, B)
visible_message("<span class='boldwarning'>[src] rises out of the pool of blood!</span>")
exit_blood_effect(B)
if(iscarbon(src))
@@ -175,5 +182,4 @@
for(var/obj/item/bloodcrawl/BC in C)
BC.flags_1 = null
qdel(BC)
QDEL_NULL(holder)
return TRUE
+1 -2
View File
@@ -56,10 +56,9 @@
var/tod = null /// Time of death
var/on_fire = 0 ///The "Are we on fire?" var
var/on_fire = FALSE ///The "Are we on fire?" var
var/fire_stacks = 0 ///Tracks how many stacks of fire we have on, max is usually 20
var/holder = null //The holder for blood crawling
var/ventcrawler = 0 //0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always
var/limb_destroyer = 0 //1 Sets AI behavior that allows mobs to target and dismember limbs with their basic attack.