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/__DEFINES/dcs/signals.dm
+3
View File
@@ -421,6 +421,9 @@
#define COMSIG_LIVING_CAN_TRACK "mob_cantrack"
#define COMPONENT_CANT_TRACK (1<<0)
///When a carbon mob hugs someone, this is called on the carbon mob.
#define COMSIG_CARBON_HUG "carbon_hug"
// /mob/living/carbon physiology signals
#define COMSIG_CARBON_GAIN_WOUND "carbon_gain_wound" //from /datum/wound/proc/apply_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L)
#define COMSIG_CARBON_LOSE_WOUND "carbon_lose_wound" //from /datum/wound/proc/remove_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L)
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++
code/modules/mob/living/carbon/carbon_defense.dm
+1 -2
View File
@@ -446,6 +446,7 @@
//SKYRAT EDIT ADDITION END
else
SEND_SIGNAL(M, COMSIG_CARBON_HUG, M, src)
M.visible_message("<span class='notice'>[M] hugs [src] to make [p_them()] feel better!</span>", \
null, "<span class='hear'>You hear the rustling of clothes.</span>", DEFAULT_MESSAGE_RANGE, list(M, src))
to_chat(M, "<span class='notice'>You hug [src] to make [p_them()] feel better!</span>")
@@ -476,8 +477,6 @@
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M)
else if (mood.sanity >= SANITY_DISTURBED)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/betterhug, M)
for(var/datum/brain_trauma/trauma in M.get_traumas())
trauma.on_hug(M, src)
AdjustStun(-60)
AdjustKnockdown(-60)
AdjustUnconscious(-60)