cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Flash and flashbang tweaks and fixes (#15651)

Browse Source
This commit is contained in:
Wildkins
2023-01-25 12:41:17 +01:00
committed by GitHub
parent c081ebcedd
commit b381d6f124
13 changed files with 75 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/flash.dm
+8 -6
View File
@@ -92,6 +92,11 @@
if(!L || !user || !clumsy_check(user) || !cooldown())
return
if(L == user)
if(user.a_intent == I_HURT)
attack_self(user)
return
L.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been flashed (attempt) with [src.name] by [user.name] ([user.ckey])</font>")
user.attack_log += text("\[[time_stamp()]\] <span class='warning'>Used the [src.name] to flash [L.name] ([L.ckey])</span>")
msg_admin_attack("[user.name] ([user.ckey]) Used the [src.name] to flash [L.name] ([L.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",ckey=key_name(user),ckey_target=key_name(L))
@@ -118,17 +123,14 @@
else
user.visible_message(SPAN_NOTICE("[user] fails to blind [L] with \the [src]."))
/obj/item/device/flash/attack_hand(mob/living/carbon/user)
if(!user || loc != user || user.a_intent != I_HURT)
return ..()
attack_self(user)
/obj/item/device/flash/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
// AOE flash
if(!user || !clumsy_check(user)|| !cooldown())
return
if(user.a_intent != I_HURT)
return
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(broken)