mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-25 06:07:22 +01:00
[MIRROR] Assorted Shadekin Fixes (#12503)
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
co-authored by
Will
parent
6703395b08
commit
0e9e78d25c
@@ -162,7 +162,8 @@
|
||||
|
||||
//attack_as_weapon
|
||||
/obj/item/flash/attack(mob/living/target, mob/living/user, var/target_zone)
|
||||
if(!user || !target) return //sanity
|
||||
if(!user || !target || target.is_incorporeal())
|
||||
return //sanity
|
||||
|
||||
add_attack_logs(user,target,"Flashed (attempt) with [src]")
|
||||
|
||||
@@ -208,6 +209,8 @@
|
||||
return FALSE
|
||||
if(target.stat == DEAD) //no point, they're already gone.
|
||||
return FALSE
|
||||
if(target.is_incorporeal()) // SHADEEEKINNNNNNN
|
||||
return FALSE
|
||||
if(FLASHPROOF in target.mutations)
|
||||
return FALSE
|
||||
var/flash_strength = 5
|
||||
|
||||
@@ -28,6 +28,9 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/item/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/carbon/M) // Added a new proc called 'bang' that takes a location and a person to be banged.
|
||||
if(M.is_incorporeal())
|
||||
return
|
||||
|
||||
to_chat(M, span_danger("BANG")) // Called during the loop that bangs people in lockers/containers and when banging
|
||||
playsound(src, 'sound/effects/bang.ogg', 50, 1, 30) // people in normal view. Could theroetically be called during other explosions.
|
||||
// -- Polymorph
|
||||
|
||||
Reference in New Issue
Block a user