Copyright Pass/Pruning | Part 1 - Clothing (#2539)

* Backpacks/Belts * Cleans up Headsets * Glasses and Gloves (Remind me to make an alpha for those stupid gloves) * This commit has taken too many of my damn tears please appreciate it * Holy SHIT that was an ordeal * NECK and MASKS * Jumpsuits/skirts * Goodbye old color.rsi * Outerclothing * More Outerclothing * It builds now * More ID organization :) * Gloves up to scratch * My piss burns * GLasses * Added some more glasses * Mission control we are ready for review * Hotfix * Cleanup * Fix not commenting out whole line in contents * duffelbag => duffel bag * Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Fixed Breath Mask * Scrubs * New line * Fixed Build * Ok * Update engivend.yml * Fix meson glasses prototype in boxes * Fix prototype name for sec glasses in boxes * Fix InventoryHelpersTest janitor jumpsuit prototype * Fix outdated stationstation prototypes * Fix vending machines having invalid starting inventories * Fix chapel vending machine Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2020-11-22 04:17:14 +00:00
parent ccb7719935
commit f46a6a8d81
3124 changed files with 16722 additions and 17241 deletions
--- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -14,8 +14,9 @@
 - type: startingGear
  id: CargoTechGear
  equipment:
-    innerclothing: UniformCargoTech
-    backpack: BackpackClothingFilled
-    shoes: ShoesBlack
+    head: ClothingHeadHatCargosoft
+    innerclothing: ClothingUniformJumpsuitCargo
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBlack
    idcard: CargoPDA
-    ears: HeadsetCargo
+    ears: ClothingHeadsetCargo
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -15,8 +15,9 @@
 - type: startingGear
  id: QuartermasterGear
  equipment:
-    innerclothing: UniformQM
-    backpack: BackpackClothingFilled
-    shoes: ShoesBrown
+    head: ClothingHeadHatCargosoft
+    innerclothing: ClothingUniformJumpsuitQM
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBrown
    idcard: QuartermasterPDA
-    ears: HeadsetCargo
+    ears: ClothingHeadsetCargo
--- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
@@ -12,8 +12,8 @@
 - type: startingGear
  id: AssistantGear
  equipment:
-    innerclothing: UniformColorGrey
-    backpack: BackpackClothingFilled
-    shoes: ShoesBlack
+    innerclothing: ClothingUniformJumpsuitColorGrey
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBlack
    idcard: AssistantPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
@@ -14,9 +14,10 @@
 - type: startingGear
  id: BartenderGear
  equipment:
-    innerclothing: UniformBartender
-    outerclothing: OuterclothingArmorVest
-    backpack: BackpackClothingFilled
-    shoes: ShoesBlack
+    head: ClothingHeadHatTophat
+    innerclothing: ClothingUniformJumpsuitBartender
+    outerclothing: ClothingOuterVestKevlar
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBlack
    idcard: BartenderPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService
--- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
@@ -15,8 +15,8 @@
 - type: startingGear
  id: BotanistGear
  equipment:
-    innerclothing: UniformHydroponics
-    backpack: BackpackClothingFilled
-    shoes: ShoesBrown
+    innerclothing: ClothingUniformJumpsuitHydroponics
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBrown
    idcard: BotanistPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -13,8 +13,8 @@
 - type: startingGear
  id: ChaplainGear
  equipment:
-    innerclothing: UniformChaplain
-    backpack: BackpackClothing
-    shoes: ShoesBlack
+    innerclothing: ClothingUniformJumpsuitChaplain
+    backpack: ClothingBackpack
+    shoes: ClothingShoesColorBlack
    idcard: ChaplainPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -14,8 +14,9 @@
 - type: startingGear
  id: ChefGear
  equipment:
-    innerclothing: UniformChef
-    backpack: BackpackClothingFilled
-    shoes: ShoesBlack
+    innerclothing: ClothingUniformJumpsuitChef
+    head: ClothingHeadHatChef
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBlack
    idcard: ChefPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -14,10 +14,10 @@
 - type: startingGear
  id: ClownGear
  equipment:
-    innerclothing: UniformClown
-    backpack: ClownPackFilled
-    shoes: ShoesClown
-    mask: MaskClown
+    innerclothing: ClothingUniformJumpsuitClown
+    backpack: ClothingBackpackClownFilled
+    shoes: ClothingShoesClown
+    mask: ClothingMaskClown
    pocket1: BikeHorn
    idcard: ClownPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -13,10 +13,10 @@
 - type: startingGear
  id: JanitorGear
  equipment:
