cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7506 from Citadel-Station-13/kevinz000-patch-2

Browse Source 
Clamps flash confusion
This commit is contained in:
deathride58
2018-09-01 06:09:32 -04:00
committed by GitHub
parent b08b05fafb 0a39366f1a
commit 60c7c2cda5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/assembly/flash.dm
View File

@@ -108,7 +108,7 @@
to_chat(M, "<span class='disarm'>[src] emits a blinding light!</span>") to_chat(M, "<span class='disarm'>[src] emits a blinding light!</span>")
if(targeted) if(targeted)
if(M.flash_act(1, 1)) if(M.flash_act(1, 1))
M.confused += power M.confused = CLAMP(M.confused + power, 0, power * 2)
if(user) if(user)
terrible_conversion_proc(M, user) terrible_conversion_proc(M, user)
visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>") visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
@@ -125,7 +125,7 @@
to_chat(M, "<span class='danger'>[src] fails to blind you!</span>") to_chat(M, "<span class='danger'>[src] fails to blind you!</span>")
else else
if(M.flash_act()) if(M.flash_act())
M.confused += power M.confused = CLAMP(M.confused + power, 0, power * 2)
/obj/item/assembly/flash/attack(mob/living/M, mob/user) /obj/item/assembly/flash/attack(mob/living/M, mob/user)
if(!try_use_flash(user)) if(!try_use_flash(user))
@@ -138,7 +138,7 @@
add_logs(user, R, "flashed", src) add_logs(user, R, "flashed", src)
update_icon(1) update_icon(1)
M.Knockdown(rand(80,120)) M.Knockdown(rand(80,120))
R.confused += 5 R.confused = CLAMP(R.confused + 5, 0, 10)
R.flash_act(affect_silicon = 1) R.flash_act(affect_silicon = 1)
user.visible_message("<span class='disarm'>[user] overloads [R]'s sensors with the flash!</span>", "<span class='danger'>You overload [R]'s sensors with the flash!</span>") user.visible_message("<span class='disarm'>[user] overloads [R]'s sensors with the flash!</span>", "<span class='danger'>You overload [R]'s sensors with the flash!</span>")
return TRUE return TRUE