Add medical gloves and sterile masks to medical loadouts (#27029)

* Add medical gloves to loadouts

* Realize I don't need to duplicate them

* Re-add extra lines

* I did it wrong...

* Format it back to how it was this time for sure

* For real this time

* ...

* Add sterile masks too

* I can't spell officer apparently

* Standardize order of where gloves are

* Add Nurse Hat to doctors

* Remove duplication of gloves and masks

* Remove extra space

* Name glove protos similiar to other ones

* Remove latex gloves proto from medical (sci has it)

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index e8ebb67ef3411839dfbae0a1d5e8eda72527a70b..ecbcbb3fe6107ea3718738cdbde5d170d4c836ab 100644 (file)
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -153,6 +153,9 @@ loadout-group-detective-outerclothing = Detective outer clothing
 loadout-group-security-cadet-jumpsuit = Security cadet jumpsuit
 
 # Medical
+loadout-group-medical-gloves = Medical gloves
+loadout-group-medical-mask = Medical mask
+
 loadout-group-chief-medical-officer-head = Chief Medical Officer head
 loadout-group-chief-medical-officer-jumpsuit = Chief Medical Officer jumpsuit
 loadout-group-chief-medical-officer-outerclothing = Chief Medical Officer outer clothing

diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
index aaa7b64cbbd7d16a64aa22124c3217a61101cdfe..9b05120b1aa3e1ce8b6edb7769840a9cc2eaadbb 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
@@ -62,4 +62,5 @@
 - type: startingGear
   id: ChemistWintercoat
   equipment:
-    outerClothing: ClothingOuterWinterChem
\ No newline at end of file
+    outerClothing: ClothingOuterWinterChem
+

diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
index d128d72379ce95886c66926ae222009398ceb778..4a0c011f43bae4bafe00b0eec8aca185b23bcea8 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -91,4 +91,5 @@
 - type: startingGear
   id: ChiefMedicalOfficerWintercoat
   equipment:
-    outerClothing: ClothingOuterWinterCMO
\ No newline at end of file
+    outerClothing: ClothingOuterWinterCMO
+

diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
index 919d9d288c73c97f7a937ae8b758a7df549d1363..7e4732cd03bc0de3b3710eb9692551565ca7a10c 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -68,6 +68,15 @@
   equipment:
     head: ClothingHeadHatSurgcapPurple
 
+- type: loadout
+  id: NurseHat
+  equipment: NurseHat
+
+- type: startingGear
+  id: NurseHat
+  equipment:
+    head: ClothingHeadNurseHat
+
 # Jumpsuit
 - type: loadout
   id: MedicalDoctorJumpsuit
@@ -219,3 +228,23 @@
   id: SeniorPhysicianPDA
   equipment:
     id: SeniorPhysicianPDA
+
+# Gloves
+- type: loadout
+  id: NitrileGloves
+  equipment: NitrileGloves
+
+- type: startingGear
+  id: NitrileGloves
+  equipment:
+    gloves: ClothingHandsGlovesNitrile
+
+#Masks
+- type: loadout
+  id: SterileMask
+  equipment: SterileMask
+
+- type: startingGear
+  id: SterileMask
+  equipment:
+    mask: ClothingMaskSterile

diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
index 4630a0363f66b198768cec13b8ba2963318fa415..f393109eea42f653aa4e016c547067414adf0918 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
@@ -82,4 +82,5 @@
 - type: startingGear
   id: BlueShoes
   equipment:
-    shoes: ClothingShoesColorBlue
\ No newline at end of file
+    shoes: ClothingShoesColorBlue
+

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 222c598e0573f955b1670b87ea1b64585e9ef03d..ab8b1acfe588fca2affb6e02a28af8d9c339f189 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -1010,6 +1010,7 @@
   - BlueSurgeryCap
   - GreenSurgeryCap
   - PurpleSurgeryCap
+  - NurseHat
 
 - type: loadoutGroup
   id: MedicalDoctorJumpsuit
@@ -1054,6 +1055,21 @@
   - MedicalDoctorPDA
   - SeniorPhysicianPDA
 
+- type: loadoutGroup
+  id: MedicalGloves
+  name: loadout-group-medical-gloves
+  minLimit: 0
+  loadouts:
+  - LatexGloves
+  - NitrileGloves
+
+- type: loadoutGroup
+  id: MedicalMask
+  name: loadout-group-medical-mask
+  minLimit: 0
+  loadouts:
+  - SterileMask
+
 - type: loadoutGroup
   id: MedicalInternJumpsuit
   name: loadout-group-medical-intern-jumpsuit

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index b5e19147b10c65c25217cd07588970a3ff0cab4d..97a073333885d41d3fa7a6907689d3ef407de8c7 100644 (file)
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -287,7 +287,9 @@
   id: JobChiefMedicalOfficer
   groups:
   - ChiefMedicalOfficerHead
+  - MedicalMask
   - ChiefMedicalOfficerJumpsuit
+  - MedicalGloves
   - ChiefMedicalOfficerBackpack
   - ChiefMedicalOfficerOuterClothing
   - ChiefMedicalOfficerNeck
@@ -298,7 +300,9 @@
   id: JobMedicalDoctor
   groups:
   - MedicalDoctorHead
+  - MedicalMask
   - MedicalDoctorJumpsuit
+  - MedicalGloves
   - MedicalBackpack
   - MedicalDoctorOuterClothing
   - MedicalShoes
@@ -315,7 +319,9 @@
 - type: roleLoadout
   id: JobChemist
   groups:
+  - MedicalMask
   - ChemistJumpsuit
+  - MedicalGloves
   - ChemistBackpack
   - ChemistOuterClothing
   - MedicalShoes
@@ -325,8 +331,10 @@
   id: JobParamedic
   groups:
   - ParamedicHead
+  - MedicalMask
   - ParamedicJumpsuit
-  - ParamedicBackpack
+  - MedicalGloves
+  - ParamedicBackpack  
   - ParamedicOuterClothing
   - ParamedicShoes
   - Trinkets