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

515 Compat (#17465)

Browse Source 
* ONLY SKYRAT CHANGES

* ACTUALLY SKYRAT CHANGES

* yolo, revert later

* Update alternate_byond_versions.txt

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
This commit is contained in:
Zonespace
2022-11-14 22:59:06 -08:00
committed by GitHub
parent 5b56f43ff5
commit f7c26bbf25
1577 changed files with 5030 additions and 4847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,12 +29,12 @@
owner.mind.add_antag_datum(/datum/antagonist/obsessed)
antagonist = owner.mind.has_antag_datum(/datum/antagonist/obsessed)
antagonist.trauma = src
RegisterSignal(obsession, COMSIG_MOB_EYECONTACT, .proc/stare)
RegisterSignal(obsession, COMSIG_MOB_EYECONTACT, PROC_REF(stare))
..()
//antag stuff//
antagonist.forge_objectives(obsession.mind)
antagonist.greet()
RegisterSignal(owner, COMSIG_CARBON_HELPED, .proc/on_hug)
RegisterSignal(owner, COMSIG_CARBON_HELPED, PROC_REF(on_hug))
/datum/brain_trauma/special/obsessed/on_life(delta_time, times_fired)
if(!obsession || obsession.stat == DEAD)
@@ -75,7 +75,7 @@
return
if(prob(25)) // 25% chances to be nervous and stutter.
if(prob(50)) // 12.5% chance (previous check taken into account) of doing something suspicious.
addtimer(CALLBACK(src, .proc/on_failed_social_interaction), rand(1, 3) SECONDS)
addtimer(CALLBACK(src, PROC_REF(on_failed_social_interaction)), rand(1, 3) SECONDS)
else if(!owner.has_status_effect(/datum/status_effect/speech/stutter))
to_chat(owner, span_warning("Being near [obsession] makes you nervous and you begin to stutter..."))
owner.set_stutter_if_lower(6 SECONDS)
@@ -94,16 +94,16 @@
return
switch(rand(1, 100))
if(1 to 40)
INVOKE_ASYNC(owner, /mob.proc/emote, pick("blink", "blink_r"))
INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), pick("blink", "blink_r"))
owner.blur_eyes(10)
to_chat(owner, span_userdanger("You sweat profusely and have a hard time focusing..."))
if(41 to 80)
INVOKE_ASYNC(owner, /mob.proc/emote, "pale")
INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "pale")
shake_camera(owner, 15, 1)
owner.adjustStaminaLoss(70)
to_chat(owner, span_userdanger("You feel your heart lurching in your chest..."))
if(81 to 100)
INVOKE_ASYNC(owner, /mob.proc/emote, "cough")
INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "cough")
owner.adjust_dizzy(20 SECONDS)
owner.adjust_disgust(5)
to_chat(owner, span_userdanger("You gag and swallow a bit of bile..."))
@@ -115,7 +115,7 @@
if(examining_mob != owner || !triggering_examiner || prob(50))
return
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, obsession, span_warning("You catch [examining_mob] staring at you..."), 3))
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), obsession, span_warning("You catch [examining_mob] staring at you..."), 3))
return COMSIG_BLOCK_EYECONTACT
/datum/brain_trauma/special/obsessed/proc/find_obsession()