From 4ae7cbce5ddd45131aafca547193ad4138a0c215 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sun, 21 Jun 2015 15:42:37 -0500 Subject: [PATCH 1/4] Re-adds the new uplink item --- .../objects/items/devices/uplink_items.dm | 6 +++++ .../items/weapons/storage/uplink_kits.dm | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/code/game/objects/items/devices/uplink_items.dm b/code/game/objects/items/devices/uplink_items.dm index 97655196222..6e4ef338b90 100644 --- a/code/game/objects/items/devices/uplink_items.dm +++ b/code/game/objects/items/devices/uplink_items.dm @@ -345,6 +345,12 @@ datum/uplink_item/dd_SortValue() ..() antag_roles = list(MODE_MERCENARY) +/datum/uplink_item/item/tools/money + name = "Operations Funding" + item_cost = 3 + path = /obj/item/weapon/storage/secure/briefcase/money + desc = "A briefcase with 10,000 untraceable thalers for funding your sneaky activities." + /*********** * Implants * ***********/ diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 6b3fdd04ae5..cb764342b7f 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -234,3 +234,26 @@ ..() new /obj/item/rig_module/electrowarfare_suite(src) new /obj/item/rig_module/voice(src) + + +/obj/item/weapon/storage/secure/briefcase/money + name = "Suspicious Briefcase" + desc = "An imposing briefcase that has an old reeking smell to it, and gives off an ominous aurora." + + + + +/obj/item/weapon/storage/secure/briefcase/money/New() + ..() + new /obj/item/weapon/spacecash/c1000(src) + new /obj/item/weapon/spacecash/c1000(src) + new /obj/item/weapon/spacecash/c1000(src) + new /obj/item/weapon/spacecash/c1000(src) + new /obj/item/weapon/spacecash/c1000(src) + new /obj/item/weapon/spacecash/c1000(src) + new /obj/item/weapon/spacecash/c1000(src) + new /obj/item/weapon/spacecash/c1000(src) + new /obj/item/weapon/spacecash/c1000(src) + new /obj/item/weapon/spacecash/c1000(src) + + From cdc3c1f0d5b627aa7167b104f58af66926fec6f9 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sun, 21 Jun 2015 15:47:48 -0500 Subject: [PATCH 2/4] Update uplink_kits.dm --- code/game/objects/items/weapons/storage/uplink_kits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index cb764342b7f..2fde00eb34e 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -238,7 +238,7 @@ /obj/item/weapon/storage/secure/briefcase/money name = "Suspicious Briefcase" - desc = "An imposing briefcase that has an old reeking smell to it, and gives off an ominous aurora." + desc = "An ominous briefcase that has the unmistakeable smell of old, stale, cigarette smoke, and gives those who look at it a bad feeling." From ec7f3c73bae0cb2170d1743195045e66caa3b3b9 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sun, 21 Jun 2015 16:20:49 -0500 Subject: [PATCH 3/4] Adds Changelog --- html/changelogs/Vivalas-Uplink.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/Vivalas-Uplink.yml diff --git a/html/changelogs/Vivalas-Uplink.yml b/html/changelogs/Vivalas-Uplink.yml new file mode 100644 index 00000000000..7be346cf6d7 --- /dev/null +++ b/html/changelogs/Vivalas-Uplink.yml @@ -0,0 +1,5 @@ +author: Vivalas +delete-after: True +changes: + - rscadd: "A new uplink item has been added! A briefcase full 'o thalla can now be bought by traitors for bribes and such!" + From 5a8e075fb23378b47e0f200e747bead09eb1728d Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sun, 21 Jun 2015 16:21:51 -0500 Subject: [PATCH 4/4] Update uplink_kits.dm --- code/game/objects/items/weapons/storage/uplink_kits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 2fde00eb34e..5b46e990f0b 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -237,7 +237,7 @@ /obj/item/weapon/storage/secure/briefcase/money - name = "Suspicious Briefcase" + name = "suspicious briefcase" desc = "An ominous briefcase that has the unmistakeable smell of old, stale, cigarette smoke, and gives those who look at it a bad feeling."