cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

/obj/item/weapon/spacecash change to /obj/item/weapon/money

Browse Source 
Can now split and stack money properly.

Fixes genetics/research access door and also money path changes.
This commit is contained in:
Erthilo
2012-05-21 23:56:48 +01:00
parent 36b0ba73cd
commit b7b33fc91a
13 changed files with 174 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/closets/kitchen.dm
+13 -13
View File
@@ -65,17 +65,17 @@
/obj/structure/closet/secure_closet/money_freezer/New()
..()
sleep(2)
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/c500(src)
new /obj/item/weapon/spacecash/c500(src)
new /obj/item/weapon/spacecash/c500(src)
new /obj/item/weapon/spacecash/c500(src)
new /obj/item/weapon/spacecash/c500(src)
new /obj/item/weapon/spacecash/c200(src)
new /obj/item/weapon/spacecash/c200(src)
new /obj/item/weapon/spacecash/c200(src)
new /obj/item/weapon/spacecash/c200(src)
new /obj/item/weapon/spacecash/c200(src)
new /obj/item/weapon/money/c1000(src)
new /obj/item/weapon/money/c1000(src)
new /obj/item/weapon/money/c1000(src)
new /obj/item/weapon/money/c500(src)
new /obj/item/weapon/money/c500(src)
new /obj/item/weapon/money/c500(src)
new /obj/item/weapon/money/c500(src)
new /obj/item/weapon/money/c500(src)
new /obj/item/weapon/money/c200(src)
new /obj/item/weapon/money/c200(src)
new /obj/item/weapon/money/c200(src)
new /obj/item/weapon/money/c200(src)
new /obj/item/weapon/money/c200(src)
code/game/objects/items/weapons/RSF.dm
+2 -2
View File
@@ -56,7 +56,7 @@ RSF
if (istype(A, /obj/structure/table) && matter >= 1)
user << "Dispensing Dosh..."
playsound(src.loc, 'click.ogg', 10, 1)
new /obj/item/weapon/spacecash/c10( A.loc )
new /obj/item/weapon/money/c10( A.loc )
if (isrobot(user))
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
@@ -70,7 +70,7 @@ RSF
if (istype(A, /turf/simulated/floor) && matter >= 1)
user << "Dispensing Dosh..."
playsound(src.loc, 'click.ogg', 10, 1)
new /obj/item/weapon/spacecash/c10( A )
new /obj/item/weapon/money/c10( A )
if (isrobot(user))
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
code/game/objects/storage/bible.dm
+3 -3
View File
@@ -2,9 +2,9 @@
..()
new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
new /obj/item/weapon/spacecash(src)
new /obj/item/weapon/spacecash(src)
new /obj/item/weapon/spacecash(src)
new /obj/item/weapon/money(src)
new /obj/item/weapon/money(src)
new /obj/item/weapon/money(src)
/obj/item/weapon/storage/bible/tajaran/New()
..()