cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-09 16:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Replaces the mood component with a mood datum [MDB IGNORE] (#15549)

Browse Source 
* Replaces the mood component with a mood datum

* Fixes merge conflicts and updates all of our mood events to use the new mood datums

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2022-08-12 20:58:14 +02:00
committed by GitHub
parent f8e00a62ab
commit 48685b4356
138 changed files with 1081 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/datums/brain_damage/creepy_trauma.dm
View File

@@ -49,7 +49,7 @@
else
viewing = FALSE
if(viewing)
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "creeping", /datum/mood_event/creeping, obsession.name)
owner.add_mood_event("creeping", /datum/mood_event/creeping, obsession.name)
total_time_creeping += delta_time SECONDS
time_spent_away = 0
if(attachedobsessedobj)//if an objective needs to tick down, we can do that since traumas coexist with the antagonist datum
@@ -60,9 +60,9 @@
/datum/brain_trauma/special/obsessed/proc/out_of_view()
time_spent_away += 20
if(time_spent_away > 1800) //3 minutes
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "creeping", /datum/mood_event/notcreepingsevere, obsession.name)
owner.add_mood_event("creeping", /datum/mood_event/notcreepingsevere, obsession.name)
else
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "creeping", /datum/mood_event/notcreeping, obsession.name)
owner.add_mood_event("creeping", /datum/mood_event/notcreeping, obsession.name)
/datum/brain_trauma/special/obsessed/on_lose()
..()