cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-01 04:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance

Browse Source 
# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm
This commit is contained in:
Neerti
2016-04-20 05:41:36 -04:00
parent 75c0c5cc38 c6f2b0f76d
commit 3c92193bf5
222 changed files with 4002 additions and 3123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/projectiles/projectile/beams.dm
View File

@@ -136,9 +136,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