cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update beams_vr.dm

Browse Source
This commit is contained in:
Razgriz
2021-04-30 22:22:31 -07:00
committed by GitHub
parent 8964acaca1
commit 40b77f37e4
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/projectiles/projectile/beams_vr.dm
View File

@@ -42,14 +42,6 @@
tracer_type = /obj/effect/projectile/tracer/laser_blue
impact_type = /obj/effect/projectile/impact/laser_blue
<<<<<<< HEAD
||||||| parent of 7e0f0ef92c... Merge pull request #10207 from klaasjared/The-Model-E2
/obj/item/projectile/beam/weaklaser/blue
muzzle_type = /obj/effect/projectile/muzzle/laser_blue
tracer_type = /obj/effect/projectile/tracer/laser_blue
impact_type = /obj/effect/projectile/impact/laser_blue
=======
/obj/item/projectile/beam/weaklaser/blue
icon_state = "bluelaser"
light_color = "#0066FF"
@@ -58,7 +50,6 @@
tracer_type = /obj/effect/projectile/tracer/laser_blue
impact_type = /obj/effect/projectile/impact/laser_blue
>>>>>>> 7e0f0ef92c... Merge pull request #10207 from klaasjared/The-Model-E2
/obj/item/projectile/beam/medigun
name = "healing beam"
icon_state = "healbeam"