From 447416b6805b101c7a29cd543578ca788679a3fa Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 6 Jul 2024 12:30:29 -0700 Subject: [PATCH 1/4] Update flash.dm --- code/game/objects/items/devices/flash.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 0845b670c6fd..ee74a83613c3 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -94,7 +94,8 @@ if(iscarbon(M)) flashfail = !M.flash_eyes() if(!flashfail) - M.apply_effect(10, WEAKEN) + M.KnockDown(10) + M.Stun(10) else if(isSilicon(M)) M.apply_effect(rand(5,10), WEAKEN) From 7b4e4ff3fa965657dacfe34401d7e05cda944f73 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 6 Jul 2024 16:44:24 -0700 Subject: [PATCH 2/4] fix flashbang too --- code/game/objects/items/explosives/grenades/flashbang.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/explosives/grenades/flashbang.dm b/code/game/objects/items/explosives/grenades/flashbang.dm index 50cb34668ae3..8acf16cd86e6 100644 --- a/code/game/objects/items/explosives/grenades/flashbang.dm +++ b/code/game/objects/items/explosives/grenades/flashbang.dm @@ -135,7 +135,8 @@ deafen_amount = 0 to_chat(M, SPAN_HELPFUL("Your gear protects you from the worst of the 'bang'.")) - M.apply_effect(weaken_amount, WEAKEN) + M.apply_effect(weaken_amount, STUN) + M.apply_effect(weaken_amount, KNOCKDOWN) M.apply_effect(paralyze_amount, PARALYZE) if(deafen_amount) M.SetEarDeafness(max(M.ear_deaf, deafen_amount)) From d8d6a00c62de1f7edad2559368bc6231d11b4399 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 6 Jul 2024 16:47:05 -0700 Subject: [PATCH 3/4] woops --- code/game/objects/items/explosives/grenades/flashbang.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/explosives/grenades/flashbang.dm b/code/game/objects/items/explosives/grenades/flashbang.dm index 8acf16cd86e6..92c33d8e0777 100644 --- a/code/game/objects/items/explosives/grenades/flashbang.dm +++ b/code/game/objects/items/explosives/grenades/flashbang.dm @@ -136,7 +136,7 @@ to_chat(M, SPAN_HELPFUL("Your gear protects you from the worst of the 'bang'.")) M.apply_effect(weaken_amount, STUN) - M.apply_effect(weaken_amount, KNOCKDOWN) + M.apply_effect(weaken_amount, WEAKEN) M.apply_effect(paralyze_amount, PARALYZE) if(deafen_amount) M.SetEarDeafness(max(M.ear_deaf, deafen_amount)) From 6d40216665e9bcb7061ac4e542a22c439bd838de Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 6 Jul 2024 17:19:48 -0700 Subject: [PATCH 4/4] use tg procs not legacy redirects --- code/game/objects/items/explosives/grenades/flashbang.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/explosives/grenades/flashbang.dm b/code/game/objects/items/explosives/grenades/flashbang.dm index 92c33d8e0777..de4af15667e9 100644 --- a/code/game/objects/items/explosives/grenades/flashbang.dm +++ b/code/game/objects/items/explosives/grenades/flashbang.dm @@ -135,9 +135,9 @@ deafen_amount = 0 to_chat(M, SPAN_HELPFUL("Your gear protects you from the worst of the 'bang'.")) - M.apply_effect(weaken_amount, STUN) - M.apply_effect(weaken_amount, WEAKEN) - M.apply_effect(paralyze_amount, PARALYZE) + M.Stun(weaken_amount) + M.KnockDown(weaken_amount) + M.KnockOut(paralyze_amount) if(deafen_amount) M.SetEarDeafness(max(M.ear_deaf, deafen_amount))