From 3c70c509301df3ba031753fc700fe3fb193d7bd4 Mon Sep 17 00:00:00 2001 From: fleure Date: Sat, 3 Jan 2015 15:08:57 +0000 Subject: [PATCH 1/3] Adds briefcase with cash to uplink --- code/datums/uplink_item.dm | 7 +++++++ code/game/objects/items/weapons/storage/secure.dm | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 1c9e9e686b6..43e46a1114b 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -566,6 +566,13 @@ var/list/uplink_items = list() excludefrom = list(/datum/game_mode/nuclear) surplus = 40 +/datum/uplink_item/badass/syndiecash + name = "Syndicate Briefcase Full of Cash" + desc = "A secure briefcase containing 5000 space credits. Useful for bribing personnel, or purchasing goods and services at lucrative prices. \ + The briefcase also feels a little heavier to hold; it has been manufactured to pack a little bit more of a punch if your client needs some convincing." + item = /obj/item/weapon/storage/secure/briefcase/syndie + cost = 2 + /datum/uplink_item/badass/balloon name = "For showing that you are The Boss" desc = "A useless red balloon with the syndicate logo on it, which can blow the deepest of covers." diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 3c5f5bfd146..b41d9ad3562 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -189,6 +189,15 @@ src.add_fingerprint(user) return +//Syndie variant of Secure Briefcase. Contains space cash, slightly more robust. +/obj/item/weapon/storage/secure/briefcase/syndie + force = 15.0 + +/obj/item/weapon/storage/secure/briefcase/syndie/New() + ..() + for(var/i = 0, i < 5, i++) + new /obj/item/weapon/spacecash/c1000(src) + // ----------------------------- // Secure Safe // ----------------------------- From 7da85a57681d1ee4fe913e8612d4b48b7ea3291c Mon Sep 17 00:00:00 2001 From: fleure Date: Wed, 7 Jan 2015 19:02:34 +0000 Subject: [PATCH 2/3] Changes syndiebux TC cost from 2 to 1 --- 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 43e46a1114b..8fe315d1a21 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -571,7 +571,7 @@ var/list/uplink_items = list() desc = "A secure briefcase containing 5000 space credits. Useful for bribing personnel, or purchasing goods and services at lucrative prices. \ The briefcase also feels a little heavier to hold; it has been manufactured to pack a little bit more of a punch if your client needs some convincing." item = /obj/item/weapon/storage/secure/briefcase/syndie - cost = 2 + cost = 1 /datum/uplink_item/badass/balloon name = "For showing that you are The Boss" From e17aec48d0003d6dcae655a3ae9f7f53254c6c50 Mon Sep 17 00:00:00 2001 From: fleure Date: Mon, 19 Jan 2015 19:27:00 +0000 Subject: [PATCH 3/3] Added changelog --- html/changelogs/fleure-PR-6871.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 html/changelogs/fleure-PR-6871.yml diff --git a/html/changelogs/fleure-PR-6871.yml b/html/changelogs/fleure-PR-6871.yml new file mode 100644 index 00000000000..a2f27f334a8 --- /dev/null +++ b/html/changelogs/fleure-PR-6871.yml @@ -0,0 +1,11 @@ +# Your name. +author: fleure +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: +- rscadd: "Added briefcase filled with cash to uplink." \ No newline at end of file