Seniors' Lockers (#849)

Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl

@@ -0,0 +1,2 @@
+ent-ClothingBeltUtilityImproved = {ent-ClothingBeltUtility}
+    .desc = {ent-ClothingBeltUtility.desc}

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -129,9 +129,10 @@
     state: icon
   - type: Item
     sprite: Objects/Tools/wrench.rsi
-    storedSprite:
+    storedRotation: -44 # WD
-      sprite: Objects/Tools/wrench.rsi
+    # storedSprite: # WD removed
-      state: storage
+    #   sprite: Objects/Tools/wrench.rsi
+    #   state: storage
   - type: MeleeWeapon
     wideAnimationRotation: 135
     attackRate: 1.5
@@ -177,9 +178,10 @@
   - type: Item
     sprite: Objects/Tools/crowbar.rsi
     size: Small
-    storedSprite:
+    storedRotation: -63 # WD
-      sprite: Objects/Tools/crowbar.rsi
+    # storedSprite: # WD removed
-      state: storage
+    #   sprite: Objects/Tools/crowbar.rsi
+    #   state: storage
   - type: MeleeWeapon
     wideAnimationRotation: -135
     damage:
@@ -213,9 +215,9 @@
     state: red-icon
   - type: Item
     heldPrefix: red
-    storedSprite:
+    # storedSprite: # WD removed
-      sprite: Objects/Tools/crowbar.rsi
+    #   sprite: Objects/Tools/crowbar.rsi
-      state: red-storage
+    #   state: red-storage
 
 - type: entity
   name: multitool

Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml

@@ -0,0 +1,13 @@
+- type: entity
+  id: ClothingBeltUtilityImproved
+  parent: ClothingBeltUtility
+  suffix: Brigadier
+  components:
+  - type: StorageFill
+    contents:
+      - id: ImprovedCrowbar
+      - id: ImprovedWrench
+      - id: ImprovedScrewdriver
+      - id: ImprovedWirecutter
+      - id: ImprovedWelder
+      - id: Multitool

Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml

@@ -1,8 +1,22 @@
 - type: entity
   parent: Medkit
   id: ExpandedMedkit
-  name: expanded medkit
+  name: расширенная аптечка
   components:
     - type: Sprite
       sprite: White/Specific/expmedkit.rsi
       state: icon
+
+- type: entity
+  id: ExpandedMedkitFilled
+  parent: ExpandedMedkit
+  suffix: Filled
+  components:
+    - type: StorageFill
+      contents:
+        - id: MedicatedSuture
+          amount: 2
+        - id: RegenerativeMesh
+          amount: 2
+        - id: PillCanisterDylovene
+        - id: PillCanisterKelotane

Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml

@@ -16,6 +16,9 @@
       sprite: White/Objects/Tools/impcrowbar.rsi
     - type: Item
       sprite: White/Objects/Tools/impcrowbar.rsi
+      size: Small
+      storedSprite: null
+      storedRotation: -63
 
 - type: entity
   parent: Wrench
@@ -30,6 +33,9 @@
       sprite: White/Objects/Tools/impwrench.rsi
     - type: Item
       sprite: White/Objects/Tools/impwrench.rsi
+      size: Small
+      storedSprite: null
+      storedRotation: -44
     - type: MeleeWeapon
       attackRate: 1.5
       damage:
@@ -55,6 +61,7 @@
       state: icon
     - type: Item
       sprite: White/Objects/Tools/impscrewdriver.rsi
+      storedRotation: -90
     - type: UseDelay
     - type: MeleeWeapon
       attackRate: 1
@@ -72,6 +79,12 @@
     - type: PhysicalComposition
       materialComposition:
         Steel: 100
+    - type: EmitSoundOnPickup
+      sound:
+        path: /Audio/White/Items/handling/screwdriver_pickup.ogg
+    - type: EmitSoundOnDrop
+      sound:
+        path: /Audio/Items/screwdriver_drop.ogg
 
 - type: entity
   parent: BaseItem
@@ -83,6 +96,7 @@
       price: 500
     - type: Item
       sprite: White/Objects/Tools/impwirecutter.rsi
+      storedRotation: -90
     - type: Sprite
       sprite: White/Objects/Tools/impwirecutter.rsi
       state: icon
