mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
X-ray beams now have infinite penetration.
Every time an X-ray beam passes through an object, its damage is reduced by 2. The beam is deleted when its damage reaches 0.
This commit is contained in:
@@ -95,6 +95,7 @@ var/list/beam_master = list()
|
||||
var/first = 1
|
||||
var/tS = 0
|
||||
while(src && src.loc)// only stop when we've hit something, or hit the end of the map
|
||||
bumped = 0
|
||||
if(first && timestopped)
|
||||
tS = 1
|
||||
timestopped = 0
|
||||
@@ -578,8 +579,17 @@ var/list/beam_master = list()
|
||||
name = "xray beam"
|
||||
icon_state = "xray"
|
||||
damage = 30
|
||||
kill_count = 500
|
||||
phase_type = PROJREACT_WALLS|PROJREACT_WINDOWS|PROJREACT_OBJS|PROJREACT_MOBS|PROJREACT_BLOB
|
||||
penetration = -1
|
||||
fire_sound = 'sound/weapons/laser3.ogg'
|
||||
|
||||
/obj/item/projectile/beam/xray/Bump(atom/A)
|
||||
if(..())
|
||||
damage -= 2
|
||||
if(damage <= 0)
|
||||
bullet_die()
|
||||
|
||||
/obj/item/projectile/beam/pulse
|
||||
name = "pulse"
|
||||
icon_state = "u_laser"
|
||||
|
||||
Reference in New Issue
Block a user