diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 19651f99898..2d6c12a03bb 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -255,8 +255,7 @@
usr << "\icon[cashmoney] That is not enough money."
return 0
- if(istype(cashmoney, /obj/item/weapon/spacecash/bundle))
- // Bundles can just have money subtracted, and will work
+ if(istype(cashmoney, /obj/item/weapon/spacecash))
visible_message("\The [usr] inserts some cash into \the [src].")
var/obj/item/weapon/spacecash/bundle/cashmoney_bundle = cashmoney
@@ -267,19 +266,6 @@
qdel(cashmoney_bundle)
else
cashmoney_bundle.update_icon()
- else
- // Bills (banknotes) cannot really have worth different than face value,
- // so we have to eat the bill and spit out change in a bundle
- // This is really dirty, but there's no superclass for all bills, so we
- // just assume that all spacecash that's not something else is a bill
-
- visible_message("\The [usr] inserts a bill into \the [src].")
- var/left = cashmoney.worth - currently_vending.price
- usr.drop_from_inventory(cashmoney)
- qdel(cashmoney)
-
- if(left)
- spawn_money(left, src.loc, user)
// Vending machines have no idea who paid with cash
credit_purchase("(cash)")
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index a01722f9e94..5b46e990f0b 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/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)
+ 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)
diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm
index e9ef52fc114..9b4f9271a24 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/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/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/item2_type
if(prob(50))
- 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)
+ 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)
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 f7d50ad0285..0722b5b0771 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/bundle/c1000(src)
+ new /obj/item/weapon/spacecash/c1000(src)
for(var/i = 0, i < 5, i++)
- new /obj/item/weapon/spacecash/bundle/c500(src)
+ new /obj/item/weapon/spacecash/c500(src)
for(var/i = 0, i < 6, i++)
- new /obj/item/weapon/spacecash/bundle/c200(src)
+ new /obj/item/weapon/spacecash/c200(src)
return
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 94f13c9a1b2..3db3cfbca66 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/bundle/c1000
+ sec_briefcase.contents += new /obj/item/weapon/spacecash/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 c3d2e21b53a..022ebe2239a 100644
--- a/code/modules/economy/cash.dm
+++ b/code/modules/economy/cash.dm
@@ -31,12 +31,6 @@
user << "You combine the Thalers to a bundle of [bundle.worth] Thalers."
qdel(src)
-/obj/item/weapon/spacecash/bundle
- name = "pile of thalers"
- icon_state = ""
- desc = "They are worth 0 Thalers."
- worth = 0
-
/obj/item/weapon/spacecash/update_icon()
overlays.Cut()
name = "[worth] Thaler\s"
@@ -135,11 +129,11 @@
worth = 1000
proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob)
- var/obj/item/weapon/spacecash/bundle/bundle = new (spawnloc)
- bundle.worth = sum
- bundle.update_icon()
+ var/obj/item/weapon/spacecash/SC = new (spawnloc)
+ SC.worth = sum
+ SC.update_icon()
if (ishuman(human_user) && !human_user.get_active_hand())
- human_user.put_in_hands(bundle)
+ human_user.put_in_hands(SC)
return
/obj/item/weapon/spacecash/ewallet