Merge pull request #200 from Proxima-Project/I_need_healing

Боже, как же хочется жрать иногда

code/bos/datums/contract.dm

@@ -199,7 +199,7 @@ GLOBAL_LIST_EMPTY(all_antag_contracts)
 
 /datum/antag_contract/item/dump/check(obj/item/storage/container)
 	var/received = 0
-	for(var/obj/item/spacecash/cash in container)
+	for(var/obj/item/reagent_containers/food/snacks/spacecash/cash in container)
 		received += cash.worth
 	return received >= sum
 

code/datums/outfits/horror_killers.dm

@@ -55,7 +55,7 @@
 	for(var/obj/item/briefcase_item in sec_briefcase)
 		qdel(briefcase_item)
 	for(var/i=3, i>0, i--)
-		new /obj/item/spacecash/bundle/c1000(sec_briefcase)
+		new /obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000(sec_briefcase)
 	new /obj/item/gun/energy/crossbow(sec_briefcase)
 	new /obj/item/gun/projectile/revolver(sec_briefcase)
 	new /obj/item/ammo_magazine/speedloader/magnum(sec_briefcase)

code/datums/trading/trade.dm

@@ -178,7 +178,7 @@
 		if(blacklisted_trade_items?.len && is_type_in_list(offer ,blacklisted_trade_items))
 			return make_response(TRADER_NO_BLACKLISTED, "I refuse to take one of those items.", 0, FALSE)
 
-		if(istype(offer, /obj/item/spacecash))
+		if(istype(offer, /obj/item/reagent_containers/food/snacks/spacecash))
 			if(!(trade_flags & TRADER_MONEY))
 				return make_response(TRADER_NO_MONEY, "I don't take money.", 0, FALSE)
 		else

code/game/antagonist/station/mini_roles.dm

@@ -246,7 +246,7 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new)
 	name = "Крыса"
 	desc = "Может они держат в плену всё что Вам дорого, а может Вы уже не в первый раз вставляете нож в спину своим хозяевам. Как-бы то не было, Вы согласились найти для кое-кого компрометирующую информацию на миссию Кастельнау. Ходите, смотрите и слушайте. Эти военные преступники наверняка не заставят Вас долго ждать."
 	objective = "Доживите до конца смены сохранив свою роль в секрете."
-	gear = list(/obj/item/storage/box/syndie_kit/spy, /obj/item/spacecash/bundle/c2000, /obj/item/storage/box/radiokeys, /obj/item/device/uv_light, /obj/item/device/camera, /obj/item/device/taperecorder)
+	gear = list(/obj/item/storage/box/syndie_kit/spy, /obj/item/reagent_containers/food/snacks/spacecash/bundle/c2000, /obj/item/storage/box/radiokeys, /obj/item/device/uv_light, /obj/item/device/camera, /obj/item/device/taperecorder)
 	random_gear = 2
 
 /datum/mini_role/rat/special_act(var/mob/living/carbon/human/target)
@@ -357,8 +357,8 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new)
 /datum/mini_role/regcom_agent
 	name = "Агент РегКома"
 	desc = "Краем уха Вы услышали о будущих приказах фрау Марты к Кастельнау. Если Вы сможете сделать приказ ещё до того, как он опубликуется, то Вас может ждать очень приятная награда. Конечно, лучше будет сделать вид что всё это вышло 'случайно'."
-	gear = list(/obj/item/storage/lockbox/loyalty, /obj/item/storage/box/syndie_kit/imp_explosive, /obj/item/storage/box/syndie_kit/imp_imprinting, /obj/item/spacecash/bundle/c2000,
-				/obj/item/spacecash/bundle/c2000, /obj/item/spacecash/bundle/c2000, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000)
+	gear = list(/obj/item/storage/lockbox/loyalty, /obj/item/storage/box/syndie_kit/imp_explosive, /obj/item/storage/box/syndie_kit/imp_imprinting, /obj/item/reagent_containers/food/snacks/spacecash/bundle/c2000,
+				/obj/item/reagent_containers/food/snacks/spacecash/bundle/c2000, /obj/item/reagent_containers/food/snacks/spacecash/bundle/c2000, /obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, /obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, /obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000)
 	random_gear = 3
 
 /datum/mini_role/regcom_agent/special_act(var/mob/living/carbon/human/target)
