diff --git a/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl b/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl index 021fcb33b5..f9dd40a693 100644 --- a/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl +++ b/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl @@ -7,6 +7,7 @@ loadout-group-jumpsuit = Униформа loadout-group-outerclothing = Верхняя одежда loadout-group-backpack = Рюкзак loadout-group-belt = Пояс +loadout-group-bottom = Трусы loadout-group-gloves = Перчатки loadout-group-shoes = Ботинки loadout-group-pda = ПДА diff --git a/Resources/Prototypes/Loadouts/Jobs/common.yml b/Resources/Prototypes/Loadouts/Jobs/common.yml index b51c76a769..041bfd0249 100644 --- a/Resources/Prototypes/Loadouts/Jobs/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/common.yml @@ -9,6 +9,152 @@ role: JobPassenger time: 180000 # 50 hours +# Bottom + +- type: itemLoadout + id: BottomPantiesWhite + equipment: BottomPantiesWhite +- type: startingGear + id: BottomPantiesWhite + equipment: + underwearb: ClothingUnderwearBottomPantiesWhite + +- type: itemLoadout + id: BottomBoxersWhite + equipment: BottomBoxersWhite +- type: startingGear + id: BottomBoxersWhite + equipment: + underwearb: ClothingUnderwearBottomBoxersWhite + +- type: itemLoadout + id: BottomBeeShorts + equipment: BottomBeeShorts +- type: startingGear + id: BottomBeeShorts + equipment: + underwearb: ClothingUnderwearBottomBeeShorts + +- type: itemLoadout + id: BottomBoxersHeart + equipment: BottomBoxersHeart +- type: startingGear + id: BottomBoxersHeart + equipment: + underwearb: ClothingUnderwearBottomBoxersHeart + +- type: itemLoadout + id: BottomBoxersStriped + equipment: BottomBoxersStriped +- type: startingGear + id: BottomBoxersStriped + equipment: + underwearb: ClothingUnderwearBottomBoxersStriped + +- type: itemLoadout + id: BottomBriefs + equipment: BottomBriefs +- type: startingGear + id: BottomBriefs + equipment: + underwearb: ClothingUnderwearBottomBriefs + +- type: itemLoadout + id: BottomFishnetLower + equipment: BottomFishnetLower +- type: startingGear + id: BottomFishnetLower + equipment: + underwearb: ClothingUnderwearBottomFishnetLower + +- type: itemLoadout + id: BottomJockstrap + equipment: BottomJockstrap +- type: startingGear + id: BottomJockstrap + equipment: + underwearb: ClothingUnderwearBottomJockstrap + +- type: itemLoadout + id: BottomMankini + equipment: BottomMankini +- type: startingGear + id: BottomMankini + equipment: + underwearb: ClothingUnderwearBottomMankini + +- type: itemLoadout + id: BottomPantiesBeeKini + equipment: BottomPantiesBeeKini +- type: startingGear + id: BottomPantiesBeeKini + equipment: + underwearb: ClothingUnderwearBottomPantiesBeeKini + +- type: itemLoadout + id: BottomPantiesKinky + equipment: BottomPantiesKinky +- type: startingGear + id: BottomPantiesKinky + equipment: + underwearb: ClothingUnderwearBottomPantiesKinky + +- type: itemLoadout + id: BottomPantiesNeko + equipment: BottomPantiesNeko +- type: startingGear + id: BottomPantiesNeko + equipment: + underwearb: ClothingUnderwearBottomPantiesNeko + +- type: itemLoadout + id: BottomPantiesSlim + equipment: BottomPantiesSlim +- type: startingGear + id: BottomPantiesSlim + equipment: + underwearb: ClothingUnderwearBottomPantiesSlim + +- type: itemLoadout + id: BottomPantiesSwimming + equipment: BottomPantiesSwimming +- type: startingGear + id: BottomPantiesSwimming + equipment: + underwearb: ClothingUnderwearBottomPantiesSwimming + +- type: itemLoadout + id: BottomPantiesThin + equipment: BottomPantiesThin +- type: startingGear + id: BottomPantiesThin + equipment: + underwearb: ClothingUnderwearBottomPantiesThin + +- type: itemLoadout + id: BottomPantiesStripped + equipment: BottomPantiesStripped +- type: startingGear + id: BottomPantiesStripped + equipment: + underwearb: ClothingUnderwearBottomPantiesStripped + +- type: itemLoadout + id: BottomPantiesThong + equipment: BottomPantiesThong +- type: startingGear + id: BottomPantiesThong + equipment: + underwearb: ClothingUnderwearBottomPantiesThong + +- type: itemLoadout + id: BottomWebLower + equipment: BottomWebLower +- type: startingGear + id: BottomWebLower + equipment: + underwearb: ClothingUnderwearBottomWebLower + # Eyes - type: itemLoadout diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index d80f375b87..d7f6eacb21 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1,3 +1,27 @@ +#Bottom +- type: loadoutGroup # WD!? + id: CommonBottom + name: loadout-group-bottom + loadouts: + - BottomPantiesWhite + - BottomBoxersWhite + - BottomBeeShorts + - BottomBoxersHeart + - BottomBoxersStriped + - BottomBriefs + - BottomFishnetLower + - BottomJockstrap + - BottomMankini + - BottomPantiesBeeKini + - BottomPantiesKinky + - BottomPantiesNeko + - BottomPantiesSlim + - BottomPantiesSwimming + - BottomPantiesThin + - BottomPantiesStripped + - BottomPantiesThong + - BottomWebLower + # Miscellaneous - type: loadoutGroup id: Trinkets diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index df99d7f436..71699c23bc 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -24,6 +24,7 @@ - CommonMaskCigar - HoPNeck - HoPJumpsuit + - CommonBottom # WD - HoPGloves # WD - HoPBackpack - HoPOuterClothing @@ -40,6 +41,7 @@ - CommonGlasses # WD - CommonMaskCigarette # WD - AssistantJumpsuit + - CommonBottom # WD - CommonBackpack - CommonGloves # WD - AssistantOuterClothing @@ -55,6 +57,7 @@ - CommonGlasses # WD - CommonMaskCigarette # WD - BartenderJumpsuit + - CommonBottom # WD - CommonBackpack - BartenderOuterClothing - CommonShoes # WD @@ -68,6 +71,7 @@ - CommonGlasses # WD - CommonMaskCigarette # WD - BartenderJumpsuit + - CommonBottom # WD - CommonBackpack - CommonShoes # WD - ServiceWorkerPDA # WD @@ -81,6 +85,7 @@ - CommonGlasses # WD - ChefMask - ChefJumpsuit + - CommonBottom # WD - CommonBackpack - ChefOuterClothing - CommonShoes # WD @@ -94,6 +99,7 @@ - CommonGlasses # WD - CommonMaskCigarette # WD - LibrarianJumpsuit + - CommonBottom # WD - CommonBackpack - CommonShoes # WD - LibrarianPDA @@ -109,6 +115,7 @@ - ChaplainMask - ChaplainNeck - ChaplainJumpsuit + - CommonBottom # WD - CommonGloves # WD - ChaplainBackpack - ChaplainOuterClothing @@ -126,6 +133,7 @@ - CommonGlasses # WD - CommonMaskCigarette # WD - JanitorJumpsuit + - CommonBottom # WD - CommonGloves # WD - CommonBackpack - JanitorOuterClothing @@ -141,6 +149,7 @@ - CommonGlasses # WD - BotanistMask # WD - BotanistJumpsuit + - CommonBottom # WD - BotanistBackpack - BotanistOuterClothing - BotanistGloves # WD @@ -157,6 +166,7 @@ - ClownMask # WD - ClownNeck # WD - ClownJumpsuit + - CommonBottom # WD - ClownBackpack - ClownOuterClothing - ClownShoes @@ -171,6 +181,7 @@ - CommonServiceHeadset # WD - MimeMask - MimeJumpsuit + - CommonBottom # WD - MimeBackpack - MimeOuterClothing - MimeGloves # WD @@ -185,6 +196,7 @@ - CommonGlasses # WD - CommonServiceHeadset # WD - MusicianJumpsuit # WD + - CommonBottom # WD - MusicianOuterClothing - MusicianBackpack - MusicianPDA # WD @@ -201,6 +213,7 @@ - CommonGlasses # WD - QuartermasterNeck - QuartermasterJumpsuit + - CommonBottom # WD - QuartermasterBackpack - QuartermasterOuterClothing - CommonGloves # WD @@ -216,6 +229,7 @@ - CommonCargoHeadset # WD - CommonGlasses # WD - CargoTechnicianJumpsuit + - CommonBottom # WD - CargoTechnicianBackpack - CargoTechnicianOuterClothing - CommonGloves # WD @@ -232,6 +246,7 @@ - SalvageSpecialistEyes # WD - SalvageSpecialistMask # WD - SalvageSpecialistJumpsuit # WD + - CommonBottom # WD - SalvageSpecialistOuterClothing - SalvageSpecialistBelt # WD - SalvageSpecialistBackpack @@ -247,6 +262,7 @@ - ChiefEngineerHead - ChiefEngineerHeadset # WD - ChiefEngineerJumpsuit + - CommonBottom # WD - ChiefEngineerBackpack - ChiefEngineerNeck - ChiefEngineerOuterClothing @@ -261,6 +277,7 @@ - SeniorEngineerHead - CommonEngineeringHeadset - SeniorEngineerJumpsuit + - CommonBottom # WD - StationEngineerBackpack - StationEngineerOuterClothing - CommonGloves # WD @@ -274,6 +291,7 @@ - StationEngineerHead - CommonEngineeringHeadset - TechnicalAssistantJumpsuit + - CommonBottom # WD - StationEngineerBackpack - StationEngineerOuterClothing - CommonGloves # WD @@ -287,6 +305,7 @@ - StationEngineerHead - CommonEngineeringHeadset - StationEngineerJumpsuit + - CommonBottom # WD - StationEngineerBackpack - StationEngineerOuterClothing - CommonGloves # WD @@ -300,6 +319,7 @@ - StationEngineerHead - CommonEngineeringHeadset - AtmosphericTechnicianJumpsuit + - CommonBottom # WD - AtmosphericTechnicianBackpack - AtmosphericTechnicianOuterClothing - CommonGloves # WD @@ -315,6 +335,7 @@ - ResearchDirectorHeadset # WD - ResearchDirectorNeck - ResearchDirectorJumpsuit + - CommonBottom # WD - ResearchDirectorBackpack - ResearchDirectorOuterClothing - ResearchDirectorShoes @@ -329,6 +350,7 @@ - CommonScienceHeadset - CommonScientistNeck - SeniorResearcherJumpsuit + - CommonBottom # WD - ScientistBackpack - SeniorResearcherOuterclothing - CommonScienceGloves @@ -343,6 +365,7 @@ - CommonScienceHeadset - CommonScientistNeck - ScientistJumpsuit + - CommonBottom # WD - ScientistBackpack - ScientistOuterClothing - CommonScienceGloves @@ -357,6 +380,7 @@ - CommonScienceHeadset - CommonScientistNeck - ResearchAssistantJumpsuit + - CommonBottom # WD - ScientistOuterClothing - ScientistBackpack - CommonScienceGloves @@ -374,6 +398,7 @@ - CommonSecurityCommandMask # WD - HeadofSecurityNeck - HeadofSecurityJumpsuit + - CommonBottom # WD - CommonGloves # WD - CommonSecurityBelt # WD - CommonSecurityBackpack @@ -390,6 +415,7 @@ - CommonSecurityCommandMask # WD - CommonSecurityNeck - WardenJumpsuit + - CommonBottom # WD - CommonSecurityBackpack - CommonGloves # WD - CommonSecurityBelt # WD @@ -406,6 +432,7 @@ - CommonSecurityCommandMask # WD - CommonSecurityNeck - SeniorOfficerJumpsuit + - CommonBottom # WD - CommonSecurityBackpack - SecurityOuterClothing - CommonSecurityBelt # WD @@ -423,6 +450,7 @@ - CommonSecurityMask # WD - CommonSecurityNeck # WD - SecurityJumpsuit + - CommonBottom # WD - CommonSecurityBackpack - SecurityOuterClothing - CommonSecurityBelt # WD @@ -440,6 +468,7 @@ - CommonMaskCigarette # WD - CommonSecurityNeck - DetectiveJumpsuit + - CommonBottom # WD - DetectiveBackpack - DetectiveOuterClothing - DetectiveGloves @@ -455,6 +484,7 @@ - CommonSecurityHeadsetFull # WD - CommonSecurityNeck - SecurityCadetJumpsuit + - CommonBottom # WD - CommonSecurityBackpack - CommonGloves # WD - CommonSecurityShoes @@ -471,6 +501,7 @@ - CommonMedicalMask # WD - ChiefMedicalOfficerNeck - ChiefMedicalOfficerJumpsuit + - CommonBottom # WD - ChiefMedicalOfficerBackpack - ChiefMedicalOfficerOuterClothing - CommonMedicalGloves @@ -485,6 +516,7 @@ - CommonMedicalHeadset # WD - CommonMedicalMask - SeniorPhysicianJumpsuit + - CommonBottom # WD - MedicalBackpack - SeniorPhysicianOuterClothing - CommonMedicalShoes @@ -499,6 +531,7 @@ - CommonMedicalHeadset # WD - CommonMedicalMask # WD - MedicalDoctorJumpsuit + - CommonBottom # WD - MedicalBackpack - MedicalDoctorOuterClothing - CommonMedicalShoes # WD @@ -513,6 +546,7 @@ - CommonMedicalHeadset # WD - CommonMedicalMask # WD - MedicalInternJumpsuit + - CommonBottom # WD - MedicalBackpack - CommonMedicalOuterClothing - CommonMedicalGloves @@ -528,6 +562,7 @@ - ChemistEyes - CommonMedicalMask # WD - ChemistJumpsuit + - CommonBottom # WD - ChemistBackpack - ChemistOuterClothing - CommonMedicalGloves # WD @@ -542,6 +577,7 @@ - CommonMedicalHeadset # WD - CommonMedicalMask # WD - ParamedicJumpsuit + - CommonBottom # WD - ParamedicBackpack - ParamedicOuterClothing - ParamedicBelt # WD @@ -561,6 +597,7 @@ - InspectorMask - InspectorNeck - InspectorJumpsuit + - CommonBottom # WD - InspectorOuterclothing - InspectorBackpack - InspectorGloves @@ -579,6 +616,7 @@ - CommonMaskCigarette # WD - LawyerNeck - LawyerJumpsuit + - CommonBottom # WD - CommonBackpack - CommonShoes # WD - LawyerPDA @@ -594,6 +632,7 @@ - CommonServiceHeadset # WD - CommonGlasses # WD - ZookeeperJumpsuit # WD + - CommonBottom # WD - CommonBackpack - CommonShoes # WD - ZookeeperPDA # WD @@ -607,6 +646,7 @@ - CommonServiceHeadset # WD - CommonMaskCigarette # WD - ReporterJumpsuit + - CommonBottom # WD - CommonGloves # WD - CommonBackpack - CommonShoes # WD @@ -621,6 +661,7 @@ - CommonMedicalHeadset # WD - CommonMedicalMask # WD - PsychologistJumpsuit # WD + - CommonBottom # WD - CommonMedicalGloves # WD - MedicalBackpack - MedicalDoctorOuterClothing @@ -634,6 +675,7 @@ - CommonServiceHeadset # WD - CommonGlasses # WD - BoxerJumpsuit + - CommonBottom # WD - BoxerGloves - CommonBackpack - BoxerBelt # WD