Merge branch 'master' into development

This commit is contained in:
skull132
2017-08-04 22:19:20 +03:00
6 changed files with 1138 additions and 1101 deletions
+1 -1
View File
@@ -14,7 +14,7 @@
item_cost = 5
path = /obj/item/rig_module/fabricator/energy_net
/datum/uplink_item/item/ewar_voice
/datum/uplink_item/item/hardsuit_modules/ewar_voice
name = "Electrowarfare Suite and Voice Synthesiser"
item_cost = 6
path = /obj/item/weapon/storage/box/syndie_kit/ewar_voice