Всякое по мелочи (#148)

* fix: у мартышек снова отображается одежда

* fix: с зеркалом снова можно взаимодействовать

* tweak: шлюзы культа теперь работают как двери, а не шлюзы

* remove: убрано отображение текущего патрона у револьверов

* add: новые плитки для мапперов

Resources/Locale/en-US/_white/tiles.ftl

@@ -0,0 +1,11 @@
+tiles-dark-floor-pavement-alt = тёмное стальное покрытие (альтернативное)
+tiles-dark-floor-pavement-vertical-alt = тёмное стальное вертикальное покрытие (альтернативное)
+tiles-dark-floor-herringbone-alt = тёмное стальное покрытие мозаикой (альтернативное)
+
+tiles-steel-floor-pavement-alt = стальное покрытие (альтернативное)
+tiles-steel-floor-pavement-vertical-alt = стальное вертикальное покрытие (альтернативное)
+tiles-steel-floor-herringbone-alt = стальное покрытие мозаикой (альтернативное)
+
+tiles-white-floor-pavement-alt = белое стальное покрытие (альтернативное)
+tiles-white-floor-pavement-vertical-alt = белое стальное вертикальное покрытие (альтернативное)
+tiles-white-floor-herringbone-alt = белое стальное покрытие мозаикой (альтернативное)

Resources/Locale/ru-RU/weapons/ranged/gun.ftl

@@ -35,8 +35,8 @@ gun-chamber-bolt-closed = Затвор закрыт
 gun-chamber-bolt-opened = Затвор открыт
 gun-chamber-bolt-close = Закрыть завтор
 gun-chamber-bolt-open = Открыть затвор
-gun-chamber-bolt-closed-state = закрыт
-gun-chamber-bolt-open-state = открыт
+gun-chamber-bolt-closed-state = открыт
+gun-chamber-bolt-open-state = закрыт
 gun-chamber-rack = Разрядить
 
 # MagazineAmmoProvider

Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml

@@ -3,18 +3,19 @@
   name: mirror
   description: 'Mirror mirror on the wall , who''s the most robust of them all?'
   components:
-  - type: WallMount
-  - type: Sprite
-    sprite: Structures/Wallmounts/mirror.rsi
-    state: mirror
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Transform
-    anchored: true
-  - type: MagicMirror
-  - type: ActivatableUI
-    key: enum.MagicMirrorUiKey.Key
-  - type: UserInterface
-    interfaces:
-    - key: enum.MagicMirrorUiKey.Key
-      type: MagicMirrorBoundUserInterface
+    - type: WallMount
+    - type: Sprite
+      sprite: Structures/Wallmounts/mirror.rsi
+      state: mirror
+    - type: InteractionOutline
+    - type: Clickable
+    - type: Transform
+      anchored: true
+    - type: MagicMirror
+    - type: ActivatableUI
+      key: enum.MagicMirrorUiKey.Key
+      singleUser: true
+    - type: UserInterface
+      interfaces:
+        - key: enum.MagicMirrorUiKey.Key
+          type: MagicMirrorBoundUserInterface

Resources/Prototypes/White/Tiles/floors.yml

@@ -0,0 +1,162 @@
+- type: tile
+  id: FloorDarkPavementAlt
+  name: tiles-dark-floor-pavement-alt
+  sprite: /Textures/White/Tiles/dark_pavement.png
+  variants: 4
+  placementVariants:
+    - 1.0
+    - 1.0
+    - 1.0
+    - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemDark
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorDarkPavementVerticalAlt
+  name: tiles-dark-floor-pavement-vertical-alt
+  sprite: /Textures/White/Tiles/dark_pavement_vertical.png
+  variants: 4
+  placementVariants:
+    - 1.0
+    - 1.0
+    - 1.0
+    - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemDark
+  heatCapacity: 10000
+  
+
+- type: tile
+  id: FloorDarkHerringboneAlt
+  name: tiles-dark-floor-herringbone-alt
+  sprite: /Textures/White/Tiles/dark_herringbone.png
+  variants: 4
+  placementVariants:
+    - 1.0
+    - 1.0
+    - 1.0
+    - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemDark
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorSteelHerringboneAlt
+  name: tiles-steel-floor-herringbone-alt
+  sprite: /Textures/White/Tiles/steel_herringbone.png
+  variants: 4
+  placementVariants:
+    - 1.0
+    - 1.0
+    - 1.0
+    - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemSteel
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorSteelPavementAlt
+  name: tiles-steel-floor-pavement-alt
+  sprite: /Textures/White/Tiles/steel_pavement.png
+  variants: 4
+  placementVariants:
+    - 1.0
+    - 1.0
+    - 1.0
+    - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemSteel
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorSteelPavementVerticalAlt
+  name: tiles-steel-floor-pavement-vertical-alt
+  sprite: /Textures/White/Tiles/steel_pavement_vertical.png
+  variants: 4
+  placementVariants:
+    - 1.0
+    - 1.0
+    - 1.0
+    - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemSteel
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorWhiteHerringboneAlt
+  name: tiles-white-floor-herringbone-alt
+  sprite: /Textures/White/Tiles/white_herringbone.png
+  variants: 4
+  placementVariants:
+    - 1.0
+    - 1.0
+    - 1.0
+    - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemWhite
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorWhitePavementAlt
+  name: tiles-white-floor-pavement-alt
+  sprite: /Textures/White/Tiles/white_pavement.png
+  variants: 4
+  placementVariants:
+    - 1.0
+    - 1.0
+    - 1.0
+    - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemWhite
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorWhitePavementVerticalAlt
+  name: tiles-white-floor-pavement-vertical-alt
+  sprite: /Textures/White/Tiles/white_pavement_vertical.png
+  variants: 4
+  placementVariants:
+    - 1.0
+    - 1.0
+    - 1.0
+    - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemWhite
+  heatCapacity: 10000

Resources/Prototypes/_White/Entities/Cult/other_structures.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: AirlockGlassCult
-  parent: BaseStructure
+  parent: BaseMaterialDoor
   name: runic airlock
   description: Strange glass airlock with a rune.
   components:
@@ -8,65 +8,32 @@
     soundGroups:
       Brute:
         collection: GlassSmash
-  - type: InteractionOutline
   - type: Sprite
     sprite: /Textures/White/Cult/Structures/cult_airlock.rsi
     layers:
     - state: closed
       map: ["enum.DoorVisualLayers.Base"]
-    - state: closed_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseUnlit"]
-    - state: welded
-      map: ["enum.WeldableLayers.BaseWelded"]
-      visible: false
-    - state: bolted_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseBolted"]
-    - state: emergency_unlit
-      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
-      shader: unshaded
-    - state: panel_closed
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-      visible: false
-  - type: AnimationPlayer
   - type: Physics
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
-        density: 100
-        mask:
-        - FullTileMask
-        layer:
-        - GlassAirlockLayer
+    bodyType: Static
+  - type: Occluder
+    enabled: false
   - type: Door
     occludes: false
+    bumpOpen: true
     crushDamage:
       types:
         Blunt: 15
     openSound:
-      path: /Audio/Machines/airlock_open.ogg
+      path: /Audio/Effects/stonedoor_openclose.ogg
     closeSound:
-      path: /Audio/Machines/airlock_close.ogg
+      path: /Audio/Effects/stonedoor_openclose.ogg
     denySound:
       path: /Audio/Machines/airlock_deny.ogg
-  - type: Airlock
-    openUnlitVisible: true
-  - type: DoorBolt
-  - type: Appearance
   - type: Airtight
     fixVacuum: true
     noAirWhenFullyAirBlocked: false
   - type: RadiationBlocker
     resistance: 2
-  - type: Occluder
-    enabled: false
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -76,8 +43,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: RunicDoor
-  - type: ApcPowerReceiver
-    needsPower: false
   - type: Construction
     graph: AirlockGlassCult
     node: airlock

Resources/Textures/White/Cult/Structures/cult_airlock.rsi/meta.json

@@ -41,157 +41,6 @@
     },
     {
       "name": "assembly"
-    },
-    {
-      "name": "bolted_unlit"
-    },
-    {
-      "name": "welded"
-    },
-    {
-      "name": "closing_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "deny_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "emergency_unlit",
-      "delays": [
-        [
-          1.2,
-          1.2
-        ]
-      ]
-    },
-    {
-      "name": "opening_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "panel_closed"
-    },
-    {
-      "name": "panel_open"
-    },
-    {
-      "name": "panel_opening",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "panel_closing",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks_damaged",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          1.7
-        ]
-      ]
-    },
-    {
-      "name": "sparks_open",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks_broken",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "bolted_open_unlit"
-    },
-    {
-      "name": "closed_unlit"
-    },
-    {
-      "name": "emergency_open_unlit"
-    },
-    {
-      "name": "open_unlit"
     }
   ]
 }