From 8a55bc6d9cb37db2b58c5acb482a462f193f267d Mon Sep 17 00:00:00 2001
From: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Date: Mon, 5 Jun 2023 13:06:41 +0200
Subject: [PATCH] QoL Unhusking tweaks (#21197)
* Make splashed Synthflesh penetrate skin
* Allow Synthflesh to unhusk on ingestion reactions
* Add a tiny bit of intuitive leeway to the unhusk damage threshold
* 310 characters line moment
* Fix missing closing tag, gnarg
---
.../reagents/chemistry/reagents/medicine.dm | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index 9b50757c93d..6414fd30bec 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -293,20 +293,22 @@
description = "A resorbable microfibrillar collagen and protein mixture that can rapidly heal injuries when applied topically."
reagent_state = LIQUID
color = "#FFEBEB"
+ penetrates_skin = TRUE
taste_description = "blood"
/datum/reagent/medicine/synthflesh/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume, show_message = 1)
if(iscarbon(M))
if(method == REAGENT_TOUCH)
- M.adjustBruteLoss(-1.5*volume)
- M.adjustFireLoss(-1.5*volume)
+ M.adjustBruteLoss(-1.5 * volume)
+ M.adjustFireLoss(-1.5 * volume)
if(show_message)
to_chat(M, "The synthetic flesh integrates itself into your wounds, healing you.")
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(HAS_TRAIT_FROM(H, TRAIT_HUSK, BURN) && H.getFireLoss() < UNHUSK_DAMAGE_THRESHOLD && (H.reagents.get_reagent_amount("synthflesh") + volume >= SYNTHFLESH_UNHUSK_AMOUNT))
- H.cure_husk(BURN)
- H.visible_message("The squishy liquid coats [H]'s burns. [H] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because humans could be a skeleton or a golem or something
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(HAS_TRAIT_FROM(H, TRAIT_HUSK, BURN) && H.getFireLoss() <= UNHUSK_DAMAGE_THRESHOLD && (H.reagents.get_reagent_amount("synthflesh") + volume >= SYNTHFLESH_UNHUSK_AMOUNT))
+ H.cure_husk(BURN)
+ // Could be a skeleton or a golem or sth, avoid phrases like "burnt flesh" and "burnt skin"
+ H.visible_message("The squishy liquid coats [H]'s burns. [H] looks a lot healthier!")
..()
/datum/reagent/medicine/synthflesh/reaction_turf(turf/T, volume) //let's make a mess!