cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] replaces a cursed proc in trauma code with a blessed signal (#1184)

Browse Source 
* replaces a cursed proc in trauma code with a blessed signal (#54208)

code: some cursed snowflake proc call now uses a blessed signal in trauma code

* replaces a cursed proc in trauma code with a blessed signal

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
This commit is contained in:
SkyratBot
2020-10-07 15:58:16 +02:00
committed by GitHub
co-authored by Qustinnus
parent 4d561124ed
commit 35cbcf8a8b
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/brain_trauma.dm
-5
View File
@@ -56,8 +56,3 @@
SIGNAL_HANDLER
UnregisterSignal(owner, COMSIG_MOB_SAY)
//Called when hugging. expand into generally interacting, where future coders could switch the intent?
/datum/brain_trauma/proc/on_hug(mob/living/hugger, mob/living/hugged)
return
code/datums/brain_damage/creepy_trauma.dm
+2 -1
View File
@@ -34,6 +34,7 @@
//antag stuff//
antagonist.forge_objectives(obsession.mind)
antagonist.greet()
RegisterSignal(owner, COMSIG_CARBON_HUG, .proc/on_hug)
/datum/brain_trauma/special/obsessed/on_life()
if(!obsession || obsession.stat == DEAD)
@@ -76,7 +77,7 @@
if(mood && mood.sanity >= SANITY_GREAT && social_interaction())
speech_args[SPEECH_MESSAGE] = ""
/datum/brain_trauma/special/obsessed/on_hug(mob/living/hugger, mob/living/hugged)
/datum/brain_trauma/special/obsessed/proc/on_hug(mob/living/hugger, mob/living/hugged)
if(hugged == obsession)
obsession_hug_count++