Merge branch 'master' into development

This commit is contained in:
skull132
2017-08-07 23:56:04 +03:00
11 changed files with 52 additions and 31 deletions
+3 -3
View File
@@ -26,9 +26,9 @@
path = /obj/item/weapon/plastique
/datum/uplink_item/item/tools/heavy_vest
name = "Heavy Armor Vest"
name = "Heavy Armor Kit"
item_cost = 4
path = /obj/item/clothing/suit/storage/vest/merc
path = /obj/item/weapon/storage/box/syndie_kit/armor
/datum/uplink_item/item/tools/encryptionkey_radio
name = "Encrypted Radio Channel Key"
@@ -86,7 +86,7 @@
name = "Hacked Supply Beacon (DANGER!)"
item_cost = 14
path = /obj/item/supply_beacon
/datum/uplink_item/item/tools/advancedpinpointer
name = "Advanced pinpointer"
item_cost = 15