From 9292c4b304794ab4e541451bfa69fc607f13f7fe Mon Sep 17 00:00:00 2001 From: theColdflame Date: Thu, 8 Sep 2016 01:08:10 +0100 Subject: [PATCH 1/3] adds 10mm variants to uplink fixes typo fixes extra line fixes HP uplink name don't code at 1am --- code/datums/uplink_item.dm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 5f7b5e8237a..7a1d3b59def 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -577,11 +577,32 @@ var/list/uplink_items = list() /datum/uplink_item/ammo/pistol name = "Magazine - 10mm" - desc = "An additional 8-round 10mm magazine for use in the syndicate pistol. These subsonic rounds are dirt cheap but are half as effective as .357 rounds." + desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with standard rounds that are weak but inexpensive." reference = "10MM" item = /obj/item/ammo_box/magazine/m10mm cost = 1 +/datum/uplink_item/ammo/pistolap + name = "Magazine - 10mm Armour Piercing" + desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with rounds that are less effective at injuring the target but penetrate protective gear." + reference = "10MM" + item = /obj/item/ammo_box/magazine/m10mm/ap + cost = 2 + +/datum/uplink_item/ammo/pistolfire + name = "Magazine - 10mm Incendiary" + desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with incendiary rounds which ignite the target." + reference = "10MM" + item = /obj/item/ammo_box/magazine/m10mm/fire + cost = 2 + +/datum/uplink_item/ammo/pistolhp + name = "Magazine - 10mm Hollow Point" + desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with rounds which are more damaging but ineffective against armour." + reference = "10MM" + item = /obj/item/ammo_box/magazine/m10mm/hp + cost = 3 + /datum/uplink_item/ammo/revolver name = "Speed Loader - .357" desc = "A speed loader that contains seven additional .357 Magnum rounds for the syndicate revolver. For when you really need a lot of things dead." @@ -791,7 +812,7 @@ var/list/uplink_items = list() reference = "CHHUD" item = /obj/item/clothing/glasses/hud/security/chameleon cost = 2 - + /datum/uplink_item/stealthy_weapons/chameleonflag name = "Chameleon Flag" desc = "A flag that can be disguised as any other known flag. There is a heat sensitive bomb loaded into the pole that will be detonated if the flag is lit on fire." From aaa08f2189a44cf6dacbd5a9aa8322412ca057de Mon Sep 17 00:00:00 2001 From: theColdflame Date: Mon, 12 Sep 2016 21:38:09 +0100 Subject: [PATCH 2/3] adds unique references --- code/datums/uplink_item.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 7a1d3b59def..cd2eb32ab4a 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -585,21 +585,21 @@ var/list/uplink_items = list() /datum/uplink_item/ammo/pistolap name = "Magazine - 10mm Armour Piercing" desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with rounds that are less effective at injuring the target but penetrate protective gear." - reference = "10MM" + reference = "10MMAP" item = /obj/item/ammo_box/magazine/m10mm/ap cost = 2 /datum/uplink_item/ammo/pistolfire name = "Magazine - 10mm Incendiary" desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with incendiary rounds which ignite the target." - reference = "10MM" + reference = "10MMFIRE" item = /obj/item/ammo_box/magazine/m10mm/fire cost = 2 /datum/uplink_item/ammo/pistolhp name = "Magazine - 10mm Hollow Point" desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with rounds which are more damaging but ineffective against armour." - reference = "10MM" + reference = "10MMHP" item = /obj/item/ammo_box/magazine/m10mm/hp cost = 3 From bd73e58d60aaac8a901931b88edd8850c3e36dae Mon Sep 17 00:00:00 2001 From: theColdflame Date: Mon, 26 Sep 2016 04:43:10 +0100 Subject: [PATCH 3/3] description --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index cd2eb32ab4a..3b09989d6d4 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -577,7 +577,7 @@ var/list/uplink_items = list() /datum/uplink_item/ammo/pistol name = "Magazine - 10mm" - desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with standard rounds that are weak but inexpensive." + desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with rounds that are cheap but around half as effective as .357" reference = "10MM" item = /obj/item/ammo_box/magazine/m10mm cost = 1