mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
[MIRROR] Confusion will no longer continue to confuse after being cured (#213)
* 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 * Confusion will no longer continue to confuse after being cured Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
This commit is contained in:
@@ -388,7 +388,7 @@
|
||||
user.visible_message("<span class='danger'>[user] slams head-first into [hit], suffering major cranial trauma!</span>", "<span class='userdanger'>You slam head-first into [hit], and the world explodes around you!</span>")
|
||||
user.adjustStaminaLoss(30)
|
||||
user.adjustBruteLoss(30)
|
||||
user.confused += 15
|
||||
user.add_confusion(15)
|
||||
if(prob(80))
|
||||
user.gain_trauma(/datum/brain_trauma/mild/concussion)
|
||||
user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9)
|
||||
@@ -401,7 +401,7 @@
|
||||
user.visible_message("<span class='danger'>[user] slams hard into [hit], knocking [user.p_them()] senseless!</span>", "<span class='userdanger'>You slam hard into [hit], knocking yourself senseless!</span>")
|
||||
user.adjustStaminaLoss(30)
|
||||
user.adjustBruteLoss(10)
|
||||
user.confused += 10
|
||||
user.add_confusion(10)
|
||||
user.Knockdown(30)
|
||||
shake_camera(user, 3, 4)
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
|
||||
/datum/component/wet_floor/proc/AfterSlip(mob/living/L)
|
||||
if(highest_strength == TURF_WET_LUBE)
|
||||
L.confused = max(L.confused, 8)
|
||||
L.set_confusion(max(L.get_confusion(), 8))
|
||||
|
||||
/datum/component/wet_floor/proc/update_flags()
|
||||
var/intensity
|
||||
|
||||
Reference in New Issue
Block a user