From 76db1f5e6ca5c72d688407a983bd097fd0937136 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 21 Feb 2016 02:16:14 +0000 Subject: [PATCH] Changes predefined space cash stacks to be bundles Fixes #926 --- .../items/weapons/storage/uplink_kits.dm | 20 +++++++++---------- .../objects/items/weapons/storage/wallets.dm | 4 ++-- .../crates_lockers/closets/secure/freezer.dm | 6 +++--- code/modules/admin/verbs/debug.dm | 2 +- code/modules/economy/cash.dm | 20 +++++++++---------- maps/polaris-2.dmm | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 5b46e990f0..a01722f9e9 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -245,15 +245,15 @@ /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) + new /obj/item/weapon/spacecash/bundle/c1000(src) + new /obj/item/weapon/spacecash/bundle/c1000(src) + new /obj/item/weapon/spacecash/bundle/c1000(src) + new /obj/item/weapon/spacecash/bundle/c1000(src) + new /obj/item/weapon/spacecash/bundle/c1000(src) + new /obj/item/weapon/spacecash/bundle/c1000(src) + new /obj/item/weapon/spacecash/bundle/c1000(src) + new /obj/item/weapon/spacecash/bundle/c1000(src) + new /obj/item/weapon/spacecash/bundle/c1000(src) + new /obj/item/weapon/spacecash/bundle/c1000(src) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 9b4f9271a2..e9ef52fc11 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -75,10 +75,10 @@ /obj/item/weapon/storage/wallet/random/New() ..() - var/item1_type = pick( /obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c20,/obj/item/weapon/spacecash/c200,/obj/item/weapon/spacecash/c50, /obj/item/weapon/spacecash/c500) + var/item1_type = pick( /obj/item/weapon/spacecash/bundle/c10,/obj/item/weapon/spacecash/bundle/c100,/obj/item/weapon/spacecash/bundle/c1000,/obj/item/weapon/spacecash/bundle/c20,/obj/item/weapon/spacecash/bundle/c200,/obj/item/weapon/spacecash/bundle/c50, /obj/item/weapon/spacecash/bundle/c500) var/item2_type if(prob(50)) - item2_type = pick( /obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c20,/obj/item/weapon/spacecash/c200,/obj/item/weapon/spacecash/c50, /obj/item/weapon/spacecash/c500) + item2_type = pick( /obj/item/weapon/spacecash/bundle/c10,/obj/item/weapon/spacecash/bundle/c100,/obj/item/weapon/spacecash/bundle/c1000,/obj/item/weapon/spacecash/bundle/c20,/obj/item/weapon/spacecash/bundle/c200,/obj/item/weapon/spacecash/bundle/c50, /obj/item/weapon/spacecash/bundle/c500) var/item3_type = pick( /obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/gold, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron ) spawn(2) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 0722b5b077..f7d50ad028 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -85,9 +85,9 @@ New() ..() for(var/i = 0, i < 3, i++) - new /obj/item/weapon/spacecash/c1000(src) + new /obj/item/weapon/spacecash/bundle/c1000(src) for(var/i = 0, i < 5, i++) - new /obj/item/weapon/spacecash/c500(src) + new /obj/item/weapon/spacecash/bundle/c500(src) for(var/i = 0, i < 6, i++) - new /obj/item/weapon/spacecash/c200(src) + new /obj/item/weapon/spacecash/bundle/c200(src) return diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 3db3cfbca6..94f13c9a1b 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -607,7 +607,7 @@ for(var/obj/item/briefcase_item in sec_briefcase) qdel(briefcase_item) for(var/i=3, i>0, i--) - sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000 + sec_briefcase.contents += new /obj/item/weapon/spacecash/bundle/c1000 sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba sec_briefcase.contents += new /obj/item/ammo_magazine/a357 diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 6934dc7a33..8f694611d2 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -78,7 +78,7 @@ if(!worth) usr.drop_from_inventory(src) if(amount in list(1000,500,200,100,50,20,1)) - var/cashtype = text2path("/obj/item/weapon/spacecash/c[amount]") + var/cashtype = text2path("/obj/item/weapon/spacecash/bundle/c[amount]") var/obj/cash = new cashtype (usr.loc) usr.put_in_hands(cash) else @@ -89,49 +89,49 @@ if(!worth) qdel(src) -/obj/item/weapon/spacecash/c1 +/obj/item/weapon/spacecash/bundle/c1 name = "1 Thaler" icon_state = "spacecash1" desc = "It's worth 1 credit." worth = 1 -/obj/item/weapon/spacecash/c10 +/obj/item/weapon/spacecash/bundle/c10 name = "10 Thaler" icon_state = "spacecash10" desc = "It's worth 10 Thalers." worth = 10 -/obj/item/weapon/spacecash/c20 +/obj/item/weapon/spacecash/bundle/c20 name = "20 Thaler" icon_state = "spacecash20" desc = "It's worth 20 Thalers." worth = 20 -/obj/item/weapon/spacecash/c50 +/obj/item/weapon/spacecash/bundle/c50 name = "50 Thaler" icon_state = "spacecash50" desc = "It's worth 50 Thalers." worth = 50 -/obj/item/weapon/spacecash/c100 +/obj/item/weapon/spacecash/bundle/c100 name = "100 Thaler" icon_state = "spacecash100" desc = "It's worth 100 Thalers." worth = 100 -/obj/item/weapon/spacecash/c200 +/obj/item/weapon/spacecash/bundle/c200 name = "200 Thaler" icon_state = "spacecash200" desc = "It's worth 200 Thalers." worth = 200 -/obj/item/weapon/spacecash/c500 +/obj/item/weapon/spacecash/bundle/c500 name = "500 Thaler" icon_state = "spacecash500" desc = "It's worth 500 Thalers." worth = 500 -/obj/item/weapon/spacecash/c1000 +/obj/item/weapon/spacecash/bundle/c1000 name = "1000 Thaler" icon_state = "spacecash1000" desc = "It's worth 1000 Thalers." @@ -139,7 +139,7 @@ proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) if(sum in list(1000,500,200,100,50,20,10,1)) - var/cash_type = text2path("/obj/item/weapon/spacecash/c[sum]") + var/cash_type = text2path("/obj/item/weapon/spacecash/bundle/c[sum]") var/obj/cash = new cash_type (usr.loc) if(ishuman(human_user) && !human_user.get_active_hand()) human_user.put_in_hands(cash) diff --git a/maps/polaris-2.dmm b/maps/polaris-2.dmm index d9a70ef01c..2056e569d5 100644 --- a/maps/polaris-2.dmm +++ b/maps/polaris-2.dmm @@ -2342,7 +2342,7 @@ "Tb" = (/obj/structure/table/woodentable,/obj/item/device/megaphone,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Tc" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/box/donut,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Td" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/chawanmushi,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"Te" = (/obj/structure/table/woodentable,/obj/item/weapon/spacecash/c1,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"Te" = (/obj/structure/table/woodentable,/obj/item/weapon/spacecash/bundle/c1,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Tf" = (/obj/item/weapon/book/manual/robotics_cyborgs,/obj/structure/table/glass,/turf/unsimulated/floor{tag = "icon-cult"; name = "plating"; icon_state = "cult"},/area/wizard_station) "Tg" = (/obj/item/robot_parts/head,/obj/structure/table/glass,/turf/unsimulated/floor{tag = "icon-cult"; name = "plating"; icon_state = "cult"},/area/wizard_station) "Th" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{tag = "icon-cult"; name = "plating"; icon_state = "cult"},/area/wizard_station)