@@ -510,7 +510,7 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new)
 	name = "Авторитет"
 	desc = "Девяностые"
 	objective = "Доживите до конца смены вместе со всеми членами своей группировки."
-	gear = list(/obj/random/handgun, /obj/item/clothing/mask/balaclava, /obj/item/storage/box/syndie_kit/imp_imprinting, /obj/item/grenade/smokebomb, /obj/item/spacecash/bundle/c1000, /obj/item/melee/energy/knife)
+	gear = list(/obj/random/handgun, /obj/item/clothing/mask/balaclava, /obj/item/storage/box/syndie_kit/imp_imprinting, /obj/item/grenade/smokebomb, /obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, /obj/item/melee/energy/knife)
 	random_gear = 2
 
 /datum/mini_role/authority/special_act(var/mob/living/carbon/human/target)

code/game/machinery/vending.dm

@@ -158,12 +158,12 @@
 		if (I) //for IDs and PDAs and wallets with IDs
 			paid = pay_with_card(I,W)
 			handled = 1
-		else if (istype(W, /obj/item/spacecash/ewallet))
-			var/obj/item/spacecash/ewallet/C = W
+		else if (istype(W, /obj/item/reagent_containers/food/snacks/spacecash/ewallet))
+			var/obj/item/reagent_containers/food/snacks/spacecash/ewallet/C = W
 			paid = pay_with_ewallet(C)
 			handled = 1
-		else if (istype(W, /obj/item/spacecash/bundle))
-			var/obj/item/spacecash/bundle/C = W
+		else if (istype(W, /obj/item/reagent_containers/food/snacks/spacecash/bundle))
+			var/obj/item/reagent_containers/food/snacks/spacecash/bundle/C = W
 			paid = pay_with_cash(C)
 			handled = 1
 
@@ -174,7 +174,7 @@
 			SSnano.update_uis(src)
 			return TRUE // don't smack that machine with your 2 thalers
 
-	if (I || istype(W, /obj/item/spacecash))
+	if (I || istype(W, /obj/item/reagent_containers/food/snacks/spacecash))
 		attack_hand(user)
 		return TRUE
 	if(isMultitool(W) || isWirecutter(W))
@@ -216,7 +216,7 @@
 /**
  *  Receive payment with cashmoney.
  */
-/obj/machinery/vending/proc/pay_with_cash(var/obj/item/spacecash/bundle/cashmoney)
+/obj/machinery/vending/proc/pay_with_cash(var/obj/item/reagent_containers/food/snacks/spacecash/bundle/cashmoney)
 	if(currently_vending.price > cashmoney.worth)
 		// This is not a status display message, since it's something the character
 		// themselves is meant to see BEFORE putting the money in
@@ -241,7 +241,7 @@
  * Takes payment for whatever is the currently_vending item. Returns 1 if
  * successful, 0 if failed.
  */
-/obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/spacecash/ewallet/wallet)
+/obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/reagent_containers/food/snacks/spacecash/ewallet/wallet)
 	visible_message("<span class='info'>\The [usr] swipes \the [wallet] through \the [src].</span>")
 	if(currently_vending.price > wallet.worth)
 		src.status_message = "Insufficient funds on chargecard."

code/game/objects/items/glassjar.dm

@@ -69,14 +69,14 @@
 			return
 
 /obj/item/glass_jar/attackby(var/obj/item/W, var/mob/user)
-	if(istype(W, /obj/item/spacecash))
+	if(istype(W, /obj/item/reagent_containers/food/snacks/spacecash))
 		if(contains == 0)
 			contains = 1
 		if(contains != 1)
 			return
 		if(!user.unEquip(W, src))
 			return
-		var/obj/item/spacecash/S = W
+		var/obj/item/reagent_containers/food/snacks/spacecash/S = W
 		user.visible_message("<span class='notice'>[user] puts [S.worth] [S.worth > 1 ? GLOB.using_map.local_currency_name : GLOB.using_map.local_currency_name_singular] into \the [src].</span>")
 		update_icon()
 
