From 344c8b1334ad3433897884e99fa8e96c3b34b212 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sat, 18 Apr 2020 08:28:14 -0400 Subject: [PATCH 1/4] Hmm --- .../chemistry/reagents/medicine_reagents.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index ecceb6e8bf..c758f7c37d 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -241,6 +241,13 @@ overdose_threshold = 50 value = 3 +/datum/reagent/medicine/silver_sulfadiazine/reaction_obj(obj/O, reac_volume) + if(istype(O, /obj/item/stack/medical/gauze)) + var/obj/item/stack/medical/gauze/G = O + reac_volume = min((reac_volume / 10), G.amount) + new/obj/item/stack/medical/ointment(get_turf(G), reac_volume) + G.use(reac_volume) + /datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1) if(iscarbon(M) && M.stat != DEAD) if(method in list(INGEST, VAPOR, INJECT)) @@ -317,6 +324,12 @@ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) ..() +/datum/reagent/medicine/styptic_powder/reaction_obj(obj/O, reac_volume) + if(istype(O, /obj/item/stack/medical/gauze)) + var/obj/item/stack/medical/gauze/G = O + reac_volume = min((reac_volume / 10), G.amount) + new/obj/item/stack/medical/bruise_pack(get_turf(G), reac_volume) + G.use(reac_volume) /datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/carbon/M) M.adjustBruteLoss(-2*REM, 0) From 37a0fb558c60b639b640a51aff50b9eb1b877f43 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sun, 19 Apr 2020 15:29:48 -0400 Subject: [PATCH 2/4] with fixes and new gauze --- code/game/objects/items/stacks/medical.dm | 11 +++++++++++ .../reagents/chemistry/reagents/other_reagents.dm | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 50e9b94e97..ee2105d3fc 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -92,6 +92,7 @@ icon_state = "gauze" var/stop_bleeding = 1800 var/heal_brute = 5 + var/heal_tox = FALSE self_delay = 10 /obj/item/stack/medical/gauze/heal(mob/living/M, mob/user) @@ -100,6 +101,9 @@ if(!H.bleedsuppress && H.bleed_rate) //so you can't stack bleed suppression H.suppress_bloodloss(stop_bleeding) to_chat(user, "You stop the bleeding of [M]!") + H.adjustBruteLoss(-(heal_brute)) + if(heal_tox) + H.adjustToxLoss(-5) //Heals 5 damage but is not safe for slimes... return TRUE to_chat(user, "You can not use \the [src] on [M]!") @@ -127,6 +131,13 @@ stop_bleeding = 900 heal_brute = 0 +/obj/item/stack/medical/gauze/adv + name = "sterilized medical gauze" + desc = "A roll of elastic sterilized cloth that is extremely effective at stopping bleeding, heals minor wounds and cleans them." + singular_name = "sterilized medical gauze" + heal_tox = TRUE + self_delay = 5 + /obj/item/stack/medical/gauze/cyborg custom_materials = null is_cyborg = 1 diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index e66ebc5f20..04c5d63b28 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1034,6 +1034,14 @@ // +20% success propability on each step, useful while operating in less-than-perfect conditions ..() +/datum/reagent/space_cleaner/sterilizine/reaction_obj(obj/O, reac_volume) + if(istype(O, /obj/item/stack/medical/gauze)) + var/obj/item/stack/medical/gauze/G = O + reac_volume = min((reac_volume / 10), G.amount) + new/obj/item/stack/medical/gauze/adv(get_turf(G), reac_volume) + G.use(reac_volume) + + /datum/reagent/iron name = "Iron" description = "Pure iron is a metal." From 71e91a15b121a3f20c83724f1709c85e41397d16 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 22 Apr 2020 02:19:35 -0400 Subject: [PATCH 3/4] toxin healing bad I guess --- code/game/objects/items/stacks/medical.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index ee2105d3fc..adc4970175 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -92,7 +92,6 @@ icon_state = "gauze" var/stop_bleeding = 1800 var/heal_brute = 5 - var/heal_tox = FALSE self_delay = 10 /obj/item/stack/medical/gauze/heal(mob/living/M, mob/user) @@ -102,8 +101,6 @@ H.suppress_bloodloss(stop_bleeding) to_chat(user, "You stop the bleeding of [M]!") H.adjustBruteLoss(-(heal_brute)) - if(heal_tox) - H.adjustToxLoss(-5) //Heals 5 damage but is not safe for slimes... return TRUE to_chat(user, "You can not use \the [src] on [M]!") @@ -135,7 +132,6 @@ name = "sterilized medical gauze" desc = "A roll of elastic sterilized cloth that is extremely effective at stopping bleeding, heals minor wounds and cleans them." singular_name = "sterilized medical gauze" - heal_tox = TRUE self_delay = 5 /obj/item/stack/medical/gauze/cyborg From 1191268430afe5d39ce187f1221f6631d12a1e1e Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Mon, 27 Apr 2020 07:34:23 -0400 Subject: [PATCH 4/4] kevs request --- .../crafting/recipes/recipes_misc.dm | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index cf0e1bdec9..9eb3fcaaea 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -115,6 +115,33 @@ //Tools & Storage// /////////////////// +/datum/crafting_recipe/upgraded_gauze + name = "Improved Gauze" + result = /obj/item/stack/medical/gauze/adv + time = 1 + reqs = list(/obj/item/stack/medical/gauze = 1, + /datum/reagent/space_cleaner/sterilizine = 10) + category = CAT_MISC + subcategory = CAT_TOOL + +/datum/crafting_recipe/bruise_pack + name = "Bruise Pack" + result = /obj/item/stack/medical/bruise_pack + time = 1 + reqs = list(/obj/item/stack/medical/gauze = 1, + /datum/reagent/medicine/styptic_powder = 10) + category = CAT_MISC + subcategory = CAT_TOOL + +/datum/crafting_recipe/burn_pack + name = "Brun Ointment" + result = /obj/item/stack/medical/ointment + time = 1 + reqs = list(/obj/item/stack/medical/gauze = 1, + /datum/reagent/medicine/silver_sulfadiazine = 10) + category = CAT_MISC + subcategory = CAT_TOOL + /datum/crafting_recipe/ghettojetpack name = "Improvised Jetpack" result = /obj/item/tank/jetpack/improvised