-    innerclothing: UniformJanitor
-    backpack: BackpackClothingFilled
-    shoes: ShoesGaloshes
-    head: HatPurplesoft
+    innerclothing: ClothingUniformJumpsuitJanitor
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesGaloshes
+    head: ClothingHeadHatPurplesoft
    idcard: JanitorPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService
    belt: ClothingBeltJanitorFilled
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -13,14 +13,14 @@
 - type: startingGear
  id: MimeGear
  equipment:
-    innerclothing: UniformMime
-    backpack: BackpackClothing
-    head: HatBeret
-    belt: SuspendersClothing
-    gloves: GlovesWhite
-    shoes: ShoesMime
+    innerclothing: ClothingUniformJumpsuitMime
+    backpack: ClothingBackpackFilled
+    head: ClothingHeadHatBeret
+    belt: ClothingBeltSuspenders
+    gloves: ClothingHandsGlovesLatex
+    shoes: ClothingShoesColorWhite
    pocket1: Pen
    pocket2: Paper
-    mask: MaskMime
+    mask: ClothingMaskMime
    idcard: MimePDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -11,6 +11,7 @@
  # All of em.
  # Could probably do with some kind of wildcard or whatever to automate this.
  # HELL FUCKING YEAH WE COULD
+  # Guys please don't fight
  - Captain
  - HeadOfPersonnel
  - Command
@@ -38,12 +39,12 @@
 - type: startingGear
  id: CaptainGear
  equipment:
-    innerclothing: UniformCaptain
-    backpack: BackpackCaptainFilled
-    shoes: ShoesBlack
-    head: HatCaptain
-    eyes: SunGlasses
-    gloves: GlovesCaptain
-    outerclothing: OuterclothingCaparmor
+    innerclothing: ClothingUniformJumpsuitCaptain
+    backpack: ClothingBackpackCaptainFilled
+    shoes: ClothingShoesColorBlack
+    head: ClothingHeadHatCaptain
+    eyes: ClothingEyesGlassesSunglasses
+    gloves: ClothingHandsGlovesCaptain
+    outerclothing: ClothingOuterHardsuitCap
    idcard: CaptainPDA
-    ears: HeadsetCommand
+    ears: ClothingHeadsetAltCommand
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -22,9 +22,9 @@
 - type: startingGear
  id: HoPGear
  equipment:
-    innerclothing: UniformHoP
-    backpack: BackpackClothingFilled
-    shoes: ShoesBrown
-    head: HatHopcap
+    innerclothing: ClothingUniformJumpsuitHoP
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBrown
+    head: ClothingHeadHatHopcap
    idcard: HoPPDA
-    ears: HeadsetCommand
+    ears: ClothingHeadsetAltCommand
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -18,10 +18,10 @@
 - type: startingGear
  id: ChiefEngineerGear
  equipment:
-    head: HatHardhatWhite
-    innerclothing: UniformChiefEngineer
-    backpack: BackpackEngineeringFilled
-    shoes: ShoesBrown
+    head: ClothingHeadHatHardhatWhite
+    innerclothing: ClothingUniformJumpsuitChiefEngineer
+    backpack: ClothingBackpackEngineeringFilled
+    shoes: ClothingShoesColorBrown
    idcard: CEPDA
-    ears: HeadsetEngineering
+    ears: ClothingHeadsetEngineering
    belt: ClothingBeltChiefEngineerFilled
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -15,10 +15,11 @@
 - type: startingGear
  id: StationEngineerGear
  equipment:
-    innerclothing: UniformEngineering
-    backpack: BackpackEngineeringFilled
-    shoes: ShoesWorkboots
-    outerclothing: OuterclothingHazard
+    head: ClothingHeadHatHardhatYellow
+    innerclothing: ClothingUniformJumpsuitEngineering
+    backpack: ClothingBackpackEngineeringFilled
+    shoes: ClothingShoesBootsWork
+    outerclothing: ClothingOuterVestHazard
    idcard: EngineerPDA
-    belt: UtilityBeltClothingFilled
-    ears: HeadsetEngineering
+    belt: ClothingBeltUtilityFilled
+    ears: ClothingHeadsetEngineering
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -19,10 +19,10 @@
 - type: startingGear
  id: CMOGear
  equipment:
