cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cleanupTwo

Browse Source
This commit is contained in:
Kelenius
2016-04-21 11:41:32 +03:00
parent df5a0d7941 a1faf6e497
commit 98badae45f
386 changed files with 7149 additions and 4820 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/beams.dm
+1 -4
View File
@@ -140,9 +140,6 @@
icon_state = "xray"
damage = 50
armor_penetration = 10
stun = 3
weaken = 3
stutter = 3
muzzle_type = /obj/effect/projectile/xray/muzzle
tracer_type = /obj/effect/projectile/xray/tracer
@@ -170,4 +167,4 @@
muzzle_type = /obj/effect/projectile/stun/muzzle
tracer_type = /obj/effect/projectile/stun/tracer
impact_type = /obj/effect/projectile/stun/impact
impact_type = /obj/effect/projectile/stun/impact