Merge pull request #9723 from Ghommie/Ghommie-cit321

Riding component fix and hacky mood runtimes workaround.
This commit is contained in:
kevinz000
2019-11-14 16:46:54 -07:00
committed by GitHub
2 changed files with 6 additions and 3 deletions
+4 -1
View File
@@ -125,6 +125,9 @@
screen_obj.icon_state = "mood[mood_level]"
/datum/component/mood/process() //Called on SSmood process
if(QDELETED(parent)) // workaround to an obnoxious sneaky periodical runtime.
qdel(src)
return
var/mob/living/owner = parent
switch(mood_level)
@@ -249,7 +252,7 @@
RegisterSignal(screen_obj, COMSIG_CLICK, .proc/hud_click)
/datum/component/mood/proc/unmodify_hud(datum/source)
if(!screen_obj)
if(!screen_obj || !parent)
return
var/mob/living/owner = parent
var/datum/hud/hud = owner.hud_used