From f97f33eed11ba7e37167a042de7961e6a2cc0281 Mon Sep 17 00:00:00 2001 From: Kolergo <85778771+Kolergo@users.noreply.github.com> Date: Thu, 6 Jul 2023 19:38:49 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A8=D1=82=D0=BE=D1=80=D0=BC=20=D0=B8=20?= =?UTF-8?q?=D0=B4=D1=80=D0=BE=D0=BF=D0=BF=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/bos/modules/mob/cat.dm | 2 +- .../overmap/disperser/disperser_charge.dm | 4 ++-- maps/away/cadaab/icons/turfs.dmi | Bin 32984 -> 35146 bytes maps/castelnau/code/modules/sandstorm.dm | 12 ++++++++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/bos/modules/mob/cat.dm b/code/bos/modules/mob/cat.dm index cc9dec1258387..8c04f4aa1358a 100644 --- a/code/bos/modules/mob/cat.dm +++ b/code/bos/modules/mob/cat.dm @@ -43,7 +43,7 @@ icon_living = "floppa_newyear" mob_size = MOB_LARGE -mob/living/simple_animal/passive/cat/bolgarin +/mob/living/simple_animal/passive/cat/bolgarin name = "Major Bolgarin" desc = "A domesticated, upolnomochenniy ICCG officer. Has a tendency to kiss crewmembers." icon = 'icons/bos/mob/cat.dmi' diff --git a/code/bos/modules/overmap/disperser/disperser_charge.dm b/code/bos/modules/overmap/disperser/disperser_charge.dm index 351bae73c5e78..dcfc0570a172d 100644 --- a/code/bos/modules/overmap/disperser/disperser_charge.dm +++ b/code/bos/modules/overmap/disperser/disperser_charge.dm @@ -94,7 +94,7 @@ var/chargedesc = "ODST" /obj/structure/ship_munition/disperser_charge/s2s/fire(turf/target, strength, range) - explosion(target, strength * range / 1) + explosion(target, 0, strength * range / 1, 2) /obj/structure/ship_munition/disperser_charge/vox name = "Vox charge" @@ -105,4 +105,4 @@ /obj/structure/ship_munition/disperser_charge/vox/fire(turf/target, strength, range) explosion(target,max(2,strength * range / 10),strength * range / 8,strength * range / 5) - empulse(target, strength * range / 5, strength * range) \ No newline at end of file + empulse(target, strength * range / 5, strength * range) diff --git a/maps/away/cadaab/icons/turfs.dmi b/maps/away/cadaab/icons/turfs.dmi index db0cd9df178b77bbfa3c8f170d43db5fbf6f31e0..a3d0f77e080e51baf9db8e51776b4f7bac93332a 100644 GIT binary patch delta 21512 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 sq?j@BX~xV25ODqyi^08D8sg|1t7-uH9w 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 diff --git a/maps/castelnau/code/modules/sandstorm.dm b/maps/castelnau/code/modules/sandstorm.dm index 2dcd42017ef75..60b233930828a 100644 --- a/maps/castelnau/code/modules/sandstorm.dm +++ b/maps/castelnau/code/modules/sandstorm.dm @@ -13,7 +13,7 @@ var/checking_area = get_area(unlucky) if(is_type_in_list(checking_area, storm_areas)) return CADAAB_OUTSIDE - else if(istype(checking_area, /area/cadaab)) + else if((unlucky.z << 4) && (!istype(checking_area, /area/cadaab/sputnik))) return CADAAB_INDOORS else return FALSE @@ -69,7 +69,7 @@ for(var/turf/simulated/floor/inaks/target_turf in world) target_turf.set_light(0, 0, 0) - for(var/turf/simulated/floor/grass/cadaab/target_turf in world) + for(var/turf/simulated/floor/shuttle_ceiling/cadaab/target_turf in world) target_turf.set_light(0, 0, 0) sleep(10 SECONDS) @@ -88,6 +88,14 @@ areas.forced_ambience = list('sound/ambience/bos/super_sandstorm_indoor.ogg') areas.ambience = list('sound/effects/bos/lighting.ogg') + for(var/area/castelnau/areas in world) + areas.forced_ambience = list('sound/ambience/bos/super_sandstorm_indoor.ogg') + areas.ambience = list('sound/effects/bos/lighting.ogg') + + for(var/area/shuttle/castelnau/areas in world) + areas.forced_ambience = list('sound/ambience/bos/super_sandstorm_indoor.ogg') + areas.ambience = list('sound/effects/bos/lighting.ogg') + for(var/obj/machinery/noisetv/broadcast in world) broadcast.endnoise() From 5c0fe751b0bb7047757953579d9340c23d8e344a Mon Sep 17 00:00:00 2001 From: Evie7056 Date: Fri, 7 Jul 2023 04:53:04 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BA=D0=BE=D1=80?= =?UTF-8?q?=D0=BC=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 From 4264951b356b6629d8d73954aa02fb0082b2a33c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Sat, 8 Jul 2023 15:02:39 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=BD=D1=83=20=D0=BA=D0=B5=D0=B9=D0=BA=20?= =?UTF-8?q?=D0=B1=D0=BB=D1=8F=20(#201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ну кейк бля * господи блять я не ненавижу гит, сука хуле ты мне срешь modified: code/modules/economy/cash.dm --- code/modules/economy/cash.dm | 31 ++++++++++++++----- .../Chemistry-Reagents-Medicine.dm | 3 +- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 447a1e1c678a1..6445e52f16693 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -18,13 +18,28 @@ var/worth = 0 var/static/denominations = list(1000,500,200,100,50,20,10,1) - volume = 1 - nutriment_amt = 1 + bitesize = 3 + volume = 1000 nutriment_amt = 1 nutriment_desc = list( - "Jewrenium" = 1 + "dirty dollar" = 2, + "liquified money" = 2, + "1% of life" = 2, + "Trasen's balls" = 1, + "communists' anger" = 1 ) +/obj/item/reagent_containers/food/snacks/spacecash/Initialize() + .=..() + reagents.add_reagent(/datum/reagent/tricordrazine/jew, worth) + +/obj/item/reagent_containers/food/snacks/spacecash/attack(mob/M as mob, mob/user as mob, def_zone) + .=..() + worth = round(worth - bitesize) + reagents.del_reagent(/datum/reagent/tricordrazine/jew) + reagents.add_reagent(/datum/reagent/tricordrazine/jew, worth) + update_icon() + /obj/item/reagent_containers/food/snacks/spacecash/standard_feed_mob(var/mob/user, var/mob/target) if(user.a_intent == I_HELP) return @@ -40,14 +55,16 @@ 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 + bundle.nutriment_amt = cash.worth + bundle.reagents.del_reagent(/datum/reagent/tricordrazine/jew) + bundle.reagents.add_reagent(/datum/reagent/tricordrazine/jew, bundle.worth) qdel(cash) else //is bundle bundle = W bundle.worth += src.worth - bundle.volume = bundle.worth - bundle.nutriment_amt = bundle.volume + bundle.nutriment_amt = bundle.worth + bundle.reagents.del_reagent(/datum/reagent/tricordrazine/jew) + bundle.reagents.add_reagent(/datum/reagent/tricordrazine/jew, bundle.worth) bundle.update_icon() if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/h_user = user diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index bef95cd5fe788..03d0030c9b604 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1062,4 +1062,5 @@ //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. + M.heal_organ_damage(2 * removed, 2 * removed) //Slightly buffed tric. Might be Excessive. + //Fuck the buffs, t0o op