From 92060cc1235d85a3a00ec119423c912df7d6a684 Mon Sep 17 00:00:00 2001 From: KabKebab Date: Sat, 7 May 2022 20:42:47 +0200 Subject: [PATCH] weight chems are now more potent, weight loss chem is now safer --- .../chemistry/reagents/consumable_reagents.dm | 2 +- code/datums/diseases/advance/advance.dm | 2 +- .../datums/diseases/advance/symptoms/flesh_eating.dm | 2 +- code/game/objects/items/cigs_lighters.dm | 6 +++--- code/modules/food_and_drinks/food/snacks_pastry.dm | 2 +- .../recipes/tablecraft/recipes_pastry.dm | 2 +- code/modules/hydroponics/grown/cannabis.dm | 10 +++++----- .../reagents/chemistry/reagents/toxin_reagents.dm | 12 ++++++------ code/modules/reagents/chemistry/recipes/toxins.dm | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index c81f4b68..e9c185d0 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -10,5 +10,5 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM /datum/reagent/consumable/lipoifier/on_mob_life(mob/living/carbon/M) - M.fatness = M.fatness + 3 + M.fatness = M.fatness + 10 return ..() diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index e2a29907..4a088270 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -64,7 +64,7 @@ /datum/reagent/pax, /datum/reagent/drug/happiness, /datum/reagent/medicine/ephedrine ), list( // level 9 - /datum/reagent/toxin/lipolicide, /datum/reagent/medicine/sal_acid + /datum/reagent/medicine/lipolicide, /datum/reagent/medicine/sal_acid ), list( // level 10 /datum/reagent/medicine/haloperidol, /datum/reagent/drug/aranesp, /datum/reagent/medicine/diphenhydramine diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 93eb0e6b..438ecd96 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -129,7 +129,7 @@ Bonus var/get_damage = rand(6,10) M.adjustBruteLoss(get_damage) if(chems) - M.reagents.add_reagent_list(list(/datum/reagent/toxin/heparin = 2, /datum/reagent/toxin/lipolicide = 2)) + M.reagents.add_reagent_list(list(/datum/reagent/toxin/heparin = 2, /datum/reagent/medicine/lipolicide = 2)) if(zombie) M.reagents.add_reagent(/datum/reagent/romerol, 1) return 1 diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 3d56fdb6..63ac3554 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -293,7 +293,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/shadyjims desc = "A Shady Jim's Super Slims cigarette." - list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/toxin/lipolicide = 4, /datum/reagent/ammonia = 2, /datum/reagent/toxin/plantbgone = 1, /datum/reagent/toxin = 1.5) + list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/medicine/lipolicide = 4, /datum/reagent/ammonia = 2, /datum/reagent/toxin/plantbgone = 1, /datum/reagent/toxin = 1.5) /obj/item/clothing/mask/cigarette/xeno desc = "A Xeno Filtered brand cigarette." @@ -327,10 +327,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM starts_lit = TRUE /obj/item/clothing/mask/cigarette/rollie/cannabis - list_reagents = list(/datum/reagent/drug/space_drugs = 15, /datum/reagent/toxin/lipolicide = 35) + list_reagents = list(/datum/reagent/drug/space_drugs = 15, /datum/reagent/medicine/lipolicide = 35) /obj/item/clothing/mask/cigarette/rollie/mindbreaker - list_reagents = list(/datum/reagent/toxin/mindbreaker = 35, /datum/reagent/toxin/lipolicide = 15) + list_reagents = list(/datum/reagent/toxin/mindbreaker = 35, /datum/reagent/medicine/lipolicide = 15) /obj/item/cigbutt/roach name = "roach" diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 1747b9e1..4e2aece1 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -466,7 +466,7 @@ name = "\improper Dank-pocket" desc = "The food of choice for the seasoned botanist." icon_state = "dankpocket" - list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4) + list_reagents = list(/datum/reagent/medicine/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4) filling_color = "#00FF00" tastes = list("meat" = 2, "dough" = 2) foodtype = GRAIN | VEGETABLES diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index d21649a0..c2d867ab 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -357,7 +357,7 @@ datum/crafting_recipe/food/donut/meat name = "\improper Dank-pocket" desc = "The food of choice for the seasoned botanist." icon_state = "dankpocket" - list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4) + list_reagents = list(/datum/reagent/medicine/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4) filling_color = "#00FF00" tastes = list("meat" = 2, "dough" = 2) foodtype = GRAIN | VEGETABLES diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index fcde38fd..0531bd2c 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -15,7 +15,7 @@ genes = list(/datum/plant_gene/trait/repeated_harvest) mutatelist = list(/obj/item/seeds/cannabis/rainbow, /obj/item/seeds/cannabis/death) - reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.35) // gives u the munchies + reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/medicine/lipolicide = 0.35) // gives u the munchies /obj/item/seeds/cannabis/rainbow name = "pack of rainbow weed seeds" @@ -25,7 +25,7 @@ plantname = "Rainbow Weed" product = /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow mutatelist = list(/obj/item/seeds/cannabis/ultimate) - reagents_add = list(/datum/reagent/toxin/mindbreaker = 0.15, /datum/reagent/toxin/lipolicide = 0.35) + reagents_add = list(/datum/reagent/toxin/mindbreaker = 0.15, /datum/reagent/medicine/lipolicide = 0.35) rarity = 40 /obj/item/seeds/cannabis/death @@ -36,7 +36,7 @@ plantname = "Deathweed" product = /obj/item/reagent_containers/food/snacks/grown/cannabis/death mutatelist = list(/obj/item/seeds/cannabis/white) - reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15) + reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/medicine/lipolicide = 0.15) rarity = 40 /obj/item/seeds/cannabis/white @@ -47,7 +47,7 @@ plantname = "Lifeweed" product = /obj/item/reagent_containers/food/snacks/grown/cannabis/white mutatelist = list() - reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15) + reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/medicine/lipolicide = 0.15) rarity = 40 @@ -74,7 +74,7 @@ /datum/reagent/drug/crank = 0.15, /datum/reagent/drug/krokodil = 0.15, /datum/reagent/toxin/histamine = 0.15, - /datum/reagent/toxin/lipolicide = 0.15) + /datum/reagent/medicine/lipolicide = 0.15) rarity = 69 diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index c9be477f..e8dbed8f 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -600,26 +600,26 @@ M.adjustToxLoss(toxdamage) ..() -/datum/reagent/toxin/lipolicide +//GS13 change. We'll need the weight loss chem way more than other codebases, let's make it useable. +/datum/reagent/medicine/lipolicide name = "Lipolicide" description = "A powerful toxin that will destroy fat cells, massively reducing body weight in a short time. Deadly to those without nutriment in their body." taste_description = "mothballs" reagent_state = LIQUID color = "#F0FFF0" metabolization_rate = 0.5 * REAGENTS_METABOLISM - toxpwr = 0 - overdose_threshold = 40 + overdose_threshold = 100 -/datum/reagent/toxin/lipolicide/overdose_process(mob/living/carbon/C) +/datum/reagent/medicine/lipolicide/overdose_process(mob/living/carbon/C) . = ..() if(current_cycle >=41 && prob(10)) to_chat(C, "You feel like your organs are on fire!") C.IgniteMob() -/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/M) +/datum/reagent/medicine/lipolicide/on_mob_life(mob/living/carbon/M) if(M.nutrition <= NUTRITION_LEVEL_STARVING) M.adjustToxLoss(1*REM, 0) - M.fatness = max(M.fatness - 3, 0) + M.fatness = max(M.fatness - 10, 0) if(M.fatness == 0) M.nutrition = max(M.nutrition - 3, 0) // making the chef more valuable, one meme trap at a time M.overeatduration = 0 diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index d9f28d21..288ced34 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -41,8 +41,8 @@ /datum/chemical_reaction/lipolicide name = "lipolicide" - id = /datum/reagent/toxin/lipolicide - results = list(/datum/reagent/toxin/lipolicide = 3) + id = /datum/reagent/medicine/lipolicide + results = list(/datum/reagent/medicine/lipolicide = 3) required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/diethylamine = 1, /datum/reagent/medicine/ephedrine = 1) /datum/chemical_reaction/mutagen