diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/pda.ftl index 537f00bf0e..41324fbd28 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/pda.ftl @@ -52,7 +52,7 @@ ent-NtrLeadGuardPDA = КПК командира ИСН .desc = { ent-BasePDA.desc } ent-MailCarrierPDA = КПК почтальона .desc = { ent-BasePDA.desc } -ent-MiningPDA = mining PDA +ent-MiningPDA = КПК шахтёра .desc = В каждой трещине грязь. ent-BlueShieldPDA = КПК офицера «Синий щит» .desc = { ent-BasePDA.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/storage/closets/lockers/lockers.ftl index 4eba1ca735..e42bc4ed22 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/storage/closets/lockers/lockers.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/storage/closets/lockers/lockers.ftl @@ -7,7 +7,7 @@ ent-LockerPilot = шкаф Пилота ent-GunSafeIonRifle = оружейный сейф с ионной пушкой .suffix = Ионная пушка .desc = { ent-GunSafe.desc } -ent-ClosetPatologoanatom = Шкаф патологоанатома +ent-ClosetPatologoanatom = шкафчик патологоанатома .desc = У каждого свои скелеты в шкафу... у него буквально. .suffix = Пусто ent-ClosetPatologoanatomFilled = { ent-ClosetPatologoanatom } @@ -18,3 +18,9 @@ ent-LockerBlueshield = шкаф офицера «Синий щит» ent-GunSafeRPGNanotrasen = оружейный сейф с РПГ-7 .suffix = РПГ .desc = { ent-GunSafe.desc } +ent-LockerMiningSpecialist = снаряжение специалиста по добыче руды + .desc = Налей во флягу мужественного дворфа да сумку для руды не забудь. Камни и сокровища! + .suffix = Пусто +ent-LockerMiningSpecialistFilled = { ent-LockerMiningSpecialist } + .desc = { ent-LockerMiningSpecialist.desc } + .suffix = Заполнен diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 4a17affcfe..d1ebd708e1 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -40,6 +40,7 @@ - Ntrep # Sunrise-edit - Barber # Sunrise-edit - Mail # Sunrise-edit + - Mining # Sunrise-edit - CargoPurchaseAccess # Sunrise-edit - ResearchConsoleAccess # Sunrise-edit diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml index 87643773db..2bb3f8a54b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml @@ -5,6 +5,7 @@ description: A robust bag for salvage specialists and miners alike to carry large amounts of ore. Magnetises any nearby ores when attached to a belt. components: - type: MagnetPickup + range: 3.75 # Sunrise-add - type: Sprite sprite: Objects/Specific/Mining/ore_bag.rsi state: icon diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/e_pickaxe.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/e_pickaxe.yml index eebe08f6b5..d6a02bfe92 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/e_pickaxe.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/e_pickaxe.yml @@ -1,6 +1,6 @@ - type: entity id: EnergyPickaxe - parent: EnergySword # Has a reflect chance + parent: [ BaseCargoContraband, EnergySword] # Has a reflect chance name: holopickaxe description: A holographic mining tool with blades comprised of hard light. Doesn't pack the same punch as an energy weapon, but more compact than most mining tools when turned off. components: @@ -9,6 +9,8 @@ activatedShape: - 0,0,2,0 - 1,1,1,2 + - type: MeleeWeapon + attackRate: 1.5 - type: ItemToggleMeleeWeapon activatedDamage: types: @@ -45,7 +47,7 @@ - state: inhand-right-blade shader: unshaded - type: Reflect - reflectProb: 0.05 + reflectProb: 0.1 - type: Tag tags: - Pickaxe diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 75ef2302c5..2c9d545fbb 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -120,3 +120,49 @@ - id: RubberStampPath - id: ClothingOuterHospitalGown amount: 2 + +- type: entity + id: LockerMiningSpecialist + parent: LockerBaseSecure + suffix: Empty + name: mining specialist's equipment + description: Nevermind the pickaxe. + components: + - type: Appearance + - type: Sprite + sprite: _Sunrise/Structures/Storage/closet.rsi + - type: EntityStorageVisuals + stateBaseClosed: mining + stateDoorOpen: mining_open + stateDoorClosed: mining_door + - type: AccessReader + access: [["Mining"]] + alertAccesses: + red: RedAlertAccesses + blue: BlueAlertAccessesHOS + gamma: GammaAlertAccesses + +- type: entity + id: LockerMiningSpecialistFilled + parent: LockerMiningSpecialist + suffix: Filled, Hardsuit + name: mining specialist's equipment + description: Nevermind the pickaxe. + components: + - type: StorageFill + contents: + - id: ClothingOuterHardsuitSalvage + - id: ToolboxMechanicalFilledAllTools + - id: ClothingMaskGasExplorer + - id: AirTankFilled + - id: RadioHandheld + - id: OreBag + - id: Nanopaste + - id: WeaponProtoKineticAccelerator + - id: HandHeldMassScanner + - id: PKAUpgradeRange + prob: 0.1 + - id: PKAUpgradeFireRate + prob: 0.1 + - id: PKAUpgradeDamage + prob: 0.1 diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Cargo/mining_specialist.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Cargo/mining_specialist.yml index 04e9961f6d..df10dc3fec 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Cargo/mining_specialist.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Cargo/mining_specialist.yml @@ -26,9 +26,10 @@ jumpsuit: ClothingUniformJumpsuitMiningSpecialist id: MiningPDA ears: ClothingHeadsetMining - storage: - back: - - EnergyPickaxe # Временно. + belt: OreBag + head: ClothingHeadHatHardhatYellowDark + pocket1: MineralScannerUnpowered + pocket2: EnergyPickaxe - type: chameleonOutfit id: MiningSpecialistChameleonOutfit diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/meta.json index 0652bf4cd0..b0904294fd 100644 --- a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/meta.json @@ -63,6 +63,15 @@ }, { "name": "pilot_open" + }, + { + "name": "mining_open" + }, + { + "name": "mining" + }, + { + "name": "mining_door" } ] } diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/mining.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/mining.png new file mode 100644 index 0000000000..af7c7bb87e Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/mining.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/mining_door.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/mining_door.png new file mode 100644 index 0000000000..92f907918c Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/mining_door.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/mining_open.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/mining_open.png new file mode 100644 index 0000000000..2c8f0b5a13 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/mining_open.png differ