Merge branch 'SerbiaStrong-220:master' into upstream-fix

SerbiaStrong-220 · Jan 20, 2025 · 466bd80 · 466bd80
2 parents 1a7ddea + 9b5bb8d
commit 466bd80
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 35 deletions.
diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml
@@ -1,35 +1,4 @@
 Entries:
-- author: Kemran
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0443\u043D\u0438\
-      \u0444\u043E\u0440\u043C\u0430 \u041D\u0422\u0420. \u0415\u0451 \u043C\u043E\
-      \u0436\u043D\u043E \u043D\u0430\u0439\u0442\u0438 \u0432 \u043B\u043E\u0434\u0430\
-      \u0443\u0442\u0435 \u0410\u0412\u0414."
-    type: Add
-  - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0451\u043D \u043B\u043E\u0434\u0430\
-      \u0443\u0442 \u0410\u0412\u0414."
-    type: Tweak
-  id: 274
-  time: '2024-07-13T20:32:52.0000000+00:00'
-  url: https://github.com/SerbiaStrong-220/space-station-14/pull/1331
-- author: ReeZii
-  changes:
-  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043A\u043E\
-      \u043B-\u0432\u043E \u043F\u0440\u0435\u0434\u043C\u0435\u0442\u043E\u0432 \u0434\
-      \u043B\u044F \u043A\u0440\u0430\u0436\u0438 \u0443 \u0432\u043E\u0440\u0430"
-    type: Fix
-  id: 275
-  time: '2024-07-14T19:58:28.0000000+00:00'
-  url: https://github.com/SerbiaStrong-220/space-station-14/pull/1329
-- author: Okroshka
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0443\u043D\u0438\
-      \u0444\u043E\u0440\u043C\u0430 \u0434\u043E\u0432\u0435\u0440\u0435\u043D\u043D\
-      \u043E\u0433\u043E \u044E\u0440\u0438\u0441\u0442\u0430 NanoTrasen."
-    type: Add
-  id: 276
-  time: '2024-07-14T20:20:01.0000000+00:00'
-  url: https://github.com/SerbiaStrong-220/space-station-14/pull/1357
 - author: Kemran
   changes:
   - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u043E\u0432\
@@ -6131,3 +6100,33 @@
   id: 775
   time: '2025-01-17T16:37:18.0000000+00:00'
   url: https://github.com/SerbiaStrong-220/space-station-14/pull/2490
+- author: Helm
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0432\u0432\u043E\
+      \u0434 \u0440\u0435\u0430\u0433\u0435\u043D\u0442\u043E\u0432 \u0432 \u0441\u0443\
+      \u043F\u044B!"
+    type: Fix
+  id: 776
+  time: '2025-01-19T10:07:59.0000000+00:00'
+  url: https://github.com/SerbiaStrong-220/space-station-14/pull/2495
+- author: Helm
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0447\u0435\u0440\
+      \u0435\u0441\u0447\u0443\u0440 \u0432\u043C\u0435\u0441\u0442\u0438\u0442\u0435\
+      \u043B\u044C\u043D\u044B\u0439 \u0441\u043F\u0438\u0447\u0435\u0447\u043D\u044B\
+      \u0439 \u043A\u043E\u0440\u043E\u0431\u043E\u043A!"
+    type: Fix
+  id: 777
+  time: '2025-01-19T10:18:46.0000000+00:00'
+  url: https://github.com/SerbiaStrong-220/space-station-14/pull/2496
+- author: Kimorue
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0446\u0432\u0435\u0442\
+      \ \u0447\u0430\u0441\u0442\u043E\u0442\u044B \u042E\u0440 \u043E\u0442\u0434\
+      \u0435\u043B\u0430. \u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0446\u0432\u0435\
+      \u0442 \u0434\u043E\u043B\u0436\u043D\u043E\u0441\u0442\u0435\u0439 \u041A\u041C\
+      \u0414 \u0432 \u0440\u0430\u0446\u0438\u0438."
+    type: Tweak
+  id: 778
+  time: '2025-01-19T20:11:03.0000000+00:00'
+  url: https://github.com/SerbiaStrong-220/space-station-14/pull/2497
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml
@@ -20,7 +20,7 @@
     - type: SolutionContainerManager
       solutions:
         food:
-          maxVol: 30
+          maxVol: 35 #SS220-SoupFix
           reagents:
             - ReagentId: Nutriment
               Quantity: 10

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -1,7 +1,7 @@
 # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml
 
 - type: entity
-  parent: FoodBase
+  parent: FoodInjectableBase #SS220-SoupFix
   id: FoodBowlBase
   abstract: true
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -85,6 +85,11 @@
   - type: Storage
     grid:
     - 0,0,2,1
+    #SS220-FixMatchBox-begin
+    whitelist:
+      tags:
+        - Matchstick
+    #SS220-FixMatchBox-end
   - type: StorageFill
     contents:
       - id: Matchstick

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -60,7 +60,7 @@
   name: department-Command
   sort: 1
   description: department-Command-description
-  color: "#052EED"
+  color: "#2a4ef6" #SS220 changed color
   roles:
   - Captain
 #  - IAA #SS220-Law Department

diff --git a/Resources/Prototypes/SS220/radio_channels.yml b/Resources/Prototypes/SS220/radio_channels.yml
@@ -198,4 +198,4 @@
   name: chat-radio-law
   keycode: 'ю'
   frequency: 1373
-  color: "#323ba9"
+  color: "#5b65e2"