shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1432 from Citadel-Station-13/upstream-merge-28094

Browse Source 
[MIRROR] Fixes 28060 : emergency shields have a hit effect instead of setting opacity to 1
This commit is contained in:
LetterJay
2017-06-06 13:06:23 -05:00
committed by GitHub
parent e32283f059 369d8f1142
commit 8a9db7b4d2
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/shieldgen.dm
View File

@@ -49,9 +49,7 @@
/obj/structure/emergency_shield/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
. = ..()
if(.) //damage was dealt
set_opacity(1)
spawn(20)
set_opacity(0)
new /obj/effect/temp_visual/impact_effect/ion(loc)
/obj/structure/emergency_shield/sanguine
name = "sanguine barrier"