From 5817b84c580b0474536c5cc49b152fcf65e01c07 Mon Sep 17 00:00:00 2001 From: Hero010h <163765999+Hero010h@users.noreply.github.com> Date: Wed, 25 Dec 2024 23:11:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=AF=D1=89=D0=B8=D0=BA=D0=B8=20=D0=B3=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Belt/clothingBeltUtilityImproved.ftl | 2 + .../Belt/clothingBeltUtilityImproved.yml | 13 ++ .../Specific/Medical/expanded_medkit.yml | 14 ++ .../Structures/Storage/CleanersLocker.yml | 12 ++ .../Structures/Storage/SenorsLockers.yml | 154 ++++++++++++++++-- 5 files changed, 177 insertions(+), 18 deletions(-) create mode 100644 Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl create mode 100644 Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml create mode 100644 Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml 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/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml new file mode 100644 index 0000000000..b4bcd14018 --- /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: NetworkConfigurator 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..3c0d2d62ec 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml @@ -6,3 +6,17 @@ - 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/Structures/Storage/CleanersLocker.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml new file mode 100644 index 0000000000..5ebdb62092 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml @@ -0,0 +1,12 @@ +- type: entity + id: LockerHeadCleaner + parent: BaseSenorsLocker + name: head cleaner's locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: head_cleaner_locker + stateDoorOpen: head_cleaner_open + stateDoorClosed: head_cleaner_door + - type: AccessReader + access: [ [ "Janitor" ] ] \ 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 index 9043a7f0ed..c3e3562945 100644 --- a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml +++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml @@ -3,6 +3,7 @@ parent: LockerBaseSecure abstract: true name: base senors locker + description: Стандартное хранилище НаноТрайзен. components: - type: Sprite sprite: White/Structures/Storage/senor_lockers.rsi @@ -11,7 +12,7 @@ - type: entity id: LockerVeteran parent: BaseSenorsLocker - name: veteran's locker + name: шкаф ветерана components: - type: Appearance - type: EntityStorageVisuals @@ -19,12 +20,40 @@ stateDoorOpen: vet_open stateDoorClosed: vet_door - type: AccessReader - access: [ [ "ChiefEngineer" ] ] + 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 - type: entity id: LockerBrigadier parent: BaseSenorsLocker - name: brigadier's locker + name: шкаф бригадира components: - type: Appearance - type: EntityStorageVisuals @@ -32,12 +61,41 @@ stateDoorOpen: brigadier_open stateDoorClosed: brigadier_door - type: AccessReader - access: [ [ "ChiefEngineer" ] ] + 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: BaseSenorsLocker - name: medical officer's locker + name: шкаф медицинского офицера components: - type: Appearance - type: EntityStorageVisuals @@ -47,10 +105,45 @@ - 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: BaseSenorsLocker - name: cargo hunter's locker + name: шкаф охотника карго components: - type: Appearance - type: EntityStorageVisuals @@ -58,12 +151,34 @@ stateDoorOpen: cargo_hunt_open stateDoorClosed: cargo_hunt_door - type: AccessReader - access: [ [ "ChiefEngineer" ] ] + access: [ [ "Salvage" ] ] + +- type: entity + id: LockerCargoHunterFilled + parent: LockerCargoHunter + 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: BaseSenorsLocker - name: lead researcher's locker + name: шкаф ведущего исследователя components: - type: Appearance - type: EntityStorageVisuals @@ -74,14 +189,17 @@ access: [ [ "Research" ] ] - type: entity - id: LockerHeadCleaner - parent: BaseSenorsLocker - name: head cleaner's locker + id: LockerLeadResearcherFilled + parent: LockerLeadResearcher components: - - type: Appearance - - type: EntityStorageVisuals - stateBaseClosed: head_cleaner_locker - stateDoorOpen: head_cleaner_open - stateDoorClosed: head_cleaner_door - - type: AccessReader - access: [ [ "ChiefEngineer" ] ] \ No newline at end of file + - type: StorageFill + contents: + - id: ClothingHandsGlovesLatex + - id: ClothingHeadsetScience + - id: ClothingMaskSterile + - id: ClothingOuterCoatRnd + - id: AnomalyScanner + - id: NodeScanner + - id: NetworkConfigurator + prob: 0.5 + - id: ClothingShoesBootsMagSci \ No newline at end of file