Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
ClothingHandsMusicianWarmers: 2
ClothingUnderSocksMusician: 2
ClothingUniformMusicianThong: 2
ClothingUniformJulianneVA11HALLA: 1 # Hardlight
contrabandInventory:
ToyFigurineBartender: 1
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,6 @@
ToyFigurineGreytider: 1
# ClothingBackpackSatchelSmugglerUnanchored: 1 # Frontier
ClothingHeadHatSolidHeadband: 2
ClothingUniformJumpsuitFormalBlueShield: 1 # Hardlight
ClothingUniformDama0965: 1 # Hardlight
# DO NOT ADD MORE, USE UNIFORM DYING
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
ClothingHeadHatSurgcapBlue: 4
ClothingHeadHatSurgcapPurple: 4
ClothingNeckCollarMed: 2 # Floofstation - Collar addition
ClothingUniformJumpsuitCoroner: 2 # Hardlight
# Paramed:
ClothingUniformJumpsuitParamedic: 4
ClothingUniformJumpskirtParamedic: 4
Expand Down
19 changes: 19 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,24 @@
ClothingHandsStripedWhiteWarmers: 2
ClothingUnderSocksStripedWhite: 2
ClothingUniformStripedWhiteThong: 2
ClothingUnderSocksPrideAce: 3
ClothingUnderSocksPrideAro: 3
ClothingUnderSocksPrideBi: 3
ClothingUnderSocksPrideGay: 3
ClothingUnderSocksPrideInter: 3
ClothingUnderSocksPrideLesbian: 3
ClothingUnderSocksPrideNon: 3
ClothingUnderSocksPridePan: 3
ClothingUnderSocksPrideTrans: 3
ClothingHandsStripePurpleWarmers: 3
ClothingHandsPrideAce: 3
ClothingHandsPrideAro: 3
ClothingHandsPrideBi: 3
ClothingHandsPrideGay: 3
ClothingHandsPrideInter: 3
ClothingHandsPrideLesbian: 3
ClothingHandsPrideNon: 3
ClothingHandsPridePan: 3
ClothingHandsPrideTrans: 3
contrabandInventory:
ClothingNeckScarfStripedLesbianLong: 2
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@
CoolCoyoteClothesWhitesun: 9000
CoolCoyoteClothesYellowwshort: 9000
CoolCoyoteClothesGearHarness: 9000
ClothingUniformJumpskirtPencilTan: 9000
contrabandInventory:
ClothingHeadHatRichard: 1
ToyFigurineBoxer: 1
Expand All @@ -486,6 +487,8 @@
ClothingShoesResonant: 1 # Goobstation
ClothingNeckCloakResonant: 1 # Goobstation
ClothingUniformJumpsuitResonant: 1 # Goobstation
ClothingUniformJumpsuitAerostatic: 1 # Hardlight
ClothingUniformJumpsuitSuperstarCop: 1 # Hardlight
emaggedInventory:
ClothingShoesBling: 1
ClothingShoesBootsCowboyFancy: 1
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatCybersunWindbreaker
name: CyberSun windbreaker
description: A foreboding windbreaker, sporting the official heraldry of CyberSun's R&D division. It's made of sturdy ballistic fiber.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.90
Slash: 0.90
Piercing: 0.90
Heat: 0.70
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterWinterCCWarden
name: Colonial Command's armored winter coat
description: A tough, utilitarian coat designed for the wardens of Colonial Command. Reinforced kevlar plating and high quality fur allow the user to look stylish while staying protected.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Piercing: 0.4 #Stronger than the warden's armored jacket, because shenanigans and CC spends alot of money.
Heat: 0.75
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtCentcomDirector
name: CC Director's jumpskirt
description: A sharp and professional jumpskirt worn by a high-ranking member of Colonial Command.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitCentcomDirector
name: CC Director's jumpsuit
description: A sharp and professional jumpsuit worn by a high-ranking member of Colonial Command.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi
10 changes: 10 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/scrubs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingUniformBase
id: UniformScrubsColorCybersun
name: CyberSun scrubs
description: The official uniform of CyberSun's R&D division
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -1214,3 +1214,21 @@
- state: winterbits-equipped-OUTERCLOTHING
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodWinterColorYellow

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterCsCorporateJacket
name: CyberSun Corporate Jacket
description: A cozy jacket with the Cybersun logo printed on the back. The R&D division's insignia is on the shoulder, and reinforced fibers bulk out the jacket.
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.85
Slash: 0.85
Piercing: 0.80
Heat: 0.95
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: vendingMachineInventory
id: MNKDrobeInventory
startingInventory:
ClothingUniformMNKOfficeSkirt: 3
ClothingUniformMNKUnderGarment: 3
ClothingUniformMNKDressBlack: 3
ClothingUniformMNKGymBra: 3
ClothingUniformMNKBlackOveralls: 3
ClothingUniformMNKBlackShoulder: 3
ClothingUniformMNKTracksuitBlack: 3
ClothingOuterCoatMNKBlackJacket: 3
ClothingOuterCoatMNKWhiteHoodie: 3
ClothingOuterCoatMNKBlackTopCoat: 3
Original file line number Diff line number Diff line change
@@ -1,48 +1,7 @@
- type: entity
parent: ClothingHeadHelmetHardsuitRd
id: ClothingHeadHelmetHardsuitMystagogue
abstract: true
name: mystagogue's hardsuit helmet
description: Lightweight hardsuit helmet that has a galaxy-first psionic passthrough system.
components:
- type: Psionic
- type: TinfoilHat
passthrough: true
destroyOnFry: false
- type: ClothingGrantPsionicPower
power: MetapsionicPower
#- type: GuideHelp
#guides:
#- Psionics

