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

Removes the flashbang stun. (#8546)

Browse Source 
I hate security.
This commit is contained in:
Matt Atlas
2020-03-31 21:05:11 +02:00
committed by GitHub
parent 876d315ad3
commit 0e60f21352
2 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/grenades/flashbang.dm
+1 -6
View File
@@ -51,7 +51,6 @@
//Flashing everyone
if(eye_safety < FLASH_PROTECTION_MODERATE)
flick("e_flash", M.flash)
M.Stun(2)
M.Weaken(10)
//Vaurca damage 15/01/16
var/mob/living/carbon/human/H = M
@@ -65,10 +64,8 @@
//Now applying sound
if((get_dist(M, T) <= 2 || src.loc == M.loc || src.loc == M))
if(ear_safety > 0)
M.Stun(2)
M.Weaken(1)
else
M.Stun(10)
M.Weaken(3)
if ((prob(14) || (M == src.loc && prob(70))))
M.ear_damage += rand(1, 10)
@@ -78,13 +75,11 @@
else if(get_dist(M, T) <= 5)
if(!ear_safety)
M << sound('sound/weapons/flash_ring.ogg',0,1,0,100)
M.Stun(8)
sound_to(M, sound('sound/weapons/flash_ring.ogg',0,1,0,100))
M.ear_damage += rand(0, 3)
M.ear_deaf = max(M.ear_deaf,10)
else if(!ear_safety)
M.Stun(4)
M.ear_damage += rand(0, 1)
M.ear_deaf = max(M.ear_deaf,5)