Merge remote-tracking branch 'upstream/master'

Resources/Changelog/ChangelogWhite.yml

@@ -5028,3 +5028,23 @@
   id: 330
   time: '2024-06-27T20:54:09.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/387
+- author: ThereDrD
+  changes:
+  - message: "\u0418\u043D\u0445\u0435\u043D\u0434\u044B \u0434\u0440\u043E\u0431\u043E\
+      \u0432\u0438\u043A\u043E\u0432 \u0432\u0435\u0440\u043D\u0443\u043B\u0438\u0441\
+      \u044C"
+    type: Fix
+  id: 331
+  time: '2024-06-28T09:43:09.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/390
+- author: Remuchi
+  changes:
+  - message: "\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\
+      \u0430\u044F \u0442\u043E\u0440\u0433\u043E\u0432\u0430\u044F \u0441\u0442\u0430\
+      \u043D\u0446\u0438\u044F \u0432\u044B\u043D\u0435\u0441\u0435\u043D\u0430 \u043D\
+      \u0430 \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u0443\u044E \u043A\u0430\u0440\
+      \u0442\u0443."
+    type: Add
+  id: 332
+  time: '2024-06-28T12:23:19.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/391

Resources/Locale/en-US/tabletop/tabletop.ftl

@@ -4,6 +4,7 @@ tabletop-verb-dump-pieces = Dump Pieces
 tabletop-default-board-name = Board Game
 tabletop-error-remove-non-hologram = You cant remove a built in piece!
 tabletop-added-piece = The board shimmers brightly!
+tabletop-max-entities = Maximum number of holograms placed.
 
 ## Chess
 tabletop-chess-board-name = Chess

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

@@ -5,6 +5,7 @@ tabletop-verb-dump-pieces = Сбросить куски
 tabletop-default-board-name = Настольная игра
 tabletop-error-remove-non-hologram = Вы не можете удалить встроенный элемент!
 tabletop-added-piece = Доска ярко переливается!
+tabletop-max-entities = Максимальное количество голограмм уже поставлено.
 
 ## Chess
 

Resources/Maps/Shuttles/trading_outpost.yml

@@ -23,7 +23,7 @@ entities:
   - uid: 2
     components:
     - type: MetaData
-      name: Automated Trade Station
+      name: Автономная Торговая Станция
     - type: Transform
       pos: -2.9375,-1.625
       parent: invalid
@@ -382,6 +382,11 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
+    - type: ProtectedGrid
+    - type: TradeStation
+    - type: Shuttle
+      linearDamping: 10000
+      angularDamping: 10000
 - proto: AirAlarm
   entities:
   - uid: 802

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -10,7 +10,6 @@
     - state: icon
       map: [ "enum.GunVisualLayers.Base" ]
   - type: Item
-    # If you update this also update the bulldog's size.
     size: Large
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
@@ -52,6 +51,7 @@
   - type: EmitSoundOnLand
     sound:
       collection: ShotgunsDrop
+  - type: Appearance
 
 
 - type: entity
@@ -126,7 +126,6 @@
     shape:
     - 0,0,4,0
     sprite: White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi
-    heldPrefix: db
   - type: Gun
     fireRate: 2
   - type: BallisticAmmoProvider
@@ -159,7 +158,6 @@
     sprite: White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi
   - type: Item
     sprite: White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi
-    heldPrefix: enforcer
   - type: BallisticAmmoProvider
 
 - type: entity
@@ -177,11 +175,10 @@
   description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells.
   components:
   - type: Item
+    sprite: White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi
-    heldPrefix: pump
   - type: Sprite
     sprite: White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi
   - type: Clothing
@@ -289,7 +286,6 @@
     shape:
     - 0,0,4,0
     sprite: White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi
-    heldPrefix: improvised
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
   - type: BallisticAmmoProvider

Resources/Prototypes/Entities/Stations/base.yml

@@ -46,12 +46,12 @@
       path: /Maps/Shuttles/cargo.yml
     - type: GridSpawn
       groups:
-        trade:
-          addComponents:
-            - type: ProtectedGrid
-            - type: TradeStation
-          paths:
-            - /Maps/Shuttles/trading_outpost.yml
+#        trade:
+#          addComponents:
+#            - type: ProtectedGrid
+#            - type: TradeStation
+#          paths:
+#            - /Maps/Shuttles/trading_outpost.yml
         mining:
           paths:
           - /Maps/Shuttles/mining.yml