mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-15 12:43:13 +00:00
Fixes #5186
This commit is contained in:
@@ -7,19 +7,21 @@
|
|||||||
|
|
||||||
prime()
|
prime()
|
||||||
..()
|
..()
|
||||||
for(var/obj/structure/closet/L in view(get_turf(src), null))
|
for(var/obj/structure/closet/L in hear(7, get_turf(src)))
|
||||||
if(locate(/mob/living/carbon/, L))
|
if(locate(/mob/living/carbon/, L))
|
||||||
for(var/mob/living/carbon/M in L)
|
for(var/mob/living/carbon/M in L)
|
||||||
bang(get_turf(src), M)
|
bang(get_turf(src), M)
|
||||||
|
|
||||||
|
|
||||||
for(var/mob/living/carbon/M in viewers(get_turf(src), null))
|
for(var/mob/living/carbon/M in hear(7, get_turf(src)))
|
||||||
bang(get_turf(src), M)
|
bang(get_turf(src), M)
|
||||||
|
|
||||||
for(var/obj/effect/blob/B in view(8,get_turf(src))) //Blob damage here
|
for(var/obj/effect/blob/B in hear(8,get_turf(src))) //Blob damage here
|
||||||
var/damage = round(30/(get_dist(B,get_turf(src))+1))
|
var/damage = round(30/(get_dist(B,get_turf(src))+1))
|
||||||
B.health -= damage
|
B.health -= damage
|
||||||
B.update_icon()
|
B.update_icon()
|
||||||
|
|
||||||
|
new/obj/effect/effect/smoke/flashbang(src.loc)
|
||||||
del(src)
|
del(src)
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -30,7 +32,7 @@
|
|||||||
S.icon_state = "shield0"
|
S.icon_state = "shield0"
|
||||||
|
|
||||||
M << "\red <B>BANG</B>"
|
M << "\red <B>BANG</B>"
|
||||||
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
|
playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 5)
|
||||||
|
|
||||||
//Checking for protections
|
//Checking for protections
|
||||||
var/eye_safety = 0
|
var/eye_safety = 0
|
||||||
@@ -98,6 +100,15 @@
|
|||||||
M << "\red Your ears start to ring!"
|
M << "\red Your ears start to ring!"
|
||||||
M.update_icons()
|
M.update_icons()
|
||||||
|
|
||||||
|
/obj/effect/effect/smoke/flashbang
|
||||||
|
name = "illumination"
|
||||||
|
time_to_live = 10
|
||||||
|
opacity = 0
|
||||||
|
icon_state = "sparks"
|
||||||
|
|
||||||
|
/obj/effect/effect/smoke/flashbang/New()
|
||||||
|
..()
|
||||||
|
SetLuminosity(15)
|
||||||
|
|
||||||
/obj/item/weapon/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve
|
/obj/item/weapon/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve
|
||||||
desc = "Use of this weapon may constiute a war crime in your area, consult your local captain."
|
desc = "Use of this weapon may constiute a war crime in your area, consult your local captain."
|
||||||
|
|||||||
Reference in New Issue
Block a user