- type: entity
parent: ClothingHeadHelmetHardsuitSyndie
id: ClothingHeadHelmetHardsuitSyndieReverseEngineered
abstract: true
name: SA-123 combat hardsuit helmet
description: An advanced hardsuit helmet designed for work in special operations.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi

- type: entity
parent: ClothingHeadHelmetHardsuitCybersun
id: ClothingHeadHelmetHardsuitJuggernautReverseEngineered
abstract: true
name: SA-127 combat hardsuit helmet
description: An assault hardsuit helmet featuring a top-secret translucent polymer.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Head/ReverseEngineering/juggernaut.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Head/ReverseEngineering/juggernaut.rsi

- type: entity
parent: ClothingHeadHelmetHardsuitERTLeader
id: ClothingHeadHelmetHardsuitERTCentcomm
name: CentCom hardsuit helmet
name: ColComm hardsuit helmet
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Head/Hardsuits/ERThelmets/ertcentcomm.rsi
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
parent: ClothingOuterHardsuitERTLeader
id: ClothingOuterHardsuitERTCentcomm
name: ColComm hardsuit
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/OuterClothing/Hardsuits/ERTSuits/ertcentcomm.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/OuterClothing/Hardsuits/ERTSuits/ertcentcomm.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitERTCentcomm
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatMNKWhiteHoodie
name: MNK white hoodie
description: A classic MNK produced white hoodie.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Misc/hoodie_white.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Misc/hoodie_white.rsi
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatMNKBlackTopCoat
name: MNK black top coat
description: A sturdy MNK black top coat.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Misc/black_top_coat.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Misc/black_top_coat.rsi
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatMNKBlackJacket
name: MNK black jacket
description: A light MNK black jacket.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Misc/black_jacket.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Misc/black_jacket.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,83 @@
sprite: Nyanotrasen/Clothing/Uniforms/Costume/arc.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Uniforms/Costume/arc.rsi

## mnk

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformMNKOfficeSkirt
name: MNK office skirt
description: An MNK outfit within office dress code.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Misc/office_skirt.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Misc/office_skirt.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformMNKUnderGarment
name: MNK under garment
description: MNK ensured comfort for the important bits.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Misc/under_garments.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Misc/under_garments.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformMNKGymBra
name: MNK gym bra
description: Maximum performance with MNK sweat blockers.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Misc/gym_bra.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Misc/gym_bra.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformMNKDressBlack
name: MNK black dress
description: A sleek black dress sporting a MNK window.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Misc/black_dress.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Misc/black_dress.rsi


- type: entity
parent: ClothingUniformBase
id: ClothingUniformMNKBlackOveralls
name: MNK black overalls
description: A comfy undershirt and thick black MNK overalls.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Misc/black_overall.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Misc/black_overall.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformMNKBlackShoulder
name: MNK exposed shoulders
description: A MNK outfit with exposed shoulders.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Misc/exposed_shoulder.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Misc/exposed_shoulder.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformMNKTracksuitBlack
name: MNK black tracksuit
description: A set of light MNK athletic clothing.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Misc/tracksuit.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Misc/tracksuit.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,21 @@
color: "#4b93ad"
- type: AccessReader # Frontier
access: [["Mail"]] # Frontier

- type: entity
parent: VendingMachine
id: VendingMachineMNKDrobe
name: MNK Drobe
description: Quality garments provided by MoNoKrome.
components:
- type: VendingMachine
pack: MNKDrobeInventory
offState: off
brokenState: broken
- type: Sprite
sprite: Nyanotrasen/Structures/Machines/VendingMachines/mnkdrobe.rsi
layers:
- state: off
map: ["enum.VendingMachineVisualLayers.Base"]
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
Loading
Loading