Merge remote-tracking branch 'upstream/master'

.github/workflows/publish.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.205
+        dotnet-version: '8.0.205'
 
     - name: Get Engine Tag
       run: |

Content.Shared/_White/Telescope/TelescopeComponent.cs

@@ -2,10 +2,10 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared._White.Telescope;
 
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class TelescopeComponent : Component
 {
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public float Divisor = 1f;
 
     [ViewVariables]

Resources/Changelog/ChangelogWhite.yml

@@ -3679,3 +3679,128 @@
   id: 257
   time: '2024-04-24T13:23:43.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/293
+- author: S_k_R_i_M_e_X
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043A\u043E\u043B\
+      \u043E\u0434\u0430 \u0438\u0433\u0440\u043E\u043A\u0430"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043A\u043E\u043B\
+      \u043E\u0434\u0430 \u043A\u0430\u0440\u0442 \u043D\u0430 36 \u0438 52 \u043A\
+      \u0430\u0440\u0442\u044B"
+    type: Add
+  id: 258
+  time: '2024-05-06T17:06:37.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/296
+- author: ThereDrD
+  changes:
+  - message: "\u0412\u0430\u0439\u0442\u0431\u043E\u043A\u0441 \u043E\u0431\u043D\u043E\
+      \u0432\u043B\u0435\u043D"
+    type: Tweak
+  id: 259
+  time: '2024-05-13T17:24:52.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/302
+- author: ThereDrD
+  changes:
+  - message: "\u0412 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442 \u043F\u0440\
+      \u0438\u043D\u0442\u0435\u0440 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\
+      \u0436\u043D\u043E \u043F\u043E\u043B\u043E\u0436\u0438\u0442\u044C \u043E\u0431\
+      \u044B\u0447\u043D\u0443\u044E \u0431\u0443\u043C\u0430\u0433\u0443"
+    type: Fix
+  - message: "\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442 \u043F\u0440\u0438\u043D\
+      \u0442\u0435\u0440 \u0442\u0435\u043F\u0435\u0440\u044C \u0438\u0441\u043F\u043E\
+      \u043B\u044C\u0437\u0443\u0435\u0442 \u0431\u0443\u043C\u0430\u0433\u0443 \u0434\
+      \u043B\u044F \u043F\u0435\u0447\u0430\u0442\u0438 \u0434\u043E\u043A\u0443\u043C\
+      \u0435\u043D\u0442\u043E\u0432"
+    type: Fix
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D\u0430 \u0430\u043D\u0438\
+      \u043C\u0430\u0446\u0438\u044F \u043F\u0435\u0447\u0430\u0442\u0438 \u0434\u043E\
+      \u043A\u0443\u043C\u0435\u043D\u0442\u043E\u0432"
+    type: Fix
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D \u043A\u0440\u0438\u0442\
+      \u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0431\u0430\u0433"
+    type: Fix
+  id: 260
+  time: '2024-05-13T18:25:34.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/303
+- author: ThereDrD
+  changes:
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D \u043F\u043E\u043F\u0430\
+      \u043F \u043E \u0442\u043E\u043C, \u0447\u0442\u043E \u0437\u0430\u043A\u0440\
+      \u044B\u0442\u0430\u044F \u043D\u0430 \u043A\u043B\u044E\u0447 \u0434\u0432\u0435\
+      \u0440\u044C \u0437\u0430\u043A\u0440\u044B\u0442\u0430"
+    type: Fix
+  id: 261
+  time: '2024-05-14T05:05:48.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/304
+- author: ThereDrD
+  changes:
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D\u043E \u0438\u0437\u043C\
+      \u0435\u043D\u0435\u043D\u0438\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\
+      \u044F \u0434\u0430\u043B\u044C\u043D\u043E\u0441\u0442\u0438 \u0443\u0432\u0435\
+      \u043B\u0438\u0447\u0435\u043D\u0438\u044F \u043F\u0440\u0438\u0446\u0435\u043B\
+      \u0430 \u0447\u0435\u0440\u0435\u0437 \u0432\u0432"
+    type: Fix
+  id: 262
+  time: '2024-05-14T18:44:14.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/305
+- author: ThereDrD
+  changes:
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D\u043E $amount \u0432\
+      \ \u0430\u043D\u0430\u043B\u0438\u0437\u0430\u0442\u043E\u0440\u0435 \u0437\u0434\
+      \u043E\u0440\u043E\u0432\u044C\u044F"
+    type: Fix
+  id: 263
+  time: '2024-05-14T20:08:53.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/306
+- author: ThereDrD
+  changes:
+  - message: "\u0411\u0430\u0433\u0435\u043B\u044C \u0443\u0431\u0440\u0430\u043D\
+      \ \u0432\u0432\u0438\u0434\u0443 \u0441\u043B\u043E\u043C\u0430\u043D\u043D\u043E\
+      \u0441\u0442\u0438"
+    type: Remove
+  id: 264
+  time: '2024-05-15T22:47:35.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/308
+- author: Valtos
+  changes:
+  - message: "8 \u043D\u043E\u0432\u044B\u0445 \u0433\u043E\u043B\u043E\u0441\u043E\
+      \u0432 TTS"
+    type: Add
+  id: 265
+  time: '2024-05-16T05:38:10.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/309
+- author: S_k_R_i_M_e_X
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0441\u043F\u0430\
+      \u0432\u043D \u043A\u0443\u0432\u0430\u043B\u0434\u044B. \u0422\u0435\u043F\u0435\
+      \u0440\u044C \u043E\u043D\u0430 \u043F\u043E\u044F\u0432\u043B\u044F\u0435\u0442\
+      \u0441\u044F \u0443 \u0413\u043B\u0430\u0432\u044B \u0421\u043B\u0443\u0436\u0431\
+      \u044B \u0411\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438\
+      \ \u0432 \u0448\u043A\u0430\u0444\u0443."
+    type: Fix
+  id: 266
+  time: '2024-05-16T19:16:43.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/310
+- author: S_k_R_i_M_e_X
+  changes:
+  - message: "\u041F\u043E\u0447\u0438\u043D\u0435\u043D \u0431\u0438\u043D\u0430\u0440\
+      \u043D\u044B\u0439 \u043A\u0430\u043D\u0430\u043B."
+    type: Fix
+  - message: "\u041F\u043E\u0447\u0438\u043D\u0435\u043D \u043D\u0430\u0435\u043C\u043D\
+      \u044B\u0439 \u043A\u0430\u043D\u0430\u043B."
+    type: Fix
+  - message: "\u041F\u043E\u0447\u0438\u043D\u0435\u043D \u043F\u0435\u0440\u0435\u0432\
+      \u043E\u0434 \u043A\u0430\u043D\u0430\u043B\u043E\u0432."
+    type: Fix
+  - message: "\u041F\u043E\u0447\u0438\u043D\u0435\u043D \u0431\u043E\u0440\u0433\
+      \ \u0441\u0438\u043D\u0434\u0438\u043A\u0430\u0442\u0430. \u0422\u0435\u043F\
+      \u0435\u0440\u044C \u043E\u043D \u043C\u043E\u0436\u0435\u0442 \u0438\u0441\u043F\
+      \u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u044D\u043D\u0435\u0440\
+      \u0433\u0435\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u043C\u0435\u0447\
+      , \u0430 \u0442\u0430\u043A\u0436\u0435 \u0435\u043C\u0443 \u0434\u043E\u0431\
+      \u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0435\u0437\u0438\u0441\u0442\u044B\
+      ."
+    type: Fix
+  id: 267
+  time: '2024-05-22T23:54:27.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/312

Resources/Locale/ru-RU/headset/headset-component.ftl

@@ -39,3 +39,5 @@ chat-radio-security = Безопасность
 chat-radio-service = Сервисный
 chat-radio-supply = Снабжение
 chat-radio-syndicate = Синдикат
+chat-radio-binary = Бинарный
+chat-radio-freelance = Наемный

Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl

@@ -13,27 +13,27 @@ health-analyzer-window-scan-mode-text = Режим сканирования:
 health-analyzer-window-scan-mode-active = ВКЛЮЧЕН
 health-analyzer-window-scan-mode-inactive = ВЫКЛЮЧЕН
 
-health-analyzer-window-damage-group-Brute = Механические: {$amount}
+health-analyzer-window-damage-group-Brute = Механические:
-health-analyzer-window-damage-type-Blunt = Удары: {$amount}
+health-analyzer-window-damage-type-Blunt = Удары:
-health-analyzer-window-damage-type-Slash = Разрезы: {$amount}
+health-analyzer-window-damage-type-Slash = Разрезы:
-health-analyzer-window-damage-type-Piercing = Уколы: {$amount}
+health-analyzer-window-damage-type-Piercing = Уколы:
 
-health-analyzer-window-damage-group-Burn = Ожоги: {$amount}
+health-analyzer-window-damage-group-Burn = Ожоги:
-health-analyzer-window-damage-type-Heat = Термические: {$amount}
+health-analyzer-window-damage-type-Heat = Термические:
-health-analyzer-window-damage-type-Laser = Лазерный: {$amount}
+health-analyzer-window-damage-type-Laser = Лазерный:
-health-analyzer-window-damage-type-Shock = Электрические: {$amount}
+health-analyzer-window-damage-type-Shock = Электрические:
-health-analyzer-window-damage-type-Cold = Обморожение: {$amount}
+health-analyzer-window-damage-type-Cold = Обморожение:
-health-analyzer-window-damage-type-Caustic = Кислотные: {$amount}
+health-analyzer-window-damage-type-Caustic = Кислотные:
 
-health-analyzer-window-damage-group-Airloss = Нехватка воздуха: {$amount}
+health-analyzer-window-damage-group-Airloss = Нехватка воздуха:
-health-analyzer-window-damage-type-Asphyxiation = Удушение: {$amount}
+health-analyzer-window-damage-type-Asphyxiation = Удушение:
-health-analyzer-window-damage-type-Bloodloss = Кровопотеря: {$amount}
+health-analyzer-window-damage-type-Bloodloss = Кровопотеря:
 
-health-analyzer-window-damage-group-Toxin = Токсины: {$amount}
+health-analyzer-window-damage-group-Toxin = Токсины:
-health-analyzer-window-damage-type-Poison = Яды: {$amount}
+health-analyzer-window-damage-type-Poison = Яды:
-health-analyzer-window-damage-type-Radiation = Радиация: {$amount}
+health-analyzer-window-damage-type-Radiation = Радиация:
 
-health-analyzer-window-damage-group-Genetic = Генетические: {$amount}
+health-analyzer-window-damage-group-Genetic = Генетические:
-health-analyzer-window-damage-type-Cellular = Клеточные: {$amount}
+health-analyzer-window-damage-type-Cellular = Клеточные:
 
 health-analyzer-window-malnutrition = Тяжёлое недоедание

Resources/Locale/ru-RU/radio/radio.ftl

@@ -17,6 +17,8 @@ examine-encryption-default-channel =
         [Medical] Медицинский
         [Security] Безопасность
         [Service] Сервисный
+        [Binary] Бинарный
+        [Freelance] Наемный
        *[other] _
     }[/color].
 ent-EncryptionKeySyndie = кроваво-красный ключ шифрования
