From 9185b2299fac1a8a9e0dc9339562af4166ea0ea6 Mon Sep 17 00:00:00 2001 From: tacoguy7765093 Date: Mon, 26 Dec 2022 13:13:22 -0600 Subject: [PATCH] Makes Glucose a craftable reagent and uncomments VOREstation removal from sweatmaxes. (#5409) * Gives glucose a crafting recipe and un comments sweatmax glucose. * slash * nerf this * Moving glucose pens to medical tab --- code/datums/supplypacks/misc.dm | 3 ++- code/modules/economy/vending_machines.dm | 4 ++-- .../reagents/reactions/instant/instant_ch.dm | 6 ++++++ code/modules/reagents/reagents/medicine_ch.dm | 18 ++++++++++++++++++ .../code/datums/supplypacks/medical.dm | 8 ++++++++ vorestation.dme | 1 + 6 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 modular_chomp/code/datums/supplypacks/medical.dm diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index e2ff8049c9..bb71372f49 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -153,6 +153,7 @@ containertype = /obj/structure/closet/crate/thinktronic containername = "Holoplant crate" +/* CHOMPedit, moved to medical.dm in modular folder /datum/supply_pack/misc/glucose_hypos name = "Glucose Hypoinjectors" contains = list( @@ -161,7 +162,7 @@ cost = 25 containertype = /obj/structure/closet/crate/zenghu containername = "Glucose Hypo Crate" - +*/ /datum/supply_pack/misc/mre_rations num_contained = 6 name = "Emergency - MREs" diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 101df4b4dc..114c01f912 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -284,7 +284,7 @@ /obj/item/weapon/reagent_containers/food/snacks/fruitbar = 16, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 8, /obj/item/weapon/reagent_containers/pill/diet = 8, - ///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, //CHOMPedit nah /obj/item/weapon/towel/random = 8, /obj/item/toy/tennis = 4) @@ -296,7 +296,7 @@ /obj/item/weapon/reagent_containers/food/snacks/fruitbar = 5, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5, /obj/item/weapon/reagent_containers/pill/diet = 25, - ///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //CHOMPedit nah /obj/item/weapon/towel/random = 20, /obj/item/toy/tennis = 15) //VOREStation Edit End diff --git a/code/modules/reagents/reactions/instant/instant_ch.dm b/code/modules/reagents/reactions/instant/instant_ch.dm index 586278daef..bcd8c10770 100644 --- a/code/modules/reagents/reactions/instant/instant_ch.dm +++ b/code/modules/reagents/reactions/instant/instant_ch.dm @@ -58,6 +58,12 @@ required_reagents = list("unsorbitol" = 1, "phoron" = 1) result_amount = 2 +/decl/chemical_reaction/instant/galactose + name = "Galactose" + id = "galactose" + result = "galactose" + required_reagents = list("milk" = 1, "sacid" = 1) + result_amount = 3 ///SAP RECIPES////// /decl/chemical_reaction/instant/myelamine_sap //This is the clotting agent used by clotting packs. diff --git a/code/modules/reagents/reagents/medicine_ch.dm b/code/modules/reagents/reagents/medicine_ch.dm index 26daefc6fe..7bb2c5b750 100644 --- a/code/modules/reagents/reagents/medicine_ch.dm +++ b/code/modules/reagents/reagents/medicine_ch.dm @@ -194,3 +194,21 @@ chem_effective = 0.75 if(alien != IS_DIONA) M.heal_organ_damage(12 * removed * chem_effective, 0) + +/datum/reagent/nutriment/glucose/galactose + name = "Galactose" + id = "galactose" + description = "A clear sweet tasting fluid derived from lactose that is not as dense as glucose for IV application" + nutriment_factor = 5 //1/6 of glucose + taste_description = "sweetness" + color = "#ffffff" + overdose = 45 + +/datum/reagent/nutriment/glucose/galactose/overdose(var/mob/living/carbon/M, var/alien, var/removed) + ..() + M.eye_blurry = min(20, max(0, M.eye_blurry + 10)) + if(prob(10)) // 1 in 10 per tick + var/mob/living/carbon/human/H = M + var/obj/item/organ/internal/brain/br = H.internal_organs_by_name[O_BRAIN] //Give brain damage spaceman, AKA no change at all + br?.take_damage(1) + to_chat(M, "You feel extremely jittery!") diff --git a/modular_chomp/code/datums/supplypacks/medical.dm b/modular_chomp/code/datums/supplypacks/medical.dm new file mode 100644 index 0000000000..9c2328878e --- /dev/null +++ b/modular_chomp/code/datums/supplypacks/medical.dm @@ -0,0 +1,8 @@ +/datum/supply_pack/med/glucose_hypos + name = "Glucose Hypoinjectors" + contains = list( + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5 + ) + cost = 25 + containertype = /obj/structure/closet/crate/zenghu + containername = "Glucose Hypo Crate" diff --git a/vorestation.dme b/vorestation.dme index 90330f2645..a0b42cab15 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4503,6 +4503,7 @@ #include "modular_chomp\code\datums\autolathe\engineering_ch.dm" #include "modular_chomp\code\datums\autolathe\general_ch.dm" #include "modular_chomp\code\datums\outfits\jobs\noncrew.dm" +#include "modular_chomp\code\datums\supplypacks\medical.dm" #include "modular_chomp\code\game\dna\dna2.dm" #include "modular_chomp\code\game\jobs\job\department.dm" #include "modular_chomp\code\game\jobs\job\noncrew.dm"