-    innerclothing: UniformCMO
-    backpack: BackpackMedicalFilled
-    shoes: ShoesBrown
-    outerclothing: OuterclothingLabcoatcmo
+    innerclothing: ClothingUniformJumpsuitCMO
+    backpack: ClothingBackpackMedicalFilled
+    shoes: ClothingShoesColorBrown
+    outerclothing: ClothingOuterCoatLabCmo
    idcard: CMOPDA
-    ears: HeadsetMedicalAlt
+    ears: ClothingHeadsetAltMedical
    belt: ClothingBeltMedical
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -14,10 +14,10 @@
 - type: startingGear
  id: DoctorGear
  equipment:
-    innerclothing: UniformMedicalDoctor
-    backpack: BackpackMedicalFilled
-    shoes: ShoesWhite
-    outerclothing: OuterclothingLabcoatmedspecopen
+    innerclothing: ClothingUniformJumpsuitMedicalDoctor
+    backpack: ClothingBackpackMedicalFilled
+    shoes: ClothingShoesColorWhite
+    outerclothing: ClothingOuterCoatLab
    idcard: MedicalPDA
-    ears: HeadsetMedical
+    ears: ClothingHeadsetMedical
    belt: ClothingBeltMedical
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -17,10 +17,9 @@
 - type: startingGear
  id: ResearchDirectorGear
  equipment:
-    innerclothing: UniformResearchDirector
+    innerclothing: ClothingUniformJumpsuitResearchDirector
    # Note to Swept add science backpacks
-    backpack: BackpackClothingFilled
-    shoes: ShoesBrown
-    outerclothing: OuterclothingLabcoatopen
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBrown
    idcard: RnDPDA
-    ears: HeadsetScience
+    ears: ClothingHeadsetScience
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -14,9 +14,9 @@
 - type: startingGear
  id: ScientistGear
  equipment:
-    innerclothing: UniformScientist
-    backpack: BackpackClothingFilled
-    shoes: ShoesWhite
-    outerclothing: OuterclothingLabcoat
+    innerclothing: ClothingUniformJumpsuitScientist
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorWhite
+    outerclothing: ClothingOuterCoatLab
    idcard: SciencePDA
-    ears: HeadsetScience
+    ears: ClothingHeadsetScience
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -20,12 +20,12 @@
 - type: startingGear
  id: HoSGear
  equipment:
-    innerclothing: UniformHoS
-    backpack: SecPackFilled
-    shoes: ShoesJackboots
-    outerclothing: OuterclothingHoSTrenchcoat
-    eyes: SecGlasses
-    head: HatBeretHoS
+    innerclothing: ClothingUniformJumpsuitHoS
+    backpack: ClothingBackpackSecurityFilled
+    shoes: ClothingShoesJackboots
+    outerclothing: ClothingOuterCoatHoSTrench
+    eyes: ClothingEyesGlassesSecurity
+    head: ClothingHeadHatBeretHoS
    idcard: HoSPDA
-    ears: HeadsetSecurityAlt
+    ears: ClothingHeadsetAltSecurity
    belt: ClothingBeltSecurityFilled
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -15,11 +15,12 @@
 - type: startingGear
  id: SecurityOfficerGear
  equipment:
-    innerclothing: UniformSec
-    backpack: SecPackFilled
-    shoes: ShoesJackboots
-    eyes: SecGlasses
-    outerclothing: OuterclothingArmorVest
+    innerclothing: ClothingUniformJumpsuitSec
+    backpack: ClothingBackpackSecurityFilled
+    shoes: ClothingShoesBootsJack
+    eyes: ClothingEyesGlassesSecurity
+    head: ClothingHeadHelmetHelmetOld
+    outerclothing: ClothingOuterVestKevlar
    idcard: SecurityPDA
-    ears: HeadsetSecurity
+    ears: ClothingHeadsetSecurity
    belt: ClothingBeltSecurityFilled
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -16,11 +16,12 @@
 - type: startingGear
  id: WardenGear
  equipment:
-    innerclothing: UniformWarden
-    backpack: SecPackFilled
-    shoes: ShoesJackboots
-    eyes: SecGlasses
-    outerclothing: OuterclothingArmorVest
+    head: ClothingHeadHatWarden
+    innerclothing: ClothingUniformJumpsuitWarden
+    backpack: ClothingBackpackSecurityFilled
+    shoes: ClothingShoesBootsJack
+    eyes: ClothingEyesGlassesSecurity
+    outerclothing: ClothingOuterVestKevlar
    idcard: WardenPDA
-    ears: HeadsetSecurity
+    ears: ClothingHeadsetSecurity
    belt: ClothingBeltSecurityFilled