[MIRROR] Blackout qol [MDB IGNORE] (#24541)

* Blackout qol

* This should have been a config setting

---------

Co-authored-by: FinancialGoose <92416224+TheBoondock@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-10-24 20:22:07 +00:00
committed by GitHub
co-authored by FinancialGoose Giz
parent 4b4119e4b6
commit c8cb56309c
4 changed files with 26 additions and 7 deletions
+15 -1
View File
@@ -275,7 +275,9 @@
qdel(src)
/datum/brain_trauma/severe/split_personality/blackout/on_life(seconds_per_tick, times_fired)
if(current_controller == OWNER)
if(current_controller == OWNER && stranger_backseat)//we should only start transitioning after the other personality has entered
owner.overlay_fullscreen("fade_to_black", /atom/movable/screen/fullscreen/blind)
owner.clear_fullscreen("fade_to_black", animated = 4 SECONDS)
switch_personalities()
if(owner.stat == DEAD)
if(current_controller != OWNER)
@@ -285,6 +287,18 @@
if(duration_in_seconds <= 0)
qdel(src)
return
else if(duration_in_seconds <= 50)
to_chat(owner, span_warning("You have 50 seconds left before sobering up!"))
if(prob(10) && !HAS_TRAIT(owner, TRAIT_DISCOORDINATED_TOOL_USER))
ADD_TRAIT(owner, TRAIT_DISCOORDINATED_TOOL_USER, TRAUMA_TRAIT)
owner.balloon_alert(owner, "dexterity reduced temporarily!")
//We then send a callback to automatically re-add the trait
addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_DISCOORDINATED_TOOL_USER, TRAUMA_TRAIT), 10 SECONDS)
addtimer(CALLBACK(owner, TYPE_PROC_REF(/atom, balloon_alert), owner, "dexterity regained!"), 10 SECONDS)
if(prob(15))
playsound(owner,'sound/effects/sf_hiccup_male_01.ogg', 50)
owner.emote("hiccup")
owner.adjustStaminaLoss(-5) //too drunk to feel anything
duration_in_seconds -= seconds_per_tick
/mob/living/split_personality/blackout
+8 -6
View File
@@ -223,13 +223,15 @@
/datum/status_effect/inebriated/drunk/proc/attempt_to_blackout()
/* SKYRAT EDIT REMOVAL - Blackout drunk begone
var/mob/living/carbon/drunkard = owner
if(drunkard.gain_trauma(/datum/brain_trauma/severe/split_personality/blackout, TRAUMA_LIMIT_ABSOLUTE))
drunk_value -= 50 //So that the drunk personality can spice things up without being killed by liver failure
if(drunkard.has_trauma_type(/datum/brain_trauma/severe/split_personality/blackout))// prevent ping spamming
if(prob(10))
to_chat(owner, span_warning("You stumbled and fall over!"))
owner.slip(1 SECONDS)
return
else if(drunkard.has_trauma_type(/datum/brain_trauma/severe/split_personality/blackout) && prob(10))
to_chat(owner, span_warning("You stumbled and fall over!"))
owner.slip(1 SECONDS)
*/ // SKYRAT EDIT REMOVAL END (also removed the else on the line after)
if(drunkard.gain_trauma(/datum/brain_trauma/severe/split_personality/blackout, TRAUMA_LIMIT_ABSOLUTE))
drunk_value -= 70 //So that the drunk personality can spice things up without being killed by liver failure
return
*/ // SKYRAT EDIT REMOVAL END
if(SSshuttle.emergency.mode == SHUTTLE_DOCKED && is_station_level(owner.z))// Don't put us in a deep sleep if the shuttle's here. QoL, mainly.
to_chat(owner, span_warning("You're so tired... but you can't miss that shuttle..."))
else
+3
View File
@@ -106,6 +106,9 @@ https://freesound.org/people/reelworldstudio/sounds/161122/
arcade_jump.ogg is adapted from se2001's "8-Bit Jump 3", which is public domain (CC 0):
hhttps://freesound.org/people/se2001/sounds/528568/
hiccup sfx is taken from SOUNDFISHING's hiccup sound effects, which is license under LESF and allowed ussage for video games under section 4 of aggreement:
https://www.soundfishing.eu/sound/hiccup
laser2.ogg is adapted with 3 SFX made by junggle (CC 4), inferno (CC Sampling+), humanoide9000 (CC 0):
https://freesound.org/people/junggle/sounds/28917/
https://freesound.org/people/inferno/sounds/18397/
Binary file not shown.