cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9723 from Ghommie/Ghommie-cit321

Browse Source 
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
parent 02e8a73265 7348693338
commit 746bbccb9c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/datums/components/mood.dm
View File

@@ -125,6 +125,9 @@
screen_obj.icon_state = "mood[mood_level]" screen_obj.icon_state = "mood[mood_level]"
/datum/component/mood/process() //Called on SSmood process /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 var/mob/living/owner = parent
switch(mood_level) switch(mood_level)
@@ -249,7 +252,7 @@
RegisterSignal(screen_obj, COMSIG_CLICK, .proc/hud_click) RegisterSignal(screen_obj, COMSIG_CLICK, .proc/hud_click)
/datum/component/mood/proc/unmodify_hud(datum/source) /datum/component/mood/proc/unmodify_hud(datum/source)
if(!screen_obj) if(!screen_obj || !parent)
return return
var/mob/living/owner = parent var/mob/living/owner = parent
var/datum/hud/hud = owner.hud_used var/datum/hud/hud = owner.hud_used

4
code/datums/components/riding.dm
View File

@@ -310,10 +310,10 @@
if(!user.put_in_hands(inhand, TRUE)) if(!user.put_in_hands(inhand, TRUE))
qdel(inhand) // it isn't going to be added to offhands anyway qdel(inhand) // it isn't going to be added to offhands anyway
break break
LAZYADD(equipped, src) LAZYADD(equipped, inhand)
var/amount_equipped = LAZYLEN(equipped) var/amount_equipped = LAZYLEN(equipped)
if(amount_equipped) if(amount_equipped)
LAZYADD(offhands[L], amount_equipped) LAZYADD(offhands[L], equipped)
if(amount_equipped >= amount_required) if(amount_equipped >= amount_required)
return TRUE return TRUE
unequip_buckle_inhands(L) unequip_buckle_inhands(L)