Merge pull request #240 from frosty-dev/upstream-core

Upstream core

Resources/Changelog/ChangelogWhite.yml

@@ -1,61 +1,4 @@
 Entries:
-- author: Aviu
-  changes:
-  - message: "\u0423\u043B\u0443\u0447\u0448\u0435\u043D\u043D\u044B\u0435 \u0430\u043D\
-      \u0438\u043C\u0430\u0446\u0438\u0438 \u0430\u0442\u0430\u043A."
-    type: Add
-  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0434\u0443\u0431\u0438\u043D\u043A\
-      \u0430-\u0448\u043E\u043A\u0435\u0440 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\
-      \u0430\u0435\u0442 \u0437\u0430\u0440\u044F\u0434 \u043F\u0440\u0438 \u043E\u0441\
-      \u043C\u043E\u0442\u0440\u0435."
-    type: Add
-  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u044D\u043A\u0441\u043F\u0435\u0440\
-      \u0438\u043C\u0435\u043D\u0442\u0430\u043B\u044C\u043D\u0430\u044F \u0434\u0443\
-      \u0431\u0438\u043D\u043A\u0430-\u0448\u043E\u043A\u0435\u0440 \u043D\u0435 \u043D\
-      \u0430\u043D\u043E\u0441\u0438\u0442 \u0432\u0434\u0432\u043E\u0435 \u0431\u043E\
-      \u043B\u044C\u0448\u0435 \u0443\u0440\u043E\u043D\u0430, \u0447\u0435\u043C\
-      \ \u043E\u0431\u044B\u0447\u043D\u0430\u044F, \u043D\u043E \u0440\u0430\u0437\
-      \u0440\u044F\u0436\u0430\u0435\u0442\u0441\u044F \u043C\u0435\u0434\u043B\u0435\
-      \u043D\u043D\u0435\u0435, \u043A\u0430\u043A \u0438 \u0441\u043A\u0430\u0437\
-      \u0430\u043D\u043E \u0432 \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u0438."
-    type: Tweak
-  - message: "\u0422\u0435\u043C\u043F\u0435\u0440\u0430\u0442\u0443\u0440\u043D\u044B\
-      \u0435 \u043F\u0443\u0448\u043A\u0438 \u0442\u0435\u043F\u0435\u0440\u044C \u0438\
-      \u043C\u0435\u044E\u0442 \u043B\u0438\u043C\u0438\u0442 \u0432 450K, \u0434\u043E\
-      \u0441\u0442\u0438\u0433\u0430\u0435\u043C\u044B\u0439 7\u044E \u043F\u043E\u043F\
-      \u0430\u0434\u0430\u043D\u0438\u044F\u043C\u0438 \u0432 \u0440\u0435\u0436\u0438\
-      \u043C\u0435 \u043D\u0430\u0433\u0440\u0435\u0432\u0430."
-    type: Tweak
-  - message: "\u041C\u0443\u0441\u043E\u0440, \u043B\u0443\u0436\u0438 \u0438 \u0432\
-      \u0440\u0430\u0436\u0434\u0435\u0431\u043D\u044B\u0435 \u0441\u0443\u0449\u0435\
-      \u0441\u0442\u0432\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u0441\u043F\u0430\
-      \u0432\u043D\u044F\u0442\u0441\u044F \u0442\u043E\u043B\u044C\u043A\u043E \u043D\
-      \u0430 \u043E\u0441\u043D\u043E\u0432\u043D\u043E\u043C \u0433\u0440\u0438\u0434\
-      \u0435 \u0441\u0442\u0430\u043D\u0446\u0438\u0438."
-    type: Tweak
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0440\u0435\u0436\u0438\
-      \u043C \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\u043E\u0432 \u0432 \u0433\
-      \u043E\u043B\u043E\u0441\u043E\u0432\u0430\u043D\u0438\u0435."
-    type: Tweak
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0433\u0435\u0439\u043C\
-      \u0440\u0443\u043B \u043A\u0443\u043B\u044C\u0442\u0430 \u0438 \u0433\u0435\u043D\
-      \u043E\u043A\u0440\u0430\u0434\u043E\u0432 \u0432 \u0440\u0435\u0436\u0438\u043C\
-      \ \u0432\u0441\u0435 \u0438 \u0441\u0440\u0430\u0437\u0443."
-    type: Tweak
-  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432 \u0440\u0435\u0436\u0438\
-      \u043C\u0435 \u0432\u0441\u0435 \u0438 \u0441\u0440\u0430\u0437\u0443 \u0440\
-      \u0430\u0443\u043D\u0434 \u043D\u0435 \u0437\u0430\u043A\u0430\u043D\u0447\u0438\
-      \u0432\u0430\u0435\u0442\u0441\u044F \u043F\u0440\u0438 \u043F\u043E\u0431\u0435\
-      \u0434\u0435 \u0440\u0435\u0432\u043E\u043B\u044E\u0446\u0438\u0438."
-    type: Tweak
-  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043A\u0438\u0440\u043A\u0430\
-      \ \u0438 \u0431\u0443\u0440 \u043D\u0435 \u0442\u0440\u0430\u0442\u044F\u0442\
-      \ \u0441\u0442\u0430\u043C\u0438\u043D\u0443 \u043F\u0440\u0438 \u041F\u041A\
-      \u041C \u0430\u0442\u0430\u043A\u0435."
-    type: Tweak
-  id: 150
-  time: '2024-02-21T07:52:25.0000000+00:00'
-  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/104
 - author: Valtos
   changes:
   - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u0440\u0438\u0437\
@@ -8925,3 +8868,13 @@
   id: 649
   time: '2025-01-02T20:30:34.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/869
+- author: BIG_Zi_348
+  changes:
+  - message: "\u041C\u043E\u043B\u0438 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\
+      \u043E\u0433\u0443\u0442 \u0438\u0441\u043F\u043E\u043B\u043D\u044F\u0442\u044C\
+      \ \u0440\u043E\u043B\u044C \u0433\u043B\u0430\u0432\u043D\u043E\u0433\u043E\
+      \ \u0432\u0440\u0430\u0447\u0430."
+    type: Tweak
+  id: 650
+  time: '2025-01-04T21:01:53.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/871

Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml

@@ -37,6 +37,6 @@
 - type: startingGear
   id: BomzhGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitCaptain
+    jumpsuit: ClothingUniformJumpsuitWhiteBomzh
     outerClothing: ClothingOuterOverCoatBomzh
     id: BomzhPDA

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -17,6 +17,7 @@
       species:
       - Human
       - Felinid
+      - Moth
   weight: 10
   icon: "JobIconChiefMedicalOfficer"
   arrivalNotificationPrototype: ChiefMedicalOfficerArrivalNotification
@@ -25,6 +26,7 @@
   whitelistedSpecies:
     - Human
     - Felinid
+    - Moth
   canBeAntag: true
   access:
   - Medical

Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml

@@ -33,6 +33,7 @@
   suffix: mindslave
   components:
   - type: Implanter
+    implantTime: 3
     implant: MindslaveImplant
 
 - type: entity
@@ -50,6 +51,7 @@
   components:
   - type: Implanter
     implant: VoiceActivatedBombImplant
+    implantTime: 3
   - type: TriggerOnVoice
   - type: Tag
     tags: