mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 23:58:07 +01:00
Converts drunkness and dizziness to status effects. Refactors status effect examine text (and, subsequently, stabilized black extracts). (#66340)
* Refactors dizziness into a status effect * Refactors the dizziness setter to use the new kind * Drunkness. - Should drunk continue to work off of a magic value or be swapped to duration? I've not yet decided: For understandability it's preferabale for "drunk" to use a timer (they are drunk for 3 more minutes), but both adding drunk and decreasing drunk currently use weird calculations which would be difficult to carry over. - Ballmer is a liver trait * Dizzy was a setter, not an adjuster * Does all the drunk effects over - refactors examine text fully - refactors stabilized blacks because of this * Removed * repaths, fixes some issues * Minor fixes * Some erroneous changes * Fixes some dizziness errors * Consistency thing * Warning * Undoes this change, I dont like its implementation * max_duration * Max amount * Should be a negative * max duration * drunk doesn't tick on death * Rework dizziness strength * Erroneous dizzy change * Fixes return type
This commit is contained in:
@@ -103,7 +103,7 @@
|
||||
to_chat(owner, span_userdanger("You feel your heart lurching in your chest..."))
|
||||
if(81 to 100)
|
||||
INVOKE_ASYNC(owner, /mob.proc/emote, "cough")
|
||||
owner.dizziness += 10
|
||||
owner.adjust_timed_status_effect(20 SECONDS, /datum/status_effect/dizziness)
|
||||
owner.adjust_disgust(5)
|
||||
to_chat(owner, span_userdanger("You gag and swallow a bit of bile..."))
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
if(1)
|
||||
owner.vomit()
|
||||
if(2,3)
|
||||
owner.dizziness += 10
|
||||
owner.adjust_timed_status_effect(20 SECONDS, /datum/status_effect/dizziness)
|
||||
if(4,5)
|
||||
owner.add_confusion(10)
|
||||
owner.blur_eyes(10)
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
owner.Jitter(5)
|
||||
owner.blind_eyes(10)
|
||||
if(4)
|
||||
owner.dizziness += 10
|
||||
owner.adjust_timed_status_effect(20 SECONDS, /datum/status_effect/dizziness)
|
||||
owner.add_confusion(10)
|
||||
owner.Jitter(10)
|
||||
owner.adjust_timed_status_effect(20 SECONDS, /datum/status_effect/speech/stutter)
|
||||
|
||||
@@ -189,12 +189,12 @@
|
||||
if(2)
|
||||
if(!high_stress)
|
||||
to_chat(owner, span_warning("You can't stop shaking..."))
|
||||
owner.dizziness += 20
|
||||
owner.adjust_timed_status_effect(40 SECONDS, /datum/status_effect/dizziness)
|
||||
owner.add_confusion(20)
|
||||
owner.Jitter(20)
|
||||
else
|
||||
to_chat(owner, span_warning("You feel weak and scared! If only you weren't alone..."))
|
||||
owner.dizziness += 20
|
||||
owner.adjust_timed_status_effect(40 SECONDS, /datum/status_effect/dizziness)
|
||||
owner.add_confusion(20)
|
||||
owner.Jitter(20)
|
||||
owner.adjustStaminaLoss(50)
|
||||
|
||||
Reference in New Issue
Block a user