Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Socks, Arm-Warmers, and Uniforms #116

Merged
merged 19 commits into from
Aug 18, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
ClothingNeckScarfStripedBrown: 3
ClothingShoesBootsWinterCargo: 2
ClothingNeckCollarLogi: 1 # Floofstation - Collar addition
ClothingHandsLogisWarmers: 1 # Floofstation
ClothingUnderSocksLogis: 1 # Floofstation
ClothingUniformLogisThong: 1 # Floofstation
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
ClothingHeadHatWitch1: 1
ClothingOuterPlagueSuit: 1
ClothingMaskPlague: 1
ClothingHandsChaplainWarmers: 1 # Floofstation
ClothingUnderSocksChaplain: 1 # Floofstation
ClothingUniformChaplainThong: 1 # Floofstation
ClothingOuterEpiChaplainMantle: 1 # Floofstation
#ClothingHeadsetService: 2 # Delta-V - Chaplain is no longer service dept
BoxCandle: 2
BoxCandleSmall: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@
ClothingNeckScarfStripedOrange: 3
ClothingShoesBootsWinterEngi: 2
ClothingNeckCollarEngi: 1 # Floofstation - Collar addition
ClothingHandsEngiWarmers: 1 # Floofstation
ClothingUnderSocksEngi: 1 # Floofstation
ClothingUniformEngiThong: 1 # Floofstation
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
ClothingShoesBootsWinterJani: 2 #Delta V: Add departmental winter boots
ClothingUniformJumpskirtJanimaid: 2 # Delta V: the maiden outfits no longer require emagging.
ClothingUniformJumpskirtJanimaidmini: 1
ClothingHandsJanitorWarmers: 1 # Floofstation
ClothingUnderSocksJanitor: 1 # Floofstation
ClothingUniformJanitorThong: 1 # Floofstation

emaggedInventory: # Delta V: tactical maid outfit set is now the emagg reward.
ClothingHandsTacticalMaidGloves: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
ClothingHeadHatSurgcapPurple: 4
ClothingShoesBootsWinterMed: 2
ClothingNeckCollarMed: 1 # Floofstation - Collar addition
ClothingHandsMedicWarmers: 1 # Floofstation
ClothingUnderSocksMedic: 1 # Floofstation
ClothingUniformMedicThong: 1 # Floofstation
contrabandInventory: #DeltaV
UniformScrubsColorCybersun: 1 #DeltaV
ClothingHeadHatSurgcapCybersun: 1 #DeltaV
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@
ClothingOuterWinterSci: 2
ClothingNeckScarfStripedPurple: 3
ClothingNeckCollarEpi: 1 # Floofstation - Collar addition
ClothingHandsEpiWarmers: 1 # Floofstation
ClothingUnderSocksEpi: 1 # Floofstation
ClothingUniformEpiThong: 1 # Floofstation
ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
ClothingShoesBootsWinterSci: 2
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
ClothingNeckScarfStripedRed: 3
ClothingEyesBlindfold: 1
ClothingNeckCollarSec: 1 # Floofstation - Collar addition
ClothingHandsSecurityWarmers: 1 # Floofstation
ClothingUnderSocksSecurity: 1 # Floofstation
ClothingUniformSecurityThong: 1 # Floofstation
ClothingShoesBootsCombat: 1
ClothingShoesBootsWinterSec: 2
ClothingShoesBootsCowboyBlack: 1
Expand Down
44 changes: 44 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1144,6 +1144,50 @@
- CarpetWhite
# Floofstation - Collars
- ClothingNeckCollarCmd
# Floofstation - Socks, Armwarmers ect
- ClothingHandsPlainWarmers
- ClothingUnderSocksPlain
- ClothingUniformThongPlain
- ClothingHandsStripeRainbowWarmers
- ClothingUnderSocksStripedRainbow
- ClothingUniformStripedThongRainbow
- ClothingHandsStripePurpleWarmers
- ClothingUnderSocksStripedPurple
- ClothingUniformStripedThongPurple
- ClothingHandsStripeWhiteWarmers
- ClothingUnderSocksStripedWhite
- ClothingUniformStripedThongWhite
# Floofstation - Department Socks, Armwarmers ect
- ClothingHandsCaptainWarmers
- ClothingUnderSocksCaptain
- ClothingUniformCaptainThong
- ClothingHandsCommandWarmers
- ClothingUnderSocksCommand
- ClothingUniformCommandThong
- ClothingHandsEngiWarmers
- ClothingUnderSocksEngi
- ClothingUniformEngiThong
- ClothingHandsEpiWarmers
- ClothingUnderSocksEpi
- ClothingUniformEpiThong
- ClothingHandsChaplainWarmers
- ClothingUnderSocksChaplain
- ClothingUniformChaplainThong
- ClothingHandsLogisWarmers
- ClothingUnderSocksLogis
- ClothingUniformLogisThong
- ClothingHandsMedicWarmers
- ClothingUnderSocksMedic
- ClothingUniformMedicThong
- ClothingHandsSecurityWarmers
- ClothingUnderSocksSecurity
- ClothingUniformSecurityThong
- ClothingHandsServiceWarmers
- ClothingUnderSocksService
- ClothingUniformServiceThong
- ClothingHandsJanitorWarmers
- ClothingUnderSocksJanitor
- ClothingUniformJanitorThong
- type: EmagLatheRecipes
emagStaticRecipes:
- ClothingHeadHatCentcomcap
Expand Down
135 changes: 135 additions & 0 deletions Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
- type: entity
parent: ClothingHandsBase
id: ClothingHandsPlainWarmers
name: plain arm-warmers
description: A pair of rather plain arm-warmers
components:
- type: Sprite
sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi
- type: Clothing
sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi
- type: Fiber
fiberMaterial: fibers-synthetic
fiberColor: fibers-black
- type: FingerprintMask

