Skip to content

Commit

Permalink
Merge pull request #9 from Xelasto/master
Browse files Browse the repository at this point in the history
Миниатюрный огнетушитель
  • Loading branch information
PyotrIgn committed Oct 5, 2023
2 parents 2551e62 + 46d58aa commit ff91593
Show file tree
Hide file tree
Showing 11 changed files with 92 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-MiniFireExtinguisher = миниатюрный огнетушитель
.desc = Идентичен обычному огнетушителю, но имеет меньшие размеры и меньшую емкость.
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Items/belt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
components:
- type: StorageFill
contents:
- id: MiniFireExtinguisher
- id: Crowbar
- id: Wrench
- id: Screwdriver
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
components:
- type: StorageFill
contents:
- id: MiniFireExtinguisher
- id: CrowbarRed
- id: ClothingMaskBreath
amount: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# TODO: Fill this out more.
whitelist:
tags:
- MiniFireExtinguisher
- Powerdrill
- Wirecutter
- Crowbar
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}

0 comments on commit ff91593

Please sign in to comment.