cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 03:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update tracer.dm

Browse Source
This commit is contained in:
Novacat
2020-05-01 14:22:45 -04:00
committed by GitHub
parent 7066d04df5
commit 74cb8f19a1
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
+6 -8
View File
@@ -115,7 +115,12 @@
light_power = 3
light_color = "#3300ff"
<<<<<<< HEAD
/obj/effect/projectile/tracer/cannon
icon_state = "cannon"
light_range = 1
light_power = 0.5
light_color = "#f6f2b6"
//VOREStation edit: medigun
/obj/effect/projectile/tracer/medigun
icon = 'icons/obj/projectiles_vr.dmi'
@@ -124,10 +129,3 @@
light_power = 0.5
light_color = "#80F5FF"
//VOREStation edit ends
=======
/obj/effect/projectile/tracer/cannon
icon_state = "cannon"
light_range = 1
light_power = 0.5
light_color = "#f6f2b6"
>>>>>>> aafd4b4... Explorer Expansion: New Horizons (#6960)