Skip to content

Commit

Permalink
Emergency Toolbox Rework (Grimbly-Station#83)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

1. Changes the contents of emergency toolboxes, will now contain:

Radio, Mini Welder, Mini Fire-Extinguisher, Light Source, Oxygen

2. Adds Mini Fire-Extinguisher as an item

3. Adds Mini Fire-Extinguisher to Atmos Lockers

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

n/a

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

n/a

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: zelezniciar
- add: Adds mini fire extinguisher
- tweak: Tweaks contents of emergency toolbox
  • Loading branch information
SsalamethVersaach authored Sep 24, 2024
2 parents 3d6dfea + da7f32a commit 0f03345
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 13 deletions.
31 changes: 18 additions & 13 deletions Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,29 @@
- type: StorageFill
contents:
- id: CrowbarRed
- id: RadioHandheld
- id: WelderMini
- id: FireExtinguisherMini
# Random lighting item orGroup
- id: FlashlightLantern
orGroup: LightingItem
- id: Flare
orGroup: LightingItem
- id: GlowstickBase
orGroup: LightingItem
# Grimbly - Oxygen
- id: ClothingMaskBreath
- id: ClothingMaskBreath
prob: 0.5
- id: EmergencyOxygenTankFilled
- id: EmergencyOxygenTankFilled
prob: 0.5
- id: FoodTinMRE
- id: FoodTinMRE
prob: 0.5
- id: DrinkWaterBottleFull
- id: DrinkWaterBottleFull
prob: 0.5
- id: FlashlightLantern
- id: FlashlightLantern
prob: 0.5
- id: HarmonicaInstrument
# Low-chance items
- id: FoodSnackChocolate
prob: 0.15

- id: HarmonicaInstrument
prob: 0.10
- id: FoodTinMRE
prob: 0.20

- type: entity
id: ToolboxElectricalFilled
name: electrical toolbox
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
- id: ClothingOuterSuitAtmosFire
- id: ClothingHeadHelmetAtmosFire
- id: GasAnalyzer
- id: FireExtinguisherMini
- id: MedkitOxygenFilled
- id: HolofanProjector
- id: DoorRemoteFirefight
Expand All @@ -104,6 +105,7 @@
- id: ClothingOuterSuitAtmosFire
- id: ClothingHeadHelmetAtmosFire
- id: GasAnalyzer
- id: FireExtinguisherMini
- id: MedkitOxygenFilled
- id: HolofanProjector
- id: DoorRemoteFirefight
Expand Down
33 changes: 33 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,36 @@
- type: VaporVisuals
animationTime: 0.8
animationState: extinguish

- type: entity
name: pocket fire extinguisher
parent: FireExtinguisher
id: FireExtinguisherMini
description: A light and compact fibreglass-framed model fire extinguisher. It holds less water then its bigger brother.
components:
- type: Sprite
sprite: Objects/Misc/fire_extinguisher_mini.rsi
layers:
- state: fire_extinguisher_closed
map: [ "enabled" ]
- type: Item
sprite: Objects/Misc/fire_extinguisher_mini.rsi
size: Small
- type: SolutionContainerManager
solutions:
spray:
maxVol: 30
reagents:
- ReagentId: Water
Quantity: 30
- type: MeleeWeapon
wideAnimationRotation: 180
damage:
types:
Blunt: 3 #completely ineffective; your fists are better
soundHit:
path: /Audio/Effects/weak_hit1.ogg
- type: PhysicalComposition
materialComposition:
Steel: 50
Glass: 40
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": "CC-BY-SA-3.0",
"copyright": "Taken from vgstation13 at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. Edited by Flareguy for SS14",
"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 0f03345

Please sign in to comment.