cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

ayyy merge conflicts fix

Browse Source
This commit is contained in:
Aurorablade
2016-02-02 20:46:38 -05:00
parent 25876fd036
commit 6001f3d80c
12 changed files with 134 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/mounted.dm
+2 -2
View File
@@ -1,9 +1,9 @@
/obj/item/weapon/gun/energy/gun/advtaser/mounted
name = "mounted taser"
desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots."
icon_state = "armcannon_stun"
icon_state = "armcannonstun"
item_state = "armcannonstun"
modifystate = "armcannon_stun"
modifystate = "armcannonstun"
force = "5"
self_recharge = 1
flags = NODROP