cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes up this PR!

Browse Source
This commit is contained in:
Unknown
2021-04-26 11:34:58 -04:00
parent a4f93a94b8
commit 2e5737ee12
8 changed files with 75 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/beams.dm
+2 -2
View File
@@ -44,6 +44,7 @@
damage = 30
armor_penetration = 10
/obj/item/projectile/beam/midlaser
damage = 40
armor_penetration = 10
@@ -281,6 +282,7 @@
damage = 5
agony = 10
//
// Projectile Beam Definitions
//
@@ -298,5 +300,3 @@
muzzle_type = /obj/effect/projectile/muzzle/pointdefense
tracer_type = /obj/effect/projectile/tracer/pointdefense
impact_type = /obj/effect/projectile/impact/pointdefense
code/modules/projectiles/projectile/beams_vr.dm
-11
View File
@@ -50,15 +50,6 @@
tracer_type = /obj/effect/projectile/tracer/laser_blue
impact_type = /obj/effect/projectile/impact/laser_blue
/obj/item/projectile/beam/carbine/blue //double the damage of weaklaser
damage = 30
icon_state = "bluelaser"
light_color = "#0066FF"
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/medigun
name = "healing beam"
icon_state = "healbeam"
@@ -92,5 +83,3 @@
M.adjustToxLoss(-5)
M.adjustOxyLoss(-5)
return 1