@@ -58,6 +60,12 @@ ent-EncryptionKeySecurity = ключ шифрования безопасност
 ent-EncryptionKeyService = сервисный ключ шифрования
     .desc = Ключ шифрования используемый сервисными работниками, задача которых поддерживать станцию цельной, весёлой и чистой.
     .suffix = { "" }
+ent-EncryptionKeyBinary = двоичный ключ шифрования
+    .desc = Ключ шифрования, который переводит двоичные сигналы, используемые силиконами.
+    .suffix = { "" }
+ent-EncryptionKeyFreelance = ключ шифрования наемников
+    .desc = Ключ шифрования, используемый наемниками, которые могут быть или не быть связаны между собой. Выглядит так, будто он износился.
+    .suffix = { "" }
 ent-BoxEncryptionKeyCargo = коробка ключей шифрования снабжения
     .desc = Коробока запасных ключей шифрования.
     .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl

@@ -46,3 +46,6 @@ ent-ClothingHeadsetService = сервисная гарнитура
 ent-ClothingHeadsetGrey = гарнитура пассажира
     .desc = Модифицированный модульный интерком, надеваемый на голову. Принимает ключи шифрования.
     .suffix = { "" }
+ent-ClothingHeadsetFreelance = гарнитура наемника
+    .desc = Это используется группой наемников.
+    .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl

