Skip to content

Commit

Permalink
Added Captain's Combat Gas Mask (#117)
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
-->

<!--
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]?
-->

Adds a gas mask variant for the captain intended for combat encounters.

---

<!--
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:
- add: Added the Captain's Combat Gas Mask, for those more fond of close
encounters.
- tweak: Added the Captain's Trenchcoat to the other captain locker
variants.
  • Loading branch information
sleepyyapril authored and angelofallars committed Jan 5, 2025
1 parent dcd258b commit 21a811a
Show file tree
Hide file tree
Showing 12 changed files with 65 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
components:
- type: StorageFill
contents:
- id: ClothingOuterCoatCapTrench # TheDen
- id: NukeDisk
- id: PinpointerNuclear
- id: CaptainIDCard
Expand Down Expand Up @@ -75,6 +76,7 @@
components:
- type: StorageFill
contents:
- id: ClothingOuterCoatCapTrench # TheDen
- id: NukeDisk
- id: PinpointerNuclear
- id: CaptainIDCard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@
- id: OxygenTankFilled
- id: ClothingOuterHardsuitCap
- id: ClothingMaskGasCaptain
- id: ClothingMaskGasCaptainCombat #TheDen
- type: AccessReader
access: [["Captain"]]

Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/TheDen/Entities/Clothing/Masks/masks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingMaskGasExplorer
id: ClothingMaskGasCaptainCombat
name: captain's combat gas mask
description: A military-grade gas mask that can be connected to an air supply, painted and outfitted with an emblem befitting its wearer. Issued only to the station's finest.
components:
- type: Sprite
sprite: TheDen/Clothing/Mask/gascaptaincombat.rsi
- type: Clothing
sprite: TheDen/Clothing/Mask/gascaptaincombat.rsi
14 changes: 14 additions & 0 deletions Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,17 @@
- Captain
items:
- ClothingOuterCoatCapTrench

# Mask
- type: loadout
id: LoadoutCommandCapMaskGasCombat
category: JobsCommandCaptain
cost: 0
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutCaptainMask
- !type:CharacterJobRequirement
jobs:
- Captain
items:
- ClothingMaskGasCaptainCombat
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.
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,38 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version edited by Floofers. Vox state by Flareguy for SS14, Modified by Rosycup for TheDen",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"directions": 4
}
]
}

0 comments on commit 21a811a

Please sign in to comment.