diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml index 5d4ca1a7ee263..0f96b5d349444 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml @@ -153,3 +153,85 @@ reagents: - ReagentId: Water Quantity: 1 + +#DS14-Start +- type: entity + name: продвинутый огнетушитель + parent: BaseItem + id: FireExtinguisherPRO + description: Тушит огонь без необходимости в перезарядке. + components: + - type: Sprite + sprite: _DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi + layers: + - state: fire_extinguisher_closed + map: [ "enum.ToggleableVisuals.Layer" ] + - type: Item + sprite: _DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi + size: Normal + - type: SolutionContainerManager + solutions: + spray: + maxVol: 100 + reagents: + - ReagentId: Water + Quantity: 100 + - type: RefillableSolution + solution: spray + - type: DrainableSolution + solution: spray + - type: SolutionTransfer + maxTransferAmount: 100 + transferAmount: 100 + - type: UseDelay + - type: Spray + transferAmount: 10 + pushbackAmount: 60 + spraySound: + path: /Audio/Effects/extinguish.ogg + sprayedPrototype: ExtinguisherSpray + vaporAmount: 3 + vaporSpread: 90 + sprayVelocity: 2.0 + - type: ItemToggle + soundActivate: + path: /Audio/Machines/button.ogg + params: + variation: 0.125 + volume: -4 + soundDeactivate: + path: /Audio/Machines/button.ogg + params: + variation: 0.125 + volume: -4 + verbToggleOn: fire-extinguisher-component-verb-remove + verbToggleOff: fire-extinguisher-component-verb-engage + - type: SpraySafety + - type: MeleeWeapon + wideAnimationRotation: 180 + damage: + types: + Blunt: 10 + soundHit: + path: /Audio/Weapons/smash.ogg + - type: Tool + qualities: + - Rolling + speedModifier: 0.5 + - type: Appearance + - type: Tag + tags: + - FireExtinguisherPRO + - type: GenericVisualizer + visuals: + enum.ToggleableVisuals.Enabled: + enum.ToggleableVisuals.Layer: + True: { state: fire_extinguisher_open } + False: { state: fire_extinguisher_closed } + - type: SolutionRegeneration + solution: spray + generated: + reagents: + - ReagentId: Water + Quantity: 5 +#DS14-End \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml index 460f64ef3ebd7..c98103699bf72 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml @@ -52,6 +52,7 @@ - ClothingBackpackWaterTank - MegaSprayBottle - BagOfSummoningGarbage # DS14 + - FireExtinguisherPRO #DS14 - type: latheRecipePack id: Instruments diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index a5871373d87f4..2f9fac3a05ffa 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -180,6 +180,7 @@ recipeUnlocks: - WeaponSprayNozzle - ClothingBackpackWaterTank + - FireExtinguisherPRO #DS14 - type: technology id: BluespaceCargoTransport diff --git a/Resources/Prototypes/_DeadSpace/Recipes/Lathes/mics.yml b/Resources/Prototypes/_DeadSpace/Recipes/Lathes/mics.yml index a1e63d88356a9..871a275492f8d 100644 --- a/Resources/Prototypes/_DeadSpace/Recipes/Lathes/mics.yml +++ b/Resources/Prototypes/_DeadSpace/Recipes/Lathes/mics.yml @@ -16,3 +16,11 @@ Steel: 1500 Plastic: 1500 Gold: 2500 + +- type: latheRecipe + id: FireExtinguisherPRO + result: FireExtinguisherPRO + completetime: 2 + materials: + Steel: 1000 + Gold: 1500 diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 8c552951741e0..805f53d6c8d42 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -635,6 +635,9 @@ - type: Tag id: Fruit # SpecialDigestible: OrganReptilianStomach. CargoBounty: BountyFruit +- type: Tag + id: FireExtinguisherPRO + ## G ## - type: Tag diff --git a/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/fire_extinguisher_closed.png b/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/fire_extinguisher_closed.png new file mode 100644 index 0000000000000..5f590dd6cadac Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/fire_extinguisher_closed.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/fire_extinguisher_open.png b/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/fire_extinguisher_open.png new file mode 100644 index 0000000000000..215095ed933f1 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/fire_extinguisher_open.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/inhand-left.png b/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/inhand-left.png new file mode 100644 index 0000000000000..5237d0e15b698 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/inhand-right.png b/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/inhand-right.png new file mode 100644 index 0000000000000..80c8608fd5fa3 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/meta.json b/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/meta.json new file mode 100644 index 0000000000000..027535d82830c --- /dev/null +++ b/Resources/Textures/_DeadSpace/Objects/Misc/fire_extinguisherPRO.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f, edited for pro version by IvanKuvalda(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "fire_extinguisher_open" + }, + { + "name": "fire_extinguisher_closed" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +}