From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Fri, 15 Dec 2023 09:52:21 +0000 (+1100) Subject: Holy water (#22524) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0349c53d0cf723eec8bd72deb82e370cc9aa6519;p=space-station-14.git Holy water (#22524) * add * flavour * id * reaction id fix * maybe fix error * yay * notes * below 50 --- diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index d1954ababf..a1f1c56639 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -44,6 +44,7 @@ flavor-base-sharp = sharp flavor-base-syrupy = syrupy flavor-base-spaceshroom = mysterious flavor-base-clean = clean +flavor-base-holy = holy # lmao flavor-base-terrible = terrible diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl index 346175e3dd..62854196ac 100644 --- a/Resources/Locale/en-US/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl @@ -114,3 +114,6 @@ reagent-desc-puncturase = A fizzy chemical that helps rebuild trauma caused by p reagent-name-bruizine = bruizine reagent-desc-bruizine = Originally developed as a cough medicine, it turns out this chemical is wildly effective at treating blunt force trauma. + +reagent-name-holywater = holy water +reagent-desc-holywater = The cleanest and purest of waters straight from the hands of god, is known to magically heal wounds. \ No newline at end of file diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index 1b3a5c1bfa..5743f09620 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -91,3 +91,4 @@ reagent-physical-desc-exhilarating = exhilarating reagent-physical-desc-vibrant = vibrant reagent-physical-desc-fluffy = fluffy reagent-physical-desc-reflective = reflective +reagent-physical-desc-holy = holy diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 07ec78cca0..cd2e9a237f 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -868,3 +868,8 @@ id: punishment flavorType: Complex description: flavor-complex-punishment + +- type: flavor + id: holy + flavorType: Base + description: flavor-base-holy diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 2d0cd87f97..a305486830 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -1001,3 +1001,26 @@ damage: types: Poison: 4 + +- type: reagent + id: Holywater + name: reagent-name-holywater + group: Medicine + desc: reagent-desc-holywater + physicalDesc: reagent-physical-desc-holy + flavor: holy + color: "#91C3F7" + metabolisms: + Medicine: + effects: + - !type:HealthChange + condition: + - !type:TotalDamage + max: 50 + damage: + types: + Blunt: -0.2 + Poison: -0.2 + Heat: -0.2 + Shock: -0.2 + Cold: -0.2 diff --git a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml index 5a40435471..160353219b 100644 --- a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml +++ b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml @@ -1,3 +1,5 @@ +# Food + - type: reaction id: ProteinCooking impact: Low @@ -18,6 +20,8 @@ products: EggCooked: 0.5 +# Holy - TODO: make it so only the chaplain can use the bible to start these reactions, not anyone with a bible + - type: reaction id: BloodToWine impact: Low @@ -28,3 +32,14 @@ amount: 1 products: Wine: 1 + +- type: reaction + id: WatertoHolyWater + impact: Low + requiredMixerCategories: + - Holy + reactants: + Water: + amount: 1 + products: + Holywater: 1