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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-10-03 07:05:54 -04:00
parent d9c4fe21be 7ee1cd7c06
commit 5e629dff04
517 changed files with 24339 additions and 21253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/creepy_trauma.dm
+2
View File
@@ -38,6 +38,7 @@
antagonist.greet()
log_game("[key_name(antagonist)] has developed an obsession with [key_name(obsession)].")
RegisterSignal(owner, COMSIG_CARBON_HELPED, PROC_REF(on_hug))
ADD_TRAIT(owner, TRAIT_DESENSITIZED, REF(src))
/datum/brain_trauma/special/obsessed/on_life(seconds_per_tick, times_fired)
if(!obsession || obsession.stat == DEAD)
@@ -75,6 +76,7 @@
if(obsession)
log_game("[key_name(owner)] is no longer obsessed with [key_name(obsession)].")
UnregisterSignal(obsession, COMSIG_MOB_EYECONTACT)
REMOVE_TRAIT(owner, TRAIT_DESENSITIZED, REF(src))
/datum/brain_trauma/special/obsessed/handle_speech(datum/source, list/speech_args)
if(!viewing)
code/datums/brain_damage/imaginary_friend.dm
+1 -1
View File
@@ -392,7 +392,7 @@
var/obj/visual = image('icons/hud/screen_gen.dmi', our_tile, "arrow", FLY_LAYER)
INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay_global), visual, group_clients(), 2.5 SECONDS)
animate(visual, pixel_x = (tile.x - our_tile.x) * ICON_SIZE_X + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * ICON_SIZE_Y + pointed_atom.pixel_y, time = 1.7, easing = EASE_OUT)
animate(visual, pixel_x = (tile.x - our_tile.x) * ICON_SIZE_X + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * ICON_SIZE_Y + pointed_atom.pixel_y, time = 1.7, easing = SINE_EASING|EASE_OUT)
/mob/eye/imaginary_friend/create_thinking_indicator()
if(active_thinking_indicator || active_typing_indicator || !HAS_TRAIT(src, TRAIT_THINKING_IN_CHARACTER))
code/datums/brain_damage/special.dm
+2
View File
@@ -463,12 +463,14 @@
owner.add_mood_event("combat_ptsd", /datum/mood_event/desentized)
owner.mob_mood?.mood_modifier -= 1 //Basically nothing can change your mood
owner.mob_mood?.sanity_level = SANITY_DISTURBED //Makes sanity on a unstable level unless cured
ADD_TRAIT(owner, TRAIT_DESENSITIZED, REF(src))
. = ..()
/datum/brain_trauma/special/ptsd/on_lose()
owner.clear_mood_event("combat_ptsd")
owner.mob_mood?.mood_modifier += 1
owner.mob_mood?.sanity_level = SANITY_GREAT
REMOVE_TRAIT(owner, TRAIT_DESENSITIZED, REF(src))
return ..()
/datum/brain_trauma/special/primal_instincts