diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index b8398008d41..9f5362af5bb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -23,6 +23,7 @@ ClothingUniformLoinCloth: 5 # FloofStation ClothingNeckCollarBlue: 1 # Floofstation - Collar addition ClothingNeckCollarBlack: 1 # Floofstation - Collar addition + ClothingNeckCollarPink: 1 # Floofstation - Collar addition ClothingLongcoatNT: 2 # Floofstation ClothingLongcoatAL: 2 # Floofstation ClothingLongcoatBrown: 2 # Floofstation diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml index 28d2fbc1af2..f2db0a081c8 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml @@ -26,7 +26,8 @@ BedsheetRainbow: 2 ClothingUniformColorRainbow: 2 ClothingUnderSocksCoder: 1 + ClothingHandsCoderArms: 1 # Floofstation ClothingUnderSocksBee: 1 emaggedInventory: # 3 for more friends! - ClothingUnderSocksCoderValid: 3 # Floofstation \ No newline at end of file + ClothingUnderSocksCoderValid: 3 # Floofstation diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml new file mode 100644 index 00000000000..bb62055ff86 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml @@ -0,0 +1,12 @@ +- type: entity + parent: ClothingHandsBase + id: ClothingHandsCoderArms + name: Coder Armwarmers + description: A pair of armwarmers that provide some protection during those long nights at the keyboard. + components: + - type: Sprite + sprite: Floof/Clothing/Hands/coderarms.rsi + - type: Clothing + sprite: Floof/Clothing/Hands/coderarms.rsi + - type: Fiber + fiberColor: fibers-white diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml index a0d64910eb9..5ce31b6f691 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml @@ -20,6 +20,17 @@ - type: Clothing sprite: Floof/Clothing/Neck/collar_black.rsi +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarPink + name: pink collar + description: A cute pink collar. + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_pink.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_pink.rsi + - type: entity parent: ClothingNeckBase id: ClothingNeckCollarEpi diff --git a/Resources/Prototypes/Floof/Loadouts/hands.yml b/Resources/Prototypes/Floof/Loadouts/hands.yml index 5cc25557ed0..3b2705b64f6 100644 --- a/Resources/Prototypes/Floof/Loadouts/hands.yml +++ b/Resources/Prototypes/Floof/Loadouts/hands.yml @@ -5,3 +5,11 @@ exclusive: true items: - ClothingHandsTacticalMaidGloves + +- type: loadout #FloofStation + id: LoadoutHandsGlovesCoderArms + category: Hands + cost: 1 + exclusive: true + items: + - ClothingHandsCoderArms diff --git a/Resources/Prototypes/Floof/Loadouts/neck.yml b/Resources/Prototypes/Floof/Loadouts/neck.yml index e75b8560268..c227a7b0ad5 100644 --- a/Resources/Prototypes/Floof/Loadouts/neck.yml +++ b/Resources/Prototypes/Floof/Loadouts/neck.yml @@ -101,6 +101,14 @@ items: - ClothingNeckCollarBlack +- type: loadout + id: LoadoutItemsNeckPinkCollar + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckCollarPink + - type: loadout id: LoadoutItemsNeckSyndieCollar category: Neck diff --git a/Resources/Prototypes/FloofStation/Traits/lewd.yml b/Resources/Prototypes/Floof/Traits/lewd.yml similarity index 100% rename from Resources/Prototypes/FloofStation/Traits/lewd.yml rename to Resources/Prototypes/Floof/Traits/lewd.yml diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/equipped-HAND.png new file mode 100644 index 00000000000..853944c1828 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/icon.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/icon.png new file mode 100644 index 00000000000..81f0bded3a1 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-left.png new file mode 100644 index 00000000000..7994331ab6d Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-right.png new file mode 100644 index 00000000000..992c269e5ce Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json new file mode 100644 index 00000000000..e6321f48aea --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by bribrooo (Discord), original from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/equipped-NECK.png new file mode 100644 index 00000000000..b295e586241 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/icon.png new file mode 100644 index 00000000000..70dd83c7259 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/meta.json new file mode 100644 index 00000000000..8c6e22dd1fb --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Splurtstation (https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} \ No newline at end of file