@@ -110,6 +124,12 @@
     - type: PhysicalComposition
       materialComposition:
         Steel: 100
+    - type: EmitSoundOnPickup
+      sound:
+        path: /Audio/White/Items/handling/wirecutter_pickup.ogg
+    - type: EmitSoundOnDrop
+      sound:
+        path: /Audio/Items/wirecutter_drop.ogg
 
 - type: entity
   parent: BaseWelder

Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml

@@ -0,0 +1,37 @@
+- type: entity
+  id: LockerCleaner
+  parent: BaseSeniorsLocker
+  name: шкаф уборщика
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: head_cleaner_locker
+    stateDoorOpen: head_cleaner_open
+    stateDoorClosed: head_cleaner_door
+  - type: AccessReader
+    access: [ [ "Janitor" ] ]
+    
+- type: entity
+  id: LockerCleanerFilled
+  parent: LockerCleaner
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: MopItem
+        amount: 2
+      - id: BoxMousetrap
+        amount: 2
+      - id: WetFloorSign
+        amount: 3
+      - id: TrashBag
+        amount: 2
+      - id: LightReplacer
+      - id: BoxLightMixed
+      - id: Holoprojector
+      - id: SoapNT
+        amount: 2
+      - id: FlashlightLantern
+        amount: 2
+      - id: Plunger
+        amount: 2

Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml

