cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes husking disparities (#12738)

Browse Source
This commit is contained in:
Tastyfish
2022-04-14 00:59:55 +01:00
committed by GitHub
parent b3400147e0
commit 0e6b348038
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/reagents.dm
+1 -1
View File
@@ -39,7 +39,7 @@
//SKYRAT EDIT ADD
///Amount of synthflesh required to unhusk someone
#define SYNTHFLESH_LING_UNHUSK_AMOUNT 150
#define SYNTHFLESH_LING_UNHUSK_AMOUNT 200
//used by chem masters and pill presses
#define PILL_STYLE_COUNT 22 //Update this if you add more pill icons or you die
code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+3 -3
View File
@@ -490,11 +490,11 @@
if(HAS_TRAIT_FROM(exposed_mob, TRAIT_HUSK, BURN) && carbies.getFireLoss() < UNHUSK_DAMAGE_THRESHOLD && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/synthflesh) + reac_volume >= SYNTHFLESH_UNHUSK_AMOUNT))
carbies.cure_husk(BURN)
carbies.visible_message("<span class='nicegreen'>A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or a golem or something
// SKYRAT EDIT ADD
if(HAS_TRAIT_FROM(exposed_mob, TRAIT_HUSK, CHANGELING_DRAIN) && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/synthflesh) + reac_volume >= SYNTHFLESH_LING_UNHUSK_AMOUNT + 50))//Costs a little more than a normal husk
// SKYRAT EDIT ADDITION BEGIN - non-modular changeling balancing
if(HAS_TRAIT_FROM(exposed_mob, TRAIT_HUSK, CHANGELING_DRAIN) && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/synthflesh) + reac_volume >= SYNTHFLESH_LING_UNHUSK_AMOUNT))//Costs a little more than a normal husk
carbies.cure_husk(CHANGELING_DRAIN)
carbies.visible_message("<span class='nicegreen'>A rubbery liquid coats [carbies]'s tissues. [carbies] looks a lot healthier!")
//
// SKYRAT EDIT ADDITION END
/******ORGAN HEALING******/
/*Suffix: -rite*/
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+5
View File
@@ -265,6 +265,11 @@
if(reac_volume >= 5 && HAS_TRAIT_FROM(patient, TRAIT_HUSK, BURN) && patient.getFireLoss() < UNHUSK_DAMAGE_THRESHOLD) //One carp yields 12u rezadone.
patient.cure_husk(BURN)
patient.visible_message(span_nicegreen("[patient]'s body rapidly absorbs moisture from the environment, taking on a more healthy appearance."))
// SKYRAT EDIT ADDITION BEGIN - non-modular changeling balancing
if(HAS_TRAIT_FROM(exposed_mob, TRAIT_HUSK, CHANGELING_DRAIN) && (patient.reagents.get_reagent_amount(/datum/reagent/medicine/rezadone) + reac_volume >= SYNTHFLESH_LING_UNHUSK_AMOUNT))//Costs a little more than a normal husk
patient.cure_husk(CHANGELING_DRAIN)
patient.visible_message("<span class='nicegreen'>A rubbery liquid coats [patient]'s tissues. [patient] looks a lot healthier!")
// SKYRAT EDIT ADDITION END
/datum/reagent/medicine/spaceacillin
name = "Spaceacillin"