cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Damage lost on Bump() lowered to 3.

Browse Source 
If an X-ray hits an rwall or blast doors, the beam dies.
This commit is contained in:
Shadowmech88
2017-01-25 13:00:08 -06:00
parent c8c6fe1d64
commit 7fa50312bc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/projectile/beams.dm
View File

@@ -586,9 +586,9 @@ var/list/beam_master = list()
/obj/item/projectile/beam/xray/Bump(atom/A)
if(..())
damage -= 5
if(istype(A, /turf/simulated/wall/r_wall))
damage -= 5
damage -= 3
if(istype(A, /turf/simulated/wall/r_wall) || (istype(A, /obj/machinery/door/poddoor) && !istype(A, /obj/machinery/door/poddoor/shutters))) //if we hit an rwall or blast doors, but not shutters, the beam dies
bullet_die()
if(damage <= 0)
bullet_die()