From 085a71eac8d85d2ae65952d24343bf34b19b0ae5 Mon Sep 17 00:00:00 2001 From: f0x-n3rd <150924715+f0x-n3rd@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:20:37 +0800 Subject: [PATCH] Changes in chemicals page in guidebook (#25831) * 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 * Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml Co-authored-by: exincore * Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml Co-authored-by: exincore * Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml Co-authored-by: exincore * Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml Co-authored-by: exincore * 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 --- Resources/Locale/en-US/guidebook/guides.ftl | 8 +++ Resources/Prototypes/Guidebook/chemicals.yml | 63 +++++++++++++++++++ Resources/Prototypes/Guidebook/medical.yml | 2 +- .../Prototypes/Guidebook/shiftandcrew.yml | 7 --- .../Guidebook/ChemicalTabs/Biological.xml | 9 +++ .../Guidebook/ChemicalTabs/Botany.xml | 14 +++++ .../Guidebook/ChemicalTabs/Elements.xml | 9 +++ .../Guidebook/ChemicalTabs/Foods.xml | 8 +++ .../Guidebook/ChemicalTabs/Narcotics.xml | 5 ++ .../Guidebook/ChemicalTabs/Other.xml | 5 ++ .../Guidebook/ChemicalTabs/Pyrotechnic.xml | 5 ++ .../Guidebook/ChemicalTabs/Toxins.xml | 5 ++ 12 files changed, 132 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/Guidebook/chemicals.yml create mode 100644 Resources/ServerInfo/Guidebook/ChemicalTabs/Biological.xml create mode 100644 Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml create mode 100644 Resources/ServerInfo/Guidebook/ChemicalTabs/Elements.xml create mode 100644 Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml create mode 100644 Resources/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml create mode 100644 Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml create mode 100644 Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml create mode 100644 Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl index c30b49553c..496e38b9a0 100644 --- a/Resources/Locale/en-US/guidebook/guides.ftl +++ b/Resources/Locale/en-US/guidebook/guides.ftl @@ -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 index 0000000000..508b61b4ac --- /dev/null +++ b/Resources/Prototypes/Guidebook/chemicals.yml @@ -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 diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml index 9ea2398a7c..95a4f1ca75 100644 --- a/Resources/Prototypes/Guidebook/medical.yml +++ b/Resources/Prototypes/Guidebook/medical.yml @@ -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" diff --git a/Resources/Prototypes/Guidebook/shiftandcrew.yml b/Resources/Prototypes/Guidebook/shiftandcrew.yml index 9df1b26008..3c4618902e 100644 --- a/Resources/Prototypes/Guidebook/shiftandcrew.yml +++ b/Resources/Prototypes/Guidebook/shiftandcrew.yml @@ -19,12 +19,6 @@ 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 index 0000000000..6f1a4e630b --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Biological.xml @@ -0,0 +1,9 @@ + + +# 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. + + + + diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml new file mode 100644 index 0000000000..832e32d644 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml @@ -0,0 +1,14 @@ + + +# Botanical Chemicals + +These chemicals are used by botanists. Some of the chemicals change the properties of the plants. + + + + + + + + + \ 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 index 0000000000..3a1c587304 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Elements.xml @@ -0,0 +1,9 @@ + + +# Elements + +This list contains all the basic reagents used to make other chemicals. + + + + diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml new file mode 100644 index 0000000000..aea68d74ce --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml @@ -0,0 +1,8 @@ + +# Foods + +These reagents are mostly used in the kitchen. Very helpful for Chefs and/or Service Workers. + + + + diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml new file mode 100644 index 0000000000..0dbb5ad359 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml @@ -0,0 +1,5 @@ + +# Narcotics +The reagents listed in this category includes stimulants, hallucinogens and other drug-like effects. + + diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml new file mode 100644 index 0000000000..31ad4ef3cb --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml @@ -0,0 +1,5 @@ + +# Other +These are the other regeants listed in the Chemicals page. + + diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml new file mode 100644 index 0000000000..9941e2ff36 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml @@ -0,0 +1,5 @@ + +# 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. + + diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml new file mode 100644 index 0000000000..19ab91cbf4 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml @@ -0,0 +1,5 @@ + +# Toxins +The chemicals in this list contain toxins that induce certain effects and can cause death. Use responsibly. + + -- 2.51.2