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

Hybridizes Point Defense Turrets with Bay's System

Browse Source
This commit is contained in:
Schnayy
2021-02-26 09:04:43 -06:00
committed by VirgoBot
parent 71f5ccbfc8
commit 7dcd8e82a9
15 changed files with 486 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/temporary_visuals/projectiles/impact.dm
+6 -1
View File
@@ -80,6 +80,7 @@
light_power = 3
light_color = "#3300ff"
<<<<<<< HEAD
//VOREStation edit: medigun
/obj/effect/projectile/impact/medigun
icon = 'icons/obj/projectiles_vr.dmi'
@@ -87,4 +88,8 @@
light_range = 2
light_power = 0.5
light_color = "#80F5FF"
//VOREStation edit ends
//VOREStation edit ends
=======
/obj/effect/projectile/impact/pointdefense
icon_state = "impact_pointdef"
>>>>>>> 031f8a7... Merge pull request #7919 from Atermonera/point_defense_targeting
code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
+6 -1
View File
@@ -92,6 +92,7 @@
light_power = 3
light_color = "#3300ff"
<<<<<<< HEAD
//VOREStation edit: medigun
/obj/effect/projectile/muzzle/medigun
icon = 'icons/obj/projectiles_vr.dmi'
@@ -99,4 +100,8 @@
light_range = 2
light_power = 0.5
light_color = "#80F5FF"
//VOREStation edit ends
//VOREStation edit ends
=======
/obj/effect/projectile/muzzle/pointdefense
icon_state = "muzzle_pointdef"
>>>>>>> 031f8a7... Merge pull request #7919 from Atermonera/point_defense_targeting
code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
+5
View File
@@ -121,6 +121,7 @@
light_power = 0.5
light_color = "#f6f2b6"
<<<<<<< HEAD
//VOREStation edit: medigun
/obj/effect/projectile/tracer/medigun
icon = 'icons/obj/projectiles_vr.dmi'
@@ -129,3 +130,7 @@
light_power = 0.5
light_color = "#80F5FF"
//VOREStation edit ends
=======
/obj/effect/projectile/tracer/pointdefense
icon_state = "beam_pointdef"
>>>>>>> 031f8a7... Merge pull request #7919 from Atermonera/point_defense_targeting