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

Clothing Additions By DakoDemon #136

Merged
merged 30 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
466b184
Merge branch 'dev-enviro' of https://github.com/DakoDemon/floofstatio…
DakoDemon Aug 20, 2024
974eca7
- Added Coder, Bee, Coder-Valid socks ect to loadouts, lathe, & vendors
DakoDemon Aug 20, 2024
7202368
- Added Sex Comp Uniform to BoxingDrobe
DakoDemon Aug 22, 2024
5f69b33
Ah, I see where I messed up!
ShatteredSwords Aug 22, 2024
5e14879
The Autodrobe Restock Is Now More Expensive
ShatteredSwords Aug 22, 2024
e10ad26
Just fixing some things perhaps forgotten :3
ShatteredSwords Aug 22, 2024
9262b32
Commenting out the old loadout
ShatteredSwords Aug 22, 2024
f8e3467
Mimic the usual sock requirements
ShatteredSwords Aug 22, 2024
ea304c0
o7
ShatteredSwords Aug 23, 2024
636aa6e
o7
ShatteredSwords Aug 23, 2024
3293298
o7
ShatteredSwords Aug 23, 2024
7800b32
o7
ShatteredSwords Aug 23, 2024
aa88e30
o7
ShatteredSwords Aug 23, 2024
556e3f3
o7
ShatteredSwords Aug 23, 2024
0a41131
o7
ShatteredSwords Aug 23, 2024
5a014e1
o7
ShatteredSwords Aug 23, 2024
986df86
o7
ShatteredSwords Aug 23, 2024
737acbc
o7
ShatteredSwords Aug 23, 2024
2da0919
o7
ShatteredSwords Aug 23, 2024
a7a1d81
o7
ShatteredSwords Aug 23, 2024
c2b1330
o7
ShatteredSwords Aug 23, 2024
83b2d46
o7
ShatteredSwords Aug 23, 2024
bb53a46
o7
ShatteredSwords Aug 23, 2024
aefecb4
o7
ShatteredSwords Aug 23, 2024
1776d20
o7
ShatteredSwords Aug 23, 2024
9184f90
o7
ShatteredSwords Aug 23, 2024
43786d2
o7
ShatteredSwords Aug 23, 2024
e9dba8b
Alright, the o7 meme has gone on long enough
ShatteredSwords Aug 23, 2024
4a8f663
Merge branch 'Fansana:master' into DakoFix
ShatteredSwords Aug 23, 2024
b167639
I'm assuming this works
ShatteredSwords Aug 23, 2024
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockAutoDrobeFilled
cost: 1730
cost: 2000 #FloofStation due to "Arbitrage"
category: cargoproduct-category-name-service
group: market

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@
ClothingOuterVest: 2
ClothingBeltBandolier: 2
ClothingEyesGlassesSunglasses: 2
# Floofstation - Departmental Socks ect
ClothingUniformBartenderThong: 3
ClothingUnderSocksBartender: 3
ClothingHandsBartenderWarmers: 3

Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@
ClothingShoesBootsWinterChef: 2 #Delta V: Add departmental winter boots
ClothingShoesChef: 2
ClothingBeltChef: 2
# Floofstation - Departmental Socks ect
ClothingHandsChefWarmers: 2
ClothingUnderSocksChef: 2
ClothingUniformChefThong: 2
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,8 @@
ClothingOuterApronChemist: 2 # Realistic PPE apron for chemistry
ClothingEyesGlassesChemist: 2 # Safety glasses
ClothingHandsGlovesChemist: 2 # Heavy duty chemistry gloves
# End of modified code
# End of modified code
# Floofstation - Departmental Socks ect
ClothingHandsChemistsWarmers: 1
ClothingUnderSocksChemists: 1
ClothingUniformChemistsThong: 1
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@
ClothingHeadsetRobotics: 2
ClothingOuterWinterRobo: 2
ClothingShoesBootsWinterRobo: 2 #Delta V: Add departmental winter boots
ClothingOuterRoboOveralls: 2 #Floofstation - Add overalls
ClothingOuterPlainOveralls: 2 # Floofstation
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
ClothingNeckScarfStripedRed: 3
ClothingEyesBlindfold: 1
ClothingNeckCollarSec: 1 # Floofstation - Collar addition
ClothingHandsSecurityWarmers: 1 # Floofstation
ClothingUnderSocksSecurity: 1 # Floofstation
ClothingUniformSecurityThong: 1 # Floofstation
ClothingHandsSecurityWarmers: 2 # Floofstation
ClothingUnderSocksSecurity: 2 # Floofstation
ClothingUniformSecurityThong: 2 # Floofstation
ClothingShoesBootsCombat: 1
ClothingShoesBootsWinterSec: 2
ClothingShoesBootsCowboyBlack: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@
ClothingMaskNeckGaiterRed: 2
ClothingNeckBellCollar: 2
ClothingOuterUnathiRobe: 1
# Floofstation - Departmental Socks ect
ClothingUniformMusicianThong: 2
ClothingUnderSocksMusician: 2
ClothingHandsMusicianWarmers: 2
ClothingHandsStripeWhiteWarmers: 1
ClothingUnderSocksStripedWhite: 1
ClothingUniformStripedThongWhite: 1
ClothingUniformMusicKingBlack: 2
ClothingUniformMusicKing: 2
emaggedInventory:
ClothingShoesBling: 1
ClothingShoesBootsCowboyFancy: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
ClothingUniformColorRainbow: 2
ClothingUnderSocksCoder: 1
ClothingUnderSocksBee: 1
ClothingHandsBeeWarmers: 1 # Floofstation
ClothingHandsCoderWarmers: 1 # Floofstation
ClothingUniformThongCoder: 1 # Floofstation
ClothingUniformThongBee: 1 # Floofstation
emaggedInventory:
# 3 for more friends!
ClothingUnderSocksCoderValid: 3 # Floofstation
ClothingHandsCoderValidWarmers: 3 # Floofstation
ClothingUniformThongCoderValid: 3 # Floofstation
9 changes: 9 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1160,6 +1160,15 @@
- ClothingHandsStripeWhiteWarmers
- ClothingUnderSocksStripedWhite
- ClothingUniformStripedThongWhite
- ClothingHandsCoderWarmers
- ClothingUnderSocksCoder
- ClothingUniformThongCoder
- ClothingHandsCoderValidWarmers
- ClothingUnderSocksCoderValid
- ClothingUniformThongCoderValid
- ClothingHandsBeeWarmers
- ClothingUnderSocksBee
- ClothingUniformThongBee
# Floofstation - Department Socks, Armwarmers ect
- ClothingHandsCaptainWarmers
- ClothingUnderSocksCaptain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi
- type: Fiber
fiberMaterial: fibers-synthetic
fiberColor: fibers-colorful
fiberColor: fibers-purple
- type: FingerprintMask

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,59 @@
sprite: Floof/Clothing/OuterClothing/Misc/marshoodie.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodMarsHoodieHood

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterRoboOveralls
name: robotocist overalls
description: A simple pair of overalls, designed to go over a jumpsuit.
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/Misc/robooveralls.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/Misc/robooveralls.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterPlainOveralls
name: plain overalls
description: A simple pair of overalls, designed to go over a jumpsuit.
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/Misc/plainoveralls.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/Misc/plainoveralls.rsi

