Баффы (#510)

* Moodsystem cleanups * remove overhydrated and overfed mood debuffs * admins now join game deadmined + new player timers * faster arrivals * recharging rcd with metal, glass, plastic or cable coils * better timings and costs + building apc and camera * preparing for rpd * RPD + make RCD more generic * add rpd to atmos lockers, rcd to engivend * rcd and rpd to technologies * dont deadmin me in debug * rcd ammo buff * add ChargeCountModifier logic for non stackable items * increase time to become experienced player * Dynamic Radial Menus (#29678) * fix * Clean Some Code * Some Commentaries * Update Content.Client/UserInterface/Controls/RadialContainer.cs * Update Content.Client/UserInterface/Controls/RadialContainer.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * more dynamically parameters --------- Co-authored-by: Rinary <72972221+Rinary1@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-07-29 06:04:21 +03:00
parent 0f641a46d2
commit d627758826
44 changed files with 1082 additions and 315 deletions
--- a/Resources/Locale/ru-RU/rcd/components/rcd-component.ftl
+++ b/Resources/Locale/ru-RU/rcd/components/rcd-component.ftl
@@ -1,30 +1,59 @@
-### UI
+# WD EDIT ALL

-# Shown when an RCD is examined in details range
-rcd-component-examine-detail = В данный момент выбран режим { $mode }.
-# Shown when an RCD is examined in details range
-rcd-component-examine-detail-count =
-    Находится в режиме { $mode ->
-       *[other] _
-        [floors] полы
-        [walls] стены
-        [airlock] шлюзы
-        [deconstruct] разбор
-    }, и { $ammoCount ->
-       *[zero] не содержит зарядов.
-        [one] содержит 1 заряд.
-        [few] содержит { $ammoCount } заряда.
-        [other] содержит { $ammoCount } зарядов.
-    }
+# UI

-### Interaction Messages
+rcd-component-examine-mode-details = Текущий режим: '{$mode}'.
+rcd-component-examine-build-details = Текущий режим строительства: {$name}.

-# Shown when changing RCD Mode
-rcd-component-change-mode = РЦД переключён в режим { $mode }.
+
+## Interaction Messages
+
+# Mode change
+rcd-component-change-mode = РЦД переключён в режим '{$mode}'.
+rcd-component-change-build-mode = РЦД переключён в режим строительства {$name}.
+
+# Ammo count
 rcd-component-no-ammo-message = В РЦД закончились заряды!
-rcd-component-tile-indestructible-message = Эта плитка не может быть уничтожена!
-rcd-component-tile-obstructed-message = Этот тайл заблокирован!
-rcd-component-deconstruct-target-not-on-whitelist-message = Вы не можете это деконструировать!
-rcd-component-cannot-build-floor-tile-not-empty-message = Пол можно построить только в космосе или на покрытии!
-rcd-component-cannot-build-wall-tile-not-empty-message = Вы не можете построить стену в космосе!
-rcd-component-cannot-build-airlock-tile-not-empty-message = Вы не можете построить шлюз в космосе!
+rcd-component-insufficient-ammo-message = В РЦД недостаточно зарядов!
+
+# Deconstruction
+rcd-component-tile-indestructible-message = Эта плитка неразрушима!
+rcd-component-deconstruct-target-not-on-whitelist-message = Вы не можете это демонтировать!
+rcd-component-nothing-to-deconstruct-message = Здесь нечего демонтировать!
+rcd-component-tile-obstructed-message = Вы не можете демонтировать плитку, если на ней что-то есть!
+
+# Construction
+rcd-component-no-valid-grid = Вы слишком далеко в открытом космосе, чтобы строить здесь!
+rcd-component-must-build-on-empty-tile-message = Здесь уже есть фундамент!
+rcd-component-cannot-build-on-empty-tile-message = Вы не можете строить это без фундамента!
+rcd-component-must-build-on-subfloor-message = Вы можете строить это только на открытом полу!
+rcd-component-cannot-build-on-subfloor-message = Вы не можете строить это на открытом полу!
+rcd-component-cannot-build-on-occupied-tile-message = Вы не можете строить здесь, это место уже занято!
+rcd-component-cannot-build-identical-tile = Эта плитка уже существует!
+
+
+### Category names
+
+# RCD
+rcd-category-WallsAndFlooring = Стены и пол
+rcd-category-WindowsAndGrilles = Окна и решётки
+rcd-category-Airlocks = Шлюзы
+rcd-category-Electrical = Электрика
+rcd-category-Lighting = Освещение
+
+# RPD
+rcd-category-Pipes = Трубы
+rcd-category-GasDevices = Атмосферные приборы
+rcd-category-DisposalPipes = Мусорные трубы
+rcd-category-DisposalUnits = Мусорные приборы
+
+### Prototype names (note: constructable items will be puralized)
+
+rcd-component-deconstruct = демонтаж
+rcd-component-floor-steel = стальная плитка
+rcd-component-plating = лист обшивки
+
+# RPD naming
+
+ent-RapidPipeDispenser = РПД
+    .desc = Новейшее ручное строительное устройство, которое может быстро размещать трубы и атмосферные приборы.
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -92,6 +92,7 @@
      - id: ClothingEyesGlassesMeson
      - id: ClothingShoesBootsMag
      - id: ClothingHandsGlovesColorYellow
+      - id: RapidPipeDispenser # WD

 - type: entity
  id: LockerAtmosphericsFilled
@@ -111,6 +112,7 @@
      - id: ClothingEyesGlassesMeson
      - id: ClothingShoesBootsMag
      - id: ClothingHandsGlovesColorYellow
+      - id: RapidPipeDispenser # WD

 - type: entity
  id: LockerEngineerFilledHardsuit
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -152,6 +152,7 @@
      - id: ClothingOuterHardsuitEngineeringWhite
      - id: ClothingMaskBreath
      - id: OxygenTankFilled
+      - id: RapidPipeDispenser # WD

 - type: entity
  id: LockerChiefEngineerFilled
@@ -169,6 +170,7 @@
    - id: RCDAmmo
      amount: 2
    - id: HolofanProjector
+    - id: RapidPipeDispenser # WD

 - type: entity
  id: LockerChiefMedicalOfficerFilledHardsuit
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
@@ -12,6 +12,5 @@
    GeigerCounter: 3
    InflatableWallStack1: 24
    InflatableDoorStack1: 8
-  emaggedInventory:
-    RCD: 1
-    RCDAmmo: 3
+    RCD: 3 # WD
+    RCDAmmo: 3 # WD
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -86,6 +86,8 @@
        reagents:
        - ReagentId: Silicon
          Quantity: 10
+  - type: RCDAmmo # WD
+    canBeExamined: false

 - type: entity
  parent: SheetGlass
@@ -172,6 +174,9 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 2

 - type: entity
  parent: SheetRGlass
@@ -249,6 +254,9 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 2

 - type: entity
  parent: SheetPGlass
@@ -315,6 +323,9 @@
        - ReagentId: Carbon
          Quantity: 0.5
        canReact: false
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 3

 - type: entity
  parent: SheetRPGlass
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -70,6 +70,8 @@
          Quantity: 9
        - ReagentId: Carbon
          Quantity: 1
+  - type: RCDAmmo # WD
+    canBeExamined: false

 - type: entity
  parent: SheetSteel
@@ -206,6 +208,9 @@
        - ReagentId: Carbon
          Quantity: 1
        canReact: false
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 2

 - type: entity
  parent: SheetPlasteel
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -164,6 +164,9 @@
        - ReagentId: Phosphorus
          Quantity: 5
        canReact: false
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 0.5

 - type: entity
  parent: SheetPlastic
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -74,6 +74,9 @@
          Quantity: 4.5
        - ReagentId: Carbon
          Quantity: 0.5
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 0.5

 - type: entity
  parent: PartRodMetal
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -27,6 +27,9 @@
    price: 0
  - type: StackPrice
    price: 1
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 0.2

 - type: entity
  id: CableHVStack
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -395,32 +395,11 @@
      path: "/Audio/Items/drill_hit.ogg"

 - type: entity
-  id: RCD
+  id: BaseRCD
  parent: BaseItem
  name: 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
  - type: LimitedCharges
    maxCharges: 30
    charges: 30
@@ -449,13 +428,18 @@
    key: enum.RcdUiKey.Key

 - type: entity
-  id: RCDEmpty
-  parent: RCD
-  suffix: Empty
+  id: RCD
+  parent: BaseRCD
+  name: 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
-    charges: 0
  - type: RCD
+    categoryPrototypes: # WD
+    - WallsAndFlooring # WD
+    - WindowsAndGrilles # WD
+    - Airlocks # WD
+    - Electrical # WD
+    - Lighting # WD
    availablePrototypes:
    - WallSolid
    - FloorSteel
@@ -469,6 +453,76 @@
    - Airlock
    - AirlockGlass
    - Firelock
+    - TubeLight
+    - BulbLight
+    - LVCable
+    - MVCable
+    - HVCable
+    - CableTerminal
+    - APC # WD
+    - Camera # WD
+    - Deconstruct
+
+- type: entity
+  id: RCDEmpty
+  parent: RCD
+  suffix: Empty
+  components:
+  - type: LimitedCharges
+    charges: 0
+
+- type: entity # WD
+  id: RapidPipeDispenser
+  parent: BaseRCD
+  components:
+  - type: Sprite
+    sprite: White/Items/Tools/rpd.rsi
+  - type: Item
+    size: Normal
+    shape:
+    - 0, 0, 1, 0
+  - type: Clothing
+    sprite: White/Items/Tools/rpd.rsi
+    quickEquip: false
+    slots:
+    - Belt
+  - type: RCD
+    categoryPrototypes:
+    - Pipes
+    - GasDevices
+    - DisposalPipes
+    - DisposalUnits
+    availablePrototypes:
+    - PipeStraight # pipes
+    - PipeBend
+    - PipeTJunction
+    - PipeFourway
+    - GasCanisterPort # gas devices
+    - GasFilter
+    - GasMixer
+    - GasOutletInjector
+    - GasPressurePump
+    - GasVolumePump
+    - GasValve
+    - SignalControlledValve
+    - PressureControlledValve
+    - GasVentScrubber
+    - GasVentPump
+    - GasPassiveVent
+    - DisposalPipe # disposal pipes
+    - DisposalBend
+    - DisposalJunction
+    - DisposalJunctionFlipped
+    - DisposalYJunction
+    - DisposalRouter
+    - DisposalRouterFlipped
+    - DisposalTagger
+    - DisposalSignalRouter
+    - DisposalSignalRouterFlipped
+    - DisposalTrunk
+    - DisposalUnit # disposal units
+    - MailingUnit
+    - ToiletEmpty

 - type: entity
  id: RCDRecharging
@@ -500,6 +554,7 @@
  description: A cartridge of raw matter compacted by bluespace technology. Used in rapid construction devices.
  components:
  - type: RCDAmmo
+    chargeCountModifier: 1.5
  - type: Sprite
    sprite: Objects/Tools/rcd.rsi
    state: ammo
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -348,6 +348,8 @@
      - KitchenKnife # WD EDIT
      - ButchCleaver # WD EDIT
      - WeaponTempGun # WD EDIT
+      - RapidPipeDispenserRecipe # WD edit
+      - RCDRecipe # WD edit
      - DeviceQuantumSpinInverter
  - type: EmagLatheRecipes
    emagDynamicRecipes:
--- a/Resources/Prototypes/RCD/rcd.yml
+++ b/Resources/Prototypes/RCD/rcd.yml
@@ -2,7 +2,7 @@
 - type: rcd
  id: Invalid   # Hidden prototype - do not add to RCDs
  mode: Invalid
-  
+
 - type: rcd
  id: Deconstruct
  name: rcd-component-deconstruct
@@ -13,14 +13,14 @@
  rotation: Camera

 - type: rcd
-  id: DeconstructLattice   # Hidden prototype - do not add to RCDs  
+  id: DeconstructLattice   # Hidden prototype - do not add to RCDs
  name: rcd-component-deconstruct
  mode: Deconstruct
  cost: 2
  delay: 0
  rotation: Camera
  fx: EffectRCDConstruct0
-    
+
 - type: rcd
  id: DeconstructTile      # Hidden prototype - do not add to RCDs
  name: rcd-component-deconstruct
@@ -30,7 +30,7 @@
  rotation: Camera
  fx: EffectRCDDeconstruct4

-# Flooring 
+# Flooring
 - type: rcd
  id: Plating
  name: rcd-component-plating
@@ -39,12 +39,12 @@
  mode: ConstructTile
  prototype: Plating
  cost: 1
-  delay: 1
+  delay: 0
  collisionMask: InteractImpassable
  rules:
    - CanBuildOnEmptyTile
-  fx: EffectRCDConstruct1
-  
+  fx: EffectRCDConstruct0
+
 - type: rcd
  id: FloorSteel
  name: rcd-component-floor-steel
@@ -53,11 +53,11 @@
  mode: ConstructTile
  prototype: FloorSteel
  cost: 1
-  delay: 1
+  delay: 0
  collisionMask: InteractImpassable
  rules:
    - CanBuildOnEmptyTile
-  fx: EffectRCDConstruct1
+  fx: EffectRCDConstruct0

 - type: rcd
  id: Catwalk
@@ -66,13 +66,13 @@
  mode: ConstructObject
  prototype: Catwalk
  cost: 1
-  delay: 1
+  delay: 0
  collisionMask: InteractImpassable
  rules:
    - MustBuildOnSubfloor
    - IsCatwalk
  rotation: Fixed
-  fx: EffectRCDConstruct1
+  fx: EffectRCDConstruct0

 # Walls
 - type: rcd
@@ -80,7 +80,7 @@
  category: WallsAndFlooring
  sprite: /Textures/Interface/Radial/RCD/solid_wall.png
  mode: ConstructObject
-  prototype: WallSolid 
+  prototype: WallSolid
  cost: 4
  delay: 2
  collisionMask: FullTileMask
@@ -93,11 +93,11 @@
  sprite: /Textures/Interface/Radial/RCD/grille.png
  mode: ConstructObject
  prototype: Grille
-  cost: 4
-  delay: 2
+  cost: 1
+  delay: 1
  collisionMask: FullTileMask
  rotation: Fixed
-  fx: EffectRCDConstruct2
+  fx: EffectRCDConstruct1

 # Windows
 - type: rcd
@@ -106,20 +106,49 @@
  sprite: /Textures/Interface/Radial/RCD/window.png
  mode: ConstructObject
  prototype: Window
-  cost: 3
-  delay: 2
+  cost: 2
+  delay: 1
  collisionMask: FullTileMask
  rules:
    - IsWindow
  rotation: Fixed
-  fx: EffectRCDConstruct2
-  
+  fx: EffectRCDConstruct1
+
 - type: rcd
  id: WindowDirectional
  category: WindowsAndGrilles
  sprite: /Textures/Interface/Radial/RCD/directional.png
  mode: ConstructObject
  prototype: WindowDirectional
+  cost: 1
+  delay: 1
+  collisionMask: FullTileMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct1
+
+- type: rcd
+  id: ReinforcedWindow
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/window_reinforced.png
+  mode: ConstructObject
+  prototype: ReinforcedWindow
+  cost: 4
+  delay: 2
+  collisionMask: FullTileMask
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct2
+
+- type: rcd
+  id: WindowReinforcedDirectional
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/directional_reinforced.png
+  mode: ConstructObject
+  prototype: WindowReinforcedDirectional
  cost: 2
  delay: 1
  collisionMask: FullTileMask
@@ -128,35 +157,6 @@
    - IsWindow
  rotation: User
  fx: EffectRCDConstruct1
-  
- type: rcd
-  id: ReinforcedWindow
-  category: WindowsAndGrilles
-  sprite: /Textures/Interface/Radial/RCD/window_reinforced.png
-  mode: ConstructObject
-  prototype: ReinforcedWindow
-  cost: 4
-  delay: 3
-  collisionMask: FullTileMask
-  rules:
-    - IsWindow
-  rotation: User
-  fx: EffectRCDConstruct3
-    
- type: rcd
-  id: WindowReinforcedDirectional
-  category: WindowsAndGrilles
-  sprite: /Textures/Interface/Radial/RCD/directional_reinforced.png
-  mode: ConstructObject
-  prototype: WindowReinforcedDirectional
-  cost: 3
-  delay: 2
-  collisionMask: FullTileMask
-  collisionBounds: "-0.23,-0.49,0.23,-0.36"
-  rules:
-    - IsWindow
-  rotation: User
-  fx: EffectRCDConstruct2

 # Airlocks
 - type: rcd
@@ -166,11 +166,11 @@
  mode: ConstructObject
  prototype: Airlock
  cost: 4
-  delay: 4
+  delay: 3
  collisionMask: FullTileMask
  rotation: Camera
-  fx: EffectRCDConstruct4
-  
+  fx: EffectRCDConstruct3
+
 - type: rcd
  id: AirlockGlass
  category: Airlocks
@@ -178,22 +178,22 @@
  mode: ConstructObject
  prototype: AirlockGlass
  cost: 4
-  delay: 4
+  delay: 3
  collisionMask: FullTileMask
  rotation: Camera
-  fx: EffectRCDConstruct4
-  
+  fx: EffectRCDConstruct3
+
 - type: rcd
  id: Firelock
  category: Airlocks
  sprite: /Textures/Interface/Radial/RCD/firelock.png
  mode: ConstructObject
  prototype: Firelock
-  cost: 4
-  delay: 3
+  cost: 2
+  delay: 2
  collisionMask: FullTileMask
  rotation: Camera
-  fx: EffectRCDConstruct3
+  fx: EffectRCDConstruct2

 # Lighting
 - type: rcd
@@ -202,25 +202,25 @@
  sprite: /Textures/Interface/Radial/RCD/tube_light.png
  mode: ConstructObject
  prototype: Poweredlight
-  cost: 2
-  delay: 1
+  cost: 1
+  delay: 0
  collisionMask: TabletopMachineMask
  collisionBounds: "-0.23,-0.49,0.23,-0.36"
  rotation: User
-  fx: EffectRCDConstruct1
-  
+  fx: EffectRCDConstruct0
+
 - type: rcd
  id: BulbLight
  category: Lighting
  sprite: /Textures/Interface/Radial/RCD/bulb_light.png
  mode: ConstructObject
  prototype: PoweredSmallLight
-  cost: 2
-  delay: 1
+  cost: 1
+  delay: 0
  collisionMask: TabletopMachineMask
  collisionBounds: "-0.23,-0.49,0.23,-0.36"
  rotation: User
-  fx: EffectRCDConstruct1
+  fx: EffectRCDConstruct0

 # Electrical
 - type: rcd
@@ -236,7 +236,7 @@
  - MustBuildOnSubfloor
  rotation: Fixed
  fx: EffectRCDConstruct0
-    
+
 - type: rcd
  id: MVCable
  category: Electrical
@@ -250,7 +250,7 @@
  - MustBuildOnSubfloor
  rotation: Fixed
  fx: EffectRCDConstruct0
-    
+
 - type: rcd
  id: HVCable
  category: Electrical
@@ -264,7 +264,7 @@
  - MustBuildOnSubfloor
  rotation: Fixed
  fx: EffectRCDConstruct0
-    
+
 - type: rcd
  id: CableTerminal
  category: Electrical
@@ -277,4 +277,29 @@
  rules:
  - MustBuildOnSubfloor
  rotation: User
-  fx: EffectRCDConstruct0
+  fx: EffectRCDConstruct0
+
+- type: rcd # WD
+  id: APC
+  category: Electrical
+  sprite: /Textures/Structures/Power/apc.rsi/static.png
+  mode: ConstructObject
+  prototype: APCConstructed
+  cost: 4
+  delay: 1
+  collisionMask: None
+  rotation: User
+  fx: EffectRCDConstruct1
+
+- type: rcd # WD
+  id: Camera
+  category: Electrical
+  sprite: /Textures/Structures/Wallmounts/camera.rsi/cameracase.png
+  mode: ConstructObject
+  prototype: SurveillanceCameraConstructed
+  cost: 1
+  delay: 1
+  collisionMask: TabletopMachineMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rotation: User
+  fx: EffectRCDConstruct1
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -54,6 +54,7 @@
  - AutolatheHyperConvectionMachineCircuitboard
  - ProtolatheHyperConvectionMachineCircuitboard
  - SheetifierMachineCircuitboard
+  - RCDRecipe # WD

 - type: technology
  id: PowerGeneration
@@ -85,6 +86,7 @@
  recipeUnlocks:
  - ThermomachineFreezerMachineCircuitBoard
  - GasRecyclerMachineCircuitboard
+  - RapidPipeDispenserRecipe # WD

 - type: technology
  id: RipleyAPLU
--- a/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml
+++ b/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml
@@ -1,51 +1,43 @@
 - type: moodEffect
  id: Handcuffed
-  desc: "Кажется мои выходки кто-то заметил."
+  description: "Кажется мои выходки кто-то заметил."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false

 - type: moodEffect
  id: Suffocating
-  desc: "НЕ.. МОГУ... ДЫШАТЬ..."
+  description: "НЕ.. МОГУ... ДЫШАТЬ..."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false
  timeout: 1

 - type: moodEffect
  id: OnFire
-  desc: "ГОРЮ!!!"
+  description: "ГОРЮ!!!"
  moodChange: enum.MoodChangeLevel.Big
-  positiveEffect: false

 - type: moodEffect
  id: Creampied
-  desc: "Меня окремили. На вкус как пирог."
+  description: "Меня окремили. На вкус как пирог."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  timeout: 3

 - type: moodEffect
  id: MobSlipped
-  desc: "Опять поскальзываюсь. Надо быть аккуратней."
+  description: "Опять поскальзываюсь. Надо быть аккуратней."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  timeout: 3

 - type: moodEffect
  id: MobVomit
-  desc: "Меня только что вырвало. Мерзость."
+  description: "Меня только что вырвало. Мерзость."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  timeout: 8

 - type: moodEffect
  id: MobLowPressure
-  desc: "Меня сейчас разорвёт наружу!"
+  description: "Меня сейчас разорвёт наружу!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false

 - type: moodEffect
  id: MobHighPressure
-  desc: "На меня оказывается огромное давление!"
+  description: "На меня оказывается огромное давление!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false
--- a/Resources/Prototypes/_White/Mood/generic_positveEffects.yml
+++ b/Resources/Prototypes/_White/Mood/generic_positveEffects.yml
@@ -1,66 +1,66 @@
 - type: moodEffect
  id: BeingHugged
-  desc: "Обнимашки - круто."
+  description: "Обнимашки - круто."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: true
+  positive: true
  timeout: 2

 - type: moodEffect
  id: BeingPet
-  desc: "Меня погладили!"
+  description: "Меня погладили!"
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: true
+  positive: true
  timeout: 2

 - type: moodEffect
  id: ArcadePlay
-  desc: "Я весело поиграл в интересную аркаду."
+  description: "Я весело поиграл в интересную аркаду."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: true
+  positive: true
  timeout: 8

 - type: moodEffect
  id: GotBlessed
-  desc: "Меня благословили."
+  description: "Меня благословили."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: true
+  positive: true
  timeout: 8

 - type: moodEffect
  id: PetAnimal
-  desc: "Животные такие милые! Не могу перестать их гладить!"
+  description: "Животные такие милые! Не могу перестать их гладить!"
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: true
+  positive: true
  timeout: 5

 - type: moodEffect
  id: SavedLife
-  desc: "Так приятно спасать чью-то жизнь."
+  description: "Так приятно спасать чью-то жизнь."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
+  positive: true
  timeout: 8

 - type: moodEffect
  id: TraitorFocused #Used for traitors to boost their goals completion.
-  desc: "У меня есть цель, и я добьюсь её, во что бы то ни стало!"
+  description: "У меня есть цель, и я добьюсь её, во что бы то ни стало!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
+  positive: true

 - type: moodEffect
  id: RevolutionFocused #Used for revolution
-  desc: "СЛАВА РЕВОЛЮЦИИ!!!"
+  description: "СЛАВА РЕВОЛЮЦИИ!!!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
+  positive: true

 - type: moodEffect
  id: CultFocused
-  desc: "Знаю правду, славим великого!"
+  description: "Знаю правду, славим великого!"
  moodChange: enum.MoodChangeLevel.Big
-  positiveEffect: true
+  positive: true

 - type: moodEffect
  id: Stimulator
-  desc: "Я ЧУВСТВУЮ ЭТО, В МОЕЙ КРОВИ НАХОДИТСЯ ЧТО-ТО НЕОБЫЧНОЕ!!"
+  description: "Я ЧУВСТВУЮ ЭТО, В МОЕЙ КРОВИ НАХОДИТСЯ ЧТО-ТО НЕОБЫЧНОЕ!!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
-  timeout: 2
+  positive: true
+  timeout: 2
--- a/Resources/Prototypes/_White/Mood/moodEffects_needs.yml
+++ b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml
@@ -1,87 +1,78 @@
 #Hunger
 - type: moodEffect
  id: HungerOverfed
-  desc: "Во мне столько жира..."
+  description: "Во мне столько жира..."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  category: "Hunger"

 - type: moodEffect
  id: HungerOkay
-  desc: "Мой желудок полон!"
+  description: "Мой желудок полон!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
+  positive: true
  category: "Hunger"

 - type: moodEffect
  id: HungerPeckish
-  desc: "Хочу есть."
+  description: "Хочу есть."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false
  category: "Hunger"

 - type: moodEffect
  id: HungerStarving
-  desc: "Голодаю!"
+  description: "Голодаю!"
  moodChange: enum.MoodChangeLevel.Big
-  positiveEffect: false
  category: "Hunger"

 #Thirst
 - type: moodEffect
  id: ThirstOverHydrated
-  desc: "СЛИШКОМ МНОГО ВОДЫ..."
+  description: "СЛИШКОМ МНОГО ВОДЫ..."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  category: "Thirst"

 - type: moodEffect
  id: ThirstOkay
-  desc: "Не хочу пить."
+  description: "Не хочу пить."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
+  positive: true
  category: "Thirst"

 - type: moodEffect
  id: ThirstThirsty
-  desc: "Хочу пить."
+  description: "Хочу пить."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false
  category: "Thirst"

 - type: moodEffect
  id: ThirstParched
-  desc: "ВОДЫ!"
+  description: "ВОДЫ!"
  moodChange: enum.MoodChangeLevel.Big
-  positiveEffect: false
  category: "Thirst"

 #Health
 - type: moodEffect
  id: HealthNoDamage
-  desc: "Чувствую себя лишённым боли."
+  description: "Чувствую себя лишённым боли."
  moodChange: enum.MoodChangeLevel.None
-  positiveEffect: true
+  positive: true
  hidden: true
  category: "Health"

 - type: moodEffect
  id: HealthLightDamage
-  desc: "Мои ссадины жгутся."
+  description: "Мои ссадины жгутся."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  category: "Health"

 - type: moodEffect
  id: HealthSevereDamage
-  desc: "Сильная боль пронзает меня."
+  description: "Сильная боль пронзает меня."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false
  category: "Health"

 - type: moodEffect
  id: HealthHeavyDamage
-  desc: "Агония гложет мою душу!"
+  description: "Агония гложет мою душу!"
  moodChange: enum.MoodChangeLevel.Large
-  positiveEffect: false
  category: "Health"
--- a/Resources/Prototypes/_White/RCD/categories.yml
+++ b/Resources/Prototypes/_White/RCD/categories.yml
@@ -0,0 +1,43 @@
+- type: rcdCategory
+  id: WallsAndFlooring
+  spritePath: /Textures/Interface/Radial/RCD/walls_and_flooring.png
+
+- type: rcdCategory
+  id: WindowsAndGrilles
+  spritePath: /Textures/Interface/Radial/RCD/windows_and_grilles.png
+
+- type: rcdCategory
+  id: Airlocks
+  spritePath: /Textures/Interface/Radial/RCD/airlocks.png
+
+- type: rcdCategory
+  id: Electrical
+  spritePath: /Textures/Interface/Radial/RCD/multicoil.png
+
+- type: rcdCategory
+  id: Lighting
+  spritePath: /Textures/Interface/Radial/RCD/lighting.png
+
+- type: rcdCategory
+  id: Pipes
+  spritePath:
+    sprite: /Textures/Structures/Piping/Atmospherics/pipe.rsi
+    state: pipeFourway
+
+- type: rcdCategory
+  id: GasDevices
+  spritePath:
+    sprite: /Textures/Structures/Piping/Atmospherics/vent.rsi
+    state: vent_off
+
+- type: rcdCategory
+  id: DisposalPipes
+  spritePath:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: conpipe-t
+
+- type: rcdCategory
+  id: DisposalUnits
+  spritePath:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: disposal
--- a/Resources/Prototypes/_White/RPD/rpd.yml
+++ b/Resources/Prototypes/_White/RPD/rpd.yml
@@ -0,0 +1,482 @@
+# Pipes
+
+- type: rcd
+  id: PipeStraight
+  category: Pipes
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pipe.rsi
+    state: pipeStraight
+  mode: ConstructObject
+  prototype: GasPipeStraight
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: PipeBend
+  category: Pipes
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pipe.rsi
+    state: pipeBend
+  mode: ConstructObject
+  prototype: GasPipeBend
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: PipeTJunction
+  category: Pipes
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pipe.rsi
+    state: pipeTJunction
+  mode: ConstructObject
+  prototype: GasPipeTJunction
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: PipeFourway
+  category: Pipes
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pipe.rsi
+    state: pipeFourway
+  mode: ConstructObject
+  prototype: GasPipeFourway
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+# Gas devices
+
+- type: rcd
+  id: GasCanisterPort
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/gascanisterport.rsi
+    state: gasCanisterPort
+  mode: ConstructObject
+  prototype: GasPort
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasFilter
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/gasfilter.rsi
+    state: gasFilter
+  mode: ConstructObject
+  prototype: GasFilter
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasMixer
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/gasmixer.rsi
+    state: gasMixer
+  mode: ConstructObject
+  prototype: GasMixer
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasOutletInjector
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/outletinjector.rsi
+    state: injector
+  mode: ConstructObject
+  prototype: GasOutletInjector
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasPressurePump
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pump.rsi
+    state: pumpPressure
+  mode: ConstructObject
+  prototype: GasPressurePump
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasVolumePump
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pump.rsi
+    state: pumpVolume
+  mode: ConstructObject
+  prototype: GasVolumePump
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasValve
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pump.rsi
+    state: pumpManualValve
+  mode: ConstructObject
+  prototype: GasValve
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: SignalControlledValve
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pump.rsi
+    state: pumpDigitalValve
+  mode: ConstructObject
+  prototype: SignalControlledValve
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: PressureControlledValve
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pneumaticvalve.rsi
+    state: off
+  mode: ConstructObject
+  prototype: PressureControlledValve
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasVentScrubber
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/scrubber.rsi
+    state: scrub_off
+  mode: ConstructObject
+  prototype: GasVentScrubber
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasVentPump
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/vent.rsi
+    state: vent_off
+  mode: ConstructObject
+  prototype: GasVentPump
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasPassiveVent
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/vent.rsi
+    state: vent_off
+  mode: ConstructObject
+  prototype: GasPassiveVent
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+# Disposal pipes
+
+- type: rcd
+  id: DisposalPipe
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-s
+  mode: ConstructObject
+  prototype: DisposalPipe
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalBend
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-c
+  mode: ConstructObject
+  prototype: DisposalBend
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalJunction
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-j1
+  mode: ConstructObject
+  prototype: DisposalJunction
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalJunctionFlipped
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-j1
+  mode: ConstructObject
+  prototype: DisposalJunctionFlipped
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalYJunction
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-y
+  mode: ConstructObject
+  prototype: DisposalYJunction
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalRouter
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-j1s
+  mode: ConstructObject
+  prototype: DisposalRouter
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalRouterFlipped
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-j2s
+  mode: ConstructObject
+  prototype: DisposalRouterFlipped
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalTagger
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-tagger
+  mode: ConstructObject
+  prototype: DisposalTagger
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalSignalRouter
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: signal-router
+  mode: ConstructObject
+  prototype: DisposalSignalRouter
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalSignalRouterFlipped
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: signal-router-flipped
+  mode: ConstructObject
+  prototype: DisposalSignalRouterFlipped
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalTrunk
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: conpipe-t
+  mode: ConstructObject
+  prototype: DisposalTrunk
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+# Disposal units
+
+- type: rcd
+  id: DisposalUnit
+  category: DisposalUnits
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: disposal
+  mode: ConstructObject
+  prototype: DisposalUnit
+  cost: 2
+  delay: 1
+  collisionMask: InteractImpassable
+  rotation: User
+  fx: EffectRCDConstruct1
+
+- type: rcd
+  id: MailingUnit
+  category: DisposalUnits
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: mailing
+  mode: ConstructObject
+  prototype: MailingUnit
+  cost: 2
+  delay: 1
+  collisionMask: InteractImpassable
+  rotation: User
+  fx: EffectRCDConstruct1
+
+- type: rcd
+  id: ToiletEmpty
+  category: DisposalUnits
+  sprite:
+    sprite: /Textures/Structures/Furniture/toilet.rsi
+    state: condisposal
+  mode: ConstructObject
+  prototype: ToiletEmpty
+  cost: 2
+  delay: 1
+  collisionMask: InteractImpassable
+  rotation: User
+  fx: EffectRCDConstruct1
+
--- a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml
+++ b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml
@@ -166,4 +166,20 @@
  result: ShinanoGrenadeBeanbag
  completetime: 3
  materials:
-     Steel: 800
+     Steel: 800
+
+- type: latheRecipe
+  id: RapidPipeDispenserRecipe
+  result: RapidPipeDispenser
+  completetime: 1
+  materials:
+    Steel: 300
+    Glass: 300
+
+- type: latheRecipe
+  id: RCDRecipe
+  result: RCD
+  completetime: 1
+  materials:
+    Steel: 300
+    Glass: 300
--- a/Resources/Textures/White/Items/Tools/rpd.rsi/equipped-BELT.png
+++ b/Resources/Textures/White/Items/Tools/rpd.rsi/equipped-BELT.png
--- a/Resources/Textures/White/Items/Tools/rpd.rsi/icon.png
+++ b/Resources/Textures/White/Items/Tools/rpd.rsi/icon.png
--- a/Resources/Textures/White/Items/Tools/rpd.rsi/inhand-left.png
+++ b/Resources/Textures/White/Items/Tools/rpd.rsi/inhand-left.png
--- a/Resources/Textures/White/Items/Tools/rpd.rsi/inhand-right.png
+++ b/Resources/Textures/White/Items/Tools/rpd.rsi/inhand-right.png
--- a/Resources/Textures/White/Items/Tools/rpd.rsi/meta.json
+++ b/Resources/Textures/White/Items/Tools/rpd.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/ce025775f73b66934ca96f3a8edc30993ea70b4d and modified by Swept",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
--- a/Resources/Textures/_Sunrise/Entities/Objects/Devices/portable_camera_viewer.rsi/icon.png
+++ b/Resources/Textures/_Sunrise/Entities/Objects/Devices/portable_camera_viewer.rsi/icon.png
--- a/Resources/Textures/_Sunrise/Entities/Objects/Devices/portable_camera_viewer.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Entities/Objects/Devices/portable_camera_viewer.rsi/meta.json
@@ -1,14 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "",
-    "states": [
-        {
-            "name": "icon"
-        }
-    ]
-}