@@ -25,3 +25,6 @@ ent-ClothingHeadsetAltCargo = полноразмерная грузовая га
 ent-ClothingHeadsetAltSyndicate = полноразмерная гарнитура синдиката
     .desc = Модифицированный модульный интерком синдиката, надеваемый на голову, и содержащий ключ шифрования. Защищает уши от светошумовых зарядов.
     .suffix = { "" }
+ent-ClothingHeadsetAltFreelance = полноразмерная гарнитура наемника
+    .desc = Модифицированный модульный интерком наемника, надеваемый на голову, и содержащий ключ шифрования.
+    .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl

@@ -9,4 +9,6 @@ ent-EnergyDaggerBox = футляр энергокинжала
 ent-EnergyCutlass = абордажная энергосабля
     .desc = Экзотическое энергетическое оружие.
 ent-EnergySwordDouble = двойной энергетический меч
-    .desc = Стажеры из командования Синдиката решили, что одного клинка на энергетическом мече недостаточно. Его можно хранить в кармане.
+    .desc = Стажеры из командования Синдиката решили, что одного клинка на энергетическом мече недостаточно. Его можно хранить в кармане.
+ent-EnergySwordBorg = { ent-EnergySword }
+    .desc = { ent-EnergySword.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/tagilla_hammer.ftl

@@ -0,0 +1,2 @@
+ent-TagillaHammer = Мёртвый удар
+    .desc = При виде фелинида, держа эту огромную кувалду, у вас в голове появляется мысль - "Ха-ха, бегающий гвоздик!"

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -285,7 +285,6 @@
       - id: MagazinePistol
       - id: BoxMindshield
       - id: TagillaHammer
-
 - type: entity
   id: LockerFreezerVaultFilled
   suffix: Vault, Locked

Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml

@@ -1,6 +1,9 @@
 - type: vendingMachineInventory
   id: GoodCleanFunInventory
   startingInventory:
+    PlayerCardBag: 20
+    CardBag36: 4
+    CardBag52: 4
     DiceBag: 6
     Paper: 8
     d6Dice: 8

Resources/Prototypes/Damage/modifier_sets.yml

@@ -331,3 +331,16 @@
     Caustic: 0.0
     Poison: 0.0
     Cellular: 0.0
+
+- type: damageModifierSet
+  id: AssaultBorg
+  coefficients:
+    Blunt: 0.8
+    Slash: 0.5
+    Piercing: 0.3
+    Heat: 1.2
+    Shock: 1.5
+    Cold: 0.0
+    Caustic: 0.5
+    Poison: 0.0
+    Cellular: 0.0

Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -300,6 +300,8 @@
       noMindState: synd_sec
     - type: Construction
       node: syndicateassault
+    - type: Damageable
+      damageModifierSet: AssaultBorg
 
 - type: entity
   id: BorgChassisSyndicateMedical

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -244,7 +244,7 @@
     - GasAnalyzer
     - GeigerCounter
     - RemoteSignaller
-    - GasAnalyzer   
+    - GasAnalyzer
     - GeigerCounter
 
 - type: entity
@@ -540,7 +540,7 @@
       - state: icon-syndicate
     - type: ItemBorgModule
       items:
-      - EnergySwordDouble
+      - EnergySwordBorg
       - PinpointerSyndicateNuclear
 
 - type: entity

Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml

@@ -269,3 +269,32 @@
       deconstructionTarget: null
       graph: EnergyDoubleSwordGraph
       node: desword
+
+- type: entity
+  parent: EnergySwordBase
+  id: EnergySwordBorg
+  components:
+    - type: ItemToggleMeleeWeapon
+      activatedSoundOnHit:
+        path: /Audio/Weapons/eblade1.ogg
+        params:
+          variation: 0.250
+      activatedSoundOnHitNoDamage:
+        path: /Audio/Weapons/eblade1.ogg
+        params:
+          variation: 0.250
+          volume: -10
+      activatedSoundOnSwing:
+        path: /Audio/Weapons/eblademiss.ogg
+        params:
+          variation: 0.125
+      activatedDamage:
+        types:
+          Slash: 15
+          Heat: 15
+          Structural: 20
+    - type: Reflect
+      reflectProb: 0.8
+      enabled: false
+      reflects:
+        - Energy

Resources/Prototypes/Entities/Objects/Weapons/Melee/tagilla_hammer.yml

@@ -1,43 +1,43 @@
-- type: entity
+- type: entity
   name: Dead blow
   parent: BaseItem
   id: TagillaHammer
   description: At the sight of a felinid holding that huge sledgehammer, you get the thought in your head - “Ha ha, running nail!”
   components:
-  - type: Sprite
+    - type: Sprite
-    sprite: Objects/Weapons/Melee/hammer_tagilla2.rsi
+      sprite: Objects/Weapons/Melee/hammer_tagilla2.rsi
-    state: icon
+      state: icon
-    scale: 0.8, 0.8 # needed
+      scale: 0.8, 0.8 # needed
-  - type: MeleeWeapon
+    - type: MeleeWeapon
-    swingLeft: true
+      swingLeft: true
-    wideAnimationRotation: 135
+      wideAnimationRotation: 135
-    attackRate: 0.75
+      attackRate: 0.75
-    damage:
+      damage:
-      types:
+        types:
-        Blunt: 5
+          Blunt: 5
-        Slash: 5
+          Slash: 5
-        Structural: 10
+          Structural: 10
-    soundHit:
+      soundHit:
-      path: "/Audio/Weapons/sledgehammer_hit_1.ogg"
+        path: "/Audio/Weapons/sledgehammer_hit_1.ogg"
-  - type: Wieldable
+    - type: Wieldable
-  - type: IncreaseDamageOnWield
+    - type: IncreaseDamageOnWield
-    damage:
+      damage:
-      types:
+        types:
-        Blunt: 10
+          Blunt: 10
-        Slash: 5
+          Slash: 5
-        Structural: 40
+          Structural: 40
-  - type: Item
+    - type: Item
-    size: Ginormous
+      size: Ginormous
-    sprite: Objects/Weapons/Melee/hammer_tagilla.rsi
+      sprite: Objects/Weapons/Melee/hammer_tagilla.rsi
-  - type: Clothing
+    - type: Clothing
-    sprite: Objects/Weapons/Melee/hammer_tagilla.rsi
+      sprite: Objects/Weapons/Melee/hammer_tagilla.rsi
-    quickEquip: false
+      quickEquip: false
-    slots:
+      slots:
-    - back
+        - back
-  - type: DisarmMalus
+    - type: DisarmMalus
-  - type: Crit
+    - type: Crit
-    critChance: 30
+      critChance: 30
-    critMultiplier: 1.2
+      critMultiplier: 1.2
-    isBloodDagger: false
+      isBloodDagger: false
-  - type: UseDelay
+    - type: UseDelay
-    delay: 1
+      delay: 1

Resources/Prototypes/Maps/Pools/White.yml

@@ -5,8 +5,8 @@
   - Scoupidia
   - Triumph
   - WhiteBox
-  - Bagel    # Temporary
   - Meta     # Temporary
   - Train    # Temporary
+# - Bagel    # Она утонула
 #  - Polaris
 #  - Void

Resources/Prototypes/_White/Entities/Structures/Machines/doc_printer.yml

@@ -20,8 +20,6 @@
         layer:
         - TabletopMachineLayer
   - type: Lathe
-  - type: BluespaceStorage
-  - type: MaterialStorage
   - type: ActivatableUI
     key: enum.LatheUiKey.Key
   - type: ActivatableUIRequiresPower
@@ -38,6 +36,9 @@
     price: 800
   - type: ResearchClient
   - type: TechnologyDatabase
+  - type: MaterialStorage
+    materialWhiteList:
+    - Paper
 
 # Document Printer
 - type: entity
@@ -116,304 +117,303 @@
     emagStaticRecipes:
     - BoxFolderBlackBAN
     - PaperSyndicat
-  - type: MaterialStorage
 
 # Recipe Paper
 #  Station->CentComm
 - type: latheRecipe
   id: PaperRequestTargetStation # Tide
   result: PaperRequestTargetStation
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperReportCC # Tide
   result: PaperReportCC
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperCompletedStation # Tide
   result: PaperCompletedStation
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperFailedStation # Tide
   result: PaperFailedStation
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestCentComm # Tide
   result: PaperRequestCentComm
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestERT # Tide
   result: PaperRequestERT
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestRXBZZ # Tide
   result: PaperRequestRXBZZ
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestExecution # Tide
   result: PaperRequestExecution
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestMagistrat # Tide
   result: PaperRequestMagistrat
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 #  PaperCommand
 - type: latheRecipe
   id: PaperDomotionComm # Tide
   result: PaperDomotionComm
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperDismissalReq # Tide
   result: PaperDismissalReq
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestHeadCouncil # Tide
   result: PaperRequestHeadCouncil
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperHeadCouncilEnd # Tide
   result: PaperHeadCouncilEnd
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 #  PaperSecurity
 - type: latheRecipe
   id: PaperOrderSec # Tide
   result: PaperOrderSec
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestExecutionSec # Tide
   result: PaperRequestExecutionSec
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperDonos # Tide
   result: PaperDonos
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperLic # Tide
   result: PaperLic
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperTimeRequestWeapon # Tide
   result: PaperTimeRequestWeapon
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperOrderWeapon # Tide
   result: PaperOrderWeapon
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestGuard # Tide
   result: PaperRequestGuard
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 #  PaperEng
 - type: latheRecipe
   id: PaperRequestBuild # Tide
   result: PaperRequestBuild
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestMaterial # Tide
   result: PaperRequestMaterial
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperReportElect # Tide
   result: PaperReportElect
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperReportAtmos # Tide
   result: PaperReportAtmos
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 #  PaperMed
 - type: latheRecipe
   id: PaperRequestNarco # Tide
   result: PaperRequestNarco
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestExecutionMed # Tide
   result: PaperRequestExecutionMed
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperWaiverOfClaims # Tide
   result: PaperWaiverOfClaims
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperDurka # Tide
   result: PaperDurka
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 #  PaperSci
 - type: latheRecipe
   id: PaperRequestReasonable # Tide
   result: PaperRequestReasonable
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestLaw # Tide
   result: PaperRequestLaw
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperBrain # Tide
   result: PaperBrain
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 #  PaperCargo
 - type: latheRecipe
   id: PaperCargoOrder # Tide
   result: PaperCargoOrder
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 #  PaperService
 - type: latheRecipe
   id: PaperRequestUpID # Tide
   result: PaperRequestUpID
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestWork # Tide
   result: PaperRequestWork
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestTrash # Tide
   result: PaperRequestTrash
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperEndTrash # Tide
   result: PaperEndTrash
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestCourt # Tide
   result: PaperRequestCourt
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperDismissalSer # Tide
   result: PaperDismissalSer
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperPromotion # Tide
   result: PaperPromotion
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 - type: latheRecipe
   id: PaperRequestBotan # Tide
   result: PaperRequestBotan
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 #  PaperSyndicat
 - type: latheRecipe
   id: PaperSyndicat # Tide
   result: PaperSyndicat
-  completetime: 5
+  completetime: 3
   materials:
-    Paper: 0
+    Paper: 100
 
 # PapersAll
 #  Station->CentComm
@@ -925,62 +925,62 @@
 - type: latheRecipe
   id: BoxFolderGreenBAN # Tide
   result: BoxFolderGreenBAN
-  completetime: 5
+  completetime: 3
   materials:
     Paper: 999
 
 - type: latheRecipe
   id: BoxFolderGreyBAN # Tide
   result: BoxFolderGreyBAN
-  completetime: 5
+  completetime: 3
   materials:
     Paper: 999
 
 - type: latheRecipe
   id: BoxFolderWhiteBAN # Tide
   result: BoxFolderWhiteBAN
-  completetime: 5
+  completetime: 3
   materials:
     Paper: 999
 
 - type: latheRecipe
   id: BoxFolderYellowBAN # Tide
   result: BoxFolderYellowBAN
-  completetime: 5
+  completetime: 3
   materials:
     Paper: 999
 
 - type: latheRecipe
   id: BoxFolderBlueBAN # Tide
   result: BoxFolderBlueBAN
-  completetime: 5
+  completetime: 3
   materials:
     Paper: 999
 
 - type: latheRecipe
   id: BoxFolderRedBAN # Tide
   result: BoxFolderRedBAN
-  completetime: 5
+  completetime: 3
   materials:
     Paper: 999
 
 - type: latheRecipe
   id: BoxFolderRYellowBAN # Tide
   result: BoxFolderRYellowBAN
-  completetime: 5
+  completetime: 3
   materials:
     Paper: 999
 
 - type: latheRecipe
   id: BoxFolderPurpleBAN # Tide
   result: BoxFolderPurpleBAN
-  completetime: 5
+  completetime: 3
   materials:
     Paper: 999
 
 - type: latheRecipe
   id: BoxFolderBlackBAN # Tide
   result: BoxFolderBlackBAN
-  completetime: 5
+  completetime: 3
   materials:
     Paper: 999

Resources/Prototypes/_White/Fluff/fluff.yml

@@ -890,6 +890,32 @@
       sprite: White/Fluff/Geraldiy/stamp.rsi
       state: stamp-geraldiy
 
+- type: entity
+  parent: BaseItem
+  id: GeraldiyAncientBlade
+  name: клинок древних
+  description: Большой клинок, заменяющий руку. Состоит из материала, похожего на пласталь. Клинок покрыт экзотическими частицами, непонятными человеческому разуму. Кто в здравом уме пойдет против обладателя этого клинка?..
+  suffix: fluff
+  components:
+  - type: Sprite
+    sprite: White/Fluff/Geraldiy/blade.rsi
+    state: icon
+  - type: Item
+    sprite: White/Fluff/Geraldiy/blade.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Slash: 24
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: HolyWeapon
+  - type: Unremoveable
+    deleteOnDrop: true
+  - type: Sharp
+  - type: DisarmMalus
+
 # KnifeCappy
 - type: entity
   parent: ClothingOuterStorageBase

Resources/Prototypes/_White/Fluff/purplemab.yml

@@ -0,0 +1,61 @@
+- type: entity
+  parent: ClothingOuterBioVirology
+  id: BioVirologyPurpleMabFluff
+  name: "Костюм Химзащиты СМПО"
+  description: "Костюм Химзащиты Старшего медицинского полевого офицера для удобной работы в полевых условиях."
+  suffix: fluff
+  components:
+  - type: Sprite
+    sprite: White/Fluff/purplemab/lunar_cmo_bio.rsi
+  - type: Clothing
+    sprite: White/Fluff/purplemab/lunar_cmo_bio.rsi
+
+- type: entity
+  parent: ClothingHeadHatParamedicsoft
+  id: HatPurpleMabFluff
+  name: "Кепка СМПО"
+  description: "Кепка Старшего медицинского полевого офицера созданная для удобной работы в полевых условиях."
+  suffix: fluff
+  components:
+  - type: Sprite
+    sprite: White/Fluff/purplemab/lunar_cmo_soft.rsi
+  - type: Clothing
+    sprite: White/Fluff/purplemab/lunar_cmo_soft.rsi
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltWebbingPurpleMab
+  name: "РПС СМПО"
+  description: "РПС Старшего медицинского полевого офицера для удобной работы в полевых условиях."
+  suffix: fluff
+  components:
+  - type: Sprite
+    sprite: White/Fluff/purplemab/lunar_cmo_webbing.rsi
+  - type: Clothing
+    sprite: White/Fluff/purplemab/lunar_cmo_webbing.rsi
+
+- type: loadout
+  id: BioVirologyPurpleMabFluffLoadout
+  entity: BioVirologyPurpleMabFluff
+  sponsorOnly: true
+
+- type: loadout
+  id: HatPurpleMabFluffLoadout
+  entity: HatPurpleMabFluff
+  sponsorOnly: true
+
+- type: loadout
+  id: ClothingBeltWebbingPurpleMabLoadout
+  entity: ClothingBeltWebbingPurpleMab
+  sponsorOnly: true
+
+- type: loadout
+  id: ClothingShoesBootsJackPurpleMabLoadout
+  entity: ClothingShoesBootsJack
+  sponsorOnly: true
+
+- type: loadout
+  id: ClothingHeadsetAltCommandPurpleMabLoadout
+  entity: ClothingHeadsetAltCommand
+  sponsorOnly: true
+  whitelistJobs: [ ChiefMedicalOfficer ]

Resources/Prototypes/_White/Fluff/sponsor.yml

@@ -325,6 +325,11 @@
   entity: GeraldiyRubberStamp
   sponsorOnly: true
 
+- type: loadout
+  id: GeraldiyArmblade
+  entity: GeraldiyAncientBlade
+  sponsorOnly: true
+  whitelistJobs: [Chaplain]
 # KnifeCappy
 
 - type: loadout

Resources/Prototypes/_White/tts-voices.yml

@@ -761,3 +761,4 @@
   name: tts-voice-name-tychus
   sex: Male
   speaker: tychus
+

Resources/Prototypes/radio_channels.yml

@@ -100,7 +100,9 @@
 - type: radioChannel
   id: Binary
   name: chat-radio-binary
-  keycode: 'b'
+  keycodes:
+    - 'b'
+    - 'б'
   frequency: 1001
   color: "#2ed2fd"
   # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms
@@ -109,7 +111,9 @@
 - type: radioChannel
   id: Freelance
   name: chat-radio-freelance
-  keycode: 'f'
+  keycodes:
+    - 'f'
+    - 'ф'
   frequency: 1984
   color: "#f6ce64"
   # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms

Resources/Textures/Objects/Fun/Cards/Other.rsi/meta.json

@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Moln1kas",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "deck"
+        },
+        {
+            "name": "fan"
+        },
+        {
+            "name": "Unknown"
+        }
+    ]
+}

