cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4270 from Baystation12/master

Browse Source 
Merge master into Dev
This commit is contained in:
Ccomp5950
2014-01-11 18:18:03 -08:00
parent bd28c0c70b df970c5d2d
commit 83ef93c41c
5 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/defines/obj/weapon.dm
View File

@@ -400,7 +400,9 @@
/obj/item/weapon/module/power_control
name = "power control module"
icon_state = "power_mod"
desc = "Heavy-duty switching circuits for power control."
desc = "Heavy-duty switching circuits for power control."
m_amt = 50
g_amt = 50
/obj/item/weapon/module/id_auth
name = "\improper ID authentication module"