From f0dc32ef4f77a31446c31fcfe83e3a84caaade3c Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Tue, 20 Jun 2017 10:04:28 -0500
Subject: [PATCH] Space cash descriptions are more descriptive (#1651)

---
 code/game/objects/items/stacks/cash.dm | 42 ++++++++++++++++++++------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm
index 50dd23b52c..aa07367700 100644
--- a/code/game/objects/items/stacks/cash.dm
+++ b/code/game/objects/items/stacks/cash.dm
@@ -1,6 +1,5 @@
-/obj/item/stack/spacecash
+/obj/item/stack/spacecash  //Don't use base space cash stacks. Any other space cash stack can merge with them, and could cause potential money duping exploits.
 	name = "space cash"
-	desc = "It's worth 1 credit."
 	singular_name = "bill"
 	icon = 'icons/obj/economy.dmi'
 	icon_state = "spacecash"
@@ -10,40 +9,63 @@
 	throw_speed = 2
 	throw_range = 2
 	w_class = WEIGHT_CLASS_TINY
+	full_w_class = WEIGHT_CLASS_TINY
 	resistance_flags = FLAMMABLE
-	var/value = 1
+	var/value = 0
+
+/obj/item/stack/spacecash/Initialize()
+	. = ..()
+	update_desc()
+
+/obj/item/stack/spacecash/proc/update_desc()
+	var/total_worth = amount*value
+	desc = "It's worth [total_worth] credit[( amount > 1 ) ? "s" : ""]"
+
+
+/obj/item/stack/spacecash/merge(obj/item/stack/S)
+	. = ..()
+	update_desc()
+
+/obj/item/stack/spacecash/use()
+	. = ..()
+	update_desc()
+
+/obj/item/stack/spacecash/c1
+	icon_state = "spacecash"
+	singular_name = "one credit bill"
+	value = 1
 
 /obj/item/stack/spacecash/c10
 	icon_state = "spacecash10"
-	desc = "It's worth 10 credits."
+	singular_name = "ten credit bill"
 	value = 10
 
 /obj/item/stack/spacecash/c20
 	icon_state = "spacecash20"
-	desc = "It's worth 20 credits."
+	singular_name = "twenty credit bill"
 	value = 20
 
 /obj/item/stack/spacecash/c50
 	icon_state = "spacecash50"
-	desc = "It's worth 50 credits."
+	singular_name = "fifty credit bill"
 	value = 50
 
 /obj/item/stack/spacecash/c100
 	icon_state = "spacecash100"
-	desc = "It's worth 100 credits."
+	singular_name = "one hundred credit bill"
 	value = 100
 
 /obj/item/stack/spacecash/c200
 	icon_state = "spacecash200"
-	desc = "It's worth 200 credits."
+	singular_name = "two hundred credit bill"
 	value = 200
 
 /obj/item/stack/spacecash/c500
 	icon_state = "spacecash500"
-	desc = "It's worth 500 credits."
+	singular_name = "five hundred credit bill"
 	value = 500
 
 /obj/item/stack/spacecash/c1000
 	icon_state = "spacecash1000"
-	desc = "It's worth 1000 credits."
+	singular_name = "one thousand credit bill"
 	value = 1000
\ No newline at end of file