@@ -90,7 +90,7 @@
 		if(1)
 			SetName("tip jar")
 			desc = "A small jar with money inside."
-			for(var/obj/item/spacecash/S in src)
+			for(var/obj/item/reagent_containers/food/snacks/spacecash/S in src)
 				var/list/moneyImages = S.getMoneyImages()
 				for(var/A in moneyImages)
 					var/image/money = image('icons/obj/items.dmi', A)

code/game/objects/items/weapons/storage/bags.dm

@@ -103,4 +103,4 @@
 	max_storage_space = 100
 	max_w_class = ITEM_SIZE_HUGE
 	w_class = ITEM_SIZE_SMALL
-	can_hold = list(/obj/item/material/coin,/obj/item/spacecash)
+	can_hold = list(/obj/item/material/coin,/obj/item/reagent_containers/food/snacks/spacecash)

code/game/objects/items/weapons/storage/bible.dm

@@ -19,8 +19,8 @@
 
 	startswith = list(
 		/obj/item/reagent_containers/food/drinks/bottle/small/beer,
-		/obj/item/spacecash/bundle/c50,
-		/obj/item/spacecash/bundle/c50,
+		/obj/item/reagent_containers/food/snacks/spacecash/bundle/c50,
+		/obj/item/reagent_containers/food/snacks/spacecash/bundle/c50,
 		)
 
 /obj/item/storage/bible/bible

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -177,7 +177,7 @@
 
 /obj/item/storage/secure/briefcase/money
 
-	startswith = list(/obj/item/spacecash/bundle/c1000 = 5) //BoS, was 10k
+	startswith = list(/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000 = 5) //BoS, was 10k
 
 /obj/item/storage/backpack/satchel/syndie_kit/armor
 	startswith = list(

code/game/objects/items/weapons/storage/wallets.dm

@@ -7,7 +7,7 @@
 	max_w_class = ITEM_SIZE_SMALL //Don't worry, see can_hold[]
 	max_storage_space = 8
 	can_hold = list(
-		/obj/item/spacecash,
+		/obj/item/reagent_containers/food/snacks/spacecash,
 		/obj/item/card,
 		/obj/item/clothing/mask/smokable,
 		/obj/item/lipstick,
@@ -108,10 +108,10 @@
 
 /obj/item/storage/wallet/random/New()
 	..()
-	var/item1_type = pick( /obj/item/spacecash/bundle/c10,/obj/item/spacecash/bundle/c100,/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c20,/obj/item/spacecash/bundle/c200,/obj/item/spacecash/bundle/c50, /obj/item/spacecash/bundle/c500)
+	var/item1_type = pick( /obj/item/reagent_containers/food/snacks/spacecash/bundle/c10,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c100,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c20,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c200,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c50, /obj/item/reagent_containers/food/snacks/spacecash/bundle/c500)
 	var/item2_type
 	if(prob(50))
-		item2_type = pick( /obj/item/spacecash/bundle/c10,/obj/item/spacecash/bundle/c100,/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c20,/obj/item/spacecash/bundle/c200,/obj/item/spacecash/bundle/c50, /obj/item/spacecash/bundle/c500)
+		item2_type = pick( /obj/item/reagent_containers/food/snacks/spacecash/bundle/c10,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c100,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c20,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c200,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c50, /obj/item/reagent_containers/food/snacks/spacecash/bundle/c500)
 	var/item3_type = pick( /obj/item/material/coin/silver, /obj/item/material/coin/silver, /obj/item/material/coin/gold, /obj/item/material/coin/iron, /obj/item/material/coin/iron, /obj/item/material/coin/iron )
 
 	spawn(2)

code/game/objects/random/random.dm

@@ -923,12 +923,12 @@ GLOBAL_LIST_INIT(random_backpacks, list(
 	icon_state = "spacecash1"
 
 /obj/random/cash/spawn_choices()
-	return list(/obj/item/spacecash/bundle/c1 = 4,
-				/obj/item/spacecash/bundle/c10 = 3,
-				/obj/item/spacecash/bundle/c20 = 3,
-				/obj/item/spacecash/bundle/c50 = 2,
-				/obj/item/spacecash/bundle/c100 = 2,
-				/obj/item/spacecash/bundle/c1000 = 1)
+	return list(/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1 = 4,
+				/obj/item/reagent_containers/food/snacks/spacecash/bundle/c10 = 3,
+				/obj/item/reagent_containers/food/snacks/spacecash/bundle/c20 = 3,
+				/obj/item/reagent_containers/food/snacks/spacecash/bundle/c50 = 2,
+				/obj/item/reagent_containers/food/snacks/spacecash/bundle/c100 = 2,
+				/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000 = 1)
 
 /obj/random/documents // top secret documents for SCG eyes only
 	name = "random secret documents"
@@ -1436,4 +1436,4 @@ var/global/list/random_useful_
 		/obj/effect/landmark/corpse/miner = 1,
 		/obj/effect/landmark/corpse/russian = 1,
 		/obj/effect/landmark/corpse/syndicate = 1
-	)
+	)

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -47,7 +47,7 @@
 	//let's make hold a substantial amount.
 	var/created_size = 0
 	for(var/i = 1 to 200) //sanity loop limit
-		var/obj/item/cash_type = pick(3; /obj/item/spacecash/bundle/c1000, 4; /obj/item/spacecash/bundle/c500, 5; /obj/item/spacecash/bundle/c200)
+		var/obj/item/cash_type = pick(3; /obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, 4; /obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, 5; /obj/item/reagent_containers/food/snacks/spacecash/bundle/c200)
 		var/bundle_size = initial(cash_type.w_class) / 2
 		if(created_size + bundle_size <= storage_capacity)
 			created_size += bundle_size

code/modules/clothing/suits/miscellaneous.dm

@@ -95,7 +95,7 @@
 	desc = "This robe commands authority."
 	icon_state = "judge"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
-	allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/spacecash)
+	allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/reagent_containers/food/snacks/spacecash)
 	flags_inv = HIDEJUMPSUIT
 
 