Resources/Textures/Objects/Fun/Cards/clubs.rsi/meta.json

@@ -0,0 +1,50 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Moln1kas",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "clubs_a"
+        },
+        {
+            "name": "clubs_2"
+        },
+        {
+            "name": "clubs_3"
+        },
+        {
+            "name": "clubs_4"
+        },
+        {
+            "name": "clubs_5"
+        },
+        {
+            "name": "clubs_6"
+        },
+        {
+            "name": "clubs_7"
+        },
+        {
+            "name": "clubs_8"
+        },
+        {
+            "name": "clubs_9"
+        },
+        {
+            "name": "clubs_10"
+        },
+        {
+            "name": "clubs_j"
+        },
+        {
+            "name": "clubs_q"
+        },
+        {
+            "name": "clubs_k"
+        }
+    ]
+}

Resources/Textures/Objects/Fun/Cards/diamonds.rsi/meta.json

@@ -0,0 +1,50 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Moln1kas",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "diamonds_a"
+        },
+        {
+            "name": "diamonds_2"
+        },
+        {
+            "name": "diamonds_3"
+        },
+        {
+            "name": "diamonds_4"
+        },
+        {
+            "name": "diamonds_5"
+        },
+        {
+            "name": "diamonds_6"
+        },
+        {
+            "name": "diamonds_7"
+        },
+        {
+            "name": "diamonds_8"
+        },
+        {
+            "name": "diamonds_9"
+        },
+        {
+            "name": "diamonds_10"
+        },
+        {
+            "name": "diamonds_j"
+        },
+        {
+            "name": "diamonds_q"
+        },
+        {
+            "name": "diamonds_k"
+        }
+    ]
+}

