mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-16 10:35:41 +01:00
Confusion will no longer continue to confuse after being cured (#52286)
* Confusion will no longer continue to confuse after being cured * Grammar comment fix * Move to status effect * Remove test per request * Make confusion a status effect, confusion curing now completely neuters the confusion * set_confusion changes, get_confusion * Fix confusion going down twice per tick * Change strength = to proc * Move procs to status_procs
This commit is contained in:
@@ -323,7 +323,7 @@
|
||||
if(owner.can_hear())
|
||||
owner.dizziness = max(0, owner.dizziness - 2)
|
||||
owner.jitteriness = max(0, owner.jitteriness - 2)
|
||||
owner.confused = max(0, owner.confused - 1)
|
||||
owner.set_confusion(max(0, owner.get_confusion() - 1))
|
||||
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "goodmusic", /datum/mood_event/goodmusic)
|
||||
|
||||
/obj/screen/alert/status_effect/regenerative_core
|
||||
|
||||
@@ -390,6 +390,22 @@
|
||||
I.take_damage(100)
|
||||
return ..()
|
||||
|
||||
/// A status effect used for specifying confusion on a living mob.
|
||||
/// Created automatically with /mob/living/set_confusion.
|
||||
/datum/status_effect/confusion
|
||||
id = "confusion"
|
||||
alert_type = null
|
||||
var/strength
|
||||
|
||||
/datum/status_effect/confusion/tick()
|
||||
strength -= 1
|
||||
if (strength <= 0)
|
||||
owner.remove_status_effect(STATUS_EFFECT_CONFUSION)
|
||||
return
|
||||
|
||||
/datum/status_effect/confusion/proc/set_strength(new_strength)
|
||||
strength = new_strength
|
||||
|
||||
/datum/status_effect/stacking/saw_bleed
|
||||
id = "saw_bleed"
|
||||
tick_interval = 6
|
||||
|
||||
Reference in New Issue
Block a user