From 713b16bb98f65fa8de685b376fc5a96355c69799 Mon Sep 17 00:00:00 2001
From: keslik <114428094+keslik1313@users.noreply.github.com>
Date: Thu, 8 Aug 2024 21:05:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
=?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20=D0=B3=D1=80?=
=?UTF-8?q?=D1=83=D0=BF=D0=BF=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=B5?=
=?UTF-8?q?=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D1=85=20=D1=80=D0=B5=D0=B0?=
=?UTF-8?q?=D0=B3=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20(#585)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Добавил параметр группы там, где его нет
* Фикс параметров реагентов
---
Resources/Locale/en-US/guidebook/guides.ftl | 1 +
Resources/Prototypes/Guidebook/chemicals.yml | 7 +++++++
Resources/Prototypes/Reagents/cleaning.yml | 5 +++++
Resources/Prototypes/Reagents/fun.yml | 7 +++++--
Resources/Prototypes/Reagents/medicine.yml | 3 +++
Resources/ServerInfo/Guidebook/ChemicalTabs/Cleaning.xml | 8 ++++++++
Resources/ServerInfo/Guidebook/Chemicals.xml | 6 +++++-
7 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644 Resources/ServerInfo/Guidebook/ChemicalTabs/Cleaning.xml
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index 496e38b9a0..0a002d7a73 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -29,6 +29,7 @@ guide-entry-toxins = Toxins
guide-entry-foods = Foods
guide-entry-biological = Biological
guide-entry-others = Others
+guide-entry-cleaning = Cleaning
guide-entry-botanical = Botanicals
guide-entry-ss14 = Space Station 14
guide-entry-janitorial = Janitorial
diff --git a/Resources/Prototypes/Guidebook/chemicals.yml b/Resources/Prototypes/Guidebook/chemicals.yml
index 508b61b4ac..74f906c848 100644
--- a/Resources/Prototypes/Guidebook/chemicals.yml
+++ b/Resources/Prototypes/Guidebook/chemicals.yml
@@ -12,6 +12,7 @@
- Botanical
- Biological
- Others
+ - Cleaning # WD
filterEnabled: True
- type: guideEntry
@@ -61,3 +62,9 @@
name: guide-entry-others
text: "/ServerInfo/Guidebook/ChemicalTabs/Other.xml"
filterEnabled: True
+
+- type: guideEntry # WD edit start
+ id: Cleaning
+ name: guide-entry-cleaning
+ text: "/ServerInfo/Guidebook/ChemicalTabs/Cleaning.xml"
+ filterEnabled: True # WD edit end
diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml
index 2c540970a6..71e16277d6 100644
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -1,6 +1,7 @@
- type: reagent
id: Bleach
name: reagent-name-bleach
+ group: Cleaning # WD
desc: reagent-desc-bleach
physicalDesc: reagent-physical-desc-strong-smelling
flavor: bitter
@@ -27,6 +28,7 @@
- type: reagent
id: SpaceCleaner
name: reagent-name-space-cleaner
+ group: Cleaning # WD
desc: reagent-desc-space-cleaner
physicalDesc: reagent-physical-desc-lemony-fresh
flavor: bitter
@@ -45,6 +47,7 @@
- type: reagent
id: SoapReagent
name: reagent-name-soap
+ group: Cleaning # WD
desc: reagent-desc-soap
physicalDesc: reagent-physical-desc-soapy
flavor: clean
@@ -71,6 +74,7 @@
- type: reagent
id: SpaceLube
name: reagent-name-space-lube
+ group: Cleaning # WD
desc: reagent-desc-space-lube
slippery: true
physicalDesc: reagent-physical-desc-shiny
@@ -89,6 +93,7 @@
- type: reagent
id: SpaceGlue
name: reagent-name-space-glue
+ group: Cleaning # WD
desc: reagent-desc-space-glue
physicalDesc: reagent-physical-desc-sticky
flavor: glue
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index befa8d8296..83216f59ad 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -1,7 +1,7 @@
- type: reagent
id: Carpetium
name: reagent-name-carpetium
- group: Special
+ group: Unknown # WD
desc: reagent-desc-carpetium
physicalDesc: reagent-physical-desc-fibrous
flavor: carpet
@@ -30,6 +30,7 @@
- type: reagent
id: Fiber
name: reagent-name-fiber
+ group: Unknown # WD
desc: reagent-desc-fiber
physicalDesc: reagent-physical-desc-fibrous
flavor: fiber
@@ -139,6 +140,7 @@
- type: reagent
id: GroundBee
name: reagent-name-ground-bee
+ group: Unknown # WD
desc: reagent-desc-ground-bee
physicalDesc: reagent-physical-desc-bee-guts
flavor: bee
@@ -147,6 +149,7 @@
- type: reagent
id: Saxoite
name: reagent-name-saxoite
+ group: Toxins # WD
desc: reagent-desc-saxoite
physicalDesc: reagent-physical-desc-ground-brass
flavor: sax
@@ -300,7 +303,7 @@
- type: reagent
id: Laughter
name: reagent-name-laughter
- group: Special
+ group: Unknown # WD
desc: reagent-desc-laughter
physicalDesc: reagent-physical-desc-funny
flavor: funny
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 9f4deb02f3..264ea5b643 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -1217,6 +1217,7 @@
- type: reagent
id: Synthflesh
name: reagent-name-synthflesh
+ group: Medicine # WD
desc: reagent-desc-synthflesh
flavor: metallic
physicalDesc: reagent-physical-desc-gelatinous
@@ -1247,6 +1248,7 @@
- type: reagent
id: SilverSulfadiazine
name: reagent-name-silversulfadiazine
+ group: Medicine # WD
desc: reagent-desc-silversulfadiazine
flavor: medicine
physicalDesc: reagent-physical-desc-creamy
@@ -1273,6 +1275,7 @@
- type: reagent
id: StypticPowder
name: reagent-name-stypticpowder
+ group: Medicine # WD
desc: reagent-desc-stypticpowder
flavor: medicine
physicalDesc: reagent-physical-desc-powdery
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Cleaning.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Cleaning.xml
new file mode 100644
index 0000000000..d61915c107
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Cleaning.xml
@@ -0,0 +1,8 @@
+
+# Cleaning
+
+The chemicals on this list make your station white. Don't drink!
+
+
+
+
diff --git a/Resources/ServerInfo/Guidebook/Chemicals.xml b/Resources/ServerInfo/Guidebook/Chemicals.xml
index e157dbb437..23fc68e6d5 100644
--- a/Resources/ServerInfo/Guidebook/Chemicals.xml
+++ b/Resources/ServerInfo/Guidebook/Chemicals.xml
@@ -1,4 +1,4 @@
-
+
# Chemicals
Chemicals are a powerful tool that can cause a variety of effects when consumed. Some can be found in plants, purchased from cargo, or be synthesized through combination with other chemicals.
@@ -31,4 +31,8 @@ Knowing different types of chemicals and their effects is important for being ab
## Other
+
+## Cleaning
+
+