- type: entity
parent: ClothingHandsBase
id: ClothingHandsBeeWarmers
name: bee arm-warmers
description: A pair of rather buzzy arm-warmers
components:
- type: Sprite
sprite: Floof/Clothing/Under/Gloves/beewarmer.rsi
- type: Clothing
sprite: Floof/Clothing/Under/Gloves/beewarmer.rsi
- type: Fiber
fiberMaterial: fibers-synthetic
fiberColor: fibers-yellow
- type: FingerprintMask

- type: entity
parent: ClothingHandsBase
id: ClothingHandsCoderWarmers
name: coder arm-warmers
description: A pair of rather nice arm-warmers
components:
- type: Sprite
sprite: Floof/Clothing/Under/Gloves/coderwarmer.rsi
- type: Clothing
sprite: Floof/Clothing/Under/Gloves/coderwarmer.rsi
- type: Fiber
fiberMaterial: fibers-synthetic
fiberColor: fibers-white
- type: FingerprintMask

- type: entity
parent: ClothingHandsBase
id: ClothingHandsCoderValidWarmers
name: coder valid arm-warmers
description: A pair of rather nice arm-warmers
components:
- type: Sprite
sprite: Floof/Clothing/Under/Gloves/codervalidwarmer.rsi
- type: Clothing
sprite: Floof/Clothing/Under/Gloves/codervalidwarmer.rsi
- type: Fiber
fiberMaterial: fibers-synthetic
fiberColor: fibers-red
- type: FingerprintMask

- type: entity
parent: ClothingHandsBase
id: ClothingHandsStripeWhiteWarmers
name: striped white arm-warmers
description: A pair of rather nice arm-warmers
components:
- type: Sprite
sprite: Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi
- type: Clothing
sprite: Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi
- type: Fiber
fiberMaterial: fibers-cotton
fiberColor: fibers-white
- type: FingerprintMask

- type: entity
parent: ClothingHandsBase
id: ClothingHandsStripePurpleWarmers
name: striped purple arm-warmers
description: A pair of rather nice arm-warmers
components:
- type: Sprite
sprite: Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi
- type: Clothing
sprite: Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi
- type: Fiber
fiberMaterial: fibers-cotton
fiberColor: fibers-purple
- type: FingerprintMask

- type: entity
parent: ClothingHandsBase
id: ClothingHandsStripeRainbowWarmers
name: striped rainbow arm-warmers
description: A pair of rather nice arm-warmers
components:
- type: Sprite
sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi
- type: Clothing
sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi
- type: Fiber
fiberMaterial: fibers-cotton
fiberColor: fibers-colorful
- type: FingerprintMask

- type: entity
parent: ClothingHandsBase
id: ClothingHandsSexCompGlovesRed
name: red sex competition gloves
description: It looks like it should be part of a competition.
components:
- type: Sprite
sprite: Floof/Clothing/Under/Gloves/sexcompredgloves.rsi
- type: Clothing
sprite: Floof/Clothing/Under/Gloves/sexcompredgloves.rsi
- type: Fiber
fiberMaterial: fibers-synthetic
fiberColor: fibers-red
- type: FingerprintMask

- type: entity
parent: ClothingHandsBase
id: ClothingHandsSexCompGlovesBlue
name: blue sex competition gloves
description: It looks like it should be part of a competition.
components:
- type: Sprite
sprite: Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi
- type: Clothing
sprite: Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi
- type: Fiber
fiberMaterial: fibers-synthetic
fiberColor: fibers-blue
- type: FingerprintMask

22 changes: 22 additions & 0 deletions Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,25 @@
sprite: Clothing/Head/Hats/dogears.rsi
- type: Clothing
sprite: Clothing/Head/Hats/dogears.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadSexCompCirclet
name: sex competition circlet
description: It looks like it should be part of a competition.
components:
- type: Sprite
sprite: Floof/Clothing/Head/sexcompcirclet.rsi
- type: Clothing
sprite: Floof/Clothing/Head/sexcompcirclet.rsi

- type: entity
parent: ClothingHeadHatHoodWinterBase
id: ClothingHeadHatHoodMarsHoodieHood
noSpawn: true
name: pink hoodie hood
components:
- type: Sprite
sprite: Floof/Clothing/Head/hoodmarshoodie.rsi
- type: Clothing
sprite: Floof/Clothing/Head/hoodmarshoodie.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
- type: entity
parent: ClothingOuterBase
id: ClothingOuterSexCompBeltBronze
name: bronze sex competition belt
description: Looks like you came third in a competion.
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi

- type: entity
parent: ClothingOuterBase
id: ClothingOuterSexCompBeltSilver
name: silver sex competition belt
description: Looks like you came second in a competion.
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi

- type: entity
parent: ClothingOuterBase
id: ClothingOuterSexCompBeltGold
name: gold sex competition belt
description: Looks like you came in first in a competion.
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi

- type: entity
parent: ClothingOuterBase
id: ClothingOuterBeltedOutfit
name: belted outerwear
description: What? Do you think youre an anime protagonist or something?
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi

- type: entity
parent: ClothingOuterWinterCoatToggleable
id: ClothingOuterMarsHoodie
name: pink hoodie
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/Misc/marshoodie.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/Misc/marshoodie.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodMarsHoodieHood
Loading
Loading