From e01a47b0899c2f37c0bbad8209b03dfe593c2bc6 Mon Sep 17 00:00:00 2001 From: uaNoName <131008018+uaNoName@users.noreply.github.com> Date: Thu, 8 Aug 2024 21:50:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B8=D0=B6=D0=BD=D0=B5=D0=B5=20=D0=B1?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D1=91=20=D0=B2=20=D0=BB=D0=BE=D0=B4=D0=B0?= =?UTF-8?q?=D1=83=D1=82=D1=8B=20(#580)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Reapply "Reapply "Нижнее бельё в лодауты"" This reverts commit 44447d573f8ade0b556030ad55ea8b622aee7745. * fixes * fixes ver. 2 * fixes ver. 3 (final, i hope) * fixes ver. 4 --- .../ru-RU/_white/loadouts/loadoutGroups.ftl | 9 +- .../Catalog/Fills/Lockers/dressers.yml | 22 + .../Catalog/Fills/Lockers/heads.yml | 3 + .../Loadouts/Jobs/Command/captain.yml | 1 - .../Jobs/Medical/senior_physician.yml | 1 - .../Loadouts/Jobs/Science/scientist.yml | 1 - Resources/Prototypes/Loadouts/Jobs/common.yml | 601 ++++++++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 457 +++++++++++++ .../Prototypes/Loadouts/role_loadouts.yml | 130 +++- 9 files changed, 1218 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl b/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl index bcc12c58ad..68af5afca1 100644 --- a/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl +++ b/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl @@ -1,17 +1,20 @@ loadout-group-head = Голова loadout-group-ears = Наушник -loadout-group-eyes = Очки +loadout-group-eyes = Глаза loadout-group-neck = Шея -loadout-group-mask = Маска +loadout-group-mask = Лицо loadout-group-jumpsuit = Униформа loadout-group-outerclothing = Верхняя одежда loadout-group-backpack = Рюкзак loadout-group-belt = Пояс loadout-group-gloves = Перчатки -loadout-group-shoes = Ботинки +loadout-group-shoes = Обувь loadout-group-pda = ПДА loadout-group-job-trinkets = Рабочий инвентарь loadout-group-inhand = В руках loadout-group-trinkets = Побрякушки loadout-group-instruments = Муз. инструменты loadout-group-self-defence-devices = Средства самообороны +loadout-group-underwear-bottom = Трусы +loadout-group-underwear-bra = Бра +loadout-group-underwear-socks = Носки diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index dc1a0325e3..1f7a3c415c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -19,6 +19,10 @@ - id: ClothingMaskGasCaptain - id: ClothingUniformJumpskirtCaptain - id: ClothingOuterWinterCap + - id: ClothingUnderwearBottomBoxersCap # WD + - id: ClothingUnderwearBottomPantiesCap # WD + - id: ClothingUnderwearTopBraCap # WD + - type: entity id: DresserChiefEngineerFilled @@ -36,6 +40,9 @@ - id: ClothingHeadsetAltEngineering - id: ClothingHeadHatHardhatWhite - id: ClothingHandsGlovesColorYellow + - id: ClothingUnderwearBottomBoxersCE # WD + - id: ClothingUnderwearBottomPantiesCE # WD + - id: ClothingUnderwearTopBraCE # WD - type: entity id: DresserChiefMedicalOfficerFilled @@ -56,6 +63,9 @@ - id: ClothingHeadsetAltMedical - id: ClothingMaskSterile - id: ClothingEyesEyepatchHudMedical + - id: ClothingUnderwearBottomBoxersCMO # WD + - id: ClothingUnderwearBottomPantiesCMO # WD + - id: ClothingUnderwearTopBraCMO # WD - type: entity id: DresserHeadOfPersonnelFilled @@ -74,6 +84,9 @@ - id: ClothingShoesLeather - id: ClothingUniformJumpsuitHoP - id: ClothingUniformJumpskirtHoP + - id: ClothingUnderwearBottomBoxersHOP # WD + - id: ClothingUnderwearBottomPantiesHOP # WD + - id: ClothingUnderwearTopBraHOP # WD - type: entity id: DresserHeadOfSecurityFilled @@ -96,6 +109,9 @@ - id: ClothingHeadsetAltSecurityCommand - id: ClothingMaskGasSwat - id: ClothingOuterCoatHoSTrench + - id: ClothingUnderwearBottomBoxersHOS # WD + - id: ClothingUnderwearBottomPantiesHOS # WD + - id: ClothingUnderwearTopBraHOS # WD - type: entity id: DresserQuarterMasterFilled @@ -117,6 +133,9 @@ - id: ClothingUniformJumpsuitQM - id: ClothingUniformJumpskirtQM - id: ClothingHeadHatQMsoft + - id: ClothingUnderwearBottomBoxersQM # WD + - id: ClothingUnderwearBottomPantiesQM # WD + - id: ClothingUnderwearTopBraQM # WD - type: entity id: DresserResearchDirectorFilled @@ -134,6 +153,9 @@ - id: ClothingUniformJumpsuitResearchDirector - id: ClothingOuterWinterRD - id: ClothingOuterCoatRD + - id: ClothingUnderwearBottomBoxersRD # WD + - id: ClothingUnderwearBottomPantiesRD # WD + - id: ClothingUnderwearTopBraRD # WD - type: entity id: DresserWardenFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 7ff1f531a1..65ee4df28b 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -328,3 +328,6 @@ - id: ClothingHandsGlovesInspector - id: ClothingHeadsetAltSecurityCommand - id: RubberStampInspector + - id: ClothingUnderwearBottomBoxersInspector # WD + - id: ClothingUnderwearBottomPantiesInspector # WD + - id: ClothingUnderwearTopBraInspector # WD diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index dd5c2c8905..f416568888 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -151,7 +151,6 @@ - type: itemLoadout # WD id: CaptainEars equipment: CaptainEars - - type: startingGear id: CaptainEars equipment: diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/senior_physician.yml index e4e7cbbf0f..cda977e4a2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/senior_physician.yml @@ -40,4 +40,3 @@ id: SeniorPhysicianPDA equipment: id: SeniorPhysicianPDA - diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index 4e56a46d46..26cbd38078 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -124,4 +124,3 @@ id: ScientistPDA equipment: id: SciencePDA - diff --git a/Resources/Prototypes/Loadouts/Jobs/common.yml b/Resources/Prototypes/Loadouts/Jobs/common.yml index b51c76a769..bb6278eea1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/common.yml @@ -483,3 +483,604 @@ storage: back: - Cane + +#Underwear + +#ManUnderwear +#Bottom +- type: itemLoadout # WD + id: CaptainBoxers + equipment: CaptainBoxers +- type: startingGear + id: CaptainBoxers + equipment: + underwearb: ClothingUnderwearBottomBoxersCap + +- type: itemLoadout # WD + id: CaptainPanties + equipment: CaptainPanties +- type: startingGear + id: CaptainPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesCap + +- type: itemLoadout # WD + id: CEBoxers + equipment: CEBoxers +- type: startingGear + id: CEBoxers + equipment: + underwearb: ClothingUnderwearBottomBoxersCE + +- type: itemLoadout # WD + id: CEPanties + equipment: CEPanties +- type: startingGear + id: CEPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesCE + +- type: itemLoadout # WD + id: CMOBoxers + equipment: CMOBoxers +- type: startingGear + id: CMOBoxers + equipment: + underwearb: ClothingUnderwearBottomBoxersCMO + +- type: itemLoadout # WD + id: CMOPanties + equipment: CMOPanties +- type: startingGear + id: CMOPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesCMO + +- type: itemLoadout # WD + id: CMOPanties + equipment: CMOPanties +- type: startingGear + id: CMOPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesCMO + +- type: itemLoadout # WD + id: HOPBoxers + equipment: HOPBoxers +- type: startingGear + id: HOPBoxers + equipment: + underwearb: ClothingUnderwearBottomBoxersHOP + +- type: itemLoadout # WD + id: HOPPanties + equipment: HOPPanties +- type: startingGear + id: HOPPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesHOP + +- type: itemLoadout # WD + id: HOSBoxers + equipment: HOSBoxers +- type: startingGear + id: HOSBoxers + equipment: + underwearb: ClothingUnderwearBottomBoxersHOS + +- type: itemLoadout # WD + id: HOSPanties + equipment: HOSPanties +- type: startingGear + id: HOSPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesHOS + +- type: itemLoadout # WD + id: QMBoxers + equipment: QMBoxers +- type: startingGear + id: QMBoxers + equipment: + underwearb: ClothingUnderwearBottomBoxersQM + +- type: itemLoadout # WD + id: QMPanties + equipment: QMPanties +- type: startingGear + id: QMPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesQM + +- type: itemLoadout # WD + id: RDBoxers + equipment: RDBoxers +- type: startingGear + id: RDBoxers + equipment: + underwearb: ClothingUnderwearBottomBoxersRD + +- type: itemLoadout # WD + id: RDPanties + equipment: RDPanties +- type: startingGear + id: RDPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesRD + +- type: itemLoadout # WD + id: InspectorPanties + equipment: InspectorPanties +- type: startingGear + id: InspectorPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesInspector + +- type: itemLoadout # WD + id: InspectorBoxers + equipment: InspectorBoxers +- type: startingGear + id: InspectorBoxers + equipment: + underwearb: ClothingUnderwearBottomBoxersInspector + +- type: itemLoadout # WD + id: WhiteBoxer + equipment: WhiteBoxer +- type: startingGear + id: WhiteBoxer + equipment: + underwearb: ClothingUnderwearBottomBoxersWhite + +- type: itemLoadout # WD + id: HeartBoxer + equipment: HeartBoxer +- type: startingGear + id: HeartBoxer + equipment: + underwearb: ClothingUnderwearBottomBoxersHeart + +- type: itemLoadout # WD + id: StripedBoxer + equipment: StripedBoxer +- type: startingGear + id: StripedBoxer + equipment: + underwearb: ClothingUnderwearBottomBoxersStriped + +- type: itemLoadout # WD + id: Briefs + equipment: Briefs +- type: startingGear + id: Briefs + equipment: + underwearb: ClothingUnderwearBottomBriefs + +- type: itemLoadout # WD + id: Jockstrap + equipment: Jockstrap +- type: startingGear + id: Jockstrap + equipment: + underwearb: ClothingUnderwearBottomJockstrap + +- type: itemLoadout # WD + id: Mankini + equipment: Mankini +- type: startingGear + id: Mankini + equipment: + underwearb: ClothingUnderwearBottomMankini + +- type: itemLoadout # WD + id: BeeShorts + equipment: BeeShorts +- type: startingGear + id: BeeShorts + equipment: + underwearb: ClothingUnderwearBottomBeeShorts + +#WomanUnderwear +#Bra +- type: itemLoadout # WD + id: CaptainBra + equipment: CaptainBra +- type: startingGear + id: CaptainBra + equipment: + underweart: ClothingUnderwearTopBraCap + +- type: itemLoadout # WD + id: CEBra + equipment: CEBra +- type: startingGear + id: CEBra + equipment: + underweart: ClothingUnderwearTopBraCE + +- type: itemLoadout # WD + id: CMOBra + equipment: CMOBra +- type: startingGear + id: CMOBra + equipment: + underweart: ClothingUnderwearTopBraCMO + +- type: itemLoadout # WD + id: HOPBra + equipment: HOPBra +- type: startingGear + id: HOPBra + equipment: + underweart: ClothingUnderwearTopBraHOP + +- type: itemLoadout # WD + id: HOSBra + equipment: HOSBra +- type: startingGear + id: HOSBra + equipment: + underweart: ClothingUnderwearTopBraHOS + +- type: itemLoadout # WD + id: QMBra + equipment: QMBra +- type: startingGear + id: QMBra + equipment: + underweart: ClothingUnderwearTopBraQM + +- type: itemLoadout # WD + id: RDBra + equipment: RDBra +- type: startingGear + id: RDBra + equipment: + underweart: ClothingUnderwearTopBraRD + +- type: itemLoadout # WD + id: InspectorBra + equipment: InspectorBra +- type: startingGear + id: InspectorBra + equipment: + underweart: ClothingUnderwearTopBraInspector + +- type: itemLoadout # WD + id: WhiteBra + equipment: WhiteBra +- type: startingGear + id: WhiteBra + equipment: + underweart: ClothingUnderwearTopBraWhite + +- type: itemLoadout # WD + id: StripedBra + equipment: StripedBra +- type: startingGear + id: StripedBra + equipment: + underweart: ClothingUnderwearTopBraStriped + +- type: itemLoadout # WD + id: BinderBra + equipment: BinderBra +- type: startingGear + id: BinderBra + equipment: + underweart: ClothingUnderwearTopBraBinder + +- type: itemLoadout # WD + id: SportBra + equipment: SportBra +- type: startingGear + id: SportBra + equipment: + underweart: ClothingUnderwearTopBraSports + +- type: itemLoadout # WD + id: SportBraAlt + equipment: SportBraAlt +- type: startingGear + id: SportBraAlt + equipment: + underweart: ClothingUnderwearTopBraSportsAlternative + +- type: itemLoadout # WD + id: SwimmingBra + equipment: SwimmingBra +- type: startingGear + id: SwimmingBra + equipment: + underweart: ClothingUnderwearTopBraSwimming + +- type: itemLoadout # WD + id: SwimmingBraAlt + equipment: SwimmingBraAlt +- type: startingGear + id: SwimmingBraAlt + equipment: + underweart: ClothingUnderwearTopBraSwimmingAlt + +- type: itemLoadout # WD + id: TubetopBra + equipment: TubetopBra +- type: startingGear + id: TubetopBra + equipment: + underweart: ClothingUnderwearTopBraTubetop + +- type: itemLoadout # WD + id: BinderStraplessBra + equipment: BinderStraplessBra +- type: startingGear + id: BinderStraplessBra + equipment: + underweart: ClothingUnderwearTopBraBinderStrapless + +- type: itemLoadout # WD + id: StraplessBraAlt + equipment: StraplessBraAlt +- type: startingGear + id: StraplessBraAlt + equipment: + underweart: ClothingUnderwearTopBraStraplessAlt + +- type: itemLoadout # WD + id: HalterneckBra + equipment: HalterneckBra +- type: startingGear + id: HalterneckBra + equipment: + underweart: ClothingUnderwearTopBraHalterneck + +- type: itemLoadout # WD + id: ThinBra + equipment: ThinBra +- type: startingGear + id: ThinBra + equipment: + underweart: ClothingUnderwearTopBraThin + +- type: itemLoadout # WD + id: NekoBra + equipment: NekoBra +- type: startingGear + id: NekoBra + equipment: + underweart: ClothingUnderwearTopBraNeko + +- type: itemLoadout # WD + id: BeeBra + equipment: BeeBra +- type: startingGear + id: BeeBra + equipment: + underweart: ClothingUnderwearTopBraBeeKini + +- type: itemLoadout # WD + id: CowBra + equipment: CowBra +- type: startingGear + id: CowBra + equipment: + underweart: ClothingUnderwearTopCow + +#Panties +- type: itemLoadout # WD + id: WhitePanties + equipment: WhitePanties +- type: startingGear + id: WhitePanties + equipment: + underwearb: ClothingUnderwearBottomPantiesWhite + +- type: itemLoadout # WD + id: StripedPanties + equipment: StripedPanties +- type: startingGear + id: StripedPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesStripped + +- type: itemLoadout # WD + id: SlimPanties + equipment: SlimPanties +- type: startingGear + id: SlimPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesSlim + +- type: itemLoadout # WD + id: SwimmingPanties + equipment: SwimmingPanties +- type: startingGear + id: SwimmingPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesSwimming + +- type: itemLoadout # WD + id: ThongPanties + equipment: ThongPanties +- type: startingGear + id: ThongPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesThong + +- type: itemLoadout # WD + id: ThinPanties + equipment: ThinPanties +- type: startingGear + id: ThinPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesThin + +- type: itemLoadout # WD + id: BeePanties + equipment: BeePanties +- type: startingGear + id: BeePanties + equipment: + underwearb: ClothingUnderwearBottomPantiesBeeKini + +- type: itemLoadout # WD + id: NekoPanties + equipment: NekoPanties +- type: startingGear + id: NekoPanties + equipment: + underwearb: ClothingUnderwearBottomPantiesNeko + +# Socks +- type: itemLoadout # WD + id: Socks1White + equipment: Socks1White +- type: startingGear + id: Socks1White + equipment: + socks: ClothingUnderwearSocksNormal + +- type: itemLoadout # WD + id: Socks2White + equipment: Socks2White +- type: startingGear + id: Socks2White + equipment: + socks: ClothingUnderwearSocksHigh + +- type: itemLoadout # WD + id: Socks3White + equipment: Socks3White +- type: startingGear + id: Socks3White + equipment: + socks: ClothingUnderwearSocksThigh + +- type: itemLoadout # WD + id: Socks4White + equipment: Socks4White +- type: startingGear + id: Socks4White + equipment: + socks: ClothingUnderwearSocksGarter + +- type: itemLoadout # WD + id: Socks1Black + equipment: Socks1Black +- type: startingGear + id: Socks1Black + equipment: + socks: ClothingUnderwearSocksThinKnee + +- type: itemLoadout # WD + id: Socks2Black + equipment: Socks2Black +- type: startingGear + id: Socks2Black + equipment: + socks: ClothingUnderwearSocksThinThigh + +- type: itemLoadout # WD + id: Socks3Black + equipment: Socks3Black +- type: startingGear + id: Socks3Black + equipment: + socks: ClothingUnderwearSocksPantyhose + +- type: itemLoadout # WD + id: Socks1BlackWhite + equipment: Socks1BlackWhite +- type: startingGear + id: Socks1BlackWhite + equipment: + socks: ClothingUnderwearSocksStripedKnee + +- type: itemLoadout # WD + id: Socks2BlackWhite + equipment: Socks2BlackWhite +- type: startingGear + id: Socks2BlackWhite + equipment: + socks: ClothingUnderwearSocksStripedThigh + +#Striped stockings +- type: itemLoadout # WD + id: Socks1Bee + equipment: Socks1Bee +- type: startingGear + id: Socks1Bee + equipment: + socks: ClothingUnderwearSocksBeeKnee + +- type: itemLoadout # WD + id: Socks2Bee + equipment: Socks2Bee +- type: startingGear + id: Socks2Bee + equipment: + socks: ClothingUnderwearSocksBeeThigh + +- type: itemLoadout # WD + id: Stockings1LightPink + equipment: Stockings1LightPink +- type: startingGear + id: Stockings1LightPink + equipment: + socks: ClothingUnderwearStockingsLightPink + +- type: itemLoadout # WD + id: Stockings2Cyan + equipment: Stockings2Cyan +- type: startingGear + id: Stockings2Cyan + equipment: + socks: ClothingUnderwearStockingsCyan + +- type: itemLoadout # WD + id: Stockings3LightPurple + equipment: Stockings3LightPurple +- type: startingGear + id: Stockings3LightPurple + equipment: + socks: ClothingUnderwearStockingsLightPurple + +- type: itemLoadout # WD + id: Stockings4Green + equipment: Stockings4Green +- type: startingGear + id: Stockings4Green + equipment: + socks: ClothingUnderwearStockingsGreen + +- type: itemLoadout # WD + id: Stockings5Pink + equipment: Stockings5Pink +- type: startingGear + id: Stockings5Pink + equipment: + socks: ClothingUnderwearStockingsPink + +- type: itemLoadout # WD + id: Stockings6Orange + equipment: Stockings6Orange +- type: startingGear + id: Stockings6Orange + equipment: + socks: ClothingUnderwearStockingsLightOrange + +- type: itemLoadout # WD + id: Stockings7Blue + equipment: Stockings7Blue +- type: startingGear + id: Stockings7Blue + equipment: + socks: ClothingUnderwearStockingsBlue + +- type: itemLoadout # WD + id: Stockings8Yellow + equipment: Stockings8Yellow +- type: startingGear + id: Stockings8Yellow + equipment: + socks: ClothingUnderwearStockingsLightYellow diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 775e3ee4db..f9e6c071b3 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -2224,3 +2224,460 @@ name: loadout-group-pda loadouts: - ZookeeperPDA + +#Underwear + +#Bottom +- type: loadoutGroup # WD + id: CommonUnderwearBottom + name: loadout-group-underwear-bottom + minLimit: 0 + loadouts: + - WhiteBoxer + - HeartBoxer + - StripedBoxer + - Briefs + - Jockstrap + - Mankini + - BeeShorts + - WhitePanties + - StripedPanties + - SlimPanties + - SwimmingPanties + - ThongPanties + - ThinPanties + - NekoPanties + - BeePanties + +#Bra +- type: loadoutGroup # WD + id: CommonUnderwearBra + name: loadout-group-underwear-bra + minLimit: 0 + loadouts: + - WhiteBra + - StripedBra + - BinderBra + - SportBra + - SportBraAlt + - SwimmingBra + - SwimmingBraAlt + - TubetopBra + - BinderStraplessBra + - StraplessBra + - StraplessBraAlt + - HalterneckBra + - ThinBra + - NekoBra + - BeeBra + - CowBra + +#Socks +- type: loadoutGroup # WD + id: CommonUnderwearSocks + name: loadout-group-underwear-socks + minLimit: 0 + loadouts: + - Socks1White + - Socks2White + - Socks3White + - Socks4White + - Socks1Black + - Socks2Black + - Socks3Black + - Socks1BlackWhite + - Socks2BlackWhite + - Socks1Bee + - Socks2Bee + - Stockings1LightPink + - Stockings2Cyan + - Stockings3LightPurple + - Stockings4Green + - Stockings5Pink + - Stockings6Orange + - Stockings7Blue + - Stockings8Yellow + +#BottomCaptain +- type: loadoutGroup # WD + id: CommonUnderwearBottomCaptain + name: loadout-group-underwear-bottom + minLimit: 0 + loadouts: + - CaptainBoxers + - CaptainPanties + - WhiteBoxer + - HeartBoxer + - StripedBoxer + - Briefs + - Jockstrap + - Mankini + - BeeShorts + - WhitePanties + - StripedPanties + - SlimPanties + - SwimmingPanties + - ThongPanties + - ThinPanties + - NekoPanties + - BeePanties + +#BraCaptain +- type: loadoutGroup # WD + id: CommonUnderwearBraCaptain + name: loadout-group-underwear-bra + minLimit: 0 + loadouts: + - CaptainBra + - WhiteBra + - StripedBra + - BinderBra + - SportBra + - SportBraAlt + - SwimmingBra + - SwimmingBraAlt + - TubetopBra + - BinderStraplessBra + - StraplessBra + - StraplessBraAlt + - HalterneckBra + - ThinBra + - NekoBra + - BeeBra + - CowBra + +#BottomCE +- type: loadoutGroup # WD + id: CommonUnderwearBottomCE + name: loadout-group-underwear-bottom + minLimit: 0 + loadouts: + - CEBoxers + - CEPanties + - WhiteBoxer + - HeartBoxer + - StripedBoxer + - Briefs + - Jockstrap + - Mankini + - BeeShorts + - WhitePanties + - StripedPanties + - SlimPanties + - SwimmingPanties + - ThongPanties + - ThinPanties + - NekoPanties + - BeePanties + +#BraCE +- type: loadoutGroup # WD + id: CommonUnderwearBraCE + name: loadout-group-underwear-bra + minLimit: 0 + loadouts: + - CEBra + - WhiteBra + - StripedBra + - BinderBra + - SportBra + - SportBraAlt + - SwimmingBra + - SwimmingBraAlt + - TubetopBra + - BinderStraplessBra + - StraplessBra + - StraplessBraAlt + - HalterneckBra + - ThinBra + - NekoBra + - BeeBra + - CowBra + +#BottomCMO +- type: loadoutGroup # WD + id: CommonUnderwearBottomCMO + name: loadout-group-underwear-bottom + minLimit: 0 + loadouts: + - CMOBoxers + - CMOPanties + - WhiteBoxer + - HeartBoxer + - StripedBoxer + - Briefs + - Jockstrap + - Mankini + - BeeShorts + - WhitePanties + - StripedPanties + - SlimPanties + - SwimmingPanties + - ThongPanties + - ThinPanties + - NekoPanties + - BeePanties + +#BraCMO +- type: loadoutGroup # WD + id: CommonUnderwearBraCMO + name: loadout-group-underwear-bra + minLimit: 0 + loadouts: + - CMOBra + - WhiteBra + - StripedBra + - BinderBra + - SportBra + - SportBraAlt + - SwimmingBra + - SwimmingBraAlt + - TubetopBra + - BinderStraplessBra + - StraplessBra + - StraplessBraAlt + - HalterneckBra + - ThinBra + - NekoBra + - BeeBra + - CowBra + +#BottomHOP +- type: loadoutGroup # WD + id: CommonUnderwearBottomHOP + name: loadout-group-underwear-bottom + minLimit: 0 + loadouts: + - HOPBoxers + - HOPPanties + - WhiteBoxer + - HeartBoxer + - StripedBoxer + - Briefs + - Jockstrap + - Mankini + - BeeShorts + - WhitePanties + - StripedPanties + - SlimPanties + - SwimmingPanties + - ThongPanties + - ThinPanties + - NekoPanties + - BeePanties + +#BraHOP +- type: loadoutGroup # WD + id: CommonUnderwearBraHOP + name: loadout-group-underwear-bra + minLimit: 0 + loadouts: + - HOPBra + - WhiteBra + - StripedBra + - BinderBra + - SportBra + - SportBraAlt + - SwimmingBra + - SwimmingBraAlt + - TubetopBra + - BinderStraplessBra + - StraplessBra + - StraplessBraAlt + - HalterneckBra + - ThinBra + - NekoBra + - BeeBra + - CowBra + +#BottomHOS +- type: loadoutGroup # WD + id: CommonUnderwearBottomHOS + name: loadout-group-underwear-bottom + minLimit: 0 + loadouts: + - HOSBoxers + - HOSPanties + - WhiteBoxer + - HeartBoxer + - StripedBoxer + - Briefs + - Jockstrap + - Mankini + - BeeShorts + - WhitePanties + - StripedPanties + - SlimPanties + - SwimmingPanties + - ThongPanties + - ThinPanties + - NekoPanties + - BeePanties + +#BraHOS +- type: loadoutGroup # WD + id: CommonUnderwearBraHOS + name: loadout-group-underwear-bra + minLimit: 0 + loadouts: + - HOSBra + - WhiteBra + - StripedBra + - BinderBra + - SportBra + - SportBraAlt + - SwimmingBra + - SwimmingBraAlt + - TubetopBra + - BinderStraplessBra + - StraplessBra + - StraplessBraAlt + - HalterneckBra + - ThinBra + - NekoBra + - BeeBra + - CowBra + +#InspectorCaptain +- type: loadoutGroup # WD + id: CommonUnderwearBottomInspector + name: loadout-group-underwear-bottom + minLimit: 0 + loadouts: + - InspectorBoxers + - InspectorPanties + - WhiteBoxer + - HeartBoxer + - StripedBoxer + - Briefs + - Jockstrap + - Mankini + - BeeShorts + - WhitePanties + - StripedPanties + - SlimPanties + - SwimmingPanties + - ThongPanties + - ThinPanties + - NekoPanties + - BeePanties + +#BraInspector +- type: loadoutGroup # WD + id: CommonUnderwearBraInspector + name: loadout-group-underwear-bra + minLimit: 0 + loadouts: + - InspectorBra + - WhiteBra + - StripedBra + - BinderBra + - SportBra + - SportBraAlt + - SwimmingBra + - SwimmingBraAlt + - TubetopBra + - BinderStraplessBra + - StraplessBra + - StraplessBraAlt + - HalterneckBra + - ThinBra + - NekoBra + - BeeBra + - CowBra + +#BottomQM +- type: loadoutGroup # WD + id: CommonUnderwearBottomQM + name: loadout-group-underwear-bottom + minLimit: 0 + loadouts: + - QMBoxers # WD + - QMPanties # WD + - WhiteBoxer + - HeartBoxer + - StripedBoxer + - Briefs + - Jockstrap + - Mankini + - BeeShorts + - WhitePanties + - StripedPanties + - SlimPanties + - SwimmingPanties + - ThongPanties + - ThinPanties + - NekoPanties + - BeePanties + +#BraQM +- type: loadoutGroup # WD + id: CommonUnderwearBraQM + name: loadout-group-underwear-bra + minLimit: 0 + loadouts: + - QMBra + - WhiteBra + - StripedBra + - BinderBra + - SportBra + - SportBraAlt + - SwimmingBra + - SwimmingBraAlt + - TubetopBra + - BinderStraplessBra + - StraplessBra + - StraplessBraAlt + - HalterneckBra + - ThinBra + - NekoBra + - BeeBra + - CowBra + +#BottomRD +- type: loadoutGroup # WD + id: CommonUnderwearBottomRD + name: loadout-group-underwear-bottom + minLimit: 0 + loadouts: + - RDBoxers + - RDPanties + - WhiteBoxer + - HeartBoxer + - StripedBoxer + - Briefs + - Jockstrap + - Mankini + - BeeShorts + - WhitePanties + - StripedPanties + - SlimPanties + - SwimmingPanties + - ThongPanties + - ThinPanties + - NekoPanties + - BeePanties + +#BraRD +- type: loadoutGroup # WD + id: CommonUnderwearBraRD + name: loadout-group-underwear-bra + minLimit: 0 + loadouts: + - RDBra + - WhiteBra + - StripedBra + - BinderBra + - SportBra + - SportBraAlt + - SwimmingBra + - SwimmingBraAlt + - TubetopBra + - BinderStraplessBra + - StraplessBra + - StraplessBraAlt + - HalterneckBra + - ThinBra + - NekoBra + - BeeBra + - CowBra diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 769000b8bc..d60bff8265 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -15,6 +15,9 @@ - CaptainPDA # WD - SelfDefenceDevices # WD - Trinkets + - CommonUnderwearBottomCaptain + - CommonUnderwearBraCaptain + - CommonUnderwearSocks - type: roleLoadout id: JobHeadOfPersonnel @@ -32,6 +35,9 @@ - HoPPDA # WD - SelfDefenceDevices # WD - Trinkets + - CommonUnderwearBottomHOP + - CommonUnderwearBraHOP + - CommonUnderwearSocks # Civilian - type: roleLoadout @@ -48,6 +54,9 @@ - CommonShoes # WD - AssistantPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobBartender @@ -62,6 +71,9 @@ - CommonShoes # WD - BartenderPDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobServiceWorker @@ -74,6 +86,9 @@ - CommonShoes # WD - ServiceWorkerPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobChef @@ -88,6 +103,9 @@ - CommonShoes # WD - ChefPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobLibrarian @@ -101,6 +119,9 @@ - LibrarianPDA - ItemCane # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobChaplain @@ -119,6 +140,9 @@ - ChaplainPDA # WD - ChaplainJobTrinkets # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobJanitor @@ -134,6 +158,9 @@ - CommonShoes # WD - JanitorPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobBotanist @@ -149,6 +176,9 @@ - CommonShoes # WD - BotanistPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobClown @@ -165,6 +195,9 @@ - ClownPDA # WD - ClownTrinkets # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobMime @@ -179,6 +212,9 @@ - CommonShoes # WD - MimePDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobMusician @@ -193,6 +229,9 @@ - CommonShoes # WD - Trinkets - Instruments + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks # Cargo - type: roleLoadout @@ -211,6 +250,9 @@ - SelfDefenceDevices # WD - CommonCargoJobTrinkets - Trinkets + - CommonUnderwearBottomQM + - CommonUnderwearBraQM + - CommonUnderwearSocks - type: roleLoadout id: JobCargoTechnician @@ -226,6 +268,9 @@ - CargoTechnicianPDA - CommonCargoJobTrinkets - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobSalvageSpecialist @@ -242,7 +287,9 @@ - SalvageSpecialistShoes - SalvagePDA # WD - Trinkets - + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks # Engineering - type: roleLoadout id: JobChiefEngineer @@ -258,6 +305,9 @@ - ChiefEngineerPDA # WD - SelfDefenceDevices # WD - Trinkets + - CommonUnderwearBottomCE + - CommonUnderwearBraCE + - CommonUnderwearSocks - type: roleLoadout id: JobSeniorEngineer @@ -271,6 +321,9 @@ - StationEngineerShoes - SeniorEngineerPDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobTechnicalAssistant @@ -284,6 +337,9 @@ - StationEngineerShoes - TechnicalAssistantPDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobStationEngineer @@ -297,6 +353,9 @@ - StationEngineerShoes - StationEngineerPDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobAtmosphericTechnician @@ -310,6 +369,9 @@ - AtmosphericTechnicianShoes - AtmosphericTechnicianPDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks # Science - type: roleLoadout @@ -326,6 +388,9 @@ - ResearchDirectorPDA - SelfDefenceDevices # WD - Trinkets + - CommonUnderwearBottomRD + - CommonUnderwearBraRD + - CommonUnderwearSocks - type: roleLoadout id: JobSeniorResearcher @@ -340,6 +405,9 @@ - ScientistShoes - SeniorResearcherPDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobScientist @@ -355,6 +423,9 @@ - ScientistPDA - CommonGlasses # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobResearchAssistant @@ -368,6 +439,9 @@ - ScientistShoes - ResearchAssistantPDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks # Security - type: roleLoadout @@ -387,6 +461,9 @@ - SelfDefenceDevices # WD - CommonSecurityJobTrinkets # WD - Trinkets + - CommonUnderwearBottomHOS + - CommonUnderwearBraHOS + - CommonUnderwearSocks - type: roleLoadout id: JobWarden @@ -403,6 +480,9 @@ - WardenPDA - CommonSecurityJobTrinkets # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobSeniorOfficer @@ -420,6 +500,9 @@ - SeniorOfficerPDA - CommonSecurityJobTrinkets # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobSecurityOfficer @@ -437,6 +520,9 @@ - SecurityPDA - CommonSecurityJobTrinkets # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobDetective @@ -453,6 +539,9 @@ - DetectivePDA # WD - CommonSecurityJobTrinkets # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobSecurityCadet @@ -467,6 +556,9 @@ - SecurityCadetPDA - CommonSecurityJobTrinkets # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks # Medical - type: roleLoadout @@ -484,6 +576,9 @@ - ChiefMedicalOfficerPDA - SelfDefenceDevices # WD - Trinkets + - CommonUnderwearBottomCMO + - CommonUnderwearBraCMO + - CommonUnderwearSocks - type: roleLoadout id: JobSeniorPhysician @@ -498,6 +593,9 @@ - CommonMedicalGloves - SeniorPhysicianPDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobMedicalDoctor @@ -512,6 +610,9 @@ - CommonMedicalGloves # WD - MedicalDoctorPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobMedicalIntern @@ -526,6 +627,9 @@ - CommonMedicalShoes - MedicalInternPDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobChemist @@ -541,6 +645,9 @@ - ChemistShoes - ChemistPDA - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobParamedic @@ -556,6 +663,9 @@ - CommonMedicalShoes # WD - ParamedicPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks # Justice @@ -577,6 +687,9 @@ - SelfDefenceDevices # WD - InspectorJobTrinkets - Trinkets + - CommonUnderwearBottomInspector + - CommonUnderwearBraInspector + - CommonUnderwearSocks - type: roleLoadout id: JobLawyer @@ -593,6 +706,9 @@ - BriefcaseInhand # WD - LawyerJobTrinkets # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks # Wildcards - type: roleLoadout @@ -606,6 +722,9 @@ - CommonShoes # WD - ZookeeperPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobReporter @@ -620,6 +739,9 @@ - CommonShoes # WD - ReporterPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobPsychologist @@ -635,6 +757,9 @@ - CommonMedicalShoes # WD - PsychologistPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks - type: roleLoadout id: JobBoxer @@ -648,3 +773,6 @@ - CommonShoes # WD - BoxerPDA # WD - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks