Hunts down some runtimes

cleans up some dogborg sleeper code too
This commit is contained in:
Poojawa
2018-03-17 19:38:03 -05:00
parent b479e5fc7a
commit c8365e6be7
7 changed files with 82 additions and 86 deletions
+6 -6
View File
@@ -52,7 +52,7 @@
owner.derpspeech = min(owner.derpspeech + 5, 25)
if(prob(3))
owner.emote("drool")
else if(owner.stat == CONSCIOUS && prob(3))
else if(owner && owner.stat == CONSCIOUS && prob(3))
owner.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage"))
..()
@@ -142,13 +142,13 @@
/datum/brain_trauma/mild/muscle_weakness/on_life()
var/fall_chance = 1
if(owner.m_intent == MOVE_INTENT_RUN)
if(owner && owner.m_intent == MOVE_INTENT_RUN)
fall_chance += 2
if(prob(fall_chance) && !owner.lying && !owner.buckled)
to_chat(owner, "<span class='warning'>Your leg gives out!</span>")
owner.Knockdown(35)
else if(owner.get_active_held_item())
else if(owner && owner.get_active_held_item())
var/drop_chance = 1
var/obj/item/I = owner.get_active_held_item()
drop_chance += I.w_class
@@ -171,11 +171,11 @@
if(prob(7))
switch(rand(1,5))
if(1)
if(owner.canmove && !isspaceturf(owner.loc))
if(owner && owner.canmove && !isspaceturf(owner.loc))
to_chat(owner, "<span class='warning'>Your leg spasms!</span>")
step(owner, pick(GLOB.cardinals))
if(2)
if(owner.incapacitated())
if(owner && owner.incapacitated())
return
var/obj/item/I = owner.get_active_held_item()
if(I)
@@ -207,7 +207,7 @@
owner.ClickOn(owner)
owner.a_intent = prev_intent
if(5)
if(owner.incapacitated())
if(owner && owner.incapacitated())
return
var/obj/item/I = owner.get_active_held_item()
var/list/turf/targets = list()
@@ -84,7 +84,7 @@
mood_change = -3
/datum/mood_event/brain_damage/add_effects()
var/damage_message = pick_list_replacements("brain_damage_lines.json", "brain_damage")
var/damage_message = pick_list_replacements("BRAIN_DAMAGE_FILE", "brain_damage")
description = "<span class='warning'>Hurr durr... [damage_message]</span>\n"
/datum/mood_event/hulk //Entire duration of having the hulk mutation