From fbae6288bf63a382a395b547116219d77dd75ce3 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 12 Jan 2025 20:14:56 -0300 Subject: [PATCH 1/3] Clean up the loadouts (#2711) * Detective clean up * Forgor the comments * HoS clean up * Warden clean up * LO clean up * Salvage clean up * Bartender clean up * Passenger clean up * Captain clean up * Chemist clean up * Engineer clean up * CMO clean up * Medical clean up * Mysta clean up * Remove repeated clothing from psychologist * Move DeltaV loadouts, better comments and new loadouts for sec * Untouch the security star * Forgor --- .../Loadouts/Jobs/Cargo/quartermaster.yml | 16 - .../Jobs/Cargo/salvage_specialist.yml | 11 - .../Loadouts/Jobs/Civilian/bartender.yml | 6 - .../Loadouts/Jobs/Civilian/passenger.yml | 46 --- .../Loadouts/Jobs/Command/captain.yml | 27 -- .../Jobs/Engineering/station_engineer.yml | 5 - .../Loadouts/Jobs/Medical/chemist.yml | 35 -- .../Jobs/Medical/chief_medical_officer.yml | 6 - .../Loadouts/Jobs/Medical/medical_doctor.yml | 6 - .../Loadouts/Jobs/Medical/paramedic.yml | 5 - .../Jobs/Science/research_director.yml | 16 - .../Loadouts/Jobs/Security/detective.yml | 30 -- .../Jobs/Security/head_of_security.yml | 41 -- .../Loadouts/Jobs/Security/warden.yml | 35 -- .../Prototypes/Loadouts/loadout_groups.yml | 363 ++++++------------ .../Prototypes/Loadouts/role_loadouts.yml | 8 +- .../_DV/Loadouts/Jobs/Cargo/quartermaster.yml | 17 + ..._technician.yml => salvage_specialist.yml} | 12 + .../_DV/Loadouts/Jobs/Civilian/bartender.yml | 6 + .../_DV/Loadouts/Jobs/Civilian/passenger.yml | 46 +++ .../_DV/Loadouts/Jobs/Command/captain.yml | 28 ++ .../Jobs/Engineering/station_engineer.yml | 6 + .../_DV/Loadouts/Jobs/Medical/chemist.yml | 34 ++ .../Jobs/Medical/chief_medical_officer.yml | 5 + .../Loadouts/Jobs/Medical/medical_doctor.yml | 6 + .../_DV/Loadouts/Jobs/Medical/paramedic.yml | 5 + .../Loadouts/Jobs/Medical/psychologist.yml | 15 - .../_DV/Loadouts/Jobs/Science/mystagogue.yml | 19 + .../_DV/Loadouts/Jobs/Security/detective.yml | 33 ++ .../Jobs/Security/head_of_security.yml | 42 ++ .../_DV/Loadouts/Jobs/Security/warden.yml | 36 ++ .../_DV/Loadouts/loadout_groups.yml | 232 ++++++++++- 32 files changed, 635 insertions(+), 563 deletions(-) create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml rename Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/{salvage_technician.yml => salvage_specialist.yml} (52%) create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml index 798ea78daf7..ecdf1e5ffee 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml @@ -24,11 +24,6 @@ equipment: jumpsuit: ClothingUniformJumpsuitQMFormal -- type: loadout #DeltaV - id: QuartermasterFormalDress - equipment: - jumpsuit: ClothingUniformJumpskirtQMFormal - # Head - type: loadout id: QuartermasterHead @@ -40,11 +35,6 @@ equipment: head: ClothingHeadHatBeretQM -- type: loadout # DeltaV - id: LogiOfficerBeret - equipment: - head: ClothingHeadHatBeretLogi - # Neck - type: loadout id: QuartermasterCloak @@ -61,9 +51,3 @@ id: QuartermasterWintercoat equipment: outerClothing: ClothingOuterWinterQM - -# Shoes - DeltaV -- type: loadout - id: QuartermasterWinterBoots - equipment: - shoes: ClothingShoesBootsWinterLogisticsOfficer diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml index fca3d4eb5fc..5ca110b5fc6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -25,14 +25,3 @@ id: SalvageBoots equipment: shoes: ClothingShoesBootsSalvage - -- type: loadout # DeltaV - id: SalvageWinterBoots - equipment: - shoes: ClothingShoesBootsWinterMiner - -# Neck - DeltaV -- type: loadout # DeltaV - id: SalvageCloak - equipment: - neck: ClothingNeckSalvager diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml index 3363cdc200b..c8c80c7895d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml @@ -40,9 +40,3 @@ id: BartenderWintercoat equipment: outerClothing: ClothingOuterWinterBar - -# Glasses - DeltaV -- type: loadout - id: BartenderGlasses - equipment: - eyes: ClothingEyesHudBeer diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml index ab5ab5eb3e6..535c2aacf3d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -48,52 +48,6 @@ equipment: jumpsuit: ClothingUniformColorRainbow -# Rose Hoodie w/ Skirt - DeltaV -- type: loadout - id: MioSkirt - equipment: - jumpsuit: ClothingCostumeMioSkirt - -# Turqoise Hoodie w/ Shorts - DeltaV -- type: loadout - id: NaotaHoodie - equipment: - jumpsuit: ClothingCostumeNaota - -# Casual Blue - DeltaV -- type: loadout - id: CasualRedSkirt - equipment: - jumpsuit: ClothingUniformJumpskirtCasualRed - -- type: loadout - id: CasualRedSuit - equipment: - jumpsuit: ClothingUniformJumpsuitCasualRed - - -# Casual Blue - DeltaV -- type: loadout - id: CasualBlueSkirt - equipment: - jumpsuit: ClothingUniformJumpskirtCasualBlue - -- type: loadout - id: CasualBlueSuit - equipment: - jumpsuit: ClothingUniformJumpsuitCasualBlue - -# Casual Purple - DeltaV -- type: loadout - id: CasualPurpleSkirt - equipment: - jumpsuit: ClothingUniformJumpskirtCasualPurple - -- type: loadout - id: CasualPurpleSuit - equipment: - jumpsuit: ClothingUniformJumpsuitCasualPurple - # Ancient - type: loadout id: AncientJumpsuit diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 63dd74961af..4d2b15f70c2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -30,22 +30,12 @@ equipment: head: ClothingHeadHatCapcap -- type: loadout # DeltaV - id: CaptainBeret - equipment: - head: ClothingHeadHatBeretCap - # Neck - type: loadout id: CaptainCloak equipment: neck: ClothingNeckCloakCap -- type: loadout # DeltaV - id: CaptainCloakFormal - equipment: - neck: ClothingNeckCloakCapFormal - - type: loadout id: CaptainMantle equipment: @@ -77,20 +67,3 @@ id: CaptainWintercoat equipment: outerClothing: ClothingOuterWinterCap - -# Gloves - DeltaV -- type: loadout # DeltaV - id: CaptainGloves - equipment: - gloves: ClothingHandsGlovesCaptain - -- type: loadout # DeltaV - id: InspectionGloves - equipment: - gloves: ClothingHandsGlovesInspection - -# Shoes - DeltaV -- type: loadout # DeltaV - id: CaptainWinterBoots - equipment: - shoes: ClothingShoesBootsWinterCap diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index 38c3909d7c8..6538efe168c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -101,11 +101,6 @@ equipment: outerClothing: ClothingOuterVestHazard -- type: loadout # DeltaV - id: StationEngineerWintercoat - equipment: - outerClothing: ClothingOuterWinterEngi - # Shoes - type: loadout id: WorkBoots diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml index cea3ca94b71..111af7b35a0 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml @@ -1,9 +1,3 @@ -# Neck - DeltaV -- type: loadout # DeltaV - id: ChemistTie - equipment: - neck: ClothingNeckTieChem - # Jumpsuit - type: loadout id: ChemistJumpsuit @@ -15,11 +9,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtChemistry -- type: loadout # DeltaV - id: ChemistFormalSuit - equipment: - jumpsuit: ClothingUniformJumpsuitChemShirt - # Back - type: loadout id: ChemistBackpack @@ -46,27 +35,3 @@ id: ChemistWintercoat equipment: outerClothing: ClothingOuterWinterChem - -## Start DeltaV Changes -- type: loadout - id: ChemistApron - equipment: - outerClothing: ClothingOuterApronChemist - -# Gloves - DeltaV -- type: loadout - id: ChemistGloves - equipment: - gloves: ClothingHandsGlovesChemist - -# Shoes - DeltaV -- type: loadout - id: ChemistWinterBoots - equipment: - shoes: ClothingShoesBootsWinterChem - -- type: loadout - id: ChemistShoes - equipment: - shoes: ClothingShoesEnclosedChem -## End DeltaV Changes diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml index c0e95cf5c07..0671bcfc32b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -51,9 +51,3 @@ id: ChiefMedicalOfficerWintercoat equipment: outerClothing: ClothingOuterWinterCMO - -# Shoes - DeltaV -- type: loadout - id: ChiefMedicalOfficerWinterBoots - equipment: - shoes: ClothingShoesBootsWinterChiefMedicalOfficer diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index d715f0ede62..8e66f5a4c10 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -72,12 +72,6 @@ equipment: head: ClothingHeadNurseHat -# Neck - DeltaV -- type: loadout # DeltaV - id: Stethoscope - equipment: - neck: ClothingNeckStethoscope - # Jumpsuit - type: loadout id: MedicalDoctorJumpsuit diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml index 9347e0c4b1e..1cfe2278720 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml @@ -31,8 +31,3 @@ id: BlueShoes equipment: shoes: ClothingShoesColorBlue - -- type: loadout # DeltaV - id: ParamedicWinterBoots - equipment: - shoes: ClothingShoesBootsWinterParamedic diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml index fabfc964040..c1c644de2a7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml @@ -4,11 +4,6 @@ id: ResearchDirectorBeret startingGear: ScientificBeret -- type: loadout # DeltaV - id: ResearchDirectorHood - equipment: - head: ClothingHeadHoodMysta - # Neck - type: loadout @@ -38,18 +33,7 @@ equipment: outerClothing: ClothingOuterCoatRD -- type: loadout # DeltaV - id: MystaLabCoat - equipment: - outerClothing: ClothingOuterCoatRndMysta - - type: loadout id: ResearchDirectorWintercoat equipment: outerClothing: ClothingOuterWinterRD - -# Shoes - DeltaV -- type: loadout # DeltaV - id: ResearchDirectorWinterBoots - equipment: - shoes: ClothingShoesBootsWinterMystagogue diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index cfda9849b83..e8afa5a203c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -9,11 +9,6 @@ equipment: head: ClothingHeadHatFedoraGrey -- type: loadout # DeltaV - id: DetBeret - equipment: - head: ClothingHeadHatBeretDet - # Neck - type: loadout id: DetectiveTie @@ -41,26 +36,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtDetectiveGrey -- type: loadout # DeltaV - id: ForensicSpecJumpsuit - equipment: - jumpsuit: ClothingUniformJumpsuitForensicSpec - -- type: loadout # DeltaV - id: ForensicSpecJumpskirt - equipment: - jumpsuit: ClothingUniformJumpskirtForensicSpec - -- type: loadout # DeltaV - id: ForensicSpecTurtlesuit - equipment: - jumpsuit: ClothingUniformJumpsuitDetTurtle - -- type: loadout # DeltaV - id: ForensicSpecTurtleskirt - equipment: - jumpsuit: ClothingUniformJumpskirtDetTurtle - # OuterClothing - type: loadout id: DetectiveArmorVest @@ -71,8 +46,3 @@ id: DetectiveCoat equipment: outerClothing: ClothingOuterCoatDetectiveLoadout - -- type: loadout # DeltaV - id: StasecWinterCoatDet - equipment: - outerClothing: ClothingOuterCoatStasecDet diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index 9b762ffd3f5..6f9d72f2b05 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -9,26 +9,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtHoS -- type: loadout # DeltaV - id: HeadofSecurityJumpsuitGrey - equipment: - jumpsuit: ClothingUniformJumpsuitHoSGrey - -- type: loadout # DeltaV - id: HeadofSecurityJumpskirtGrey - equipment: - jumpsuit: ClothingUniformJumpskirtHoSGrey - -- type: loadout # DeltaV - id: HeadofSecurityJumpsuitBlue - equipment: - jumpsuit: ClothingUniformJumpsuitHoSBlue - -- type: loadout # DeltaV - id: HeadofSecurityJumpskirtBlue - equipment: - jumpsuit: ClothingUniformJumpskirtHoSBlue - - type: loadout id: HeadofSecurityTurtleneck equipment: @@ -49,16 +29,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtHosFormal -- type: loadout # DeltaV - id: HeadofSecurityParadeSuit - equipment: - jumpsuit: ClothingUniformJumpsuitHoSParadeMale - -- type: loadout # DeltaV - id: HeadofSecurityParadeSkirt - equipment: - jumpsuit: ClothingUniformJumpskirtHoSParadeMale - # Head - type: loadout id: HeadofSecurityHead @@ -91,14 +61,3 @@ id: HeadofSecurityWinterCoat equipment: outerClothing: ClothingOuterWinterHoS - -- type: loadout # DeltaV - security winter coat - id: StasecWinterCoatHoS - equipment: - outerClothing: ClothingOuterCoatStasecHoS - -# Shoes - DeltaV -- type: loadout # DeltaV - id: HeadOfSecurityWinterBoots - equipment: - shoes: ClothingShoesBootsWinterHeadOfSecurity diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index 54f1bb0c210..9c270e6d6fd 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -20,36 +20,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtWarden -- type: loadout # DeltaV - id: WardenJumpsuitGrey - equipment: - jumpsuit: ClothingUniformJumpsuitWardenGrey - -- type: loadout # DeltaV - id: WardenJumpskirtGrey - equipment: - jumpsuit: ClothingUniformJumpskirtWardenGrey - -- type: loadout # DeltaV - id: WardenJumpsuitBlue - equipment: - jumpsuit: ClothingUniformJumpsuitWardenBlue - -- type: loadout # DeltaV - id: WardenJumpskirtBlue - equipment: - jumpsuit: ClothingUniformJumpskirtWardenBlue - -- type: loadout - id: WardenTurtlesuit - equipment: - jumpsuit: ClothingUniformJumpsuitWardenTurtle # DeltaV - -- type: loadout - id: WardenTurtleskirt - equipment: - jumpsuit: ClothingUniformJumpskirtWardenTurtle # DeltaV - # OuterClothing - type: loadout id: WardenCoat @@ -60,8 +30,3 @@ id: WardenArmoredWinterCoat equipment: outerClothing: ClothingOuterWinterWarden - -- type: loadout # DeltaV - security winter coat - id: StasecWinterCoatWarden - equipment: - outerClothing: ClothingOuterCoatStasecWarden diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index daea9b3c67f..29a7a0f7941 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -119,14 +119,6 @@ - CaptainFormalSuit - CaptainFormalSkirt -- type: loadoutGroup # DeltaV - id: CaptainGloves - name: loadout-group-captain-gloves - minLimit: 0 - loadouts: - - CaptainGloves - - InspectionGloves - - type: loadoutGroup id: CaptainNeck name: loadout-group-captain-neck @@ -151,15 +143,6 @@ - CaptainOuterClothing - CaptainWintercoat -- type: loadoutGroup # DeltaV - id: CaptainShoes - name: loadout-group-captain-shoes - loadouts: - - BrownLeatherShoes - - WhiteLeatherShoes - - LaceupShoes - - CaptainWinterBoots - - type: loadoutGroup id: HoPHead name: loadout-group-hop-head @@ -167,25 +150,19 @@ loadouts: - HoPHead -- type: loadoutGroup # DeltaV - id: HoPGloves - name: loadout-group-hop-gloves - minLimit: 0 - loadouts: - - HoPGloves - - InspectionGloves - - type: loadoutGroup id: HoPJumpsuit name: loadout-group-hop-jumpsuit loadouts: - HoPJumpsuit - HoPJumpskirt - - HoPFormal # DeltaV - - HoPFormalDress # DeltaV - - HoPMessSkirt # DeltaV - - HoPMessSuit # DeltaV - - HoPBoatswain # DeltaV + # Begin DeltaV additions + - HoPFormal + - HoPFormalDress + - HoPMessSkirt + - HoPMessSuit + - HoPBoatswain + # End DeltaV additions - type: loadoutGroup id: HoPNeck @@ -210,20 +187,13 @@ name: loadout-group-hop-outerclothing minLimit: 0 loadouts: - - HoPFormalCoat # DeltaV - - HoPArmoredCoat # DeltaV - - DuraVest # DeltaV + # Begin DeltaV additions + - HoPFormalCoat + - HoPArmoredCoat + - DuraVest + # End DeltaV additions - HoPWintercoat -- type: loadoutGroup # DeltaV - id: HoPShoes - name: loadout-group-hop-shoes - loadouts: - - BrownLeatherShoes - - WhiteLeatherShoes - - LaceupShoes - - HoPWinterBoots - # Civilian - type: loadoutGroup id: PassengerJumpsuit @@ -231,14 +201,16 @@ loadouts: - GreyJumpsuit - GreyJumpskirt - - MioSkirt # Start DeltaV Changes + # Begin DeltaV additions + - MioSkirt - NaotaHoodie - CasualBlueSkirt - CasualBlueSuit - CasualRedSkirt - CasualRedSuit - CasualPurpleSkirt - - CasualPurpleSuit # End DeltaV Changes + - CasualPurpleSuit + # Begin DeltaV additions - AncientJumpsuit - RainbowJumpsuit @@ -293,23 +265,6 @@ - BartenderHead - BartenderBowler -- type: loadoutGroup # DeltaV - id: BartenderGlasses - name: loadout-group-bartender-glasses - minLimit: 0 - loadouts: - - Glasses - - BartenderGlasses - - GlassesCheapSunglasses - -- type: loadoutGroup # DeltaV - id: BartenderNeck - name: loadout-group-bartender-neck - minLimit: 0 - loadouts: - - ScarfBlack - - ScarfPurple - - type: loadoutGroup id: BartenderJumpsuit name: loadout-group-bartender-jumpsuit @@ -317,10 +272,12 @@ - BartenderJumpsuit - BartenderJumpskirt - BartenderJumpsuitPurple - - ClothingUniformNightclubSuit #imp - - ClothingUniformNightclubSuitSkirt #imp - - ClothingUniformSeniorBartender #imp - - ClothingUniformSeniorBartenderSkirt #imp + # Begin Imp additions + - ClothingUniformNightclubSuit + - ClothingUniformNightclubSuitSkirt + - ClothingUniformSeniorBartender + - ClothingUniformSeniorBartenderSkirt + # End Imp additions - type: loadoutGroup id: BartenderOuterClothing @@ -361,13 +318,6 @@ - ChefJacket - ChefWintercoat -- type: loadoutGroup # DeltaV - id: LibrarianNeck - name: loadout-group-librarian-neck - loadouts: - - ScarfGreen - - ScarfRed - - type: loadoutGroup id: LibrarianJumpsuit name: loadout-group-librarian-jumpsuit @@ -376,8 +326,10 @@ - LibrarianJumpskirt - CuratorJumpsuit - CuratorJumpskirt - - ClothingUniformCreamSuit #imp - - ClothingUniformCreamSuitSkirt #imp + # Begin Imp additions + - ClothingUniformCreamSuit + - ClothingUniformCreamSuitSkirt + # End Imp additions - type: loadoutGroup id: LawyerJumpsuit @@ -393,8 +345,10 @@ - LawyerJumpskirtRed - LawyerJumpsuitGood - LawyerJumpskirtGood - - ClothingUniformCreamSuit #imp - - ClothingUniformCreamSuitSkirt #imp + # Begin Imp additions + - ClothingUniformCreamSuit + - ClothingUniformCreamSuitSkirt + # End Imp additions - type: loadoutGroup id: LawyerNeck @@ -402,10 +356,12 @@ minLimit: 0 loadouts: - LawyerNeck - - ScarfRed # Delta V - - ScarfBlue # Delta V - - ScarfBlack # Delta V - - ScarfPurple # Delta V + # Begin DeltaV additions + - ScarfRed + - ScarfBlue + - ScarfBlack + - ScarfPurple + # End DeltaV additions - type: loadoutGroup id: ChaplainHead @@ -433,8 +389,10 @@ - ChaplainJumpskirt - ChaplainRobesLight - ChaplainRobesDark - - ClothingUniformFuneralSuit #imp - - ClothingUniformFuneralSuitSkirt #imp + # Begin Imp additions + - ClothingUniformFuneralSuit + - ClothingUniformFuneralSuitSkirt + # End Imp additions - type: loadoutGroup id: ChaplainOuterClothing @@ -468,13 +426,6 @@ - JanitorJumpsuit - JanitorJumpskirt -- type: loadoutGroup # DeltaV - id: JanitorNeck - name: loadout-group-janitor-neck - minLimit: 0 - loadouts: - - ScarfPurple - - type: loadoutGroup id: JanitorGloves name: loadout-group-janitor-gloves @@ -522,14 +473,6 @@ - BotanistSatchel - BotanistDuffel -- type: loadoutGroup # DeltaV - id: BotanistNeck - name: loadout-group-botanist-neck - minLimit: 0 - loadouts: - - ScarfGreen - - ScarfBrown - - type: loadoutGroup id: BotanistOuterClothing name: loadout-group-botanist-outerclothing @@ -596,14 +539,6 @@ - MimeFrenchBeret - MimeCap -- type: loadoutGroup # DeltaV - id: MimeNeck - name: loadout-group-mime-neck - minLimit: 0 - loadouts: - - ScarfBlack - - ScarfZebra - - type: loadoutGroup id: MimeMask name: loadout-group-mime-mask @@ -634,15 +569,6 @@ loadouts: - MimeWintercoat -- type: loadoutGroup # DeltaV - id: MusicianNeck - name: loadout-group-musician-neck - minLimit: 0 - loadouts: - - ScarfBlack - - ScarfPurple - - ScarfZebra - - type: loadoutGroup id: MimeBelt name: loadout-group-mime-belt @@ -667,8 +593,10 @@ loadouts: - MusicianJumpsuit - MusicianJumpskirt - - ClothingUniformMrSpaceWide #imp - - ClothingUniformMrSpaceWideSkirt #imp + # Begin Imp additions + - ClothingUniformMrSpaceWide + - ClothingUniformMrSpaceWideSkirt + # End Imp additions - type: loadoutGroup id: MusicianOuterClothing @@ -764,13 +692,6 @@ loadouts: - CargoTechnicianHead -- type: loadoutGroup # DeltaV - id: CargoTechnicianNeck - name: loadout-group-cargo-technician-neck - minLimit: 0 - loadouts: - - ScarfBrown - - type: loadoutGroup id: CargoTechnicianJumpsuit name: loadout-group-cargo-technician-jumpsuit @@ -800,14 +721,6 @@ - BlackShoes - CargoWinterBoots -- type: loadoutGroup # DeltaV - id: SalvageSpecialistNeck - name: loadout-group-salvage-specialist-neck - minLimit: 0 - loadouts: - - SalvageCloak - - ScarfBrown - - type: loadoutGroup id: SalvageSpecialistBackpack name: loadout-group-salvage-specialist-backpack @@ -828,8 +741,10 @@ name: loadout-group-salvage-specialist-shoes loadouts: - SalvageBoots + # Begin DeltaV changes #- CargoWinterBoots - - SalvageWinterBoots # DeltaV + - SalvageWinterBoots + # End DeltaV changes # Engineering - type: loadoutGroup @@ -890,13 +805,6 @@ - StationEngineerHardhatRed - SeniorEngineerBeret -- type: loadoutGroup # DeltaV - id: StationEngineerNeck - name: loadout-group-station-engineer-neck - minLimit: 0 - loadouts: - - ScarfOrange - - type: loadoutGroup id: StationEngineerJumpsuit name: loadout-group-station-engineer-jumpsuit @@ -936,16 +844,10 @@ loadouts: - StationEngineerPDA - SeniorEngineerPDA - - ElectricianPDA # DeltaV - - MechanicPDA # DeltaV - -- type: loadoutGroup # DeltaV - id: AtmosphericTechnicianNeck - name: loadout-group-atmospheric-technician-neck - minLimit: 0 - loadouts: - - ScarfLightBlue - - ScarfOrange + # Begin DeltaV additions + - ElectricianPDA + - MechanicPDA + # Begin DeltaV additions - type: loadoutGroup id: AtmosphericTechnicianJumpsuit @@ -1003,9 +905,11 @@ minLimit: 0 loadouts: - ResearchDirectorMantle + # Begin DeltaV changes #- ResearchDirectorCloak - - MystagogueCloak # DeltaV - Replaced RD cloak with MG - - ScarfPurple # DeltaV + - MystagogueCloak # Replaced RD cloak with MG + - ScarfPurple + # End DeltaV changes - type: loadoutGroup id: ResearchDirectorJumpsuit @@ -1054,8 +958,10 @@ loadouts: - ScientistJumpsuit - ScientistJumpskirt - #- RoboticistJumpsuit # DeltaV: Moved to RoboticistJumpsuit - #- RoboticistJumpskirt # DeltaV: Moved to RoboticistJumpsuit + # Begin DeltaV changes + #- RoboticistJumpsuit # Moved to RoboticistJumpsuit + #- RoboticistJumpskirt # Moved to RoboticistJumpsuit + # End DeltaV changes - SeniorResearcherJumpsuit - SeniorResearcherJumpskirt @@ -1099,8 +1005,10 @@ loadouts: - ScientistPDA - SeniorResearcherPDA - - LabTechPDA # DeltaV - - XenoarchPDA # DeltaV + # Begin DeltaV changes + - LabTechPDA + - XenoarchPDA + # End DeltaV changes - type: loadoutGroup id: ResearchAssistantJumpsuit @@ -1124,16 +1032,18 @@ loadouts: - HeadofSecurityJumpsuit - HeadofSecurityJumpskirt - - HeadofSecurityJumpsuitGrey # DeltaV - - HeadofSecurityJumpskirtGrey # DeltaV - - HeadofSecurityJumpsuitBlue # DeltaV - - HeadofSecurityJumpskirtBlue # DeltaV - HeadofSecurityTurtleneck - HeadofSecurityTurtleneckSkirt - HeadofSecurityFormalSuit - HeadofSecurityFormalSkirt -# - HeadofSecurityParadeSuit # DeltaV - removed for incongruence -# - HeadofSecurityParadeSkirt # DeltaV - removed for incongruence + # Begin DeltaV changes + - HeadofSecurityJumpsuitGrey + - HeadofSecurityJumpskirtGrey + - HeadofSecurityJumpsuitBlue + - HeadofSecurityJumpskirtBlue + #- HeadofSecurityParadeSuit # Removed for incongruence + #- HeadofSecurityParadeSkirt # Removed for incongruence + # End DeltaV changes - type: loadoutGroup id: HeadofSecurityNeck @@ -1148,20 +1058,19 @@ id: HeadofSecurityOuterClothing name: loadout-group-head-of-security-outerclothing loadouts: -# - HeadofSecurityCoat # DeltaV - removed for incongruence -# - HeadofSecurityWinterCoat # DeltaV - removed for incongruence - - PlateCarrier # DeltaV - - DuraVest # DeltaV - - StasecWinterCoatHoS # DeltaV + - HeadofSecurityCoat + - HeadofSecurityWinterCoat - type: loadoutGroup # DeltaV id: HeadofSecurityShoes name: loadout-group-head-of-security-shoes loadouts: -# - CombatBoots # DeltaV - removed for standardisation of equipment - - JackBoots # DeltaV + # Begin DeltaV changes + #- CombatBoots # Removed for standardisation of equipment + - JackBoots + - HeadOfSecurityWinterBoots + # End DeltaV changes - SecurityWinterBoots - - HeadOfSecurityWinterBoots # DeltaV - type: loadoutGroup id: WardenHead @@ -1177,22 +1086,21 @@ loadouts: - WardenJumpsuit - WardenJumpskirt - - WardenJumpsuitGrey # DeltaV - - WardenJumpskirtGrey # DeltaV - - WardenJumpsuitBlue # DeltaV - - WardenJumpskirtBlue # DeltaV - - WardenTurtlesuit # DeltaV - - WardenTurtleskirt # DeltaV + # Begin DeltaV additions + - WardenJumpsuitGrey + - WardenJumpskirtGrey + - WardenJumpsuitBlue + - WardenJumpskirtBlue + - WardenTurtlesuit + - WardenTurtleskirt + # End DeltaV additions - type: loadoutGroup id: WardenOuterClothing name: loadout-group-warden-outerclothing loadouts: -# - WardenCoat # DeltaV - removed for incongruence -# - WardenArmoredWinterCoat # DeltaV - removed for incongruence - - PlateCarrier # DeltaV - - DuraVest # DeltaV - - StasecWinterCoatWarden # DeltaV + - WardenCoat + - WardenArmoredWinterCoat - type: loadoutGroup id: SecurityHead @@ -1212,14 +1120,16 @@ - SecurityJumpskirt - SecurityJumpsuitGrey - SecurityJumpskirtGrey - - SecurityJumpsuitBlue # DeltaV - - SecurityJumpskirtBlue # DeltaV -# - SeniorOfficerJumpsuit # DeltaV - removed for incongruence -# - SeniorOfficerJumpskirt # DeltaV - removed for incongruence - - SeniorSecOfficerTurtlesuit # DeltaV - - SeniorSecOfficerTurtleskirt # DeltaV - - SeniorSecOfficerJumpsuit # DeltaV - - SeniorSecOfficerJumpskirt # DeltaV + # Begin DeltaV changes + - SecurityJumpsuitBlue + - SecurityJumpskirtBlue +# - SeniorOfficerJumpsuit # Removed for incongruence +# - SeniorOfficerJumpskirt # Removed for incongruence + - SeniorSecOfficerTurtlesuit + - SeniorSecOfficerTurtleskirt + - SeniorSecOfficerJumpsuit + - SeniorSecOfficerJumpskirt + # End DeltaV changes - type: loadoutGroup id: SecurityBackpack @@ -1240,13 +1150,9 @@ id: SecurityOuterClothing name: loadout-group-security-outerclothing loadouts: -# - ArmorVest # DeltaV - removed for incongruence - - PlateCarrier # DeltaV - - DuraVest # DeltaV -# - ArmorVestSlim - removed for incongruence -# - SecurityOfficerWintercoat - removed for incongruence - - StasecSweater # DeltaV - - StasecWinterCoat # DeltaV + - ArmorVest + - ArmorVestSlim + - SecurityOfficerWintercoat - type: loadoutGroup id: SecurityShoes @@ -1262,13 +1168,6 @@ - SecurityPDA - SeniorOfficerPDA -- type: loadoutGroup # DeltaV - id: SecurityNeck - name: loadout-group-security-neck - minLimit: 0 - loadouts: - - ScarfRed - - type: loadoutGroup id: DetectiveHead name: loadout-group-detective-head @@ -1290,28 +1189,17 @@ id: DetectiveJumpsuit name: loadout-group-detective-jumpsuit loadouts: -# - DetectiveJumpsuit # DeltaV - removed for incongruence -# - DetectiveJumpskirt # DeltaV - removed for incongruence -# - NoirJumpsuit # DeltaV - removed for incongruence -# - NoirJumpskirt # DeltaV - removed for incongruence - - ForensicSpecJumpsuit # DeltaV - - ForensicSpecJumpskirt # DeltaV - - ForensicSpecTurtlesuit # DeltaV - - ForensicSpecTurtleskirt # DeltaV - - ClothingUniformMiamiVice #imp - - ClothingUniformMiamiViceSkirt #imp - - ClothingUniformDetectiveSuit #imp - - ClothingUniformDetectiveSuitSkirt #imp + - DetectiveJumpsuit + - DetectiveJumpskirt + - NoirJumpsuit + - NoirJumpskirt - type: loadoutGroup id: DetectiveOuterClothing name: loadout-group-detective-outerclothing loadouts: -# - DetectiveArmorVest # DeltaV - removed for incongruence -# - DetectiveCoat # DeltaV - removed for incongruence - - StasecWinterCoatDet # DeltaV - - PlateCarrier # DeltaV - - DuraVest # DeltaV + - DetectiveArmorVest + - DetectiveCoat - type: loadoutGroup id: SecurityCadetJumpsuit @@ -1394,14 +1282,6 @@ - PurpleSurgeryCap - NurseHat -- type: loadoutGroup # DeltaV - id: MedicalDoctorNeck - name: loadout-group-medical-doctor-neck - minLimit: 0 - loadouts: - - Stethoscope - - ScarfBlue - - type: loadoutGroup id: MedicalDoctorJumpsuit name: loadout-group-medical-doctor-jumpsuit @@ -1495,35 +1375,6 @@ - ChemistSatchel - ChemistDuffel -# Chemist Neck - DeltaV -- type: loadoutGroup - id: ChemistNeck - name: loadout-group-chemist-neck - minLimit: 0 - loadouts: - - ChemistTie # DeltaV - - ScarfOrange - - ScarfBlue - -# Chemist Gloves - DeltaV -- type: loadoutGroup - id: ChemistGloves - name: loadout-group-chemist-gloves - minLimit: 0 - loadouts: - - LatexGloves - - NitrileGloves - - ChemistGloves # DeltaV - -# Chemist Shoes - DeltaV -- type: loadoutGroup - id: ChemistShoes - name: loadout-group-chemist-shoes - loadouts: - - WhiteShoes - - ChemistWinterBoots # DeltaV - - ChemistShoes # DeltaV - - type: loadoutGroup id: ParamedicHead name: loadout-group-paramedic-head diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index bf0d7af4b59..428922831a2 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -365,7 +365,7 @@ - HeadofSecurityJumpsuit - SecurityBackpack - SecurityBelt - - HeadofSecurityOuterClothing + - HeadofSecurityOuterClothingDeltaV # DeltaV - Switched to DeltaV version, was HeadofSecurityOuterClothing - HeadofSecurityShoes # DeltaV - winter boots - SurvivalSecurity - Trinkets @@ -382,7 +382,7 @@ - WardenJumpsuit - SecurityBackpack - SecurityBelt - - WardenOuterClothing + - WardenOuterClothingDeltaV # DeltaV - Switched to DeltaV version, was WardenOuterClothing - SecurityShoes - SurvivalSecurity - Trinkets @@ -414,9 +414,9 @@ groups: - DetectiveHead - SecurityNeck # DeltaV - replace DetectiveNeck for incongruence - - DetectiveJumpsuit + - DetectiveJumpsuitDeltaV # DeltaV - Replaced with DeltaV version, was DetectiveJumpsuit - SecurityBackpack - - DetectiveOuterClothing + - DetectiveOuterClothingDeltaV # DeltaV - Replaced with DeltaV version, was DetectiveOuterClothing - SecurityShoes - SurvivalSecurity - Trinkets diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml new file mode 100644 index 00000000000..27bbcf9ce0d --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml @@ -0,0 +1,17 @@ +# Jumpsuit +- type: loadout + id: QuartermasterFormalDress + equipment: + jumpsuit: ClothingUniformJumpskirtQMFormal + +# Head +- type: loadout + id: LogiOfficerBeret + equipment: + head: ClothingHeadHatBeretLogi + +# Shoes +- type: loadout + id: QuartermasterWinterBoots + equipment: + shoes: ClothingShoesBootsWinterLogisticsOfficer diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_technician.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml similarity index 52% rename from Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_technician.yml rename to Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml index 5facd6f5689..e1b32ce4462 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_technician.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -13,3 +13,15 @@ id: ExcavatorPDA equipment: id: ExcavatorPDA + +# Shoes +- type: loadout + id: SalvageWinterBoots + equipment: + shoes: ClothingShoesBootsWinterMiner + +# Neck +- type: loadout + id: SalvageCloak + equipment: + neck: ClothingNeckSalvager diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/bartender.yml index d2992bf8405..9cc219056e0 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/bartender.yml @@ -8,3 +8,9 @@ id: MixologistPDA equipment: id: MixologistPDA + +# Glasses +- type: loadout + id: BartenderGlasses + equipment: + eyes: ClothingEyesHudBeer diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml index 65244e19821..3626769961d 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml @@ -23,3 +23,49 @@ id: StudentPDA equipment: id: StudentPDA + +# Jumpsuit +# Rose Hoodie w/ Skirt +- type: loadout + id: MioSkirt + equipment: + jumpsuit: ClothingCostumeMioSkirt + +# Turqoise Hoodie w/ Shorts +- type: loadout + id: NaotaHoodie + equipment: + jumpsuit: ClothingCostumeNaota + +# Casual Red +- type: loadout + id: CasualRedSkirt + equipment: + jumpsuit: ClothingUniformJumpskirtCasualRed + +- type: loadout + id: CasualRedSuit + equipment: + jumpsuit: ClothingUniformJumpsuitCasualRed + +# Casual Blue +- type: loadout + id: CasualBlueSkirt + equipment: + jumpsuit: ClothingUniformJumpskirtCasualBlue + +- type: loadout + id: CasualBlueSuit + equipment: + jumpsuit: ClothingUniformJumpsuitCasualBlue + +# Casual Purple +- type: loadout + id: CasualPurpleSkirt + equipment: + jumpsuit: ClothingUniformJumpskirtCasualPurple + +- type: loadout + id: CasualPurpleSuit + equipment: + jumpsuit: ClothingUniformJumpsuitCasualPurple diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml new file mode 100644 index 00000000000..d68cc74ae28 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml @@ -0,0 +1,28 @@ +# Head +- type: loadout + id: CaptainBeret + equipment: + head: ClothingHeadHatBeretCap + +# Neck +- type: loadout + id: CaptainCloakFormal + equipment: + neck: ClothingNeckCloakCapFormal + +# Gloves +- type: loadout + id: CaptainGloves + equipment: + gloves: ClothingHandsGlovesCaptain + +- type: loadout + id: InspectionGloves + equipment: + gloves: ClothingHandsGlovesInspection + +# Shoes +- type: loadout + id: CaptainWinterBoots + equipment: + shoes: ClothingShoesBootsWinterCap diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml index 9c135fd0186..5f745bc98d1 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml @@ -8,3 +8,9 @@ id: MechanicPDA equipment: id: MechanicPDA + +# OuterClothing +- type: loadout + id: StationEngineerWintercoat + equipment: + outerClothing: ClothingOuterWinterEngi diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml new file mode 100644 index 00000000000..5c6186c48ce --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml @@ -0,0 +1,34 @@ +# Jumpsuit +- type: loadout + id: ChemistFormalSuit + equipment: + jumpsuit: ClothingUniformJumpsuitChemShirt + +# OuterClothing +- type: loadout + id: ChemistApron + equipment: + outerClothing: ClothingOuterApronChemist + +# Gloves +- type: loadout + id: ChemistGloves + equipment: + gloves: ClothingHandsGlovesChemist + +# Shoes +- type: loadout + id: ChemistWinterBoots + equipment: + shoes: ClothingShoesBootsWinterChem + +- type: loadout + id: ChemistShoes + equipment: + shoes: ClothingShoesEnclosedChem + +# Neck +- type: loadout + id: ChemistTie + equipment: + neck: ClothingNeckTieChem diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml new file mode 100644 index 00000000000..596211c0760 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -0,0 +1,5 @@ +# Shoes +- type: loadout + id: ChiefMedicalOfficerWinterBoots + equipment: + shoes: ClothingShoesBootsWinterChiefMedicalOfficer diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml index 93e06f0fd3f..6298514a6a3 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml @@ -3,3 +3,9 @@ id: ClinicianPDA equipment: id: ClinicianPDA + +# Neck +- type: loadout + id: Stethoscope + equipment: + neck: ClothingNeckStethoscope diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml new file mode 100644 index 00000000000..2ccd1a41745 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml @@ -0,0 +1,5 @@ +# Shoes +- type: loadout + id: ParamedicWinterBoots + equipment: + shoes: ClothingShoesBootsWinterParamedic diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml index c7e252151ca..48e37497ca0 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml @@ -32,11 +32,6 @@ time: 14400 # 4 hours service # Head -- type: loadout - id: PsychologistFrenchBeret - equipment: - head: ClothingHeadHatBeretFrench - - type: loadout id: PsychologistGreyFlatcap equipment: @@ -48,21 +43,11 @@ head: ClothingHeadHatBrownFlatcap # OuterClothing -- type: loadout - id: PsychologistMedicalWinterCoat - equipment: - outerClothing: ClothingOuterWinterMed - - type: loadout id: PsychologistWinterCoat equipment: outerClothing: ClothingOuterWinterCoat -- type: loadout - id: PsychologistWinterCoatPlaid - equipment: - outerClothing: ClothingOuterWinterCoatPlaid - - type: loadout id: PsychologistCoatBomber equipment: diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml index 06e7af22f42..eb1008d6098 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml @@ -1,9 +1,28 @@ +# Neck - type: loadout id: MystagogueCloak equipment: neck: ClothingNeckCloakMystagogue +# Head +- type: loadout # DeltaV + id: ResearchDirectorHood + equipment: + head: ClothingHeadHoodMysta + - type: loadout id: MystagogueBeret equipment: head: ClothingHeadHatBeretMysta + +# OuterClothing +- type: loadout + id: MystaLabCoat + equipment: + outerClothing: ClothingOuterCoatRndMysta + +# Shoes +- type: loadout + id: ResearchDirectorWinterBoots + equipment: + shoes: ClothingShoesBootsWinterMystagogue diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml index 8203b103887..e73aefd5ab7 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml @@ -46,3 +46,36 @@ id: SecurityFirearmWeaponRevolverDeckard equipment: pocket1: WeaponRevolverDeckard + +# Jumpsuit +- type: loadout + id: ForensicSpecJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitForensicSpec + +- type: loadout + id: ForensicSpecJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtForensicSpec + +- type: loadout + id: ForensicSpecTurtlesuit + equipment: + jumpsuit: ClothingUniformJumpsuitDetTurtle + +- type: loadout + id: ForensicSpecTurtleskirt + equipment: + jumpsuit: ClothingUniformJumpskirtDetTurtle + +#OuterClothing +- type: loadout + id: StasecWinterCoatDet + equipment: + outerClothing: ClothingOuterCoatStasecDet + +#Head +- type: loadout + id: DetBeret + equipment: + head: ClothingHeadHatBeretDet diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml new file mode 100644 index 00000000000..9d94e7d6e25 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml @@ -0,0 +1,42 @@ +# Jumpsuit +- type: loadout + id: HeadofSecurityJumpsuitGrey + equipment: + jumpsuit: ClothingUniformJumpsuitHoSGrey + +- type: loadout + id: HeadofSecurityJumpskirtGrey + equipment: + jumpsuit: ClothingUniformJumpskirtHoSGrey + +- type: loadout + id: HeadofSecurityJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitHoSBlue + +- type: loadout + id: HeadofSecurityJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtHoSBlue + +- type: loadout + id: HeadofSecurityParadeSuit + equipment: + jumpsuit: ClothingUniformJumpsuitHoSParadeMale + +- type: loadout + id: HeadofSecurityParadeSkirt + equipment: + jumpsuit: ClothingUniformJumpskirtHoSParadeMale + +# OuterClothing +- type: loadout + id: StasecWinterCoatHoS + equipment: + outerClothing: ClothingOuterCoatStasecHoS + +# Shoes +- type: loadout + id: HeadOfSecurityWinterBoots + equipment: + shoes: ClothingShoesBootsWinterHeadOfSecurity diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml new file mode 100644 index 00000000000..bbe989cb735 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml @@ -0,0 +1,36 @@ +# Jumpsuit +- type: loadout + id: WardenJumpsuitGrey + equipment: + jumpsuit: ClothingUniformJumpsuitWardenGrey + +- type: loadout + id: WardenJumpskirtGrey + equipment: + jumpsuit: ClothingUniformJumpskirtWardenGrey + +- type: loadout + id: WardenJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitWardenBlue + +- type: loadout + id: WardenJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtWardenBlue + +- type: loadout + id: WardenTurtlesuit + equipment: + jumpsuit: ClothingUniformJumpsuitWardenTurtle + +- type: loadout + id: WardenTurtleskirt + equipment: + jumpsuit: ClothingUniformJumpskirtWardenTurtle + +# OuterClothing +- type: loadout + id: StasecWinterCoatWarden + equipment: + outerClothing: ClothingOuterCoatStasecWarden diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index 18fc2bfb367..7df19865851 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -21,6 +21,68 @@ - BartenderJumpskirt - BartenderJumpsuitPurple +## Bartender +- type: loadoutGroup + id: BartenderGlasses + name: loadout-group-bartender-glasses + minLimit: 0 + loadouts: + - Glasses + - BartenderGlasses + - GlassesCheapSunglasses + +- type: loadoutGroup + id: BartenderNeck + name: loadout-group-bartender-neck + minLimit: 0 + loadouts: + - ScarfBlack + - ScarfPurple + +## Librarian +- type: loadoutGroup + id: LibrarianNeck + name: loadout-group-librarian-neck + loadouts: + - ScarfGreen + - ScarfRed + +## Janitor +- type: loadoutGroup + id: JanitorNeck + name: loadout-group-janitor-neck + minLimit: 0 + loadouts: + - ScarfPurple + +## Botanist +- type: loadoutGroup + id: BotanistNeck + name: loadout-group-botanist-neck + minLimit: 0 + loadouts: + - ScarfGreen + - ScarfBrown + +## Mime +- type: loadoutGroup + id: MimeNeck + name: loadout-group-mime-neck + minLimit: 0 + loadouts: + - ScarfBlack + - ScarfZebra + +## Musician +- type: loadoutGroup + id: MusicianNeck + name: loadout-group-musician-neck + minLimit: 0 + loadouts: + - ScarfBlack + - ScarfPurple + - ScarfZebra + # Logistics ## Courier - type: loadoutGroup @@ -117,6 +179,23 @@ - BlackShoes - CargoWinterBoots +## Cargo Technician +- type: loadoutGroup + id: CargoTechnicianNeck + name: loadout-group-cargo-technician-neck + minLimit: 0 + loadouts: + - ScarfBrown + +## Salvage Specialist +- type: loadoutGroup + id: SalvageSpecialistNeck + name: loadout-group-salvage-specialist-neck + minLimit: 0 + loadouts: + - SalvageCloak + - ScarfBrown + # Security ## Brig Medic - type: loadoutGroup @@ -257,6 +336,63 @@ - SecurityFirearmSpeedLoaderSpecialRubber - SecurityFirearmSpeedLoaderSpecial +## Security Officer +- type: loadoutGroup + id: SecurityNeck + name: loadout-group-security-neck + minLimit: 0 + loadouts: + - ScarfRed + +- type: loadoutGroup + id: SecurityOuterClothingDeltaV + name: loadout-group-security-outerclothing + loadouts: + - PlateCarrier + - DuraVest + - StasecSweater + - StasecWinterCoat + +## Warden +- type: loadoutGroup + id: WardenOuterClothingDeltaV + name: loadout-group-warden-outerclothing + loadouts: + - PlateCarrier + - DuraVest + - StasecWinterCoatWarden + +## Head of Security +- type: loadoutGroup + id: HeadofSecurityOuterClothingDeltaV + name: loadout-group-head-of-security-outerclothing + loadouts: + - PlateCarrier + - DuraVest + - StasecWinterCoatHoS + +## Detective +- type: loadoutGroup + id: DetectiveJumpsuitDeltaV + name: loadout-group-detective-jumpsuit + loadouts: + - ForensicSpecJumpsuit + - ForensicSpecJumpskirt + - ForensicSpecTurtlesuit + - ForensicSpecTurtleskirt + - ClothingUniformMiamiVice #imp + - ClothingUniformMiamiViceSkirt #imp + - ClothingUniformDetectiveSuit #imp + - ClothingUniformDetectiveSuitSkirt #imp + +- type: loadoutGroup + id: DetectiveOuterClothingDeltaV + name: loadout-group-detective-outerclothing + loadouts: + - StasecWinterCoatDet + - PlateCarrier + - DuraVest + # Medical ## Psychologist - type: loadoutGroup @@ -265,7 +401,7 @@ minLimit: 0 loadouts: - MedicalBeret - - PsychologistFrenchBeret + - MimeFrenchBeret - PsychologistGreyFlatcap - PsychologistBrownFlatcap @@ -274,9 +410,9 @@ name: loadout-group-psychologist-outerclothing minLimit: 0 loadouts: - - PsychologistMedicalWinterCoat + - MedicalDoctorWintercoat - PsychologistWinterCoat - - PsychologistWinterCoatPlaid + - WinterCoatPlaid - PsychologistCoatBomber - PsychologistSweater @@ -289,6 +425,42 @@ - MedicalWinterBoots - WinterBoots +## Medical Doctor +- type: loadoutGroup + id: MedicalDoctorNeck + name: loadout-group-medical-doctor-neck + minLimit: 0 + loadouts: + - Stethoscope + - ScarfBlue + +## Chemist +- type: loadoutGroup + id: ChemistNeck + name: loadout-group-chemist-neck + minLimit: 0 + loadouts: + - ChemistTie + - ScarfOrange + - ScarfBlue + +- type: loadoutGroup + id: ChemistGloves + name: loadout-group-chemist-gloves + minLimit: 0 + loadouts: + - LatexGloves + - NitrileGloves + - ChemistGloves + +- type: loadoutGroup + id: ChemistShoes + name: loadout-group-chemist-shoes + loadouts: + - WhiteShoes + - ChemistWinterBoots + - ChemistShoes + # Justice ## Chief Justice - type: loadoutGroup @@ -330,6 +502,24 @@ - LeatherShoes - LaceupShoes +# Engineering +## Station Engineer +- type: loadoutGroup + id: StationEngineerNeck + name: loadout-group-station-engineer-neck + minLimit: 0 + loadouts: + - ScarfOrange + +## Atmospheric Technician +- type: loadoutGroup + id: AtmosphericTechnicianNeck + name: loadout-group-atmospheric-technician-neck + minLimit: 0 + loadouts: + - ScarfLightBlue + - ScarfOrange + ## Clerk - type: loadoutGroup id: ClerkJumpsuit @@ -487,6 +677,42 @@ - HoPGloves - InspectionGloves +## Captain +- type: loadoutGroup + id: CaptainGloves + name: loadout-group-captain-gloves + minLimit: 0 + loadouts: + - CaptainGloves + - InspectionGloves + +- type: loadoutGroup + id: CaptainShoes + name: loadout-group-captain-shoes + loadouts: + - BrownLeatherShoes + - WhiteLeatherShoes + - LaceupShoes + - CaptainWinterBoots + +## Head of Personnel +- type: loadoutGroup + id: HoPGloves + name: loadout-group-hop-gloves + minLimit: 0 + loadouts: + - HoPGloves + - InspectionGloves + +- type: loadoutGroup + id: HoPShoes + name: loadout-group-hop-shoes + loadouts: + - BrownLeatherShoes + - WhiteLeatherShoes + - LaceupShoes + - HoPWinterBoots + # PDAs - type: loadoutGroup id: PassengerPDADelta From fc3d428f1a1a00fa96f73b6c4eda9d933bca29b1 Mon Sep 17 00:00:00 2001 From: Dirius77 Date: Sun, 12 Jan 2025 18:16:00 -0500 Subject: [PATCH 2/3] Increase Tesla fade time (#2710) --- Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs b/Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs index 7fc424f9afe..ef4600bbe99 100644 --- a/Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs +++ b/Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs @@ -35,7 +35,7 @@ public sealed partial class TeslaEnergyBallComponent : Component /// The amount of energy to which the tesla must reach in order to be destroyed. /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public float EnergyToDespawn = -100f; + public float EnergyToDespawn = -540f; // DeltaV, make the Tesla take as long to fail as the singulo. /// /// Played when energy reaches the lower limit (and entity destroyed) From 869a08a6250ab497db8d9ee219a0cfacb161e6c5 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 13 Jan 2025 00:16:19 +0100 Subject: [PATCH 3/3] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index e03fc2da068..bacb6b0d3f1 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Bellwether - changes: - - message: The Chief Justice's apparel is now available in the uniform printer - type: Tweak - id: 402 - time: '2024-06-17T16:37:43.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1395 - author: deltanedas changes: - message: Added Carpy the Legal Carp, coming to justice departments near you. @@ -3851,3 +3844,10 @@ id: 901 time: '2025-01-12T15:48:39.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2658 +- author: Dirius77 + changes: + - message: Made the Tesla much slower to fade after power loss. + type: Tweak + id: 902 + time: '2025-01-12T23:16:01.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2710