]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Changes in chemicals page in guidebook (#25831)
authorf0x-n3rd <150924715+f0x-n3rd@users.noreply.github.com>
Mon, 1 Apr 2024 07:20:37 +0000 (15:20 +0800)
committerGitHub <noreply@github.com>
Mon, 1 Apr 2024 07:20:37 +0000 (07:20 +0000)
* Added pages to chemical categories

The chemical categories have their own page now. Added the "Chemical Tabs" in /ServerInfo/Guidebook. Moved the Chemicals code from shiftsandjobs.yml to its own .yml file which is "chemicals.yml".

* Update guides.ftl

* Update chemicals.yml

Changed the guide entry's ID for the medical tab from Medicine to Medicinal.
Hope this works...

* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Biological.xml

Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml

Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml

Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml

Co-authored-by: exincore <me@exin.xyz>
* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml

Co-authored-by: exincore <me@exin.xyz>
* Fixed a few errors and stuff!

A few typos have been fixed thanks to exincore. Added dedicated .xml files to be used for the dedicated category pages (Medicinal and Botanical pages). Made it so it doesn't use any duplicated IDs anymore.
If there's more problems, please do tell so I can fix it!

* Update settings.json

* Fix?

---------

Co-authored-by: exincore <me@exin.xyz>
12 files changed:
Resources/Locale/en-US/guidebook/guides.ftl
Resources/Prototypes/Guidebook/chemicals.yml [new file with mode: 0644]
Resources/Prototypes/Guidebook/medical.yml
Resources/Prototypes/Guidebook/shiftandcrew.yml
Resources/ServerInfo/Guidebook/ChemicalTabs/Biological.xml [new file with mode: 0644]
Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml [new file with mode: 0644]
Resources/ServerInfo/Guidebook/ChemicalTabs/Elements.xml [new file with mode: 0644]
Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml [new file with mode: 0644]
Resources/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml [new file with mode: 0644]
Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml [new file with mode: 0644]
Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml [new file with mode: 0644]
Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml [new file with mode: 0644]

index c30b49553c4ce2d9b1f459542383f96fc0821c33..496e38b9a0917e97c08b7af16aba4c79bd51479a 100644 (file)
@@ -22,6 +22,14 @@ guide-entry-cargo-bounties = Cargo Bounties
 guide-entry-salvage = Salvage
 guide-entry-survival = Survival
 guide-entry-chemicals = Chemicals
+guide-entry-elements = Elements
+guide-entry-narcotics = Narcotics
+guide-entry-pyrotechnics = Pyrotechnic
+guide-entry-toxins = Toxins
+guide-entry-foods = Foods
+guide-entry-biological = Biological
+guide-entry-others = Others
+guide-entry-botanical = Botanicals
 guide-entry-ss14 = Space Station 14
 guide-entry-janitorial = Janitorial
 guide-entry-bartender = Bartender
diff --git a/Resources/Prototypes/Guidebook/chemicals.yml b/Resources/Prototypes/Guidebook/chemicals.yml
new file mode 100644 (file)
index 0000000..508b61b
--- /dev/null
@@ -0,0 +1,63 @@
+- type: guideEntry
+  id: Chemicals
+  name: guide-entry-chemicals
+  text: "/ServerInfo/Guidebook/Chemicals.xml"
+  children:
+  - Elements
+  - Medicine
+  - Narcotics
+  - Pyrotechnic
+  - Toxins
+  - Foods
+  - Botanical
+  - Biological
+  - Others
+  filterEnabled: True
+
+- type: guideEntry
+  id: Elements
+  name: guide-entry-elements
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Elements.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Narcotics
+  name: guide-entry-narcotics
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Pyrotechnic
+  name: guide-entry-pyrotechnics
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Toxins
+  name: guide-entry-toxins
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Foods
+  name: guide-entry-foods
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Foods.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Botanical
+  name: guide-entry-botanical
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Botany.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Biological
+  name: guide-entry-biological
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Biological.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Others
+  name: guide-entry-others
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Other.xml"
+  filterEnabled: True
index 9ea2398a7ce36d31d80e0c52bfd42bb404794232..95a4f1ca75f04e5cd8b8e7ad7e9a0e68e2a022bd 100644 (file)
@@ -47,4 +47,4 @@
 - type: guideEntry
   id: AdvancedBrute
   name: guide-entry-brute
-  text: "/ServerInfo/Guidebook/Medical/AdvancedBrute.xml"
\ No newline at end of file
+  text: "/ServerInfo/Guidebook/Medical/AdvancedBrute.xml"
index 9df1b2600849c5122efda8874f4f90cc56fcc57f..3c4618902e658943b28a01c01443679e00a70886 100644 (file)
   name: guide-entry-survival
   text: "/ServerInfo/Guidebook/Survival.xml"
 
-- type: guideEntry
-  id: Chemicals
-  name: guide-entry-chemicals
-  text: "/ServerInfo/Guidebook/Chemicals.xml"
-  filterEnabled: True
-
 - type: guideEntry
   id: Janitorial
   name: guide-entry-janitorial
@@ -47,4 +41,3 @@
   id: Food Recipes
   name: guide-entry-foodrecipes
   text: "/ServerInfo/Guidebook/Service/FoodRecipes.xml"
-
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Biological.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Biological.xml
new file mode 100644 (file)
index 0000000..6f1a4e6
--- /dev/null
@@ -0,0 +1,9 @@
+<Document>
+
+# Biological
+
+These reagents include chemicals that you can get from certain materials and from living things. To get the other chemicals you have to use machines like the electrolyzer and the centrifuge.
+
+<GuideReagentGroupEmbed Group="Biological"/>
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml
new file mode 100644 (file)
index 0000000..832e32d
--- /dev/null
@@ -0,0 +1,14 @@
+<Document>
+
+# Botanical Chemicals
+
+These chemicals are used by botanists. Some of the chemicals change the properties of the plants.
+
+<GuideReagentEmbed Reagent="Ammonia"/>
+<GuideReagentEmbed Reagent="Diethylamine"/>
+<GuideReagentEmbed Reagent="EZNutrient"/>
+<GuideReagentEmbed Reagent="Left4Zed"/>
+<GuideReagentEmbed Reagent="RobustHarvest"/>
+<GuideReagentEmbed Reagent="UnstableMutagen"/>
+
+</Document>
\ No newline at end of file
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Elements.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Elements.xml
new file mode 100644 (file)
index 0000000..3a1c587
--- /dev/null
@@ -0,0 +1,9 @@
+<Document>
+
+# Elements
+
+This list contains all the basic reagents used to make other chemicals.
+
+<GuideReagentGroupEmbed Group="Elements"/>
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml
new file mode 100644 (file)
index 0000000..aea68d7
--- /dev/null
@@ -0,0 +1,8 @@
+<Document>
+# Foods
+
+These reagents are mostly used in the kitchen. Very helpful for Chefs and/or Service Workers.
+
+<GuideReagentGroupEmbed Group="Foods"/>
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml
new file mode 100644 (file)
index 0000000..0dbb5ad
--- /dev/null
@@ -0,0 +1,5 @@
+<Document>
+# Narcotics
+The reagents listed in this category includes stimulants, hallucinogens and other drug-like effects.
+<GuideReagentGroupEmbed Group="Narcotics"/>
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml
new file mode 100644 (file)
index 0000000..31ad4ef
--- /dev/null
@@ -0,0 +1,5 @@
+<Document>
+# Other
+These are the other regeants listed in the Chemicals page.
+<GuideReagentGroupEmbed Group="Unknown"/>
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml
new file mode 100644 (file)
index 0000000..9941e2f
--- /dev/null
@@ -0,0 +1,5 @@
+<Document>
+# Pyrotechnics
+These chemicals are flammmable and causes hazardous effects when making them (Plasma gas and explosions). It is recommmended to make these chemicals in a safe environment.
+<GuideReagentGroupEmbed Group="Pyrotechnic"/>
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml
new file mode 100644 (file)
index 0000000..19ab91c
--- /dev/null
@@ -0,0 +1,5 @@
+<Document>
+# Toxins
+The chemicals in this list contain toxins that induce certain effects and can cause death. Use responsibly.
+<GuideReagentGroupEmbed Group="Toxins"/>
+</Document>