Merge branch 'master' into upstream-merge-30056
This commit is contained in:
@@ -399,6 +399,12 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
|
||||
item = /obj/item/ammo_box/magazine/m10mm/hp
|
||||
cost = 3
|
||||
|
||||
/datum/uplink_item/ammo/pistolaps
|
||||
name = "9mm Handgun Magazine"
|
||||
desc = "An additional 15-round 9mm magazine, compatible with the Stetchkin APS pistol, found in the Spetsnaz Pyro bundle."
|
||||
item = /obj/item/ammo_box/magazine/pistolm9mm
|
||||
cost = 2
|
||||
|
||||
/datum/uplink_item/ammo/bolt_action
|
||||
name = "Surplus Rifle Clip"
|
||||
desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds."
|
||||
@@ -962,7 +968,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
|
||||
desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. \
|
||||
Be careful with wording, as artificial intelligences may look for loopholes to exploit."
|
||||
item = /obj/item/aiModule/syndicate
|
||||
cost = 14
|
||||
cost = 9
|
||||
|
||||
/datum/uplink_item/device_tools/briefcase_launchpad
|
||||
name = "Briefcase Launchpad"
|
||||
|
||||
Reference in New Issue
Block a user