Resources/Textures/Objects/Fun/Cards/hearts.rsi/meta.json

@@ -0,0 +1,50 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Moln1kas",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "hearts_a"
+        },
+        {
+            "name": "hearts_2"
+        },
+        {
+            "name": "hearts_3"
+        },
+        {
+            "name": "hearts_4"
+        },
+        {
+            "name": "hearts_5"
+        },
+        {
+            "name": "hearts_6"
+        },
+        {
+            "name": "hearts_7"
+        },
+        {
+            "name": "hearts_8"
+        },
+        {
+            "name": "hearts_9"
+        },
+        {
+            "name": "hearts_10"
+        },
+        {
+            "name": "hearts_j"
+        },
+        {
+            "name": "hearts_q"
+        },
+        {
+            "name": "hearts_k"
+        }
+    ]
+}

Resources/Textures/Objects/Fun/Cards/spades.rsi/meta.json

@@ -0,0 +1,50 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Moln1kas",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "spades_a"
+        },
+        {
+            "name": "spades_2"
+        },
+        {
+            "name": "spades_3"
+        },
+        {
+            "name": "spades_4"
+        },
+        {
+            "name": "spades_5"
+        },
+        {
+            "name": "spades_6"
+        },
+        {
+            "name": "spades_7"
+        },
+        {
+            "name": "spades_8"
+        },
+        {
+            "name": "spades_9"
+        },
+        {
+            "name": "spades_10"
+        },
+        {
+            "name": "spades_j"
+        },
+        {
+            "name": "spades_q"
+        },
+        {
+            "name": "spades_k"
+        }
+    ]
+}

Resources/Textures/White/Fluff/Geraldiy/blade.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "White Dream",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+  }

Resources/Textures/White/Fluff/purplemab/lunar_cmo_bio.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}