cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 23:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implements PASSRAILING as a new pass flag (#14009)

Browse Source
This commit is contained in:
Benedict
2022-05-23 06:46:59 -04:00
committed by GitHub
parent 792f1b2a66
commit 12ecc934f1
23 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
/obj/item/projectile/beam
name = "laser"
icon_state = "laser"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING
damage = 30
damage_type = BURN
impact_sounds = list(BULLET_IMPACT_MEAT = SOUNDS_LASER_MEAT, BULLET_IMPACT_METAL = SOUNDS_LASER_METAL)
@@ -19,7 +19,7 @@
/obj/item/projectile/beam/practice
name = "laser"
icon_state = "laser"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING
damage = 0
damage_type = BURN
no_attack_log = 1
@@ -123,7 +123,7 @@
/obj/item/projectile/beam/laser_tag
name = "lasertag beam"
icon_state = "laser"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING
damage = 0
no_attack_log = 1
damage_type = BURN
@@ -301,7 +301,7 @@
/obj/item/projectile/beam/shotgun
name = "diffuse laser"
icon_state = "laser"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING
damage = 20
eyeblur = 4
@@ -431,7 +431,7 @@
icon_state = "lightning"
damage = 10
damage_type = BURN
pass_flags = PASSTABLE | PASSGRILLE
pass_flags = PASSTABLE | PASSGRILLE | PASSRAILING
range = 40
eyeblur = 0
@@ -456,7 +456,7 @@
/obj/item/projectile/beam/freezer
name = "freezing ray"
icon_state = "bluelaser"
pass_flags = PASSTABLE
pass_flags = PASSTABLE | PASSRAILING
damage = 15
damage_type = BURN
check_armor = "energy"

12
code/modules/projectiles/projectile/energy.dm
View File

@@ -106,7 +106,7 @@
check_armor = "bomb"
damage = 60
damage_type = BRUTE
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING
range = 100
embed = 0
speed = 8
@@ -148,7 +148,7 @@
icon_state = "bluespace"
damage = 0
damage_type = BRUTE
pass_flags = PASSTABLE | PASSGRILLE
pass_flags = PASSTABLE | PASSGRILLE | PASSRAILING
range = 10
embed = 0
speed = 2
@@ -176,7 +176,7 @@
check_armor = "bio"
damage = 5
damage_type = BRUTE
pass_flags = PASSTABLE | PASSGRILLE
pass_flags = PASSTABLE | PASSGRILLE | PASSRAILING
embed = 0
weaken = 0
@@ -198,13 +198,13 @@
check_armor = "laser"
damage_type = BURN
damage_flags = DAM_LASER
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING
muzzle_type = /obj/effect/projectile/muzzle/bolt
hit_effect = /obj/effect/temp_visual/blaster_effect
/obj/item/projectile/energy/blaster/disruptor
damage = 20
pass_flags = PASSTABLE
pass_flags = PASSTABLE | PASSRAILING
/obj/item/projectile/energy/disruptorstun
name = "disruptor bolt"
@@ -214,7 +214,7 @@
speed = 0.4
damage_type = BURN
eyeblur = TRUE
pass_flags = PASSTABLE
pass_flags = PASSTABLE | PASSRAILING
muzzle_type = /obj/effect/projectile/muzzle/bolt
/obj/item/projectile/energy/blaster/heavy

2
code/modules/projectiles/projectile/trace.dm
View File

@@ -1,5 +1,5 @@
//Helper proc to check if you can hit them or not.
/proc/check_trajectory(atom/target as mob|obj, atom/firer as mob|obj, var/pass_flags=PASSTABLE|PASSGLASS|PASSGRILLE, flags=null)
/proc/check_trajectory(atom/target as mob|obj, atom/firer as mob|obj, var/pass_flags=PASSTABLE|PASSGLASS|PASSGRILLE|PASSRAILING, flags=null)
if(!istype(target) || !istype(firer))
return 0