cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 02:58:45 +01: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
code/game/objects/items/weapons/storage/uplink_kits.dm
+10 -10
View File
@@ -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)
code/game/objects/items/weapons/storage/wallets.dm
+2 -2
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+3 -3
View File
@@ -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