Merge PR #57 from EndrAnimet (РСУ и ГП)

РСУ и ГП

.github/workflows/build-map-renderer.yml

@@ -2,7 +2,7 @@
 
 on:
   push:
-    branches: [ master, staging, trying, cursed ]
+    branches: [ master, staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

.github/workflows/build-test-debug.yml

@@ -2,7 +2,7 @@ name: Build & Test Debug
 
 on:
   push:
-    branches: [ master, staging, trying, cursed ]
+    branches: [ master, staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

.github/workflows/test-packaging.yml

@@ -2,7 +2,7 @@
 
 on:
   push:
-    branches: [ master, staging, trying, cursed ]
+    branches: [ master, staging, trying, endrbranch2 ]
     paths:
       - '**.cs'
       - '**.csproj'

.github/workflows/validate-rgas.yml

@@ -1,7 +1,7 @@
 name: RGA schema validator
 on:
   push:
-    branches: [ master, staging, trying, cursed ]
+    branches: [ master, staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

.github/workflows/validate-rsis.yml

@@ -2,7 +2,7 @@ name: RSI Validator
 
 on:
   push:
-    branches: [ staging, trying, cursed ]
+    branches: [ staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     paths:

.github/workflows/validate_mapfiles.yml

@@ -1,7 +1,7 @@
 name: Map file schema validator
 on:
   push:
-    branches: [ master, staging, trying, cursed ]
+    branches: [ master, staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

.github/workflows/yaml-linter.yml

@@ -2,7 +2,7 @@ name: YAML Linter
 
 on:
   push:
-    branches: [ master, staging, trying, cursed ]
+    branches: [ master, staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

Content.Client/RCD/RCDMenu.xaml

@@ -6,7 +6,7 @@
                 VerticalExpand="True"
                 HorizontalExpand="True"
                 MinSize="450 450">
-    
+
     <!-- Note: The min size of the window just determine how close to the edge of the screen the center of the radial menu can be placed -->
     <!-- The radial menu will try to open so that its center is located where the player's cursor is currently -->
 
@@ -27,6 +27,10 @@
         <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-lighting'}" TargetLayer="Lighting" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/lighting.png"/>
         </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-tubes'}" TargetLayer="Tubes" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/Tubes.png"/>
+
+        </ui:RadialMenuTextureButton>
     </ui:RadialContainer>
 
     <!-- Walls and flooring -->
@@ -40,8 +44,10 @@
 
     <!-- Computer and machine frames -->
     <ui:RadialContainer Name="Electrical"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
-       
+
     <!-- Lighting -->
     <ui:RadialContainer Name="Lighting"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
 
+    <!-- Tubes --> <!--Stray-->
+    <ui:RadialContainer Name="Tubes"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/> <!--Stray-->
 </ui:RadialMenu>

Resources/Locale/ru-RU/stray/items/tools.ftl

@@ -0,0 +1,10 @@
+ent-AdavancedRCD = Продвинутое РСУ
+    .desc = РСУ с большим количеством возможных строений и большим возможным количеством зарядов.
+ent-AdavancedRCDEmpty = Продвинутое РСУ
+    .desc = РСУ с большим количеством возможных строений и большим возможным количеством зарядов.
+ent-CombatRCD = Боевое РСУ
+    .desc = РСУ с большим количеством возможных строений и гигантским количеством зарядов. Используется СИ и инженерами ОБР.
+ent-RACDEmpty = РАСУ
+    .desc = Ручное атмосферное строительное устройство. Может строить трубы.
+ent-RACD = РАСУ
+    .desc = Ручное атмосферное строительное устройство. Может строить трубы.

Resources/Locale/ru-RU/stray/research.ftl

@@ -1 +1,2 @@
-research-technology-advanced-salvage-weapons = Продвинутое вооружение утилизаторов
+research-technology-advanced-salvage-weapons = Продвинутое вооружение утилизаторов
+research-technology-adavanced-rcd = Продвинутые РСУ

Resources/Prototypes/Catalog/Fills/Items/belt.yml

@@ -40,6 +40,7 @@
       - id: HolofanProjector
       - id: GasAnalyzer
       - id: trayScanner
+      - id: CombatRCD
 
 - type: entity
   id: ClothingBeltSecurityFilled

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

@@ -95,6 +95,7 @@
       - id: MedkitOxygenFilled
       - id: HolofanProjector
       - id: RCD
+      - id: RACD
       - id: RCDAmmo
       - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
@@ -113,6 +114,7 @@
       - id: MedkitOxygenFilled
       - id: HolofanProjector
       - id: RCD
+      - id: RACD
       - id: RCDAmmo
       - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
         prob: 0.3

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

@@ -183,6 +183,8 @@
       - id: ClothingShoesBootsLaceup # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesBootsWinterHeadOfPersonel #Delta V: Add departmental winter boots
+      - id: ClothingOuterHardsuitHoP # Stray
+      - id: WeaponDisabler # Stray
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
 

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -373,6 +373,9 @@
       - WeaponProtoKineticAcceleratorMining
       - WeaponProtoKineticAcceleratorAdvancedMining
       - WeaponProtoKineticAcceleratorSubversiveMining
+      - RCD
+      - RACD
+      - AdavancedRCD
     # End Stray additions
   - type: EmagLatheRecipes
     emagDynamicRecipes:

Resources/Prototypes/Maps/edge.yml

@@ -49,7 +49,7 @@
             Paramedic: [ 1, 2 ]
             Psychologist: [ 1, 1 ]
             MedicalDoctor: [ 3, 4 ]
-            MedicalIntern: [ 2, 3 ]s
+            MedicalIntern: [ 2, 3 ]
             Slugcat: [ 1, 1 ]
           #science
             ResearchDirector: [ 1, 1 ]

Resources/Prototypes/Research/industrial.yml

@@ -180,6 +180,8 @@
     - JawsOfLife
     - BorgModuleAdvancedTool
     - BorgModuleRCD
+    - RCD
+    - RCDAmmo
 
 # Tier 3
 

Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -41,14 +41,14 @@
     highPressureMultiplier: 0.02
     lowPressureMultiplier: 4500
   - type: ClothingSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
+    walkModifier: 1
+    sprintModifier: 0.85
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.90
-        Slash: 0.8
-        Piercing: 0.90
+        Blunt: 0.7
+        Slash: 0.7
+        Piercing: 0.7
         Heat: 0.8
         Radiation: 0.6
   - type: ExplosionResistance

Resources/Prototypes/Stray/Body/Organs/ipc.yml

@@ -9,13 +9,6 @@
     - type: Organ
     - type: Extractable
       grindableSolutionName: organ
-    - type: SolutionContainerManager
-      solutions:
-        organ:
-          maxVol: 10
-          reagents:
-            - ReagentId: Oil
-              Quantity: 10
 
 - type: entity
   id: OrganIPCFan

Resources/Prototypes/Stray/Entities/Mobs/Species/ipc.yml

@@ -269,7 +269,6 @@
         - Freelance
     - type: LockedWiresPanel
 
-
 - type: entity
   name: Urist McIPC
   parent: MobHumanDummy

Resources/Prototypes/Stray/Entities/Objects/Tools/RCD.yml

@@ -0,0 +1,148 @@
+- type: entity
+  id: CombatRCD
+  parent: BaseItem
+  name: Combat RCD
+  description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
+  components:
+  - type: RCD
+    availablePrototypes:
+    - WallSolid
+    - FloorSteel
+    - Plating
+    - Catwalk
+    - Grille
+    - Window
+    - WindowDirectional
+    - WindowReinforcedDirectional
+    - ReinforcedWindow
+    - Airlock
+    - AirlockGlass
+    - Firelock
+    - TubeLight
+    - BulbLight
+    - LVCable
+    - MVCable
+    - HVCable
+    - CableTerminal
+    - Deconstruct
+    - GasVentPump
+    - GasVentScrubber
+    - GasPipeStraight
+    - GasPipeTJunction
+    - GasPipeBend
+    - GasPipeFourway
+    - GasPressurePump
+    - GasMixer
+    - GasFilter
+    - ComputerFrame
+    - MachineFrame
+    - WindoorSecure
+    - Windoor
+    - AirlockGlassShuttle
+    - AirlockShuttle
+    - WallShuttle
+    - WallReinforced
+  - type: LimitedCharges
+    maxCharges: 500
+    charges: 500
+  - type: AutoRecharge
+    rechargeDuration: 480
+  - type: UseDelay
+  - type: Sprite
+    sprite: Stray/Objects/Tools/crcd.rsi
+    state: icon
+  - type: Item
+    sprite: Stray/Objects/Tools/crcd.rsi
+    size: Normal
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 600
+      Plastic: 100
+  - type: StaticPrice
+    price: 50000
+  - type: UserInterface
+    interfaces:
+      enum.RcdUiKey.Key:
+        type: RCDMenuBoundUserInterface
+  - type: ActivatableUI
+    key: enum.RcdUiKey.Key
+
+- type: entity
+  id: RACD
+  parent: BaseItem
+  name: RACD
+  description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
+  components:
+  - type: RCD
+    availablePrototypes:
+    - GasPassiveVent
+    - GasVentPump
+    - GasVentScrubber
+    - GasPipeStraight
+    - GasPipeTJunction
+    - GasPipeBend
+    - GasPipeFourway
+    - GasPressurePump
+    - GasVolumePump
+    - GasMixer
+    - GasFilter
+    - FloorSteel
+    - Airlock
+    - AirlockGlass
+    - Firelock
+    - Deconstruct
+  - type: LimitedCharges
+    maxCharges: 30
+    charges: 30
+  - type: UseDelay
+  - type: Sprite
+    sprite: Stray/Objects/Tools/rcad.rsi
+    state: icon
+  - type: Item
+    sprite: Stray/Objects/Tools/rcad.rsi
+    size: Normal
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 600
+      Plastic: 100
+  - type: StaticPrice
+    price: 50000
+  - type: UserInterface
+    interfaces:
+      enum.RcdUiKey.Key:
+        type: RCDMenuBoundUserInterface
+  - type: ActivatableUI
+    key: enum.RcdUiKey.Key
+
+- type: entity
+  id: AdavancedRCD
+  parent: CombatRCD
+  name: Adavanced RCD
+  description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
+  components:
+  - type: LimitedCharges
+    maxCharges: 60
+    charges: 60
+  - type: Sprite
+    sprite: Stray/Objects/Tools/arcd.rsi
+    state: icon
+  - type: Item
+    sprite: Stray/Objects/Tools/arcd.rsi
+
+- type: entity
+  id: AdavancedRCDEmpty
+  parent: AdavancedRCD
+  suffix: пустое
+  components:
+  - type: LimitedCharges
+    maxCharges: 60
+    charges: 0
+
+- type: entity
+  id: RACDEmpty
+  parent: RACD
+  suffix: пустое
+  components:
+  - type: LimitedCharges
+    maxCharges: 30
+    charges: 0