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] =?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