From 5c0fe751b0bb7047757953579d9340c23d8e344a Mon Sep 17 00:00:00 2001 From: Evie7056 Date: Fri, 7 Jul 2023 04:53:04 +0300 Subject: [PATCH] =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BA=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D0=B8=D0=BB=D0=B0=20=D0=B1=D0=BE=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit код боба да бляяяяяя самое важное hmmmmmmm.mp3 афывафвфывфывф --- code/bos/datums/contract.dm | 2 +- code/datums/outfits/horror_killers.dm | 2 +- code/datums/trading/trade.dm | 2 +- code/game/antagonist/station/mini_roles.dm | 8 +- code/game/machinery/vending.dm | 14 ++-- code/game/objects/items/glassjar.dm | 6 +- .../objects/items/weapons/storage/bags.dm | 2 +- .../objects/items/weapons/storage/bible.dm | 4 +- .../items/weapons/storage/uplink_kits.dm | 2 +- .../objects/items/weapons/storage/wallets.dm | 6 +- code/game/objects/random/random.dm | 14 ++-- .../crates_lockers/closets/secure/freezer.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 2 +- code/modules/economy/ATM.dm | 8 +- code/modules/economy/EFTPOS.dm | 4 +- code/modules/economy/cash.dm | 76 ++++++++++++------- code/modules/item_worth/value_procs.dm | 4 +- code/modules/item_worth/worths_list.dm | 8 +- code/modules/merchant/merchant_programs.dm | 6 +- .../projectiles/guns/launcher/money_cannon.dm | 12 +-- .../Chemistry-Reagents-Medicine.dm | 20 +++++ code/modules/spells/racial_wizard.dm | 8 +- maps/antag_spawn/wizard/wizard_base.dmm | 2 +- maps/away/bearcat/bearcat-2.dmm | 4 +- maps/away/cadaab/cadaab-old.dmm | 16 ++-- maps/away/cadaab/cadaab.dmm | 16 ++-- maps/away/smugglers/smugglers.dmm | 2 +- maps/away/voxship/voxship-2.dmm | 32 ++++---- maps/castelnau/cadaab/castelnau-2-cadaab.dmm | 4 +- maps/castelnau/techbarb-event/event.dmm | 2 +- maps/castelnau/z1-admin.dmm | 10 +-- .../armsfactory/armsfactory.dmm | 2 +- .../exoplanet_ruins/hydrobase/hydrobase.dmm | 2 +- .../exoplanet_ruins/playablecolony/colony.dmm | 4 +- maps/torch/voronezh/voronezh.dmm | 6 +- maps/torch/z1_admin.dmm | 10 +-- 36 files changed, 181 insertions(+), 143 deletions(-) diff --git a/code/bos/datums/contract.dm b/code/bos/datums/contract.dm index 86f1de0d91f30..c90f415a235a3 100644 --- a/code/bos/datums/contract.dm +++ b/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 diff --git a/code/datums/outfits/horror_killers.dm b/code/datums/outfits/horror_killers.dm index 73e9fa573bcdb..f435c715c4651 100644 --- a/code/datums/outfits/horror_killers.dm +++ b/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) diff --git a/code/datums/trading/trade.dm b/code/datums/trading/trade.dm index eea1270e4b364..e81990ffa6876 100644 --- a/code/datums/trading/trade.dm +++ b/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 diff --git a/code/game/antagonist/station/mini_roles.dm b/code/game/antagonist/station/mini_roles.dm index 403c5aa6dc620..349ddc5d3ce62 100644 --- a/code/game/antagonist/station/mini_roles.dm +++ b/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) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 1e61d911128b9..f0589d61b0da9 100644 --- a/code/game/machinery/vending.dm +++ b/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("\The [usr] swipes \the [wallet] through \the [src].") if(currently_vending.price > wallet.worth) src.status_message = "Insufficient funds on chargecard." diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index de0175a56d55e..24bf232d1b8aa 100644 --- a/code/game/objects/items/glassjar.dm +++ b/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("[user] puts [S.worth] [S.worth > 1 ? GLOB.using_map.local_currency_name : GLOB.using_map.local_currency_name_singular] into \the [src].") 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) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index d3ea66d4c44dd..0b80776cbfc0c 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/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) diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index c249388dfa8a6..947e9ca60bab5 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/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 diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 0f80eb82fcec2..55a1c4f7c9135 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/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( diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index ca740651382ec..6090713953749 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/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) diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 610ba618cf8f1..f409755d78abf 100644 --- a/code/game/objects/random/random.dm +++ b/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 - ) \ No newline at end of file + ) 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 c6e7f9ec92501..79a24a96af967 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/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 diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 3b85eab5f31ed..d1c21b62de89f 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/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 diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 17690ffbf34b4..dfdebd73a1d40 100644 --- a/code/modules/economy/ATM.dm +++ b/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 diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index f5acaf9dc766e..3e07739430226 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -119,8 +119,8 @@ scan_card(I, O) else to_chat(usr, "[icon2html(src, usr)]Unable to connect to linked account.") - 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) diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index fe20e1fa87acf..447a1e1c678a1 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -1,4 +1,5 @@ -/obj/item/spacecash +//How the fuck this is a food no-- oh. Right. +/obj/item/reagent_containers/food/snacks/spacecash name = "0 thalers" desc = "It's worth 0 thalers." gender = PLURAL @@ -17,19 +18,36 @@ var/worth = 0 var/static/denominations = list(1000,500,200,100,50,20,10,1) -/obj/item/spacecash/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/spacecash)) - if(istype(W, /obj/item/spacecash/ewallet)) return 0 - - var/obj/item/spacecash/bundle/bundle - if(!istype(W, /obj/item/spacecash/bundle)) - var/obj/item/spacecash/cash = W + volume = 1 + nutriment_amt = 1 + nutriment_amt = 1 + nutriment_desc = list( + "Jewrenium" = 1 + ) + +/obj/item/reagent_containers/food/snacks/spacecash/standard_feed_mob(var/mob/user, var/mob/target) + if(user.a_intent == I_HELP) + return + worth -= amount_per_transfer_from_this + ..() + +/obj/item/reagent_containers/food/snacks/spacecash/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/reagent_containers/food/snacks/spacecash)) + if(istype(W, /obj/item/reagent_containers/food/snacks/spacecash/ewallet)) return 0 + + var/obj/item/reagent_containers/food/snacks/spacecash/bundle/bundle + if(!istype(W, /obj/item/reagent_containers/food/snacks/spacecash/bundle)) + var/obj/item/reagent_containers/food/snacks/spacecash/cash = W bundle = new (src.loc) bundle.worth += cash.worth + bundle.volume = cash.worth + bundle.nutriment_amt = cash.volume qdel(cash) else //is bundle bundle = W bundle.worth += src.worth + bundle.volume = bundle.worth + bundle.nutriment_amt = bundle.volume bundle.update_icon() if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/h_user = user @@ -42,21 +60,21 @@ var/obj/item/gun/launcher/money/L = W L.absorb_cash(src, user) -/obj/item/spacecash/proc/getMoneyImages() +/obj/item/reagent_containers/food/snacks/spacecash/proc/getMoneyImages() if(icon_state) return list(icon_state) -/obj/item/spacecash/bundle +/obj/item/reagent_containers/food/snacks/spacecash/bundle name = "pile of thalers" icon_state = "spacecash1" desc = "They are worth 0 Thalers." worth = 0 -/obj/item/spacecash/bundle/Initialize() +/obj/item/reagent_containers/food/snacks/spacecash/bundle/Initialize() . = ..() update_icon() -/obj/item/spacecash/bundle/getMoneyImages() +/obj/item/reagent_containers/food/snacks/spacecash/bundle/getMoneyImages() if(icon_state) return list(icon_state) . = list() @@ -70,7 +88,7 @@ if(num == 0) // Less than one thaler, let's just make it look like 1 for ease . += "spacecash1" -/obj/item/spacecash/bundle/on_update_icon() +/obj/item/reagent_containers/food/snacks/spacecash/bundle/on_update_icon() overlays.Cut() var/list/images = src.getMoneyImages() @@ -94,7 +112,7 @@ else w_class = ITEM_SIZE_SMALL -/obj/item/spacecash/bundle/attack_hand(mob/user as mob) +/obj/item/reagent_containers/food/snacks/spacecash/bundle/attack_hand(mob/user as mob) if (user.get_inactive_hand() == src) var/amount = input(usr, "How many [GLOB.using_map.local_currency_name] do you want to take? (0 to [src.worth])", "Take Money", 20) as num amount = round(clamp(amount, 0, src.worth)) @@ -107,11 +125,11 @@ src.worth -= amount src.update_icon() if (amount in list(1000,500,200,100,50,20,1)) - var/cashtype = text2path("/obj/item/spacecash/bundle/c[amount]") + var/cashtype = text2path("/obj/item/reagent_containers/food/snacks/spacecash/bundle/c[amount]") var/obj/cash = new cashtype (usr.loc) usr.put_in_hands(cash) else - var/obj/item/spacecash/bundle/bundle = new (usr.loc) + var/obj/item/reagent_containers/food/snacks/spacecash/bundle/bundle = new (usr.loc) bundle.worth = amount bundle.update_icon() usr.put_in_hands(bundle) @@ -120,55 +138,55 @@ else ..() -/obj/item/spacecash/bundle/c1 +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1 name = "1 Thaler" icon_state = "spacecash1" desc = "It's worth 1 credit." worth = 1 -/obj/item/spacecash/bundle/c10 +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c10 name = "10 Thaler" icon_state = "spacecash10" desc = "It's worth 10 Thalers." worth = 10 -/obj/item/spacecash/bundle/c20 +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c20 name = "20 Thaler" icon_state = "spacecash20" desc = "It's worth 20 Thalers." worth = 20 -/obj/item/spacecash/bundle/c50 +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c50 name = "50 Thaler" icon_state = "spacecash50" desc = "It's worth 50 Thalers." worth = 50 -/obj/item/spacecash/bundle/c100 +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c100 name = "100 Thaler" icon_state = "spacecash100" desc = "It's worth 100 Thalers." worth = 100 -/obj/item/spacecash/bundle/c200 +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c200 name = "200 Thaler" icon_state = "spacecash200" desc = "It's worth 200 Thalers." worth = 200 -/obj/item/spacecash/bundle/c500 +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500 name = "500 Thaler" icon_state = "spacecash500" desc = "It's worth 500 Thalers." worth = 500 -/obj/item/spacecash/bundle/c1000 +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000 name = "1000 Thaler" icon_state = "spacecash1000" desc = "It's worth 1000 Thalers." worth = 1000 -/obj/item/spacecash/bundle/c2000 //BoS +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c2000 //BoS name = "2000 Thaler" icon_state = "spacecash1000" desc = "It's worth 2000 Thalers." @@ -176,25 +194,25 @@ /proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) if(sum in list(1000,500,200,100,50,20,10,1)) - var/cash_type = text2path("/obj/item/spacecash/bundle/c[sum]") + var/cash_type = text2path("/obj/item/reagent_containers/food/snacks/spacecash/bundle/c[sum]") var/obj/cash = new cash_type (spawnloc) if(ishuman(human_user) && !human_user.get_active_hand()) human_user.put_in_hands(cash) else - var/obj/item/spacecash/bundle/bundle = new (spawnloc) + var/obj/item/reagent_containers/food/snacks/spacecash/bundle/bundle = new (spawnloc) bundle.worth = sum bundle.update_icon() if (ishuman(human_user) && !human_user.get_active_hand()) human_user.put_in_hands(bundle) return -/obj/item/spacecash/ewallet +/obj/item/reagent_containers/food/snacks/spacecash/ewallet name = "Charge card" icon_state = "efundcard" desc = "A card that holds an amount of money." var/owner_name = "" //So the ATM can set it so the EFTPOS can put a valid name on transactions. -/obj/item/spacecash/ewallet/examine(mob/user, distance) +/obj/item/reagent_containers/food/snacks/spacecash/ewallet/examine(mob/user, distance) . = ..(user) if (distance > 2 && user != loc) return to_chat(user, "Charge card's owner: [src.owner_name]. [GLOB.using_map.local_currency_name] remaining: [src.worth].") diff --git a/code/modules/item_worth/value_procs.dm b/code/modules/item_worth/value_procs.dm index c6d1eff7d952d..c09859a92c42b 100644 --- a/code/modules/item_worth/value_procs.dm +++ b/code/modules/item_worth/value_procs.dm @@ -51,10 +51,10 @@ /obj/item/material/Value() return material.value * worth_multiplier -/obj/item/spacecash/Value() +/obj/item/reagent_containers/food/snacks/spacecash/Value() return worth /mob/living/carbon/human/Value(var/base) . = ..() if(species) - . *= species.rarity_value \ No newline at end of file + . *= species.rarity_value diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index 8a1e14049e55a..82bd4b1466aaa 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -127,10 +127,10 @@ var/global/list/worths = list( /obj/item/storage/briefcase/crimekit = -50, /obj/item/storage = -30, //WEAPONS, - /obj/item/spacecash/bundle/c100 = 100, - /obj/item/spacecash/bundle/c500 = 500, - /obj/item/spacecash/bundle/c1000 = 1000, - /obj/item/spacecash = -1, + /obj/item/reagent_containers/food/snacks/spacecash/bundle/c100 = 100, + /obj/item/reagent_containers/food/snacks/spacecash/bundle/c500 = 500, + /obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000 = 1000, + /obj/item/reagent_containers/food/snacks/spacecash = -1, /obj/item/ore = -10, /obj/item/device/scanner/mining = 130, //PICK AXES, diff --git a/code/modules/merchant/merchant_programs.dm b/code/modules/merchant/merchant_programs.dm index 8d5661eb354d6..537092af61e4f 100644 --- a/code/modules/merchant/merchant_programs.dm +++ b/code/modules/merchant/merchant_programs.dm @@ -144,8 +144,8 @@ if(pad) var/list/targets = pad.get_targets() for(var/target in targets) - if(istype(target, /obj/item/spacecash)) - var/obj/item/spacecash/cash = target + if(istype(target, /obj/item/reagent_containers/food/snacks/spacecash)) + var/obj/item/reagent_containers/food/snacks/spacecash/cash = target bank += cash.worth qdel(target) last_comms = "ALL MONEY DETECTED ON PAD TRANSFERED" @@ -157,7 +157,7 @@ last_comms = "PAD NOT CONNECTED. CANNOT TRANSFER" return var/turf/T = get_turf(pad) - var/obj/item/spacecash/bundle/B = new(T) + var/obj/item/reagent_containers/food/snacks/spacecash/bundle/B = new(T) B.worth = bank bank = 0 B.update_icon() diff --git a/code/modules/projectiles/guns/launcher/money_cannon.dm b/code/modules/projectiles/guns/launcher/money_cannon.dm index a59e3b706493c..b7e7637c407fe 100644 --- a/code/modules/projectiles/guns/launcher/money_cannon.dm +++ b/code/modules/projectiles/guns/launcher/money_cannon.dm @@ -31,7 +31,7 @@ nv++ if (!nv) break - var/obj/item/spacecash/bundle/bling = new(T) + var/obj/item/reagent_containers/food/snacks/spacecash/bundle/bling = new(T) bling.worth = nv bling.update_icon() if(projectile_vomit) @@ -65,14 +65,14 @@ to_chat(user, "There's no money in [src].") return - var/obj/item/spacecash/bling = new /obj/item/spacecash/bundle() + var/obj/item/reagent_containers/food/snacks/spacecash/bling = new /obj/item/reagent_containers/food/snacks/spacecash/bundle() bling.worth = receptacle_value bling.update_icon() user.put_in_hands(bling) to_chat(user, "You eject [receptacle_value] [GLOB.using_map.local_currency_name_singular] from [src]'s receptacle.") receptacle_value = 0 -/obj/item/gun/launcher/money/proc/absorb_cash(var/obj/item/spacecash/bling, mob/user) +/obj/item/gun/launcher/money/proc/absorb_cash(var/obj/item/reagent_containers/food/snacks/spacecash/bling, mob/user) if(!istype(bling) || !bling.worth || bling.worth < 1) to_chat(user, "[src] refuses to pick up [bling].") return @@ -96,7 +96,7 @@ if(!receptacle_value || receptacle_value < 1) return null - var/obj/item/spacecash/bling = new /obj/item/spacecash/bundle() + var/obj/item/reagent_containers/food/snacks/spacecash/bling = new /obj/item/reagent_containers/food/snacks/spacecash/bundle() if(receptacle_value >= dispensing) bling.worth = dispensing receptacle_value -= dispensing @@ -130,8 +130,8 @@ return ..() /obj/item/gun/launcher/money/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/spacecash)) - var/obj/item/spacecash/bling = W + if(istype(W, /obj/item/reagent_containers/food/snacks/spacecash)) + var/obj/item/reagent_containers/food/snacks/spacecash/bling = W if(bling.worth < 1) to_chat(user, "You can't seem to get the bills to slide into the receptacle.") return diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 6ece1ec25210d..bef95cd5fe788 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1043,3 +1043,23 @@ W.bleed_timer = 0 W.clamped = TRUE E.status &= ~ORGAN_BLEEDING + +/datum/reagent/tricordrazine/jew + name = "Jewrenium" + description = "Nobody really knows what the fuck that is and who the fuck are jews. People says only rich people can truely taste JEWRENIUM." + taste_description = "dirty dollar" + color = "#08641c" + scannable = 1 // Yes. Why not? + value = 20 + glass_name = "liqufied money" + glass_desc = "It's a glass of... ripped money" + +/datum/reagent/tricordrazine/jew/affect_blood(mob/living/carbon/M, alien, removed) + if(!(ishuman(M))) + return + var/mob/living/carbon/human/H = M + //Let's get rid of those stupid pesky hobos + //Syndies are fine tho + if((H.char_branch.name != "Free Trade Union") && (H.char_branch.name != "Consortium of Trans-Star Corporations")) + return + M.heal_organ_damage(4 * removed, 4 * removed) //Slightly buffed tric. Might be Excessive. diff --git a/code/modules/spells/racial_wizard.dm b/code/modules/spells/racial_wizard.dm index 6477c13829ed1..af42255d2319a 100644 --- a/code/modules/spells/racial_wizard.dm +++ b/code/modules/spells/racial_wizard.dm @@ -39,14 +39,14 @@ qdel(src) /obj/item/storage/bag/cash/infinite - startswith = list(/obj/item/spacecash/bundle/c1000 = 1) + startswith = list(/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000 = 1) //HUMAN /obj/item/storage/bag/cash/infinite/remove_from_storage(obj/item/W as obj, atom/new_location) . = ..() if(.) - if(istype(W,/obj/item/spacecash)) //only matters if its spacecash. - var/obj/item/I = new /obj/item/spacecash/bundle/c1000() + if(istype(W,/obj/item/reagent_containers/food/snacks/spacecash)) //only matters if its spacecash. + var/obj/item/I = new /obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000() src.handle_item_insertion(I,1) /spell/messa_shroud/choose_targets() @@ -259,4 +259,4 @@ var/mob/living/L = eyeobj.owner L.release_eye() qdel(eyeobj) - return ..() \ No newline at end of file + return ..() diff --git a/maps/antag_spawn/wizard/wizard_base.dmm b/maps/antag_spawn/wizard/wizard_base.dmm index a306f7cbb780d..ef5a557f44350 100644 --- a/maps/antag_spawn/wizard/wizard_base.dmm +++ b/maps/antag_spawn/wizard/wizard_base.dmm @@ -316,7 +316,7 @@ /area/map_template/wizard_station) "aS" = ( /obj/structure/table/woodentable, -/obj/item/spacecash/bundle/c1, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" diff --git a/maps/away/bearcat/bearcat-2.dmm b/maps/away/bearcat/bearcat-2.dmm index da5ee087b59ee..400242ff1314b 100644 --- a/maps/away/bearcat/bearcat-2.dmm +++ b/maps/away/bearcat/bearcat-2.dmm @@ -3487,7 +3487,7 @@ "gw" = ( /obj/structure/closet/crate, /obj/random/coin, -/obj/item/spacecash/bundle/c1000, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, /turf/simulated/floor, /area/ship/scrap/hidden) "gx" = ( @@ -3671,7 +3671,7 @@ "gI" = ( /obj/structure/table/reinforced, /obj/item/device/flashlight/lamp, -/obj/item/spacecash/bundle/c1000, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, /obj/item/storage/bible/booze, /obj/item/cell/high, /turf/simulated/floor, diff --git a/maps/away/cadaab/cadaab-old.dmm b/maps/away/cadaab/cadaab-old.dmm index 9c6f8c12a80ff..52e4bce2c3a47 100644 --- a/maps/away/cadaab/cadaab-old.dmm +++ b/maps/away/cadaab/cadaab-old.dmm @@ -24,7 +24,7 @@ "ahU" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/freezer,/area/cadaab/caves/bunker/living/bunk) "aiC" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/bed/sofa/black/right{dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker/living/bunk) "aiJ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor/grid,/area/cadaab/lab) -"ajt" = (/obj/effect/landmark/corpse/miningstation/deadminersuit,/obj/item/spacecash/bundle/c500,/obj/item/clothing/head/helmet/gladiator,/obj/random/cash,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) +"ajt" = (/obj/effect/landmark/corpse/miningstation/deadminersuit,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500,/obj/item/clothing/head/helmet/gladiator,/obj/random/cash,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "ajz" = (/obj/structure/flora/jungle/bush/a_random,/obj/structure/railing/mapped{dir = 1},/turf/simulated/floor/grass/cadaab,/area/cadaab/oasis) "akH" = (/obj/effect/floor_decal/corner/black/diagonal,/obj/machinery/cooker/fryer,/turf/simulated/floor/tiled/freezer,/area/cadaab/shahtinsk) "ali" = (/turf/simulated/floor/tiled/techfloor,/area/cadaab/caves) @@ -522,7 +522,7 @@ "eoX" = (/obj/effect/decal/cleanable/cadaab,/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/cadaab/shahtinsk/booker) "epf" = (/obj/random/simple_mob/bot,/turf/simulated/floor/exoplanet/concrete,/area/cadaab/shahtinsk/second) "epL" = (/obj/random/tool,/turf/simulated/floor/inaks/dark_cafel,/area/cadaab/shahtinsk/city_like) -"eqk" = (/obj/structure/safe,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c1000,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/turf/simulated/floor/lino,/area/cadaab/shahtinsk/city_like) +"eqk" = (/obj/structure/safe,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/turf/simulated/floor/lino,/area/cadaab/shahtinsk/city_like) "erc" = (/obj/structure/steelfence{dir = 10; pixel_x = 16},/obj/structure/steelfence{dir = 4},/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "erj" = (/obj/effect/floor_decal/corner/black/diagonal,/obj/structure/table/marble,/obj/machinery/cooker/cereal,/turf/simulated/floor/tiled/freezer,/area/cadaab/shahtinsk) "esD" = (/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor,/area/cadaab/lab) @@ -767,7 +767,7 @@ "glm" = (/obj/effect/floor_decal/inaks{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/inaks/asphalt,/area/cadaab/shahtinsk) "glw" = (/obj/structure/steelfence{dir = 9},/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "glE" = (/obj/effect/decal/cleanable/dirt,/obj/random/simple_mob/bot{name = "random bot - low spawn chance"; spawn_nothing_percentage = 70},/turf/simulated/floor/inaks/asphalt,/area/cadaab/shahtinsk) -"glF" = (/obj/effect/landmark/corpse/miningstation/deadmineroveralls,/obj/item/spacecash/bundle/c200,/obj/item/clothing/head/helmet/gladiator,/obj/random/cash,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) +"glF" = (/obj/effect/landmark/corpse/miningstation/deadmineroveralls,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c200,/obj/item/clothing/head/helmet/gladiator,/obj/random/cash,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "glJ" = (/obj/structure/flora/pottedplant/bamboo,/obj/effect/floor_decal/corner/paleblue/border{dir = 9},/turf/simulated/floor/tiled/white,/area/cadaab/shahtinsk) "glR" = (/obj/effect/floor_decal/inaks,/obj/effect/floor_decal/inaks{dir = 8},/obj/structure/closet/crate/trashcart,/obj/item/stack/material/wood/fifty,/obj/effect/decal/cleanable/dirt,/obj/random/handgun,/turf/simulated/floor/inaks/asphalt,/area/cadaab/shahtinsk) "gmg" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/floor_decal/inaks/cafel_hole{dir = 4},/obj/effect/floor_decal/inaks/cafel_hole{dir = 8},/turf/simulated/floor/inaks/dark_cafel,/area/cadaab/desert) @@ -995,7 +995,7 @@ "icl" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/cadaab/caves/bunker/medsci) "idj" = (/obj/item/reagent_containers/glass/paint/white,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/inaks/cubic_plate,/area/cadaab/desert) "ido" = (/obj/structure/memstatue/shmesser,/turf/simulated/floor/exoplanet/concrete,/area/cadaab/shahtinsk/second) -"idL" = (/obj/effect/spider/stickyweb,/obj/effect/spider/cocoon,/obj/random/raider,/obj/item/spacecash/bundle/c500,/obj/item/spacecash/bundle/c1000,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) +"idL" = (/obj/effect/spider/stickyweb,/obj/effect/spider/cocoon,/obj/random/raider,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "iee" = (/obj/effect/floor_decal/inaks/sand_dust{dir = 4},/obj/structure/sign/poster/antar/mine{pixel_x = -32},/turf/simulated/floor/inaks/cubic_plate,/area/cadaab/desert) "ifd" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/mob/living/simple_animal/hostile/retaliate/malf_drone/hydro,/turf/simulated/floor/grass/cadaab,/area/cadaab/oasis) "ifK" = (/obj/effect/floor_decal/corner/black/diagonal,/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_coffee,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/freezer,/area/cadaab/shahtinsk) @@ -1178,7 +1178,7 @@ "jNG" = (/obj/structure/steelfence{dir = 8; pixel_x = -18},/obj/structure/steelfence{pixel_y = 25},/turf/simulated/floor/inaks/dark_cafel,/area/cadaab/shahtinsk/city_like) "jNL" = (/obj/structure/hygiene/shower{dir = 4; pixel_x = -5},/turf/simulated/floor/inaks/plate,/area/cadaab/shahtinsk/booker) "jPA" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) -"jPF" = (/obj/structure/table/steel_reinforced,/obj/item/spacecash/bundle/c500,/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker) +"jPF" = (/obj/structure/table/steel_reinforced,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500,/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker) "jPH" = (/obj/effect/floor_decal/chapel{dir = 8},/obj/structure/bed/chair/pew{dir = 8},/turf/simulated/floor/lino,/area/cadaab/shahtinsk/city_like) "jPI" = (/obj/effect/floor_decal/inaks/road_border{dir = 6},/obj/item/trash/proteinbar,/turf/simulated/floor/inaks/plate,/area/cadaab/desert) "jQe" = (/obj/effect/floor_decal/spline/plain/paleblue{dir = 4},/obj/structure/closet/medical_wall/filled{pixel_x = 32},/turf/simulated/floor/lino,/area/cadaab/outpost/living) @@ -1532,7 +1532,7 @@ "mNS" = (/obj/structure/hygiene/shower{dir = 8; pixel_x = 3},/obj/structure/curtain/open/shower,/obj/random/simple_mob/meat{name = "random meat mob - low spawn chance"; spawn_nothing_percentage = 70},/turf/simulated/floor/tiled/freezer,/area/cadaab/caves/bunker/living/bunk) "mOu" = (/obj/item/reagent_containers/food/snacks/watermelonslice,/obj/structure/table/woodentable/ebony,/turf/simulated/floor/wood/walnut,/area/cadaab/oasis_farm) "mOw" = (/obj/structure/barricade/spike,/obj/effect/floor_decal/inaks/sand_dust{dir = 6},/turf/simulated/floor/inaks/plate,/area/cadaab/city_streets) -"mOG" = (/obj/structure/table/glass,/obj/effect/floor_decal/corner/black/diagonal,/obj/machinery/light{dir = 8},/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c1000,/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker/living/can) +"mOG" = (/obj/structure/table/glass,/obj/effect/floor_decal/corner/black/diagonal,/obj/machinery/light{dir = 8},/obj/item/reagent_containers/food/reagent_containers/food/spacecash/bundle/c1000,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker/living/can) "mPl" = (/obj/machinery/atmospherics/unary/engine{dir = 8},/obj/effect/floor_decal/inaks/sand_dust{dir = 6},/turf/simulated/floor,/area/cadaab/city_streets) "mPs" = (/obj/item/storage/mgsbox/lpa,/obj/effect/floor_decal/inaks/cafel_hole,/turf/simulated/floor/inaks/dark_cafel,/area/cadaab/desert) "mQw" = (/obj/machinery/power/apc{name = "south bump"; pixel_y = -24},/obj/structure/cable/cyan{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/lino,/area/cadaab/outpost/living) @@ -1970,7 +1970,7 @@ "qaW" = (/obj/item/reagent_containers/syringe/drugs,/obj/random/trash,/turf/simulated/floor/cadaab_wood,/area/cadaab/shahtinsk/city_like) "qbz" = (/obj/structure/flora/tree/cadaab,/obj/structure/quicksand/cadaab,/turf/simulated/floor/exoplanet/desert/cadaab,/area/cadaab/desert) "qcr" = (/turf/simulated/floor/carpet/red,/area/cadaab/outpost/syndishuttle) -"qcu" = (/obj/structure/bed,/obj/item/bedsheet/mime,/obj/structure/curtain/open/bed,/obj/effect/floor_decal/carpet/red{dir = 4},/obj/effect/floor_decal/carpet/red,/obj/effect/floor_decal/carpet/red{dir = 6},/obj/machinery/light/small{dir = 4; icon_state = "bulb1"},/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c1000,/obj/random/loot,/turf/simulated/floor/carpet/red,/area/cadaab/caves/bunker/living/bunk) +"qcu" = (/obj/structure/bed,/obj/item/bedsheet/mime,/obj/structure/curtain/open/bed,/obj/effect/floor_decal/carpet/red{dir = 4},/obj/effect/floor_decal/carpet/red,/obj/effect/floor_decal/carpet/red{dir = 6},/obj/machinery/light/small{dir = 4; icon_state = "bulb1"},/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/random/loot,/turf/simulated/floor/carpet/red,/area/cadaab/caves/bunker/living/bunk) "qcz" = (/turf/unsimulated/wall/cadaab,/area/cadaab/desert) "qcG" = (/obj/random/trash,/turf/simulated/floor/inaks/cubic_plate,/area/cadaab/shahtinsk/city_like) "qcM" = (/obj/item/remains/human,/obj/item/reagent_containers/spray/waterflower,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) @@ -2861,7 +2861,7 @@ "xzQ" = (/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/structure/table/glass,/obj/item/storage/box/syringes,/obj/item/clothing/gloves/latex,/obj/item/clothing/gloves/latex/nitrile,/turf/simulated/floor/tiled/white,/area/cadaab/caves/bunker/medsci) "xAa" = (/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker/living/bunk) "xBa" = (/turf/unsimulated/cadaab/rock,/area/cadaab/city_streets) -"xBr" = (/obj/effect/landmark/corpse/miner,/obj/item/spacecash/bundle/c500,/obj/item/spacecash/bundle/c200,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) +"xBr" = (/obj/effect/landmark/corpse/miner,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c200,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "xCR" = (/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker/living/bunk) "xCT" = (/turf/simulated/floor/cadaab_wood,/area/cadaab/outpost/living) "xDx" = (/obj/structure/table/steel_reinforced,/obj/structure/window/reinforced{health = 1e+007},/obj/machinery/door/blast/shutters/open,/obj/item/material/clipboard,/obj/random/cash,/obj/random/cash,/turf/simulated/floor/tiled/techfloor/grid,/area/cadaab/shahtinsk/second) diff --git a/maps/away/cadaab/cadaab.dmm b/maps/away/cadaab/cadaab.dmm index 31a0e2df7fa77..cf1a7c61bed9c 100644 --- a/maps/away/cadaab/cadaab.dmm +++ b/maps/away/cadaab/cadaab.dmm @@ -22,7 +22,7 @@ "ahU" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/freezer,/area/cadaab/caves/bunker/living/bunk) "aiC" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/bed/sofa/black/right{dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker/living/bunk) "aiJ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor/grid,/area/cadaab/lab) -"ajt" = (/obj/effect/landmark/corpse/miningstation/deadminersuit,/obj/item/spacecash/bundle/c500,/obj/item/clothing/head/helmet/gladiator,/obj/random/cash,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) +"ajt" = (/obj/effect/landmark/corpse/miningstation/deadminersuit,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500,/obj/item/clothing/head/helmet/gladiator,/obj/random/cash,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "ajz" = (/obj/structure/flora/jungle/bush/a_random,/obj/structure/railing/mapped{dir = 1},/turf/simulated/floor/grass/cadaab,/area/cadaab/oasis) "ali" = (/turf/simulated/floor/tiled/techfloor,/area/cadaab/caves) "als" = (/obj/structure/curtain/black{pixel_y = -32},/obj/structure/table/standard,/obj/random/donkpocket_box,/turf/simulated/floor/wood/walnut,/area/cadaab/outpost/living) @@ -493,7 +493,7 @@ "eoX" = (/obj/effect/decal/cleanable/cadaab,/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/cadaab/shahtinsk/booker) "epf" = (/obj/structure/steelfence,/obj/effect/floor_decal/inaks/sand_dust,/turf/simulated/floor/inaks/plate,/area/cadaab/desert) "epL" = (/obj/random/tool,/turf/simulated/floor/inaks/dark_cafel,/area/cadaab/shahtinsk/city_like) -"eqk" = (/obj/structure/safe,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c1000,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/turf/simulated/floor/lino,/area/cadaab/shahtinsk/city_like) +"eqk" = (/obj/structure/safe,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/turf/simulated/floor/lino,/area/cadaab/shahtinsk/city_like) "erc" = (/obj/structure/steelfence{dir = 10; pixel_x = 16},/obj/structure/steelfence{dir = 4},/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "erj" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_soft/full{dir = 4},/turf/simulated/floor/wood/ebony,/area/cadaab/shahtinsk) "ern" = (/obj/structure/closet/tent{anchored = 1; pixel_x = -6},/obj/effect/landmark/start{name = "Wanderer"},/turf/simulated/floor/exoplanet/desert/cadaab,/area/cadaab/caves) @@ -728,7 +728,7 @@ "glm" = (/obj/effect/floor_decal/inaks{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/inaks/asphalt,/area/cadaab/shahtinsk) "glw" = (/obj/structure/steelfence{dir = 9},/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "glE" = (/obj/structure/table/reinforced,/obj/random/toolbox,/obj/machinery/cell_charger,/turf/simulated/floor/lino,/area/cadaab/shahtinsk) -"glF" = (/obj/effect/landmark/corpse/miningstation/deadmineroveralls,/obj/item/spacecash/bundle/c200,/obj/item/clothing/head/helmet/gladiator,/obj/random/cash,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) +"glF" = (/obj/effect/landmark/corpse/miningstation/deadmineroveralls,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c200,/obj/item/clothing/head/helmet/gladiator,/obj/random/cash,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "glJ" = (/obj/effect/floor_decal/corner/paleblue/border{dir = 9},/obj/structure/bed,/obj/item/bedsheet/medical,/turf/simulated/floor/tiled/white,/area/cadaab/shahtinsk) "glR" = (/obj/effect/floor_decal/inaks,/obj/effect/floor_decal/inaks{dir = 8},/obj/structure/closet/crate/trashcart,/obj/item/stack/material/wood/fifty,/obj/effect/decal/cleanable/dirt,/obj/random/handgun,/turf/simulated/floor/inaks/asphalt,/area/cadaab/shahtinsk) "gmW" = (/obj/structure/bed/roller/ironingboard,/turf/simulated/floor/tiled/white,/area/cadaab/caves/bunker/living/bunk) @@ -944,7 +944,7 @@ "icl" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/cadaab/caves/bunker/medsci) "idj" = (/obj/effect/floor_decal/corner/black/diagonal,/obj/machinery/cooker/fryer,/turf/simulated/floor/tiled/freezer,/area/cadaab/shahtinsk) "ido" = (/obj/effect/floor_decal/inaks/sand_dust{dir = 4},/turf/simulated/floor/inaks/dark_cafel,/area/cadaab/desert) -"idL" = (/obj/effect/spider/stickyweb,/obj/effect/spider/cocoon,/obj/random/raider,/obj/item/spacecash/bundle/c500,/obj/item/spacecash/bundle/c1000,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) +"idL" = (/obj/effect/spider/stickyweb,/obj/effect/spider/cocoon,/obj/random/raider,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "iee" = (/obj/effect/floor_decal/inaks/sand_dust{dir = 4},/obj/structure/sign/poster/antar/mine{pixel_x = -32},/turf/simulated/floor/inaks/cubic_plate,/area/cadaab/desert) "ifd" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/mob/living/simple_animal/hostile/retaliate/malf_drone/hydro,/turf/simulated/floor/grass/cadaab,/area/cadaab/oasis) "ifK" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/turf/simulated/floor/wood/ebony,/area/cadaab/shahtinsk) @@ -1117,7 +1117,7 @@ "jNG" = (/obj/structure/steelfence{dir = 8; pixel_x = -18},/obj/structure/steelfence{pixel_y = 25},/turf/simulated/floor/inaks/dark_cafel,/area/cadaab/shahtinsk/city_like) "jNL" = (/obj/structure/hygiene/shower{dir = 4; pixel_x = -5},/turf/simulated/floor/tiled/white,/area/cadaab/shahtinsk/booker) "jPA" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) -"jPF" = (/obj/structure/table/steel_reinforced,/obj/item/spacecash/bundle/c500,/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker) +"jPF" = (/obj/structure/table/steel_reinforced,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500,/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker) "jPH" = (/obj/effect/floor_decal/chapel{dir = 8},/obj/structure/bed/chair/pew{dir = 8},/turf/simulated/floor/lino,/area/cadaab/shahtinsk/city_like) "jPI" = (/obj/effect/floor_decal/inaks/road_border{dir = 6},/obj/item/trash/proteinbar,/turf/simulated/floor/inaks/plate,/area/cadaab/desert) "jQe" = (/obj/effect/floor_decal/spline/plain/paleblue{dir = 4},/obj/structure/closet/medical_wall/filled{pixel_x = 32},/turf/simulated/floor/lino,/area/cadaab/outpost/living) @@ -1461,7 +1461,7 @@ "mNS" = (/obj/structure/hygiene/shower{dir = 8; pixel_x = 3},/obj/structure/curtain/open/shower,/obj/random/simple_mob/meat{name = "random meat mob - low spawn chance"; spawn_nothing_percentage = 70},/turf/simulated/floor/tiled/freezer,/area/cadaab/caves/bunker/living/bunk) "mOu" = (/obj/item/reagent_containers/food/snacks/watermelonslice,/obj/structure/table/woodentable/ebony,/turf/simulated/floor/wood/walnut,/area/cadaab/oasis_farm) "mOw" = (/obj/structure/barricade/spike,/obj/effect/floor_decal/inaks/sand_dust{dir = 6},/turf/simulated/floor/inaks/plate,/area/cadaab/city_streets) -"mOG" = (/obj/structure/table/glass,/obj/effect/floor_decal/corner/black/diagonal,/obj/machinery/light{dir = 8},/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c1000,/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker/living/can) +"mOG" = (/obj/structure/table/glass,/obj/effect/floor_decal/corner/black/diagonal,/obj/machinery/light{dir = 8},/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker/living/can) "mPl" = (/obj/effect/floor_decal/inaks/sand_dust{dir = 6},/turf/simulated/floor,/area/cadaab/city_streets) "mPs" = (/obj/item/storage/mgsbox/loot_material,/turf/simulated/floor/steel_dirty,/area/cadaab/outpost/landing) "mQw" = (/obj/machinery/power/apc{name = "south bump"; pixel_y = -24},/obj/structure/cable/cyan{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/lino,/area/cadaab/outpost/living) @@ -1884,7 +1884,7 @@ "qaW" = (/obj/item/reagent_containers/syringe/drugs,/obj/random/trash,/turf/simulated/floor/cadaab_wood,/area/cadaab/shahtinsk/city_like) "qbz" = (/obj/effect/floor_decal/corner/blue{dir = 4},/turf/simulated/floor/steel_dirty,/area/cadaab/outpost/landing) "qcr" = (/turf/simulated/floor/carpet/red,/area/cadaab/outpost/syndishuttle) -"qcu" = (/obj/structure/bed,/obj/item/bedsheet/mime,/obj/structure/curtain/open/bed,/obj/effect/floor_decal/carpet/red{dir = 4},/obj/effect/floor_decal/carpet/red,/obj/effect/floor_decal/carpet/red{dir = 6},/obj/machinery/light/small{dir = 4; icon_state = "bulb1"},/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c1000,/obj/random/loot,/turf/simulated/floor/carpet/red,/area/cadaab/caves/bunker/living/bunk) +"qcu" = (/obj/structure/bed,/obj/item/bedsheet/mime,/obj/structure/curtain/open/bed,/obj/effect/floor_decal/carpet/red{dir = 4},/obj/effect/floor_decal/carpet/red,/obj/effect/floor_decal/carpet/red{dir = 6},/obj/machinery/light/small{dir = 4; icon_state = "bulb1"},/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/random/loot,/turf/simulated/floor/carpet/red,/area/cadaab/caves/bunker/living/bunk) "qcz" = (/turf/unsimulated/wall/cadaab,/area/cadaab/desert) "qcG" = (/obj/random/trash,/turf/simulated/floor/inaks/cubic_plate,/area/cadaab/shahtinsk/city_like) "qcM" = (/obj/item/remains/human,/obj/item/reagent_containers/spray/waterflower,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) @@ -2759,7 +2759,7 @@ "xzQ" = (/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/structure/table/glass,/obj/item/storage/box/syringes,/obj/item/clothing/gloves/latex,/obj/item/clothing/gloves/latex/nitrile,/turf/simulated/floor/tiled/white,/area/cadaab/caves/bunker/medsci) "xAa" = (/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker/living/bunk) "xBa" = (/turf/unsimulated/cadaab/rock,/area/cadaab/city_streets) -"xBr" = (/obj/effect/landmark/corpse/miner,/obj/item/spacecash/bundle/c500,/obj/item/spacecash/bundle/c200,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) +"xBr" = (/obj/effect/landmark/corpse/miner,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c200,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "xCR" = (/turf/simulated/floor/tiled/dark,/area/cadaab/caves/bunker/living/bunk) "xCT" = (/turf/simulated/floor/cadaab_wood,/area/cadaab/outpost/living) "xDx" = (/obj/structure/table/steel_reinforced,/obj/structure/window/reinforced{health = 1e+007},/obj/machinery/door/blast/shutters/open,/obj/item/material/clipboard,/obj/random/cash,/obj/random/cash,/turf/simulated/floor/tiled/techfloor/grid,/area/cadaab/shahtinsk/second) diff --git a/maps/away/smugglers/smugglers.dmm b/maps/away/smugglers/smugglers.dmm index 5f9d4cc61d07b..9dbc8122b185c 100644 --- a/maps/away/smugglers/smugglers.dmm +++ b/maps/away/smugglers/smugglers.dmm @@ -962,7 +962,7 @@ "ct" = ( /obj/structure/table/standard, /obj/effect/decal/cleanable/dirt, -/obj/item/spacecash/bundle/c10, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c10, /obj/random/smokes, /obj/random/snack, /turf/simulated/floor/tiled, diff --git a/maps/away/voxship/voxship-2.dmm b/maps/away/voxship/voxship-2.dmm index 015e34d21be39..59afa08c6e40a 100644 --- a/maps/away/voxship/voxship-2.dmm +++ b/maps/away/voxship/voxship-2.dmm @@ -580,8 +580,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/spacecash/bundle/c500, -/obj/item/spacecash/bundle/c500, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, /turf/simulated/floor/tiled/dark/monotile/vox, /area/voxship/dorms) "hE" = ( @@ -1212,7 +1212,7 @@ /obj/random/contraband, /obj/random/contraband, /obj/random/contraband, -/obj/item/spacecash/bundle/c500, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, /turf/simulated/floor/tiled/dark/vox, /area/voxship/dorms) "nA" = ( @@ -1467,9 +1467,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/spacecash/bundle/c500, -/obj/item/spacecash/bundle/c500, -/obj/item/spacecash/bundle/c500, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, /turf/simulated/floor/tiled/dark/monotile/vox, /area/voxship/dorms) "qi" = ( @@ -1546,9 +1546,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, -/obj/item/spacecash/bundle/c500, -/obj/item/spacecash/bundle/c500, -/obj/item/spacecash/bundle/c500, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -3887,7 +3887,7 @@ "SG" = ( /obj/structure/table/standard, /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, -/obj/item/spacecash/bundle/c500, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500, /obj/machinery/light{ dir = 8; icon_state = "tube1" @@ -4399,12 +4399,12 @@ /turf/simulated/floor/plating/vox, /area/voxship/dock) "Xk" = ( -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, +/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, +/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, /obj/item/implanter/loyalty, /obj/item/device/powersink, /obj/item/portable_destructive_analyzer, diff --git a/maps/castelnau/cadaab/castelnau-2-cadaab.dmm b/maps/castelnau/cadaab/castelnau-2-cadaab.dmm index cf75d94a3f130..572024db69150 100644 --- a/maps/castelnau/cadaab/castelnau-2-cadaab.dmm +++ b/maps/castelnau/cadaab/castelnau-2-cadaab.dmm @@ -2166,7 +2166,7 @@ "obD" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor/grid,/area/castelnau/engineering/gen_room{always_unpowered = 1}) "obL" = (/obj/random/simple_mob/bot{name = "random bot - low spawn chance"; spawn_nothing_percentage = 70},/turf/simulated/floor/plating,/area/cadaab/shahtinsk/city_like) "obV" = (/obj/random/toolbox,/turf/simulated/floor/tiled/techfloor,/area/cadaab/shahtinsk/booker) -"ocy" = (/obj/effect/landmark/corpse/miner,/obj/item/spacecash/bundle/c500,/obj/item/spacecash/bundle/c200,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) +"ocy" = (/obj/effect/landmark/corpse/miner,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c200,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "odj" = (/obj/machinery/atmospherics/unary/vent_pump/on{external_pressure_bound = 15000; external_pressure_bound_default = 15000},/obj/effect/floor_decal/industrial/warning/full,/obj/structure/sign/warning/vent_port{dir = 1; pixel_y = -32},/turf/simulated/floor/plating,/area/castelnau/thruster/d2starboard) "odn" = (/obj/structure/railing/mapped{dir = 8},/obj/structure/steelfence{dir = 4},/turf/simulated/floor/inaks/cubic_plate,/area/cadaab/desert) "odY" = (/obj/effect/floor_decal/inaks/road_border{dir = 1},/obj/structure/inaks_decor,/obj/effect/floor_decal/inaks/sand_dust,/turf/simulated/floor/inaks/plate,/area/cadaab/desert) @@ -2785,7 +2785,7 @@ "sqp" = (/obj/effect/floor_decal/inaks/road_border{dir = 1},/obj/effect/floor_decal/inaks/sand_dust,/turf/simulated/floor/inaks/plate,/area/cadaab/desert) "sqF" = (/turf/simulated/floor/inaks/plate,/area/cadaab/desert) "srj" = (/obj/item/stack/material/phoron/ten,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) -"srN" = (/obj/structure/safe,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c1000,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/turf/simulated/floor/lino,/area/cadaab/shahtinsk/city_like) +"srN" = (/obj/structure/safe,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/stack/material/gold/ten,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/turf/simulated/floor/lino,/area/cadaab/shahtinsk/city_like) "srR" = (/obj/structure/hygiene/sink{dir = 4; pixel_x = 12},/obj/item/storage/mirror{dir = 4; pixel_x = 28},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/freezer,/area/castelnau/security/brig) "ssd" = (/turf/simulated/wall/r_wall/hull,/area/castelnau/maintenance/auxsolarport) "ssj" = (/obj/structure/rubble/lab,/turf/simulated/floor/tiled/techfloor,/area/cadaab/shahtinsk/booker) diff --git a/maps/castelnau/techbarb-event/event.dmm b/maps/castelnau/techbarb-event/event.dmm index 3b9efb19d0cac..bd27d7aea07b8 100644 --- a/maps/castelnau/techbarb-event/event.dmm +++ b/maps/castelnau/techbarb-event/event.dmm @@ -1047,7 +1047,7 @@ "Kg" = (/obj/effect/paint/merc,/obj/effect/paint_stripe/blue,/turf/simulated/wall/r_wall,/area/cadaab/outpost/teleport) "Kh" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/door/blast/shutters/open,/turf/simulated/floor/inaks/asphalt,/area/cadaab/shahtinsk) "Kk" = (/obj/effect/floor_decal/inaks{dir = 4},/obj/item/storage/mgsbox/loot_accesory,/turf/simulated/floor/inaks/asphalt,/area/cadaab/shahtinsk) -"Km" = (/obj/effect/landmark/corpse/miner,/obj/item/spacecash/bundle/c500,/obj/item/spacecash/bundle/c200,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) +"Km" = (/obj/effect/landmark/corpse/miner,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c500,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c200,/turf/simulated/floor/exoplanet/cadaab,/area/cadaab/caves) "Kn" = (/obj/effect/floor_decal/corner/black/diagonal,/obj/item/storage/mgsbox/clear,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/freezer,/area/cadaab/shahtinsk) "Ko" = (/obj/item/stack/cable_coil/yellow,/turf/simulated/floor/inaks/dark_cafel,/area/cadaab/desert) "Kp" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/exoplanet/desert/cadaab,/area/cadaab/desert) diff --git a/maps/castelnau/z1-admin.dmm b/maps/castelnau/z1-admin.dmm index 9399a1ce2840e..8cf8dc2e57906 100644 --- a/maps/castelnau/z1-admin.dmm +++ b/maps/castelnau/z1-admin.dmm @@ -9162,11 +9162,11 @@ /area/merchant_station) "aRI" = ( /obj/structure/table/steel, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, +/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, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, /obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 diff --git a/maps/random_ruins/exoplanet_ruins/armsfactory/armsfactory.dmm b/maps/random_ruins/exoplanet_ruins/armsfactory/armsfactory.dmm index 3f52a1be6ff56..d7ed3fba6f7d7 100644 --- a/maps/random_ruins/exoplanet_ruins/armsfactory/armsfactory.dmm +++ b/maps/random_ruins/exoplanet_ruins/armsfactory/armsfactory.dmm @@ -110,7 +110,7 @@ "cg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/power/smes/buildable/max_cap_in_out,/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/corner/orange/border{dir = 8},/turf/simulated/floor/tiled/techfloor/grid,/area/map_template/armsfactory/engineering) "ch" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9; icon_state = "intact"},/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{frequency = 1441; id_tag = "cn2o"},/turf/simulated/floor/reinforced/nitrogen,/area/map_template/armsfactory/atmospherics) "ci" = (/obj/structure/catwalk,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/exoplanet/concrete,/area/template_noop) -"cj" = (/obj/structure/table/steel_reinforced,/obj/item/spacecash/bundle/c1000,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/item/spacecash/bundle/c1000,/turf/simulated/floor/tiled/techfloor,/area/map_template/armsfactory/tcomms) +"cj" = (/obj/structure/table/steel_reinforced,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/turf/simulated/floor/tiled/techfloor,/area/map_template/armsfactory/tcomms) "ck" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/map_template/armsfactory/command) "cl" = (/obj/machinery/atmospherics/pipe/simple/visible/black,/turf/simulated/floor/tiled/techfloor/grid,/area/map_template/armsfactory/atmospherics) "cm" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 5; icon_state = "intact"},/turf/simulated/floor/tiled/techfloor,/area/map_template/armsfactory/atmospherics) diff --git a/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm b/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm index ccac22b3ecdb9..057c02d52e266 100644 --- a/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm +++ b/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm @@ -2271,7 +2271,7 @@ }, /obj/random/projectile, /obj/item/material/knife/combat, -/obj/item/spacecash/bundle/c100, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c100, /obj/random/cash, /obj/random/cash, /obj/random/handgun, diff --git a/maps/random_ruins/exoplanet_ruins/playablecolony/colony.dmm b/maps/random_ruins/exoplanet_ruins/playablecolony/colony.dmm index b1ec9d18ea482..d262d73251b0e 100644 --- a/maps/random_ruins/exoplanet_ruins/playablecolony/colony.dmm +++ b/maps/random_ruins/exoplanet_ruins/playablecolony/colony.dmm @@ -1022,7 +1022,7 @@ /area/template_noop) "cj" = ( /obj/structure/table/steel_reinforced, -/obj/item/spacecash/bundle/c1000, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, /obj/random/cash, /obj/random/cash, /obj/random/cash, @@ -1040,7 +1040,7 @@ /obj/random/cash, /obj/random/cash, /obj/random/cash, -/obj/item/spacecash/bundle/c1000, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, /turf/simulated/floor/tiled/techfloor, /area/map_template/colony/tcomms) "ck" = ( diff --git a/maps/torch/voronezh/voronezh.dmm b/maps/torch/voronezh/voronezh.dmm index 86bb992b8dd13..db0fa8f8e0202 100644 --- a/maps/torch/voronezh/voronezh.dmm +++ b/maps/torch/voronezh/voronezh.dmm @@ -29,7 +29,7 @@ "aN" = (/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/tiled,/area/voronezh/common_room) "aO" = (/obj/effect/paint/silver,/turf/simulated/wall,/area/voronezh/outside) "aP" = (/obj/random/trash,/obj/structure/bed/chair{dir = 8},/mob/living/simple_animal/hostile/sol_military,/turf/simulated/floor/tiled/techmaint,/area/voronezh/outside) -"aQ" = (/obj/structure/table/steel,/obj/item/spacecash/bundle/c1,/obj/item/spacecash/bundle/c1,/turf/simulated/floor/tiled/techmaint,/area/voronezh/outside) +"aQ" = (/obj/structure/table/steel,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1,/turf/simulated/floor/tiled/techmaint,/area/voronezh/outside) "aR" = (/obj/structure/table/standard,/obj/item/defibrillator/loaded,/obj/machinery/camera/network/aquila{c_tag = "Aquila - Infirmary"; dir = 8},/obj/machinery/firealarm{dir = 4; pixel_x = 26},/turf/simulated/floor/tiled/white/monotile,/area/voronezh/acquilla) "aT" = (/obj/effect/floor_decal/inaks/asphalt_hole{dir = 1},/turf/unsimulated/floor/inaks/asphalt,/area/voronezh/outside) "aU" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/wood/mahogany,/area/voronezh/cap) @@ -715,7 +715,7 @@ "tU" = (/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 4},/obj/effect/floor_decal/scglogo{dir = 1; icon_state = "bottom-right"},/turf/simulated/floor/wood/ebony,/area/voronezh/cap) "tV" = (/obj/structure/bed/chair/padded/black{dir = 4},/turf/simulated/floor/tiled/dark,/area/voronezh/outside) "tX" = (/obj/structure/kitchenspike,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/freezer,/area/voronezh/outside) -"tY" = (/obj/structure/table/standard,/obj/item/spacecash/bundle/c100,/turf/simulated/floor/tiled/dark,/area/voronezh/outside) +"tY" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c100,/turf/simulated/floor/tiled/dark,/area/voronezh/outside) "tZ" = (/obj/structure/table/rack,/obj/item/stock_parts/circuitboard/clonepod,/obj/item/stock_parts/circuitboard/clonescanner,/obj/item/stock_parts/circuitboard/cloning,/turf/simulated/floor/tiled/dark,/area/voronezh/engineers) "ub" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light{dir = 8},/obj/machinery/cryopod{dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark/monotile,/area/voronezh/acquilla) "uc" = (/obj/effect/floor_decal/corner/brown/half,/obj/machinery/papershredder,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled,/area/voronezh/common_room) @@ -915,7 +915,7 @@ "zt" = (/obj/machinery/door/airlock/highsecurity{name = "Bolshoy Grigoriy Quarters"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/voronezh/grisha) "zv" = (/obj/effect/floor_decal/corner/paleblue{dir = 1},/turf/simulated/floor/tiled/white,/area/voronezh/outside) "zw" = (/obj/structure/table/steel,/obj/random/powercell,/turf/simulated/floor/tiled/dark,/area/voronezh/outside) -"zx" = (/obj/structure/safe,/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c1000,/obj/item/spacecash/bundle/c1000,/turf/simulated/floor/tiled/dark/monotile,/area/voronezh/outside) +"zx" = (/obj/structure/safe,/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,/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000,/turf/simulated/floor/tiled/dark/monotile,/area/voronezh/outside) "zy" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{dir = 1; id_tag = "calypso_cargo_pump"},/obj/machinery/cryopod,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techfloor/grid,/area/voronezh) "zA" = (/obj/item/stack/material/steel,/turf/unsimulated/floor/plating,/area/voronezh/outside) "zD" = (/obj/machinery/door/firedoor,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/barricade,/turf/simulated/floor/tiled/steel_ridged,/area/voronezh/outside) diff --git a/maps/torch/z1_admin.dmm b/maps/torch/z1_admin.dmm index c5e91e991ae09..52625286520ef 100644 --- a/maps/torch/z1_admin.dmm +++ b/maps/torch/z1_admin.dmm @@ -9205,11 +9205,11 @@ /area/merchant_station) "aRI" = ( /obj/structure/table/steel, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, +/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, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, +/obj/item/reagent_containers/food/snacks/spacecash/bundle/c1000, /obj/item/paper_bin{ pixel_x = 1; pixel_y = 9