Merge branch 'master-ru' into upstream-merge

Workbench-Team · Aug 16, 2023 · d6d62d7 · d6d62d7
2 parents ebd40c3 + 2db48c4
commit d6d62d7
Show file tree

Hide file tree

Showing 24 changed files with 126 additions and 96 deletions.
diff --git a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
@@ -33,7 +33,7 @@ public RoundEndSummaryWindow(string gm, string roundEnd, TimeSpan roundTimeSpan,
             RoundId = roundId;
             var roundEndTabs = new TabContainer();
             roundEndTabs.AddChild(MakeRoundEndSummaryTab(gm, roundEnd, roundTimeSpan, roundId));
-            roundEndTabs.AddChild(MakePlayerManifestoTab(info));
+            roundEndTabs.AddChild(MakePlayerManifestTab(info));
 
             Contents.AddChild(roundEndTabs);
 
@@ -90,12 +90,12 @@ private BoxContainer MakeRoundEndSummaryTab(string gamemode, string roundEnd, Ti
             return roundEndSummaryTab;
         }
 
-        private BoxContainer MakePlayerManifestoTab(RoundEndMessageEvent.RoundEndPlayerInfo[] playersInfo)
+        private BoxContainer MakePlayerManifestTab(RoundEndMessageEvent.RoundEndPlayerInfo[] playersInfo)
         {
             var playerManifestTab = new BoxContainer
             {
                 Orientation = LayoutOrientation.Vertical,
-                Name = Loc.GetString("round-end-summary-window-player-manifesto-tab-title")
+                Name = Loc.GetString("round-end-summary-window-player-manifest-tab-title")
             };
 
             var playerInfoContainerScrollbox = new ScrollContainer

diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -395,7 +395,7 @@ public bool CanFit(EntityUid toInsert, EntityUid container, EntityWhitelist? whi
 
         var targetIsMob = HasComp<BodyComponent>(toInsert);
         var storageIsItem = HasComp<ItemComponent>(container);
-        var allowedToEat = whitelist?.IsValid(toInsert) ?? storageIsItem;
+        var allowedToEat = whitelist?.IsValid(toInsert) ?? HasComp<ItemComponent>(toInsert);
 
         // BEFORE REPLACING THIS WITH, I.E. A PROPERTY:
         // Make absolutely 100% sure you have worked out how to stop people ending up in backpacks.

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1,27 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - {message: Snow planets now have minerals and rocks on them., type: Add}
-  id: 4112
-  time: '2023-06-28T11:32:02.0000000+00:00'
-- author: metalgearsloth
-  changes:
-  - {message: Added walls to lava planets., type: Add}
-  id: 4113
-  time: '2023-06-28T12:57:40.0000000+00:00'
-- author: crazybrain
-  changes:
-  - {message: The lsobjectives command now has autocompletion., type: Tweak}
-  id: 4114
-  time: '2023-06-28T13:47:46.0000000+00:00'
-- author: deltanedas
-  changes:
-  - {message: 'Hazardous and Extreme expeditions can have more dangerous modifiers,
-      of which temperature has been added.', type: Tweak}
-  - {message: Hazardous and Extreme expeditions give 4 and 5 rewards respectively.,
-    type: Tweak}
-  id: 4115
-  time: '2023-06-28T14:01:27.0000000+00:00'
 - author: Lank
   changes:
   - {message: 'Added Lead, a tasteless, incredibly powerful but slow-acting poison
@@ -3030,3 +3007,25 @@ Entries:
       range., type: Fix}
   id: 4611
   time: '2023-08-16T08:03:42.0000000+00:00'
+- author: EmoGarbage404
+  changes:
+  - {message: Lockers and crates work again., type: Fix}
+  id: 4612
+  time: '2023-08-16T13:08:53.0000000+00:00'
+- author: Ilya246
+  changes:
+  - {message: 'Taxibots, cleanbots, and similar now have binary radio.', type: Add}
+  id: 4613
+  time: '2023-08-16T13:18:57.0000000+00:00'
+- author: DogZeroX
+  changes:
+  - {message: 'Reworked the loot table from salvage spawners, the stuff you can find
+      is more varied and valuable overall.', type: Add}
+  id: 4614
+  time: '2023-08-16T19:11:02.0000000+00:00'
+- author: DogZeroX
+  changes:
+  - {message: Higher rating stock parts are now cheaper to make. Print a bunch of
+      them and upgrade stuff!, type: Tweak}
+  id: 4615
+  time: '2023-08-16T22:12:09.0000000+00:00'
diff --git a/Resources/Locale/en-US/round-end/round-end-summary-window.ftl b/Resources/Locale/en-US/round-end/round-end-summary-window.ftl
@@ -1,6 +1,6 @@
 round-end-summary-window-title = Round End Summary
 round-end-summary-window-round-end-summary-tab-title = Round Information
-round-end-summary-window-player-manifesto-tab-title = Player Manifesto
+round-end-summary-window-player-manifest-tab-title = Player Manifest
 round-end-summary-window-round-id-label = Round [color=white]#{$roundId}[/color] has ended.
 round-end-summary-window-gamemode-name-label = The game mode was [color=white]{$gamemode}[/color].
 round-end-summary-window-duration-label = It lasted for [color=yellow]{$hours} hours, {$minutes} minutes, and {$seconds} seconds.

diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/gloves.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/gloves.ftl
@@ -46,6 +46,9 @@ ent-ClothingHandsMercGlovesCombat = mercenary combat gloves
 ent-ClothingHandsGlovesFingerless = fingerless gloves
     .desc = Plain black gloves without fingertips for the hard working.
     .suffix = { "" }
+ent-ClothingHandsGlovesFingerlessInsulated = fingerless insulated gloves
+    .desc = Insulated gloves resistant to shocks, or at least they used to.
+    .suffix = { "" }
 ent-ClothingHandsGlovesMercFingerless = mercenary fingerless gloves
     .desc = Gloves that may not protect you from finger burns, but will make you cooler.
     .suffix = { "" }

diff --git a/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl b/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl
@@ -16,23 +16,21 @@ chat-manager-no-headset-on-message = У Вас нет гарнитуры!
 chat-manager-no-radio-key = Префикс канала не указан!
 chat-manager-no-such-channel = Нет канала с префиксом '{ $key }'!
 chat-manager-whisper-headset-on-message = Вы не можете шептать в радио!
-chat-manager-server-wrap-message = СЕРВЕР: { $message }
-chat-manager-sender-announcement-wrap-message =
-    Объявление { $sender }:
-    { $message }
-chat-manager-entity-say-wrap-message = { $entityName } говорит: "{ $message }"
+chat-manager-server-wrap-message = СЕРВЕР: [bold]{ $message }[/bold]
+chat-manager-sender-announcement-wrap-message = [font size=14][bold]Объявление { $sender }:[/font][font size=12]{ "\u000A" }{ $message }[/bold][/font]
+chat-manager-entity-say-wrap-message = [bold]{ $entityName }[/bold] { $verb }, [font={ $fontType } size={ $fontSize }]"{ $message }"[/font]
 chat-manager-entity-say-bold-wrap-message = [bold]{ $entityName }[/bold] { $verb }, [font={ $fontType } size={ $fontSize }][bold]"{ $message }"[/bold][/font]
-chat-manager-entity-whisper-wrap-message = { $entityName } шепчет: "{ $message }"
-chat-manager-entity-whisper-unknown-wrap-message = Кто-то шепчет: "{ $message }"
-chat-manager-entity-me-wrap-message = { $entityName } { $message }
-chat-manager-entity-looc-wrap-message = LOOC: { $entityName }: { $message }
-chat-manager-send-ooc-wrap-message = OOC: { $playerName }: { $message }
-chat-manager-send-ooc-patron-wrap-message = OOC: [color={ $patronColor }]{ $playerName }[/color]: { $message }
-chat-manager-send-dead-chat-wrap-message = { $deadChannelName }: { $playerName }: { $message }
-chat-manager-send-admin-dead-chat-wrap-message = { $adminChannelName }:({ $userName }): { $message }
-chat-manager-send-admin-chat-wrap-message = { $adminChannelName }: { $playerName }: { $message }
-chat-manager-send-admin-announcement-wrap-message = { $adminChannelName }: { $message }
-chat-manager-send-hook-ooc-wrap-message = OOC: (D){ $senderName }: { $message }
+chat-manager-entity-whisper-wrap-message = [font size=11][italic]{ $entityName } шепчет: "{ $message }"[/italic][/font]
+chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic]Кто-то шепчет: "{ $message }"[/italic][/font]
+chat-manager-entity-me-wrap-message = [italic]{ $entityName } { $message }[/italic]
+chat-manager-entity-looc-wrap-message = LOOC: [bold]{ $entityName }:[/bold] { $message }
+chat-manager-send-ooc-wrap-message = OOC: [bold]{ $playerName }:[/bold] { $message }
+chat-manager-send-ooc-patron-wrap-message = OOC: [bold][color={ $patronColor }]{ $playerName }[/color]:[/bold] { $message }
+chat-manager-send-dead-chat-wrap-message = { $deadChannelName }: [bold]{ $playerName }:[/bold] { $message }
+chat-manager-send-admin-dead-chat-wrap-message = { $adminChannelName }: [bold]({ $userName }):[/bold] { $message }
+chat-manager-send-admin-chat-wrap-message = { $adminChannelName }: [bold]{ $playerName }:[/bold] { $message }
+chat-manager-send-admin-announcement-wrap-message = [bold]{ $adminChannelName }: { $message }[/bold]
+chat-manager-send-hook-ooc-wrap-message = OOC: [bold](D){ $senderName }:[/bold] { $message }
 chat-manager-dead-channel-name = МЁРТВЫЕ
 chat-manager-admin-channel-name = АДМИН
 chat-speech-verb-suffix-exclamation = !

diff --git a/Resources/Locale/ru-RU/headset/headset-component.ftl b/Resources/Locale/ru-RU/headset/headset-component.ftl
@@ -1,5 +1,5 @@
 # Chat window radio wrap (prefix and postfix)
-chat-radio-message-wrap = [color={ $color }]{ $channel } { $name } говорит: "{ $message }"[/color]
+chat-radio-message-wrap = [color={ $color }]{ $channel } [bold]{ $name }[/bold] { $verb }, [font={ $fontType } size={ $fontSize }]"{ $message }"[/font][/color]
 chat-radio-message-wrap-bold = [color={ $color }]{ $channel } [bold]{ $name }[/bold] { $verb }, [font={ $fontType } size={ $fontSize }][bold]"{ $message }"[/bold][/font][/color]
 examine-headset-default-channel = Используйте { $prefix } для канала по умолчанию ([color={ $color }]{ $channel }[/color]).
 chat-radio-common = Общий

diff --git a/Resources/Locale/ru-RU/round-end/round-end-summary-window.ftl b/Resources/Locale/ru-RU/round-end/round-end-summary-window.ftl
@@ -1,6 +1,6 @@
 round-end-summary-window-title = Итоги раунда
 round-end-summary-window-round-end-summary-tab-title = Информация
-round-end-summary-window-player-manifesto-tab-title = Манифест игроков
+round-end-summary-window-player-manifest-tab-title = Манифест игроков
 round-end-summary-window-round-id-label = Раунд [color=white]#{ $roundId }[/color] завершился.
 round-end-summary-window-gamemode-name-label = Игровой режим был [color=white]{ $gamemode }[/color].
 round-end-summary-window-duration-label = Он длился [color=yellow]{ $hours } ч., { $minutes } мин., и { $seconds } сек.

diff --git a/Resources/Locale/ru-RU/round-end/round-end-system.ftl b/Resources/Locale/ru-RU/round-end/round-end-system.ftl
@@ -3,6 +3,6 @@
 round-end-system-shuttle-called-announcement = Эвакуационный шаттл был вызван. Он прибудет через: { $time } { $units }.
 round-end-system-shuttle-auto-called-announcement = Автоматический шаттл для смены экипажа был отправлен. Расчётное время прибытия: { $time } { $units }. Доступна возможность отзыва шаттла.
 round-end-system-shuttle-recalled-announcement = Эвакуационный шаттл был отозван.
-round-end-system-round-restart-eta-announcement = Раунд перезапустится через { $minutes } минут...
+round-end-system-round-restart-eta-announcement = Раунд перезапустится через { $time } { $units }...
 eta-units-minutes = минут
 eta-units-seconds = секунд
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/gloves.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/gloves.ftl
@@ -46,6 +46,9 @@ ent-ClothingHandsGlovesCombat = боевые перчатки
 ent-ClothingHandsGlovesMercFingerless = беспалые перчатки наемника
     .desc = Возможно эти перчатки не защитят вас от ожогов пальцев, но зато сделают круче.
     .suffix = { "" }
+ent-ClothingHandsGlovesFingerlessInsulated = изолированные беспалые перчатки
+    .desc = Эти перчатки защищают от поражения электрическим током, или, по крайней мере, раньше защищали.
+    .suffix = { "" }
 ent-ClothingHandsGlovesFingerless = беспалые перчатки
     .desc = Простые черные перчатки с обрезанными пальцами для тяжелой работы.
     .suffix = { "" }

diff --git a/...cale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/packs.ftl b/...cale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/packs.ftl
@@ -2,8 +2,8 @@ ent-CigPackBase = пачка сигарет
     .desc = { ent-BaseItem.desc }
     .suffix = { "" }
 ent-CigPackMixedBase = пачка пропитанных сигарет
-  .desc = { ent-BaseStorageItem.desc }
-  .suffix = { "" }
+    .desc = { ent-BaseStorageItem.desc }
+    .suffix = { "" }
 ent-CigPackGreen = пачка сигарет Spessman's Smokes
     .desc = Надпись на упаковке гласит: "Изменит ли что-нибудь медленная смерть?"
     .suffix = { "" }

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -31,19 +31,21 @@
   - type: StorageFill
     contents:
         # Normal (10%)
-      - id: ToolboxEmergencyFilled
+      - id: OxygenTankFilled
         prob: 0.1
-      - id: ClothingMaskBreath
+      - id: SheetPlasma
         prob: 0.1
-      - id: OxygenTankFilled
+      - id: IngotGold
+        prob: 0.1
+      - id: IngotSilver
         prob: 0.1
       - id: SheetPlasma
         prob: 0.1
       - id: WelderIndustrialAdvanced
         prob: 0.1
       - id: ResearchDisk
         prob: 0.1
-      - id: ClothingBeltStorageWaistbag
+      - id: SheetUranium
         prob: 0.1
         #  - Service
       - id: CrayonBox
@@ -54,22 +56,15 @@
       - id: BoxSyringe
         prob: 0.1
       - id: BoxBeaker
-        prob: 0.1
-        #  - Scaf
-      - id: ClothingHeadHelmetScaf
-        prob: 0.1
-      - id: ClothingOuterArmorScaf
         prob: 0.1
         #  - Heh
       - id: SalvageHumanCorpse
         prob: 0.1
-      - id: LidSalami
-        prob: 0.1
         # Interesting (1%)
         #  - Ammo
       - id: MagazineBoxMagnum
         prob: 0.01
-      - id: ResearchDisk5000
+      - id: ResearchDisk10000
         prob: 0.01
         # Just no (0.1%)
         #  - Working guns
@@ -82,30 +77,8 @@
         #  - Skub
       - id: Skub
         prob: 0.001
-      - id: ResearchDisk10000
-        prob: 0.001
       - id: ClothingHeadHatCatEars
         prob: 0.01
-        #  - Pins
-      - id: ClothingNeckLGBTPin
-        prob: 0.025
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckAromanticPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckAsexualPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckBisexualPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckIntersexPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckLesbianPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckNonBinaryPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckPansexualPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckTransPin
-        orGroup: LGBTQIAPlusPins
         # TRAITOR EQUIPMENT (0.01%)
       - id: Telecrystal10
         prob: 0.0001

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -117,6 +117,8 @@
           prob: 0.2
         - id: ClothingHandsGlovesColorYellow
           prob: 0.05
+        - id: ClothingHandsGlovesFingerlessInsulated
+          prob: 0.07
         - id: ClothingBeltUtility
           prob: 0.10
         - id: ClothingHeadHatCone

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -264,6 +264,20 @@
     fiberMaterial: fibers-synthetic
     fiberColor: fibers-black
 
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesFingerlessInsulated
+  name: fingerless insulated gloves
+  description: Insulated gloves resistant to shocks, or at least they used to.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/fingerlessinsuls.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/fingerlessinsuls.rsi
+  - type: Fiber
+    fiberMaterial: fibers-insulative
+    fiberColor: fibers-yellow
+
 - type: entity
   parent: ClothingHandsBase
   id: ClothingHandsGlovesMercFingerless

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
@@ -20,6 +20,19 @@
         - CrateSalvageEquipment
         - CrateMaterialSteel
         - CrateMaterialGlass
+        - CrateServiceJanitorialSupplies
+        - CrateHydroponicsSeedsMedicinal
+        - CrateEmergencyInternals
+        - CrateFoodMRE
+        - CrateMaterialTextiles
+        - CrateMedicalSupplies
+        - CrateEngineeringCableBulk
+        - CrateMaterialCardboard
+        - CrateServiceBooks
+        - CrateServiceSmokeables
+        - CrateTrashCartFilled
+        - ClosetMaintenanceFilledRandom
+        - ClosetEmergencyFilledRandom
       rareChance: 0.4
       prototypes:
         - CrateSalvageAssortedGoodies

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -41,6 +41,14 @@
   - type: NpcFactionMember
     factions:
     - SimpleNeutral
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Binary
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
   - type: HealthExaminable
     examinableTypes:
     - Blunt

diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -52,6 +52,14 @@
     showInHands: false
   - type: Body
     prototype: Drone
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Binary
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
   - type: DoAfter
   - type: Pullable
   - type: Examiner

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -73,6 +73,14 @@
   - type: Speech
     speechVerb: Robotic
     speechSounds: Vending
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Binary
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
   - type: DoAfter
   - type: Electrified
     enabled: false