]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Holy water (#22524)
authorUbaser <134914314+UbaserB@users.noreply.github.com>
Fri, 15 Dec 2023 09:52:21 +0000 (20:52 +1100)
committerGitHub <noreply@github.com>
Fri, 15 Dec 2023 09:52:21 +0000 (02:52 -0700)
* add

* flavour

* id

* reaction id fix

* maybe fix error

* yay

* notes

* below 50

Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/medicine.ftl
Resources/Locale/en-US/reagents/meta/physical-desc.ftl
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Reagents/medicine.yml
Resources/Prototypes/Recipes/Reactions/single_reagent.yml

index d1954ababf0a4aced1dcfd4b90da0e518316be0f..a1f1c56639406c7a1e49a965891b66adfe5aab1f 100644 (file)
@@ -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
index 346175e3ddac3e6ef32f1dec705035de9a11fb3e..62854196ac5f80c04e3cfd85917b56c6e872daf3 100644 (file)
@@ -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
index 1b3a5c1bfa4af36bd16e59f95a485aa64f0219d1..5743f096209334dbb6f84b95815c17702a38b9c2 100644 (file)
@@ -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
index 07ec78cca0330c74c80bc91a30a9999bfd3638bd..cd2e9a237f122d40108bd1dda04d7f4d48104884 100644 (file)
   id: punishment
   flavorType: Complex
   description: flavor-complex-punishment
+
+- type: flavor
+  id: holy
+  flavorType: Base
+  description: flavor-base-holy
index 2d0cd87f97d8644ec9d76826fe39f9abd8c65b29..a305486830cd6ff0586329d28b96a3d811dc4933 100644 (file)
         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
index 5a40435471d7ead29c1142e13f19b9874e5b9172..160353219b37f3253dc86f9bd85fd05b2cbae893 100644 (file)
@@ -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
       amount: 1
   products:
     Wine: 1
+
+- type: reaction
+  id: WatertoHolyWater
+  impact: Low
+  requiredMixerCategories:
+  - Holy
+  reactants:
+    Water:
+      amount: 1
+  products:
+    Holywater: 1