mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-21 20:20:33 +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:
@@ -392,7 +392,7 @@
|
||||
if(!hypnosis)
|
||||
to_chat(M, span_hypnophrase("The light makes you feel oddly relaxed..."))
|
||||
M.add_confusion(min(M.get_confusion() + 10, 20))
|
||||
M.dizziness += min(M.dizziness + 10, 20)
|
||||
M.adjust_timed_status_effect(20 SECONDS, /datum/status_effect/dizziness, max_duration = 40 SECONDS)
|
||||
M.adjust_drowsyness(min(M.drowsyness+10, 20))
|
||||
M.apply_status_effect(/datum/status_effect/pacify, 100)
|
||||
else
|
||||
@@ -406,7 +406,7 @@
|
||||
else if(M.flash_act())
|
||||
to_chat(M, span_notice("Such a pretty light..."))
|
||||
M.add_confusion(min(M.get_confusion() + 4, 20))
|
||||
M.dizziness += min(M.dizziness + 4, 20)
|
||||
M.adjust_timed_status_effect(8 SECONDS, /datum/status_effect/dizziness, max_duration = 40 SECONDS)
|
||||
M.adjust_drowsyness(min(M.drowsyness+4, 20))
|
||||
M.apply_status_effect(/datum/status_effect/pacify, 40)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user