From a3989abc58289d726a4800f5ed9c320205d20ed5 Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Tue, 13 Aug 2024 13:36:53 -0500 Subject: [PATCH 1/3] Collar me surprised --- .../Inventories/cargodrobe.yml | 1 + .../VendingMachines/Inventories/centdrobe.yml | 1 + .../Inventories/clothesmate.yml | 2 + .../VendingMachines/Inventories/engidrobe.yml | 1 + .../VendingMachines/Inventories/medidrobe.yml | 1 + .../VendingMachines/Inventories/scidrobe.yml | 1 + .../VendingMachines/Inventories/secdrobe.yml | 3 +- .../Inventories/syndiedrobe.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 2 + .../Floof/Entities/Clothing/Neck/collars.yml | 119 ++++++++++++++++++ .../Prototypes/Recipes/Lathes/clothing.yml | 9 ++ .../Neck/collar_black.rsi/equipped-NECK.png | Bin 0 -> 274 bytes .../Clothing/Neck/collar_black.rsi/icon.png | Bin 0 -> 247 bytes .../Clothing/Neck/collar_black.rsi/meta.json | 18 +++ .../Neck/collar_blue.rsi/equipped-NECK.png | Bin 0 -> 419 bytes .../Clothing/Neck/collar_blue.rsi/icon.png | Bin 0 -> 251 bytes .../Clothing/Neck/collar_blue.rsi/meta.json | 18 +++ .../Neck/collar_cc.rsi/equipped-NECK.png | Bin 0 -> 320 bytes .../Clothing/Neck/collar_cc.rsi/icon.png | Bin 0 -> 273 bytes .../Clothing/Neck/collar_cc.rsi/meta.json | 18 +++ .../Neck/collar_cmd.rsi/equipped-NECK.png | Bin 0 -> 318 bytes .../Clothing/Neck/collar_cmd.rsi/icon.png | Bin 0 -> 256 bytes .../Clothing/Neck/collar_cmd.rsi/meta.json | 18 +++ .../Neck/collar_engi.rsi/equipped-NECK.png | Bin 0 -> 322 bytes .../Clothing/Neck/collar_engi.rsi/icon.png | Bin 0 -> 253 bytes .../Clothing/Neck/collar_engi.rsi/meta.json | 18 +++ .../Neck/collar_epi.rsi/equipped-NECK.png | Bin 0 -> 310 bytes .../Clothing/Neck/collar_epi.rsi/icon.png | Bin 0 -> 257 bytes .../Clothing/Neck/collar_epi.rsi/meta.json | 18 +++ .../Neck/collar_logi.rsi/equipped-NECK.png | Bin 0 -> 327 bytes .../Clothing/Neck/collar_logi.rsi/icon.png | Bin 0 -> 286 bytes .../Clothing/Neck/collar_logi.rsi/meta.json | 18 +++ .../Neck/collar_med.rsi/equipped-NECK.png | Bin 0 -> 318 bytes .../Clothing/Neck/collar_med.rsi/icon.png | Bin 0 -> 257 bytes .../Clothing/Neck/collar_med.rsi/meta.json | 18 +++ .../Neck/collar_sec.rsi/equipped-NECK.png | Bin 0 -> 297 bytes .../Clothing/Neck/collar_sec.rsi/icon.png | Bin 0 -> 260 bytes .../Clothing/Neck/collar_sec.rsi/meta.json | 18 +++ .../Neck/collar_syndi.rsi/equipped-NECK.png | Bin 0 -> 322 bytes .../Clothing/Neck/collar_syndi.rsi/icon.png | Bin 0 -> 252 bytes .../Clothing/Neck/collar_syndi.rsi/meta.json | 18 +++ 41 files changed, 320 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_black.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_black.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_black.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_blue.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_blue.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_blue.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_cc.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_cc.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_cc.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_cmd.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_cmd.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_cmd.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_engi.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_engi.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_engi.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_epi.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_epi.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_epi.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_logi.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_logi.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_logi.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_med.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_med.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_med.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_sec.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_sec.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_sec.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_syndi.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_syndi.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_syndi.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml index d1e80ba0c80..82e53018c41 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml @@ -15,3 +15,4 @@ ClothingOuterWinterMiner: 2 ClothingNeckScarfStripedBrown: 3 ClothingShoesBootsWinterCargo: 2 + ClothingNeckCollarLogi: 1 # Floofstation - Collar addition diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml index 1630dd2a0ba..46278a8506e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml @@ -19,3 +19,4 @@ ClothingNeckScarfStripedCentcom: 3 ClothingShoesBootsWinterCentCom: 2 #Delta V: Add departmental winter boots ClothingNeckCloakCentcom: 3 + ClothingNeckCollarCC: 3 # Floofstation - Collar addition diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index ab5187a42c8..f2cc046e366 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -116,6 +116,8 @@ ClothingHandsGlovesColorPurple: 2 ClothingEyesGlassesCheapSunglasses: 3 ClothingUniformLoinCloth: 5 # FloofStation + ClothingNeckCollarBlue: 1 # Floofstation - Collar addition + ClothingNeckCollarBlack: 1 # Floofstation - Collar addition contrabandInventory: ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index 5d732def49f..a6b77477d3e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -16,3 +16,4 @@ ClothingOuterWinterEngi: 2 ClothingNeckScarfStripedOrange: 3 ClothingShoesBootsWinterEngi: 2 + ClothingNeckCollarEngi: 1 # Floofstation - Collar addition diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index f4fb03e6c75..d269645ad9a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -22,6 +22,7 @@ ClothingHeadHatSurgcapBlue: 4 ClothingHeadHatSurgcapPurple: 4 ClothingShoesBootsWinterMed: 2 + ClothingNeckCollarMed: 1 # Floofstation - Collar addition contrabandInventory: #DeltaV UniformScrubsColorCybersun: 1 #DeltaV ClothingHeadHatSurgcapCybersun: 1 #DeltaV diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index c4608af34eb..426288ce044 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -14,5 +14,6 @@ ClothingMaskGas: 3 ClothingOuterWinterSci: 2 ClothingNeckScarfStripedPurple: 3 + ClothingNeckCollarEpi: 1 # Floofstation - Collar addition ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics ClothingShoesBootsWinterSci: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index cb0c10c129e..685feb15736 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -23,7 +23,8 @@ ## ClothingOuterArmorBasicSlim: 2 ClothingNeckScarfStripedRed: 3 ClothingEyesBlindfold: 1 + ClothingNeckCollarSec: 1 # Floofstation - Collar addition ClothingShoesBootsCombat: 1 ClothingShoesBootsWinterSec: 2 ClothingShoesBootsCowboyBlack: 1 - ClothingHeadHatCowboyBlack: 1 \ No newline at end of file + ClothingHeadHatCowboyBlack: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml index 8e1f6a1c3ac..a3f7189b2ca 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml @@ -15,6 +15,7 @@ ClothingNeckScarfStripedSyndieGreen: 2 ClothingNeckScarfStripedSyndieRed: 2 ClothingShoesBootsWinterSyndicate: 2 + ClothingNeckCollarSyndi: 1 # Floofstation - Collar addition emaggedInventory: ClothingOuterCoatSyndieCapArmored: 1 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 418a09b876c..a9ecd52b676 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1139,6 +1139,8 @@ - CarpetPurple - CarpetCyan - CarpetWhite + # Floofstation - Collars + - ClothingNeckCollarCmd - type: EmagLatheRecipes emagStaticRecipes: - ClothingHeadHatCentcomcap diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml new file mode 100644 index 00000000000..d423597f196 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml @@ -0,0 +1,119 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarBlue + name: blue collar + description: A cute blue collar. + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_blue.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_blue.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarBlack + name: black collar + description: A cute black collar. + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_black.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_black.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarEpi + name: epistemics collar + description: A collar showing how loyal you are to science! + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_epi.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_epi.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarEngi + name: engineering collar + description: A collar showing your deft skill utilizing your hands! + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_engi.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_engi.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarLogi + name: logistics collar + description: Who's a good courier? + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_logi.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_logi.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarMed + name: medical collar + description: Put your patients at ease by letting them know you're here to help. + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_med.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_med.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarSec + name: security collar + description: Be the best guard dog on the station! + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_sec.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_sec.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarCmd + name: Captain's collar + description: The top dog (or cat) around. + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_cmd.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_cmd.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarCC + name: CentCom collar + description: All bark with a whole lotta bite. + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_cc.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_cc.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarSyndi + name: Blood-Red collar + description: Sometimes you gotta be naughty. + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_syndi.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_syndi.rsi + + + + #PLAN + #1: Add them all to respective vendors. Push update. + #2: Fix cum and milk production. Add pussy + #2.5 (optional): See how possible it is to mess with the max tank values and production values. + #3: Add internal-department collars (salvage, atmos, etc) + #4: Mess with making Cock traits as a different part. Add a "lewd traits" tab. + # diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 19b2fbb883c..77c1977ce92 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -1282,3 +1282,12 @@ completetime: 1 materials: Cloth: 100 + +# Floofstation - Collars +- type: latheRecipe + id: ClothingNeckCollarCmd + result: ClothingNeckCollarCmd + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_black.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/collar_black.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..a2afd131e158347c4c9cfd848823f56afd8a1468 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|&Um^whE&XX zd&`lp$v~j>;q}WqO3%8!()=R#=7Y#LrP$dUKAAjb6X5LJmSOm*o|DsLVZPT*Usa&a zJ!gfE+n=h=H;%m4E6zQCZwFN*UO4sukO4N-8xyNRbbNd)29D! zs1~#5zCE*O&Dz+B@&DCxt3Cn^fq(<^wXZOppA;PJ7kzWj_rr&^*1nwRIXlKH=JKRR zYqb+3cFbvt*_v_g`oh4njCp1Y_Q#eg`%H@b^UrXmp7L)O4u~Ne3d^}Z1r^`<_naRj N;OXk;vd$@?2>?xLavuNy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_black.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/collar_black.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0b1f67eb166a4d98fe74c64f7aa7d6a5f23cf2ec GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|6a#!hTn`*L zz`(-rpJ66Y;6KCv@bK`(ix)HO-_P*>|NmnQckbMoRS_5kl;bW5@(TtDLP2d=?Ny*~ zuBVG*h(+()31_(u7;rRmA8vU6|IlKqXFm0Nc*-L4CY?9gx;6ei_rjf(EfQX74*U<| zc0Va*3tFb=Vf>xR_Tbrx~X8!6IkFM#xjhgwa`$S)W juF|QNP0fPQ|ApsPTw>Y3q3yZ=&|(HpS3j3^P6p}{C#!j)7X>7pZC}we8>4Hf&qbg!~?GLrbhnRX=^T+zQ29dtK_$3ysJeu zKOX1oaEKM!|CL{OcC&_E*V`h_N4B?wCDawVvYGSe%k8+i=fjS@3B|Ryzn}LNPyQjS z*0bkh@B-h2+V~pP4f|?hmwj+H^4|NmnQYbUgH0VTLfg8YI(A`np5DG~-0E%kJ9 z46*2aJHeZ;L4n6baWY%ge{SWYH~6`vh0XV+K2Oc?eEGa~Q<1!ws+V5KNe-h%BOZN* zWkDj^3vNVAVY<#xvDjXC-U^2ZC9YB{a%KdfU<$@dJ3 zbKXC7t#pg{Z;O_R>t^-j-^!VNYvp9y-zA@2kM?h{nN@r^ui;D1ChOigDy6r1Gyfhv zwwKHIdfGn=7N8AKVE-bzm_e-V)}jA=^Do`1^S!<(qC3&;K-?brX(!r5RXl&+3p^az zYU_Pt{gbxmj{6?WHan-*a-ZQmyPV$7#4l%dx30Wl0x{~t@pt?ZZX%z4?s@|NmnQ8)h&t6qzwB@DbXUz~E-$nkvu^RL5Tu zi=V|qc`}uq=n7*r9My1;C%SJ zc2R-6*gE=MgtyghE`#FnGH9xvXH;((2gsBZhp_V=6h^{G7U<~QHHF3R+Cb@9@_ms0ofvD!MFJUyw(R~y7c zd-r&)`xpM}^&>{01z^x1A08^-z&-tr&28SuSvCKzZ#j78=o?9mQ!vJKijZ;7f8U<)z4*} HQ$iB}*?5Db literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_cmd.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/collar_cmd.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..450ec46c0f7e787c5b2a056df3c32cae88b83416 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|R04cLT!FNR zv8#k*grt**oSdAzyu7BSrcPL%ReEEf8*@P-%Z3>Yin)HBKy^GNL4Lsu{}F)mNPrqp zyvWnVF~p+x?SzAT4F(*}?VKl1{QF-&H(^f5F+H`oH@#mNTZ8KM>PvN<&E-%`=X=2x zle>J)w}#m(Id)1F3$8ivG%8$cI85*<9nW4J_Fj$;OXk;vd$@?2>_?{Tz>!n literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_cmd.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/collar_cmd.rsi/meta.json new file mode 100644 index 00000000000..8c6e22dd1fb --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/collar_cmd.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 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_engi.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/collar_engi.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..eb453b2f006b3e1fadd4be4e4438dd3a56e40fc1 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|{&>1LhE&XX zdut)zAp?PihsuskM-n_fC~F9GaO&7Ftv7IOa!i`_LCoe*1tUw62GhKhG&akcz}PN@ zg{sml|ITlXt}c(g>&F5#YQ1Hy+O5=mJwG;b$tNAvy0Y(Mwx0fRtt)fOKEM2IayoU_ z4a>JLPd%BCR%w`i%x>dc@fnxx)z~A~NpG5Ue~G*{J;k0S%*1l%!|L|U4)o(Kz=u~czD9z+9}09Kq8*5 KelF{r5}E*X8-hpx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_engi.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/collar_engi.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..46516d3bf6bf0931e62fc99dfc759ccd4ea2be7e GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|R04cLT!D0Y zqEak-(ffA7L9PP^9M0YCfnWarFAq6BXXV=I2lY<-e!7y8z5ky0&Z5r+iXuMk zatH2~oqWa7GP5gSg`xOCE+4;*={#>-1ehA_<}%LgdGN*Ou4KcT*}I}6#P*w=yl^UH p{><_g55q-s0@4DKUe_-Y&SPZxJ$ven-9W1uJYD@<);T3K0RW`&YLfr} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_engi.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/collar_engi.rsi/meta.json new file mode 100644 index 00000000000..8c6e22dd1fb --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/collar_engi.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 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_epi.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/collar_epi.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..83f63377090e820eed8ce45d02b280994116c209 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|K6tt~hE&XX zd&{uvkb}svkNF1=P2O{e`NmTdX6+jlVzXJr?`2-9Wazd$DaM_wsJ!`5(`OUM5C2~q zsr`)zKaX;lAq}GZffzgnJe$I z7zdxTEZP4qDf>hCudBC;r zTyyN|*BxfEbA4abF|RWFP?nOK)o;cNF=o$3W5)P|{De0y-XH-_S3j3^P6W+e|Non^DiW_S@%H*}q3}F8y_Tkz z7npb4){B&FGzb>tG<_x%(RfnzTTf#wi<82I<;Dt=1*gngY0W&LHn`mQ&~uw2e2T{_=dXVWQ{+VUB+0Ibe;~Jcy85}Sb4q9e0Eks!82|tP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_epi.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/collar_epi.rsi/meta.json new file mode 100644 index 00000000000..8c6e22dd1fb --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/collar_epi.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 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_logi.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/collar_logi.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..ada6c3f99bfb79a8b8066d87727b2c914c3b051a GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z89iMbLn`LH zz2)e2*g@pjNBswqyEtm+EezQBK=;lUiCrJWT6JC--gzR{+SPPHy2ML7E-7Zp%w^n) zpO*x_`M=$p4mb z)9(8o&kimBXZpKC`{?((I`+$#?cL0IR9(T6?cL`zpX2wgp8B&T6JpYXrdmd?WeM?9 R-HXIQBA%{(F6*2UngG<}k!t_| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_logi.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/collar_logi.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..99ba0ebe0d1046ab6b0b4340aa36468e2cd22c9d GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|ECYN(Tr)B< zl9G~&ii%oVT0%lXCQh8_@9)39SL)0vb1yHisHiAEKR=+_|7YZYHayUHx3vIVCg!0E3Hl<^TWy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_logi.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/collar_logi.rsi/meta.json new file mode 100644 index 00000000000..8c6e22dd1fb --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/collar_logi.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 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_med.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/collar_med.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..6389a4b9b201e8e4acbc5259081967c62976f713 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|et5b#hE&XX zd&@BEu!BJBL-7-$cXoQNPrKEixX*>FdDWehv8!Gdv5IrCT*_N)$NoXl%r#=8CeuC6 zNxgsT=eFE1-+U|2or!_rK<2T+GrI4epD6zxANg+H;-BAj<)=T`f9Q_w_u6`K%_kw6 zsxxQ4@-;ACI>qU=sd#i#y#4+!|MpzGe7ikPPF}^c*gSr9z0>v5?x%ibzn!lcJh}UC z!-|NmnQSFT(E(oxfPe~VuMQo&mikZE}KolK{t;IUGMDkhzLmRMQ$J--<~i&0 pd8Z2B{GDuK!qX(DX#Dlx!YqEAeSfw5VL_nP44$rjF6*2UngHvYY9jyu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_med.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/collar_med.rsi/meta.json new file mode 100644 index 00000000000..8c6e22dd1fb --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/collar_med.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 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_sec.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/collar_sec.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..6ae8bc2a562dcdee93ee7f3f592dd609f7915d62 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|9(%ethE&XX zdut=_Ap?r$Ecn#0~_srB$EuVJzrzcR?jr3`I zQvY6$xp;qb+R50B+W+rJ?ORcEXN`7M0H>|%x2TYkz$)zk9%@muDuRnoadU`TZuBa}t@g~D5Bm?FF`K#7{r&e@{~KOu-Sz+X k`N)aDSDyCPP&014WMi0+$d$VA?*fpBr>mdKI;Vst0OI0+k^lez literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_sec.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/collar_sec.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0e6ddabf74b7c705e1ffa590f7837a7d4644889b GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|v;urWTn`*L zz`(-rpJ66Y;6KCv@bK`(ix)HO-_P*>|NmnQckbNT4-)6k%gZ}_1LhE&XX zd&`#Vkb%g7kLsc=d6(8&?AoGW>y+MqfxCjO|AFM4rS1jaI9x9r4cyf^TS236!VL=! z-zA}6{!2Tb`0cUHMi6Mw6=UhXDQByMKW;Xt>zdlSv8ea{)|+dX_j65a-FWJ>?{U?M zySgri3f&hroHgOcJdx$AFIQeW`ATg{y6WV{6E*rm-`*WJiQRK@Ps_`^yHR)AO**b9 zb%sc}thM>O{>$~F%s?9;z<%9YO9pYhosnnRJMR2{ZvW3T*Pys?reJ|z+<8uwecvOZ z<@7gMo2Qhm+;r%p)y;#C5w;3^673ugEa19hDuVL;I`PZ!4! zi{7^rPVzM<@VF=nbN&B+)WNXK@%7Oo-G|q{U&^idx6(ech)_EbAOL@n|!w zQq_)fxH@Ah*JZ{H$7CM6nH$?QL8Y-TP#^4fG%M0boFyt=akR{08%wwIsgCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_syndi.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/collar_syndi.rsi/meta.json new file mode 100644 index 00000000000..8c6e22dd1fb --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/collar_syndi.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 From 437fab8fd178feef55f7898dc7c892bf58c99d58 Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Tue, 13 Aug 2024 14:09:02 -0500 Subject: [PATCH 2/3] Added to loadout --- .../Floof/Entities/Clothing/Neck/collars.yml | 10 -------- .../Loadouts/Jobs/Heads/captain.yml | 12 +++++++++ Resources/Prototypes/Loadouts/Jobs/cargo.yml | 14 +++++++++++ .../Prototypes/Loadouts/Jobs/engineering.yml | 14 +++++++++++ .../Prototypes/Loadouts/Jobs/medical.yml | 16 ++++++++++++ .../Prototypes/Loadouts/Jobs/science.yml | 14 +++++++++++ .../Prototypes/Loadouts/Jobs/security.yml | 14 +++++++++++ Resources/Prototypes/Loadouts/neck.yml | 25 +++++++++++++++++++ 8 files changed, 109 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml index d423597f196..a0d64910eb9 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml @@ -107,13 +107,3 @@ sprite: Floof/Clothing/Neck/collar_syndi.rsi - type: Clothing sprite: Floof/Clothing/Neck/collar_syndi.rsi - - - - #PLAN - #1: Add them all to respective vendors. Push update. - #2: Fix cum and milk production. Add pussy - #2.5 (optional): See how possible it is to mess with the max tank values and production values. - #3: Add internal-department collars (salvage, atmos, etc) - #4: Mess with making Cock traits as a different part. Add a "lewd traits" tab. - # diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml index d8849472ff4..e41da99475b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml @@ -146,3 +146,15 @@ - Captain items: - DrinkFlask + +# Floofstation - Collar Addition +- type: loadout + id: LoadoutCommandCapCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingNeckCollarCmd diff --git a/Resources/Prototypes/Loadouts/Jobs/cargo.yml b/Resources/Prototypes/Loadouts/Jobs/cargo.yml index 87463862010..86c7e5b2030 100644 --- a/Resources/Prototypes/Loadouts/Jobs/cargo.yml +++ b/Resources/Prototypes/Loadouts/Jobs/cargo.yml @@ -12,3 +12,17 @@ min: 36000 # 10 hours items: - ClothingNeckCloakGoliathCloak + +# Floofstation - Collar Addition +- type: loadout + id: LoadoutCargoNeckCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - CargoTechnician + - SalvageSpecialist + - Quartermaster + items: + - ClothingNeckCollarLogi diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml index 06ce4cbf8c3..ed4c5d99337 100644 --- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml +++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml @@ -176,3 +176,17 @@ - AtmosphericTechnician items: - ClothingHeadHatHardhatRed + +# Floofstation - Collar Addition +- type: loadout + id: LoadoutEngineeringNeckCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - StationEngineer + - AtmosphericTechnician + - ChiefEngineer + items: + - ClothingNeckCollarEngi diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml index edf51747d00..0f249be5b06 100644 --- a/Resources/Prototypes/Loadouts/Jobs/medical.yml +++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml @@ -495,3 +495,19 @@ - Nearsighted items: - ClothingEyesPrescriptionMedHud + +# Floofstation - Collar Addition +- type: loadout + id: LoadoutMedicalNeckCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Brigmedic + items: + - ClothingNeckCollarMed diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml index ad93e92557b..c0220de7c3d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/science.yml +++ b/Resources/Prototypes/Loadouts/Jobs/science.yml @@ -158,3 +158,17 @@ - Scientist - ResearchAssistant - ResearchDirector + +# Floofstation - Collar Addition +- type: loadout + id: LoadoutScienceNeckCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - Scientist + - ResearchAssistant + - ResearchDirector + items: + - ClothingNeckCollarEpi diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml index 2809c9c1ae5..1cbb87fc6c1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/security.yml @@ -383,3 +383,17 @@ # - Oni # items: # - Truncheon + +# Floofstation - Collar Addition +- type: loadout + id: LoadoutSecurityNeckCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - SecurityOfficer + - Warden + - HeadOfSecurity + items: + - ClothingNeckCollarSec diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml index eb933de29ee..636b9c5b8a5 100644 --- a/Resources/Prototypes/Loadouts/neck.yml +++ b/Resources/Prototypes/Loadouts/neck.yml @@ -102,3 +102,28 @@ exclusive: true items: - ClothingNeckTransPin + +# Floofstation - Collar Addition +- type: loadout + id: LoadoutItemsNeckBlueCollar + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckCollarBlue + +- type: loadout + id: LoadoutItemsNeckBlackCollar + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckCollarBlack + +- type: loadout + id: LoadoutItemsNeckSyndieCollar + category: Neck + cost: 3 + exclusive: true + items: + - ClothingNeckCollarSyndi From c6b19a0f18d083e0ee0b0329ad6836a8b499508f Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Tue, 13 Aug 2024 14:30:13 -0500 Subject: [PATCH 3/3] Use the Floof folder --- Resources/Prototypes/Floof/Loadouts/neck.yml | 103 ++++++++++++++++++ .../Loadouts/Jobs/Heads/captain.yml | 12 -- Resources/Prototypes/Loadouts/Jobs/cargo.yml | 14 --- .../Prototypes/Loadouts/Jobs/engineering.yml | 14 --- .../Prototypes/Loadouts/Jobs/medical.yml | 16 --- .../Prototypes/Loadouts/Jobs/science.yml | 14 --- .../Prototypes/Loadouts/Jobs/security.yml | 14 --- Resources/Prototypes/Loadouts/neck.yml | 25 ----- 8 files changed, 103 insertions(+), 109 deletions(-) diff --git a/Resources/Prototypes/Floof/Loadouts/neck.yml b/Resources/Prototypes/Floof/Loadouts/neck.yml index 8f826830945..e75b8560268 100644 --- a/Resources/Prototypes/Floof/Loadouts/neck.yml +++ b/Resources/Prototypes/Floof/Loadouts/neck.yml @@ -5,3 +5,106 @@ exclusive: true items: - ClothingNeckCloakMoth + +# Collars +- type: loadout + id: LoadoutCommandCapCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingNeckCollarCmd + +- type: loadout + id: LoadoutCargoNeckCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - CargoTechnician + - SalvageSpecialist + - Quartermaster + items: + - ClothingNeckCollarLogi + +- type: loadout + id: LoadoutEngineeringNeckCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - StationEngineer + - AtmosphericTechnician + - ChiefEngineer + items: + - ClothingNeckCollarEngi + +- type: loadout + id: LoadoutMedicalNeckCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Brigmedic + items: + - ClothingNeckCollarMed + +- type: loadout + id: LoadoutScienceNeckCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - Scientist + - ResearchAssistant + - ResearchDirector + items: + - ClothingNeckCollarEpi + +- type: loadout + id: LoadoutSecurityNeckCollar + category: Jobs + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - SecurityOfficer + - Warden + - HeadOfSecurity + items: + - ClothingNeckCollarSec + +- type: loadout + id: LoadoutItemsNeckBlueCollar + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckCollarBlue + +- type: loadout + id: LoadoutItemsNeckBlackCollar + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckCollarBlack + +- type: loadout + id: LoadoutItemsNeckSyndieCollar + category: Neck + cost: 3 + exclusive: true + items: + - ClothingNeckCollarSyndi diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml index 3e8c8385c32..d77dabf557c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml @@ -151,15 +151,3 @@ - Captain items: - DrinkFlask - -# Floofstation - Collar Addition -- type: loadout - id: LoadoutCommandCapCollar - category: Jobs - cost: 1 - requirements: - - !type:CharacterJobRequirement - jobs: - - Captain - items: - - ClothingNeckCollarCmd diff --git a/Resources/Prototypes/Loadouts/Jobs/cargo.yml b/Resources/Prototypes/Loadouts/Jobs/cargo.yml index f6f187466a5..cdc83a3c0f7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/cargo.yml +++ b/Resources/Prototypes/Loadouts/Jobs/cargo.yml @@ -56,17 +56,3 @@ min: 36000 # 10 hours items: - ClothingNeckCloakGoliathCloak - -# Floofstation - Collar Addition -- type: loadout - id: LoadoutCargoNeckCollar - category: Jobs - cost: 1 - requirements: - - !type:CharacterJobRequirement - jobs: - - CargoTechnician - - SalvageSpecialist - - Quartermaster - items: - - ClothingNeckCollarLogi diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml index ed4c5d99337..06ce4cbf8c3 100644 --- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml +++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml @@ -176,17 +176,3 @@ - AtmosphericTechnician items: - ClothingHeadHatHardhatRed - -# Floofstation - Collar Addition -- type: loadout - id: LoadoutEngineeringNeckCollar - category: Jobs - cost: 1 - requirements: - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - AtmosphericTechnician - - ChiefEngineer - items: - - ClothingNeckCollarEngi diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml index 6241c5b3199..f193dfaea2d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/medical.yml +++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml @@ -601,19 +601,3 @@ - Chemist items: - ClothingHandsGlovesChemist - -# Floofstation - Collar Addition -- type: loadout - id: LoadoutMedicalNeckCollar - category: Jobs - cost: 1 - requirements: - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Paramedic - - ChiefMedicalOfficer - - MedicalIntern - - Brigmedic - items: - - ClothingNeckCollarMed diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml index c0220de7c3d..ad93e92557b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/science.yml +++ b/Resources/Prototypes/Loadouts/Jobs/science.yml @@ -158,17 +158,3 @@ - Scientist - ResearchAssistant - ResearchDirector - -# Floofstation - Collar Addition -- type: loadout - id: LoadoutScienceNeckCollar - category: Jobs - cost: 1 - requirements: - - !type:CharacterJobRequirement - jobs: - - Scientist - - ResearchAssistant - - ResearchDirector - items: - - ClothingNeckCollarEpi diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml index 0df7cde0cab..f1c64730378 100644 --- a/Resources/Prototypes/Loadouts/Jobs/security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/security.yml @@ -400,17 +400,3 @@ # - Oni # items: # - Truncheon - -# Floofstation - Collar Addition -- type: loadout - id: LoadoutSecurityNeckCollar - category: Jobs - cost: 1 - requirements: - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - Warden - - HeadOfSecurity - items: - - ClothingNeckCollarSec diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml index 6773d57ef8f..c7fc7003653 100644 --- a/Resources/Prototypes/Loadouts/neck.yml +++ b/Resources/Prototypes/Loadouts/neck.yml @@ -406,28 +406,3 @@ inverted: true departments: - Command - -# Floofstation - Collar Addition -- type: loadout - id: LoadoutItemsNeckBlueCollar - category: Neck - cost: 1 - exclusive: true - items: - - ClothingNeckCollarBlue - -- type: loadout - id: LoadoutItemsNeckBlackCollar - category: Neck - cost: 1 - exclusive: true - items: - - ClothingNeckCollarBlack - -- type: loadout - id: LoadoutItemsNeckSyndieCollar - category: Neck - cost: 3 - exclusive: true - items: - - ClothingNeckCollarSyndi