cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1037 from Yoshax/dolladolla

Browse Source 
Changes predefined space cash stacks to be bundles
This commit is contained in:
Neerti
2016-02-21 04:48:00 -05:00
parent ebd2360f43 76db1f5e6c
commit 93dd32f1b2
6 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/game/objects/items/weapons/storage/uplink_kits.dm
View File

@@ -245,15 +245,15 @@
/obj/item/weapon/storage/secure/briefcase/money/New() /obj/item/weapon/storage/secure/briefcase/money/New()
..() ..()
new /obj/item/weapon/spacecash/c1000(src) new /obj/item/weapon/spacecash/bundle/c1000(src)
new /obj/item/weapon/spacecash/c1000(src) new /obj/item/weapon/spacecash/bundle/c1000(src)
new /obj/item/weapon/spacecash/c1000(src) new /obj/item/weapon/spacecash/bundle/c1000(src)
new /obj/item/weapon/spacecash/c1000(src) new /obj/item/weapon/spacecash/bundle/c1000(src)
new /obj/item/weapon/spacecash/c1000(src) new /obj/item/weapon/spacecash/bundle/c1000(src)
new /obj/item/weapon/spacecash/c1000(src) new /obj/item/weapon/spacecash/bundle/c1000(src)
new /obj/item/weapon/spacecash/c1000(src) new /obj/item/weapon/spacecash/bundle/c1000(src)
new /obj/item/weapon/spacecash/c1000(src) new /obj/item/weapon/spacecash/bundle/c1000(src)
new /obj/item/weapon/spacecash/c1000(src) new /obj/item/weapon/spacecash/bundle/c1000(src)
new /obj/item/weapon/spacecash/c1000(src) new /obj/item/weapon/spacecash/bundle/c1000(src)

4
code/game/objects/items/weapons/storage/wallets.dm
View File

@@ -75,10 +75,10 @@
/obj/item/weapon/storage/wallet/random/New() /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 var/item2_type
if(prob(50)) 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 ) 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) spawn(2)

6
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
View File

@@ -85,9 +85,9 @@
New() New()
..() ..()
for(var/i = 0, i < 3, i++) 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++) 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++) for(var/i = 0, i < 6, i++)
new /obj/item/weapon/spacecash/c200(src) new /obj/item/weapon/spacecash/bundle/c200(src)
return return

2
code/modules/admin/verbs/debug.dm
View File

@@ -607,7 +607,7 @@
for(var/obj/item/briefcase_item in sec_briefcase) for(var/obj/item/briefcase_item in sec_briefcase)
qdel(briefcase_item) qdel(briefcase_item)
for(var/i=3, i>0, i--) 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/energy/crossbow
sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba
sec_briefcase.contents += new /obj/item/ammo_magazine/a357 sec_briefcase.contents += new /obj/item/ammo_magazine/a357

20
code/modules/economy/cash.dm
View File

@@ -78,7 +78,7 @@
if(!worth) if(!worth)
usr.drop_from_inventory(src) usr.drop_from_inventory(src)
if(amount in list(1000,500,200,100,50,20,1)) 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) var/obj/cash = new cashtype (usr.loc)
usr.put_in_hands(cash) usr.put_in_hands(cash)
else else
@@ -89,49 +89,49 @@
if(!worth) if(!worth)
qdel(src) qdel(src)
/obj/item/weapon/spacecash/c1 /obj/item/weapon/spacecash/bundle/c1
name = "1 Thaler" name = "1 Thaler"
icon_state = "spacecash1" icon_state = "spacecash1"
desc = "It's worth 1 credit." desc = "It's worth 1 credit."
worth = 1 worth = 1
/obj/item/weapon/spacecash/c10 /obj/item/weapon/spacecash/bundle/c10
name = "10 Thaler" name = "10 Thaler"
icon_state = "spacecash10" icon_state = "spacecash10"
desc = "It's worth 10 Thalers." desc = "It's worth 10 Thalers."
worth = 10 worth = 10
/obj/item/weapon/spacecash/c20 /obj/item/weapon/spacecash/bundle/c20
name = "20 Thaler" name = "20 Thaler"
icon_state = "spacecash20" icon_state = "spacecash20"
desc = "It's worth 20 Thalers." desc = "It's worth 20 Thalers."
worth = 20 worth = 20
/obj/item/weapon/spacecash/c50 /obj/item/weapon/spacecash/bundle/c50
name = "50 Thaler" name = "50 Thaler"
icon_state = "spacecash50" icon_state = "spacecash50"
desc = "It's worth 50 Thalers." desc = "It's worth 50 Thalers."
worth = 50 worth = 50
/obj/item/weapon/spacecash/c100 /obj/item/weapon/spacecash/bundle/c100
name = "100 Thaler" name = "100 Thaler"
icon_state = "spacecash100" icon_state = "spacecash100"
desc = "It's worth 100 Thalers." desc = "It's worth 100 Thalers."
worth = 100 worth = 100
/obj/item/weapon/spacecash/c200 /obj/item/weapon/spacecash/bundle/c200
name = "200 Thaler" name = "200 Thaler"
icon_state = "spacecash200" icon_state = "spacecash200"
desc = "It's worth 200 Thalers." desc = "It's worth 200 Thalers."
worth = 200 worth = 200
/obj/item/weapon/spacecash/c500 /obj/item/weapon/spacecash/bundle/c500
name = "500 Thaler" name = "500 Thaler"
icon_state = "spacecash500" icon_state = "spacecash500"
desc = "It's worth 500 Thalers." desc = "It's worth 500 Thalers."
worth = 500 worth = 500
/obj/item/weapon/spacecash/c1000 /obj/item/weapon/spacecash/bundle/c1000
name = "1000 Thaler" name = "1000 Thaler"
icon_state = "spacecash1000" icon_state = "spacecash1000"
desc = "It's worth 1000 Thalers." desc = "It's worth 1000 Thalers."
@@ -139,7 +139,7 @@
proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) 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)) 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) var/obj/cash = new cash_type (usr.loc)
if(ishuman(human_user) && !human_user.get_active_hand()) if(ishuman(human_user) && !human_user.get_active_hand())
human_user.put_in_hands(cash) human_user.put_in_hands(cash)

2
maps/polaris-2.dmm
View File

@@ -2342,7 +2342,7 @@
"Tb" = (/obj/structure/table/woodentable,/obj/item/device/megaphone,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "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) "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) "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) "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) "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) "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)