From d7d460b485193a9092e12f7a61042fff482ae5db Mon Sep 17 00:00:00 2001 From: spaghetti <48985748+definitelynotspaghetti@users.noreply.github.com> Date: Wed, 17 Apr 2024 20:33:20 +0300 Subject: [PATCH] ryetalin (#497) --- code/game/objects/items/storage/fancy.dm | 4 ++-- code/game/objects/items/storage/firstaid.dm | 2 +- code/modules/reagents/reactions/medical.dm | 6 +++--- modular_RUtgmc/code/modules/reagents/reactions/medical.dm | 5 ----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 61f3fb963c2a8..02d96ac9f7e01 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -189,8 +189,8 @@ new /obj/item/clothing/mask/cigarette/kelo(src) for(var/i in 1 to 5) new /obj/item/clothing/mask/cigarette/tram(src) - for(var/i in 1 to 5) - new /obj/item/clothing/mask/cigarette/antitox(src) +// for(var/i in 1 to 5) +// new /obj/item/clothing/mask/cigarette/antitox(src) new /obj/item/clothing/mask/cigarette/emergency(src) new /obj/item/tool/lighter(src) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 24bd825913e12..0afa7561e1ca3 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -87,7 +87,7 @@ /obj/item/storage/firstaid/toxin/fill_firstaid_kit() new /obj/item/healthanalyzer(src) new /obj/item/storage/pill_bottle/dylovene(src) - new /obj/item/storage/pill_bottle/packet/ryetalyn(src) +// new /obj/item/storage/pill_bottle/packet/ryetalyn(src) new /obj/item/reagent_containers/hypospray/autoinjector/hypervene(src) new /obj/item/reagent_containers/hypospray/autoinjector/hypervene(src) new /obj/item/storage/syringe_case/tox(src) diff --git a/code/modules/reagents/reactions/medical.dm b/code/modules/reagents/reactions/medical.dm index 35d4fa827600b..435ac7e8e7305 100644 --- a/code/modules/reagents/reactions/medical.dm +++ b/code/modules/reagents/reactions/medical.dm @@ -39,12 +39,12 @@ name = "Meralyne" results = list(/datum/reagent/medicine/meralyne = 3) required_reagents = list(/datum/reagent/medicine/inaprovaline = 1, /datum/reagent/medicine/bicaridine = 1, /datum/reagent/iron = 1, /datum/reagent/medicine/lemoline = 1) - +/* RU TGMC EDIT /datum/chemical_reaction/ryetalyn name = "Ryetalyn" results = list(/datum/reagent/medicine/ryetalyn = 2) required_reagents = list(/datum/reagent/medicine/arithrazine = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/lemoline = 1) - +RU TGMC EDIT */ /datum/chemical_reaction/cryoxadone name = "Cryoxadone" results = list(/datum/reagent/medicine/cryoxadone = 3) @@ -147,7 +147,7 @@ /datum/chemical_reaction/peridaxon_plus name = "Peridaxon Plus" results = list(/datum/reagent/medicine/peridaxon_plus = 1) - required_reagents = list(/datum/reagent/medicine/ryetalyn = 5, /datum/reagent/toxin/phoron = 5) + required_reagents = list(/datum/reagent/medicine/hyronalin = 5, /datum/reagent/toxin/phoron = 5) //RU TGMC EDIT /datum/chemical_reaction/quickclot name = "Quick-Clot" diff --git a/modular_RUtgmc/code/modules/reagents/reactions/medical.dm b/modular_RUtgmc/code/modules/reagents/reactions/medical.dm index afcb879b490d4..0e3e277e4a47a 100644 --- a/modular_RUtgmc/code/modules/reagents/reactions/medical.dm +++ b/modular_RUtgmc/code/modules/reagents/reactions/medical.dm @@ -1,8 +1,3 @@ -/datum/chemical_reaction/ryetalyn - name = "Ryetalyn" - results = list(/datum/reagent/medicine/ryetalyn = 2) - required_reagents = list(/datum/reagent/medicine/arithrazine = 1, /datum/reagent/carbon = 1) - /datum/chemical_reaction/synaptizine name = "Synaptizine" results = list(/datum/reagent/medicine/synaptizine = 3)