Merge branch 'master' into pilgrim

space-syndicate · Oct 16, 2024 · 69d4c15 · 69d4c15
2 parents 74a8d82 + 8e97ed3
commit 69d4c15
Show file tree

Hide file tree

Showing 53 changed files with 21 additions and 19 deletions.
diff --git a/Resources/Changelog/ChangelogSyndie.yml b/Resources/Changelog/ChangelogSyndie.yml
@@ -1,19 +1,4 @@
 Entries:
-- author: lapatison
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0430\u0437\
-      \u043B\u0438\u0447\u043D\u044B\u0435 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\
-      \u044B"
-    type: Add
-  id: 158
-  time: '2022-06-22T20:44:57.0000000+00:00'
-- author: Morty
-  changes:
-  - message: "\u041A\u043E\u043C\u0430\u043D\u0434\u0430 adminwho \u0434\u043E\u0441\
-      \u0442\u0443\u043F\u043D\u0430 \u0432\u0441\u0435\u043C"
-    type: Tweak
-  id: 159
-  time: '2022-06-23T12:08:32.0000000+00:00'
 - author: Morty
   changes:
   - message: "\u0423\u0431\u0440\u0430\u043D \u0434\u043E\u0441\u0442\u0443\u043F\
@@ -4460,3 +4445,20 @@
   id: 657
   time: '2024-10-15T18:03:38.0000000+00:00'
   url: https://github.com/space-syndicate/space-station-14/pull/2674
+- author: MureixloL
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\
+      \u0439\u0442\u044B!"
+    type: Tweak
+  id: 658
+  time: '2024-10-15T23:03:29.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2670
+- author: SonicHDC
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\
+      \u0439\u0442\u044B \u0448\u043B\u044E\u0437\u043E\u0432 \u0433\u0438\u0434\u0440\
+      \u043E\u043F\u043E\u043D\u0438\u043A\u0438!"
+    type: Tweak
+  id: 659
+  time: '2024-10-16T05:50:04.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2679
diff --git a/.../Clothing/OuterClothing/Misc/cultrobes.rsi/equipped-OUTERCLOTHING-reptilian.png b/.../Clothing/OuterClothing/Misc/cultrobes.rsi/equipped-OUTERCLOTHING-reptilian.png
diff --git a/...s/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/equipped-OUTERCLOTHING.png b/...s/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/equipped-OUTERCLOTHING.png
diff --git a/...ces/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/equipped-OUTERCLOTHING.png b/...ces/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png
diff --git a/.../Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_open_unlit.png b/.../Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_open_unlit.png
diff --git a/...urces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png b/...urces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png
diff --git a/...urces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed_unlit.png b/...urces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing.png
diff --git a/...rces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing_unlit.png b/...rces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png
diff --git a/...xtures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_open_unlit.png b/...xtures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_open_unlit.png
diff --git a/...es/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png b/...es/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, hydroponics version made by BackeTako (github) for ss14",
+  "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9, recolored by SonicHDC",
   "size": {
     "x": 32,
     "y": 32
@@ -192,4 +192,4 @@
       ]
     }
   ]
-}
+}
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening.png
diff --git a/...rces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening_unlit.png b/...rces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening_unlit.png
diff --git a/...urces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closed.png b/...urces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closed.png
diff --git a/...rces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png b/...rces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_open.png
diff --git a/...rces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png b/...rces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks.png
diff --git a/...rces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png b/...rces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png
diff --git a/...ces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png b/...ces/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/welded.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png
diff --git a/...xtures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_open_unlit.png b/...xtures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_open_unlit.png
diff --git a/...es/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png b/...es/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png
diff --git a/...es/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png b/...es/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing.png
diff --git a/...s/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing_unlit.png b/...s/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing_unlit.png
diff --git a/...rces/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png b/...rces/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png
diff --git a/...res/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_open_unlit.png b/...res/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_open_unlit.png
diff --git a/...Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png b/...Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, hydroponics version made by BackeTako (github) for ss14", 
+  "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9, recolored by SonicHDC",
   "size": {
     "x": 32,
     "y": 32
@@ -192,4 +192,4 @@
       ]
     }
   ]
-}
+}
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png
diff --git a/...rces/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open_unlit.png b/...rces/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png
diff --git a/...s/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png b/...s/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png
diff --git a/...es/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closed.png b/...es/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closed.png
diff --git a/...s/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png b/...s/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png
diff --git a/...rces/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_open.png b/...rces/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_open.png
diff --git a/...s/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png b/...s/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks.png
diff --git a/...s/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png b/...s/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png
diff --git a/.../Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png b/.../Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png
diff --git a/...ces/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png b/...ces/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/welded.png
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png