Clothing and pronoun fields (#2689)

* Clothing & Gender fields: Add to database [MODIFIED TO NOT DEPEND ON SAPHIRE-DB-REFACTOR] Sorry about this, Saphire. * Clothing & Gender fields: Add UI [FALLBACK II] * Clothing & Gender fields: Actually apply gender * Clothing & Gender fields: Import innerclothingskirt field from my previous attempt Couldn't import actual prototypes because of a change to IDs * Clothing & Gender fields: Add innerclothingskirt field to everything * Clothing & Gender fields: Jumpskirts now work * Clothing & Gender fields: Gender field will follow sex field if it's not different (UX improvement) [FALLBACK II] * Clothing & Gender fields: Gender -> Pronouns to reduce confusion. Also, fix profile summary. Properly. [FALLBACK II] * Clothing & Pronoun fields: Refactor so that profile equipment adjustments are performed in StartingGearPrototype.
2020-12-24 13:42:40 +00:00
parent b4506b4d08
commit 6b5cded8c2
40 changed files with 1866 additions and 337 deletions
--- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -20,3 +20,5 @@
    shoes: ClothingShoesColorBlack
    idcard: CargoPDA
    ears: ClothingHeadsetCargo
+  innerclothingskirt: ClothingUniformJumpskirtCargo
+
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -21,3 +21,5 @@
    shoes: ClothingShoesColorBrown
    idcard: QuartermasterPDA
    ears: ClothingHeadsetCargo
+  innerclothingskirt: ClothingUniformJumpskirtQM
+
--- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
@@ -17,3 +17,5 @@
    shoes: ClothingShoesColorBlack
    idcard: AssistantPDA
    ears: ClothingHeadsetService
+  innerclothingskirt: ClothingUniformJumpskirtColorGrey
+
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
@@ -21,3 +21,5 @@
    shoes: ClothingShoesColorBlack
    idcard: BartenderPDA
    ears: ClothingHeadsetService
+  innerclothingskirt: ClothingUniformJumpskirtBartender
+
--- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
@@ -21,3 +21,5 @@
    idcard: BotanistPDA
    ears: ClothingHeadsetService
    outerclothing: ClothingOuterApronBotanist
+  innerclothingskirt: ClothingUniformJumpskirtHydroponics
+
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -9,7 +9,6 @@
 #  access:
 #  - Chapel
 #  - Maintenance
-
 #- type: startingGear
 #  id: ChaplainGear
 #  equipment:
@@ -18,3 +17,5 @@
 #    shoes: ClothingShoesColorBlack
 #    idcard: ChaplainPDA
 #    ears: ClothingHeadsetService
+#  innerclothingskirt: ClothingUniformJumpskirtChaplain
+
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -21,3 +21,5 @@
    idcard: ChefPDA
    ears: ClothingHeadsetService
    outerclothing: ClothingOuterApronChef
+  innerclothingskirt: ClothingUniformJumpskirtChef
+
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -20,3 +20,5 @@
    idcard: JanitorPDA
    ears: ClothingHeadsetService
    belt: ClothingBeltJanitorFilled
+  innerclothingskirt: ClothingUniformJumpskirtJanitor
+
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -24,3 +24,5 @@
    mask: ClothingMaskMime
    idcard: MimePDA
    ears: ClothingHeadsetService
+  innerclothingskirt: ClothingUniformJumpskirtMime
+
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -28,3 +28,5 @@
    head: ClothingHeadHatHopcap
    idcard: HoPPDA
    ears: ClothingHeadsetAltCommand
+  innerclothingskirt: ClothingUniformJumpskirtHoP
+
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -25,3 +25,5 @@
    idcard: CEPDA
    ears: ClothingHeadsetEngineering
    belt: ClothingBeltChiefEngineerFilled
+  innerclothingskirt: ClothingUniformJumpskirtChiefEngineer
+
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -23,3 +23,5 @@
    idcard: EngineerPDA
    belt: ClothingBeltUtilityFilled
    ears: ClothingHeadsetEngineering
+  innerclothingskirt: ClothingUniformJumpskirtEngineering
+
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -26,3 +26,5 @@
    idcard: CMOPDA
    ears: ClothingHeadsetAltMedical
    belt: ClothingBeltMedical
+  innerclothingskirt: ClothingUniformJumpskirtCMO
+
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -21,3 +21,5 @@
    idcard: MedicalPDA
    ears: ClothingHeadsetMedical
    belt: ClothingBeltMedical
+  innerclothingskirt: ClothingUniformJumpskirtMedicalDoctor
+
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -22,3 +22,5 @@
    shoes: ClothingShoesColorBrown
    idcard: RnDPDA
    ears: ClothingHeadsetScience
+  innerclothingskirt: ClothingUniformJumpskirtResearchDirector
+
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -20,3 +20,5 @@
    outerclothing: ClothingOuterCoatLab
    idcard: SciencePDA
    ears: ClothingHeadsetScience
+  innerclothingskirt: ClothingUniformJumpskirtScientist
+
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -29,3 +29,5 @@
    idcard: HoSPDA
    ears: ClothingHeadsetAltSecurity
    belt: ClothingBeltSecurityFilled
+  innerclothingskirt: ClothingUniformJumpskirtHoS
+
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -24,3 +24,5 @@
    idcard: SecurityPDA
    ears: ClothingHeadsetSecurity
    belt: ClothingBeltSecurityFilled
+  innerclothingskirt: ClothingUniformJumpskirtSec
+
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -25,3 +25,5 @@
    idcard: WardenPDA
    ears: ClothingHeadsetSecurity
    belt: ClothingBeltSecurityFilled
+  innerclothingskirt: ClothingUniformJumpskirtWarden
+