@@ -0,0 +1,207 @@
+- type: entity
+  id: BaseSeniorsLocker
+  parent: LockerBaseSecure
+  abstract: true
+  name: base senors locker
+  description: Стандартное хранилище НаноТрайзен.
+  components:
+  - type: Sprite
+    sprite: White/Structures/Storage/senor_lockers.rsi
+    noRot: true
+
+- type: entity
+  id: LockerVeteran
+  parent: BaseSeniorsLocker
+  name: шкаф ветерана
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: vet_locker
+    stateDoorOpen: vet_open
+    stateDoorClosed: vet_door
+  - type: AccessReader
+    access: [ [ "Security" ] ]
+
+- type: entity
+  id: LockerVeteranFilled
+  parent: LockerVeteran
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: FlashlightSeclite
+      - id: ClothingUniformJumpsuitSecGrey
+        prob: 0.3
+      - id: ClothingHeadHelmetBasic
+      - id: ClothingOuterArmorBasic
+      - id: ClothingBeltSeniorSecurityFilled
+      - id: Flash
+        prob: 0.5
+      - id: ClothingEyesGlassesSecurity
+      - id: ClothingHeadsetAltSecurity
+      - id: ClothingHandsGlovesColorBlack
+      - id: ClothingShoesBootsJack
+      - id: WeaponMeleeNeedle
+        prob: 0.1
+      - id: WeaponDisabler
+      - id: HoloprojectorSecurity
+        prob: 0.6
+      - id: WeaponPistolMk58Nonlethal
+      - id: SurveillanceBodyCamera
+      - id: MagazinePistol
+      - id: ClothingHeadHatBeretSecurity
+
+- type: entity
+  id: LockerBrigadier
+  parent: BaseSeniorsLocker
+  name: шкаф бригадира
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: brigadier_locker
+    stateDoorOpen: brigadier_open
+    stateDoorClosed: brigadier_door
+  - type: AccessReader
+    access: [ [ "Engineering" ] ]
+
+- type: entity
+  id: LockerBrigadierFilled
+  parent: LockerBrigadier
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHandsGlovesColorYellow
+      - id: ClothingMaskGas
+      - id: ClothingShoesBootsMag
+      - id: ClothingBeltUtilityImproved
+      - id: ClothingEyesGlassesMeson
+      - id: ClothingHeadHatBeretEngineering
+
+- type: entity
+  id: LockerBrigadierFilledHurdsuit
+  parent: LockerBrigadier
+  suffix: Filled, Hardsuit
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitEngineering
+      - id: ClothingHandsGlovesColorYellow
+      - id: ClothingMaskGas
+      - id: ClothingShoesBootsMag
+      - id: ClothingBeltUtilityImproved
+      - id: ClothingEyesGlassesMeson
+      - id: ClothingHeadHatBeretEngineering
+
+- type: entity
+  id: LockerMedicalOfficer
+  parent: BaseSeniorsLocker
+  name: шкаф медицинского офицера
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: mofficer_locker
+    stateDoorOpen: mofficer_open
+    stateDoorClosed: mofficer_door
+  - type: AccessReader
+    access: [ [ "Medical" ] ]
+
+- type: entity
+  id: LockerMedicalOfficerFilled
+  parent: LockerMedicalOfficer
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: HandheldHealthAnalyzer
+      - id: ClothingHandsGlovesLatex
+      - id: ClothingHeadsetMedical
+      - id: ClothingEyesHudMedical
+      - id: ClothingBeltMedical
+      - id: ClothingHeadHatSurgcapGreen
+        prob: 0.1
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapPurple
+        prob: 0.05
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapBlue
+        prob: 0.90
+        orGroup: Surgcaps
+      - id: ClothingUniformJumpsuitMedicalDoctor
+      - id: ClothingUniformJumpskirtMedicalDoctor
+      - id: UniformScrubsColorBlue
+        prob: 0.5
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorGreen
+        prob: 0.1
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorPurple
+        prob: 0.05
+        orGroup: Surgshrubs
+      - id: ClothingMaskSterile
+      - id: ExpandedMedkitFilled
+
+- type: entity
+  id: LockerCargoHunter
+  parent: BaseSeniorsLocker
+  name: шкаф охотника карго
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: cargo_hunt_locker
+    stateDoorOpen: cargo_hunt_open
+    stateDoorClosed: cargo_hunt_door
+  - type: AccessReader
+    access: [ [ "Salvage" ] ]
+
+- type: entity
+  id: LockerCargoHunterFilled
+  parent: LockerCargoHunter
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingBeltUtilityFilled
+      - id: SurvivalKnife
+      - id: HandheldGPSBasic
+      - id: RadioHandheld
+      - id: SeismicCharge
+        amount: 2
+      - id: OreBag
+        prob: 0.5
+      - id: Flare
+        prob: 0.3
+      - id: Flare
+        prob: 0.3
+      - id: Flare
+        prob: 0.3
+      - id: ClothingOuterHardsuitImprovedSpatio
+
+- type: entity
+  id: LockerLeadResearcher
+  parent: BaseSeniorsLocker
+  name: шкаф ведущего исследователя
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: lead_res_locker
+    stateDoorOpen: lead_res_open
+    stateDoorClosed: lead_res_door
+  - type: AccessReader
+    access: [ [ "Research" ] ]
+
+- type: entity
+  id: LockerLeadResearcherFilled
+  parent: LockerLeadResearcher
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: AnomalyLocator
+      - id: ClothingHandsGlovesLatex
+      - id: ClothingHeadsetScience
+      - id: ClothingMaskSterile
+      - id: ClothingOuterCoatRnd
+      - id: AnomalyScanner
+      - id: NodeScanner
+      - id: NetworkConfigurator

Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json

@@ -0,0 +1,80 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "copyright": "Danza",
+  "license": "CC-BY-SA-3.0",
+  "states": [
+    {
+      "name": "generic"
+    },
+    {
+      "name": "generic_door"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "vet_locker"
+    },
+    {
+      "name": "vet_door"
+    },
+    {
+      "name": "vet_open"
+    },
+    {
+      "name": "brigadier_locker"
+    },
+    {
+      "name": "brigadier_door"
+    },
+    {
+      "name": "brigadier_open"
+    },
+    {
+      "name": "mofficer_locker"
+    },
+    {
+      "name": "mofficer_door"
+    },
+    {
+      "name": "mofficer_open"
+    },
+    {
+      "name": "lead_res_locker"
+    },
+    {
+      "name": "lead_res_door"
+    },
+    {
+      "name": "lead_res_open"
+    },
+    {
+      "name": "cargo_hunt_locker"
+    },
+    {
+      "name": "cargo_hunt_door"
+    },
+    {
+      "name": "cargo_hunt_open"
+    },
+    {
+      "name": "head_cleaner_locker"
+    },
+    {
+      "name": "head_cleaner_door"
+    },
+    {
+      "name": "head_cleaner_open"
+    }
+  ]
+}