#Cybercoats
- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterCyberJacketYellow
name: yellow cyberjacket
description: a brightly coloured jacket, with a short crop.
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketyellow.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketyellow.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterCyberJacketPurple
name: purple cyberjacket
description: a brightly coloured jacket, with a short crop.
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketpurple.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketpurple.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterCyberJacketWhite
name: white cyberjacket
description: a mono coloured jacket, with a short crop.
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketwhite.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketwhite.rsi
25 changes: 24 additions & 1 deletion Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@
tags:
- Skirt


#Other Outfits
- type: entity
parent: ClothingUniformBase
id: ClothingUniformSexCompRed
Expand Down Expand Up @@ -174,7 +176,7 @@

- type: entity
parent: ClothingUniformBase
id: ClothingUniforReotaSuit
id: ClothingUniformReotaSuit
name: casual suit
description: A rather casual looking suit
components:
Expand All @@ -183,3 +185,24 @@
- type: Clothing
sprite: Floof/Clothing/Uniforms/reotasuit.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformMusicKing
name: musician king
description: A musicians outfit, fit for a king
components:
- type: Sprite
sprite: Floof/Clothing/Uniforms/musicianking.rsi
- type: Clothing
sprite: Floof/Clothing/Uniforms/musicianking.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformMusicKingBlack
name: musician king black
description: A musicians outfit, fit for a king
components:
- type: Sprite
sprite: Floof/Clothing/Uniforms/musiciankingblack.rsi
- type: Clothing
sprite: Floof/Clothing/Uniforms/musiciankingblack.rsi
Loading
Loading