Skip to content

Commit 9ce3f6b

Browse files
committed
Move The Den files to upstream namespace
1 parent cc527e1 commit 9ce3f6b

File tree

23 files changed

+59
-57
lines changed

23 files changed

+59
-57
lines changed

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
components:
3434
- type: StorageFill
3535
contents:
36-
- id: ClothingOuterCoatCapTrench # TheDen
36+
- id: ClothingOuterCoatCapTrench
3737
- id: NukeDisk
3838
- id: PinpointerNuclear
3939
- id: CaptainIDCard
@@ -55,7 +55,7 @@
5555
components:
5656
- type: StorageFill
5757
contents:
58-
- id: ClothingOuterCoatCapTrench # TheDen
58+
- id: ClothingOuterCoatCapTrench
5959
- id: NukeDisk
6060
- id: PinpointerNuclear
6161
- id: CaptainIDCard
@@ -76,7 +76,7 @@
7676
components:
7777
- type: StorageFill
7878
contents:
79-
- id: ClothingOuterCoatCapTrench # TheDen
79+
- id: ClothingOuterCoatCapTrench
8080
- id: NukeDisk
8181
- id: PinpointerNuclear
8282
- id: CaptainIDCard

Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
- id: OxygenTankFilled
229229
- id: ClothingOuterHardsuitCap
230230
- id: ClothingMaskGasCaptain
231-
- id: ClothingMaskGasCaptainCombat #TheDen
231+
- id: ClothingMaskGasCaptainCombat
232232
- type: AccessReader
233233
access: [["Captain"]]
234234

Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@
9292
- type: loadout
9393
id: LoadoutChiefMedicalOfficerJumpskirt
9494
- type: loadout
95-
id: LoadoutChiefMedicalOfficerTurtleskirt # The Den
95+
id: LoadoutChiefMedicalOfficerTurtleskirt
9696
- type: loadout
97-
id: LoadoutChiefMedicalOfficerTurtlesuit # The Den
97+
id: LoadoutChiefMedicalOfficerTurtlesuit

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

+11
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,17 @@
8888
- type: BreathMask
8989
- type: IngestionBlocker
9090

91+
- type: entity
92+
parent: ClothingMaskGasExplorer
93+
id: ClothingMaskGasCaptainCombat
94+
name: captain's combat gas mask
95+
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.
96+
components:
97+
- type: Sprite
98+
sprite: Clothing/Mask/gascaptaincombat.rsi
99+
- type: Clothing
100+
sprite: Clothing/Mask/gascaptaincombat.rsi
101+
91102
- type: entity
92103
parent: ClothingMaskGasAtmos
93104
id: ClothingMaskGasCentcom

Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

+11
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,17 @@
5151
- type: Clothing
5252
sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
5353

54+
- type: entity
55+
parent: [ClothingOuterArmorCaptainCarapace, ClothingOuterStorageBase]
56+
id: ClothingOuterCoatCapTrench
57+
name: captain's armored trenchcoat
58+
description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence, outfitted with emblems and decor befitting its wearer. Issued only to the station's finest.
59+
components:
60+
- type: Sprite
61+
sprite: Clothing/OuterClothing/Coats/cap_trenchcoat.rsi
62+
- type: Clothing
63+
sprite: Clothing/OuterClothing/Coats/cap_trenchcoat.rsi
64+
5465
- type: entity
5566
abstract: true
5667
parent: AllowSuitStorageClothing

Resources/Prototypes/Loadouts/Jobs/Command/captain.yml

+28
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,19 @@
355355
items:
356356
- ClothingMaskGasCaptain
357357

358+
- type: loadout
359+
id: LoadoutCommandCapMaskGasCombat
360+
category: JobsCommandCaptain
361+
cost: 0
362+
requirements:
363+
- !type:CharacterItemGroupRequirement
364+
group: LoadoutCaptainMask
365+
- !type:CharacterJobRequirement
366+
jobs:
367+
- Captain
368+
items:
369+
- ClothingMaskGasCaptainCombat
370+
358371
# Outer
359372
- type: loadout
360373
id: LoadoutCommandCapOuterWinter
@@ -382,6 +395,21 @@
382395
items:
383396
- ClothingOuterArmorCaptainCarapace
384397

398+
- type: loadout
399+
id: LoadoutCaptainOuterTrench
400+
category: JobsCommandCaptain
401+
cost: 0
402+
exclusive: true
403+
canBeHeirloom: true
404+
requirements:
405+
- !type:CharacterItemGroupRequirement
406+
group: LoadoutCaptainOuter
407+
- !type:CharacterJobRequirement
408+
jobs:
409+
- Captain
410+
items:
411+
- ClothingOuterCoatCapTrench
412+
385413
# Shoes
386414
- type: loadout
387415
id: LoadoutCaptainShoesLaceup

Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,8 @@
213213
items:
214214
- ClothingUniformJumpskirtCMO
215215

216-
- type: loadout
217-
id: LoadoutChiefMedicalOfficerTurtleskirt # The Den // LETS HOPE IT STICKS THIS TIME
216+
- type: loadout
217+
id: LoadoutChiefMedicalOfficerTurtleskirt
218218
category: JobsMedicalChiefMedicalOfficer
219219
cost: 0
220220
requirements:
@@ -227,7 +227,7 @@
227227
- ClothingUniformJumpskirtCMOTurtle
228228

229229
- type: loadout
230-
id: LoadoutChiefMedicalOfficerTurtlesuit # The Den
230+
id: LoadoutChiefMedicalOfficerTurtlesuit
231231
category: JobsMedicalChiefMedicalOfficer
232232
cost: 0
233233
requirements:

Resources/Prototypes/TheDen/Entities/Clothing/Masks/masks.yml

-10
This file was deleted.

Resources/Prototypes/TheDen/Entities/Clothing/OuterClothing/coats.yml

-10
This file was deleted.

Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml

-28
This file was deleted.

0 commit comments

Comments
 (0)