diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index a4004ec0f61..24402b74036 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -248,3 +248,8 @@ Entries: - {message: Замена скафандра парамедика улучшенной версией со встроенным шлемом и фонариком. Автор спрайтов - Празат (@prazat911)., type: Add} id: 55576 #костыль отображения в Обновлениях time: '2023-10-05T04:19:00.0000000+00:00' +- author: Xelasto + changes: + - {message: Добавлен миниатюрный огнетушитель., type: Add} + id: 55577 #костыль отображения в Обновлениях + time: '2023-10-05T04:19:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ADT/Objects/Misc/mini_fire_extinguisher.ftl b/Resources/Locale/ru-RU/ADT/Objects/Misc/mini_fire_extinguisher.ftl new file mode 100644 index 00000000000..8145232e1fd --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Misc/mini_fire_extinguisher.ftl @@ -0,0 +1,2 @@ +ent-MiniFireExtinguisher = миниатюрный огнетушитель + .desc = Идентичен обычному огнетушителю, но имеет меньшие размеры и меньшую емкость. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/mini_fire_extinguisher.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/mini_fire_extinguisher.yml new file mode 100644 index 00000000000..da8caefc87e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/mini_fire_extinguisher.yml @@ -0,0 +1,57 @@ +- type: entity + name: Miniature Fire Extinguisher + parent: BaseItem + id: MiniFireExtinguisher + description: It extinguishes fires. + components: + - type: Sprite + sprite: ADT/Objects/Misc/minifire_extinguisher.rsi + scale: 0.8, 0.8 + layers: + - state: fire_extinguisher_closed + map: [ "enabled" ] + - type: Item + sprite: ADT/Objects/Misc/minifire_extinguisher.rsi + size: 5 + - type: SolutionContainerManager + solutions: + spray: + maxVol: 50 + reagents: + - ReagentId: Water + Quantity: 50 + - type: RefillableSolution + solution: spray + - type: DrainableSolution + solution: spray + - type: SolutionTransfer + - type: ItemCooldown + - type: Spray + transferAmount: 10 + pushbackAmount: 60 + spraySound: + path: /Audio/Effects/extinguish.ogg + sprayedPrototype: ExtinguisherSpray + vaporAmount: 3 + vaporSpread: 90 + sprayVelocity: 2.0 + - type: FireExtinguisher + hasSafety: true + - type: MeleeWeapon + damage: + types: + Blunt: 2 + soundHit: + path: /Audio/Weapons/smash.ogg + - type: Appearance + - type: GenericVisualizer + visuals: + enum.FireExtinguisherVisuals.Safety: + enabled: + True: { state: fire_extinguisher_closed } + False: { state: fire_extinguisher_open } + - type: Tag + tags: + - MiniFireExtinguisher +- type: Tag + id: MiniFireExtinguisher diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 78fbabaf701..7240eccb44a 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -19,6 +19,7 @@ components: - type: StorageFill contents: + - id: MiniFireExtinguisher - id: Crowbar - id: Wrench - id: Screwdriver diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 0e8138cb8db..738fa04cbd1 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -6,6 +6,7 @@ components: - type: StorageFill contents: + - id: MiniFireExtinguisher - id: CrowbarRed - id: ClothingMaskBreath amount: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index fa1a5e951fa..6850c5e2066 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -15,6 +15,7 @@ # TODO: Fill this out more. whitelist: tags: + - MiniFireExtinguisher - Powerdrill - Wirecutter - Crowbar diff --git a/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/fire_extinguisher_closed.png b/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/fire_extinguisher_closed.png new file mode 100644 index 00000000000..5384f15e394 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/fire_extinguisher_closed.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/fire_extinguisher_open.png b/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/fire_extinguisher_open.png new file mode 100644 index 00000000000..6a6e538bd95 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/fire_extinguisher_open.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/inhand-left.png new file mode 100644 index 00000000000..d43a278014a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/inhand-right.png new file mode 100644 index 00000000000..7c35c6e729c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/meta.json new file mode 100644 index 00000000000..8aee544c07f --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/minifire_extinguisher.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "", + "copyright": "", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "fire_extinguisher_open" + }, + { + "name": "fire_extinguisher_closed" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +}