shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-26760

Browse Source
This commit is contained in:
LetterJay
2017-05-14 01:02:26 -04:00
committed by GitHub
parent e66cbfd7db 55dd3876e5
commit 52fa1f314f
531 changed files with 5863 additions and 3439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/equipment/weapons/weapons.dm
+1 -1
View File
@@ -107,7 +107,7 @@
icon_state = "mecha_ion"
origin_tech = "materials=4;engineering=4;combat=6;magnets=6"
energy_drain = 500
projectile = /obj/item/projectile/energy/tesla_cannon
projectile = /obj/item/projectile/energy/tesla/cannon
fire_sound = 'sound/magic/lightningbolt.ogg'