code/modules/economy/ATM.dm

@@ -45,7 +45,7 @@
 		if(ticks_left_locked_down <= 0)
 			number_incorrect_tries = 0
 
-	for(var/obj/item/spacecash/S in src)
+	for(var/obj/item/reagent_containers/food/snacks/spacecash/S in src)
 		S.dropInto(loc)
 		if(prob(50))
 			playsound(loc, 'sound/items/polaroid1.ogg', 50, 1)
@@ -87,8 +87,8 @@
 			attack_hand(user)
 
 	else if(authenticated_account)
-		if(istype(I,/obj/item/spacecash))
-			var/obj/item/spacecash/dolla = I
+		if(istype(I,/obj/item/reagent_containers/food/snacks/spacecash))
+			var/obj/item/reagent_containers/food/snacks/spacecash/dolla = I
 
 			//deposit the cash
 			if(authenticated_account.deposit(dolla.worth, "Credit deposit", machine_id))
@@ -444,7 +444,7 @@
 
 
 /obj/machinery/atm/proc/spawn_ewallet(var/sum, loc, mob/living/carbon/human/human_user as mob)
-	var/obj/item/spacecash/ewallet/E = new /obj/item/spacecash/ewallet(loc)
+	var/obj/item/reagent_containers/food/snacks/spacecash/ewallet/E = new /obj/item/reagent_containers/food/snacks/spacecash/ewallet(loc)
 	if(ishuman(human_user) && !human_user.get_active_hand())
 		human_user.put_in_hands(E)
 	E.worth = sum

code/modules/economy/EFTPOS.dm

@@ -119,8 +119,8 @@
 			scan_card(I, O)
 		else
 			to_chat(usr, "[icon2html(src, usr)]<span class='warning'>Unable to connect to linked account.</span>")
-	else if (istype(O, /obj/item/spacecash/ewallet))
-		var/obj/item/spacecash/ewallet/E = O
+	else if (istype(O, /obj/item/reagent_containers/food/snacks/spacecash/ewallet))
+		var/obj/item/reagent_containers/food/snacks/spacecash/ewallet/E = O
 		if (linked_account)
 			if(transaction_locked && !transaction_paid)
 				if(transaction_amount <= E.worth)