diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl new file mode 100644 index 0000000000..560fe1ca56 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl @@ -0,0 +1,2 @@ +ent-ClothingBeltUtilityImproved = {ent-ClothingBeltUtility} + .desc = {ent-ClothingBeltUtility.desc} \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 3a6f430fe3..d785d1190c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -129,9 +129,10 @@ state: icon - type: Item sprite: Objects/Tools/wrench.rsi - storedSprite: - sprite: Objects/Tools/wrench.rsi - state: storage + storedRotation: -44 # WD + # storedSprite: # WD removed + # 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: - sprite: Objects/Tools/crowbar.rsi - state: storage + storedRotation: -63 # WD + # storedSprite: # WD removed + # sprite: Objects/Tools/crowbar.rsi + # state: storage - type: MeleeWeapon wideAnimationRotation: -135 damage: @@ -213,9 +215,9 @@ state: red-icon - type: Item heldPrefix: red - storedSprite: - sprite: Objects/Tools/crowbar.rsi - state: red-storage + # storedSprite: # WD removed + # sprite: Objects/Tools/crowbar.rsi + # state: red-storage - type: entity name: multitool diff --git a/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml new file mode 100644 index 0000000000..66bc00f9a4 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml index 96c5e8c83b..574f7abbf9 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml index 40f6ee17f2..d4a505c9cd 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml +++ b/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 diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml new file mode 100644 index 0000000000..b84452ede9 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml new file mode 100644 index 0000000000..d35766275d --- /dev/null +++ b/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 diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_door.png new file mode 100644 index 0000000000..78a6b907ee Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_locker.png new file mode 100644 index 0000000000..81d4739edf Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_open.png new file mode 100644 index 0000000000..1a78a54a70 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_door.png new file mode 100644 index 0000000000..f2739242e0 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_locker.png new file mode 100644 index 0000000000..107d957794 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_open.png new file mode 100644 index 0000000000..7430d7dce2 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic.png new file mode 100644 index 0000000000..cd0c0ff2ea Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic_door.png new file mode 100644 index 0000000000..2649852777 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_door.png new file mode 100644 index 0000000000..e85906d18c Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_locker.png new file mode 100644 index 0000000000..49da088992 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_open.png new file mode 100644 index 0000000000..586a109186 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_door.png new file mode 100644 index 0000000000..8bbc2353af Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_locker.png new file mode 100644 index 0000000000..029a4ac5b6 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_open.png new file mode 100644 index 0000000000..bbcc1c2fc6 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/locked.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/locked.png new file mode 100644 index 0000000000..d90218d19e Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/locked.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json new file mode 100644 index 0000000000..ef5bcfe9de --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_door.png new file mode 100644 index 0000000000..db05124b4e Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_locker.png new file mode 100644 index 0000000000..322cbcd1c3 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_open.png new file mode 100644 index 0000000000..20afb09fda Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/unlocked.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/unlocked.png new file mode 100644 index 0000000000..418607bfaf Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/unlocked.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_door.png new file mode 100644 index 0000000000..653b9eecc6 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_locker.png new file mode 100644 index 0000000000..a1fac6067e Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_open.png new file mode 100644 index 0000000000..c62d5a07de Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/welded.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/welded.png new file mode 100644 index 0000000000..5ba5dcc896 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/welded.png differ