Glasses in loadouts (#27286)

* loadouts now have aaall the glasses

* cheap sunglasses dont exist at all

* empty commit to rerun tests, there's no way i fucked something up

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index cdad0f72e670979bbd7f96b0c10b1ea462513564..a093a8463aad58cacbcb159563dba96c312235ab 100644 (file)
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -1,5 +1,6 @@
 # Miscellaneous
 loadout-group-trinkets = Trinkets
+loadout-group-glasses = Glasses
 
 # Command
 loadout-group-captain-head = Captain head

diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
new file mode 100644 (file)
index 0000000..605e0e6
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
@@ -0,0 +1,56 @@
+# Timers
+- type: loadoutEffectGroup
+  id: JamjarTimer
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobLibrarian
+      time: 3600 # 1 hour of being the biggest nerd on the station
+
+- type: loadoutEffectGroup
+  id: JensenTimer
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Cargo
+      time: 36000 #10 hours of being a space trucker
+
+# Basic options
+# Glasses
+- type: loadout
+  id: Glasses
+  equipment: Glasses
+
+- type: startingGear
+  id: Glasses
+  equipment:
+    eyes: ClothingEyesGlasses
+
+# Special options
+# Jamjar    
+- type: loadout
+  id: GlassesJamjar
+  equipment: GlassesJamjar
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: JamjarTimer
+
+- type: startingGear
+  id: GlassesJamjar
+  equipment:
+    eyes: ClothingEyesGlassesJamjar
+
+# Jensen
+- type: loadout
+  id: GlassesJensen
+  equipment: GlassesJensen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: JensenTimer
+
+- type: startingGear
+  id: GlassesJensen
+  equipment:
+    eyes: ClothingEyesGlassesJensen

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index a50e9ceb71f48bdd0414ce07626db569c38ad6d5..acec697da28a976def297eab0e9f0a1296d83861 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -17,7 +17,16 @@
   - ClothingNeckTransPin
   - ClothingNeckAutismPin
   - ClothingNeckGoldAutismPin
-
+  
+- type: loadoutGroup
+  id: Glasses
+  name: loadout-group-glasses
+  minLimit: 0
+  loadouts:
+  - Glasses
+  - GlassesJamjar
+  - GlassesJensen
+  
 # Command
 - type: loadoutGroup
   id: CaptainHead

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index c5fb042d0cee2eeca0e9a2bf07fab11a25f21b95..a5aeda58b5b5a8da3b93195ba5495990f4dfde6b 100644 (file)
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -17,6 +17,7 @@
   - HoPJumpsuit
   - HoPBackpack
   - HoPOuterClothing
+  - Glasses
   - Trinkets
 
 # Civilian
@@ -29,6 +30,7 @@
   - PassengerGloves
   - PassengerOuterClothing
   - PassengerShoes
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -38,6 +40,7 @@
   - BartenderJumpsuit
   - CommonBackpack
   - BartenderOuterClothing
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -45,6 +48,7 @@
   groups:
   - BartenderJumpsuit
   - CommonBackpack
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -55,6 +59,7 @@
   - ChefJumpsuit
   - CommonBackpack
   - ChefOuterClothing
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -62,6 +67,7 @@
   groups:
   - LibrarianJumpsuit
   - CommonBackpack
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -70,6 +76,7 @@
   - LawyerNeck
   - LawyerJumpsuit
   - CommonBackpack
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -81,6 +88,7 @@
   - ChaplainJumpsuit
   - ChaplainBackpack
   - ChaplainOuterClothing
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -91,6 +99,7 @@
   - JanitorGloves
   - CommonBackpack
   - JanitorOuterClothing
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -100,6 +109,7 @@
   - BotanistJumpsuit
   - BotanistBackpack
   - BotanistOuterClothing
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -110,6 +120,7 @@
   - ClownBackpack
   - ClownOuterClothing
   - ClownShoes
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -120,6 +131,7 @@
   - MimeJumpsuit
   - MimeBackpack
   - MimeOuterClothing
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -127,6 +139,7 @@
   groups:
   - MusicianBackpack
   - MusicianOuterClothing
+  - Glasses
   - Trinkets
 
 # Cargo
@@ -139,6 +152,7 @@
   - QuartermasterBackpack
   - QuartermasterOuterClothing
   - QuartermasterShoes
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -149,6 +163,7 @@
   - CargoTechnicianBackpack
   - CargoTechnicianOuterClothing
   - CargoTechnicianShoes
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -157,6 +172,7 @@
   - SalvageSpecialistBackpack
   - SalvageSpecialistOuterClothing
   - SalvageSpecialistShoes
+  - Glasses
   - Trinkets
 
 # Engineering
@@ -209,6 +225,7 @@
   - ResearchDirectorOuterClothing
   - ScientistGloves
   - ResearchDirectorShoes
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -222,6 +239,7 @@
   - ScientistGloves
   - ScientistShoes
   - ScientistPDA
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -229,6 +247,7 @@
   groups:
   - ResearchAssistantJumpsuit
   - ScientistBackpack
+  - Glasses
   - Trinkets
 
 # Security
@@ -297,6 +316,7 @@
   - ChiefMedicalOfficerOuterClothing
   - ChiefMedicalOfficerNeck
   - ChiefMedicalOfficerShoes
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -310,6 +330,7 @@
   - MedicalDoctorOuterClothing
   - MedicalShoes
   - MedicalDoctorPDA
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -317,6 +338,7 @@
   groups:
   - MedicalInternJumpsuit
   - MedicalBackpack
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -340,6 +362,7 @@
   - ParamedicBackpack
   - ParamedicOuterClothing
   - ParamedicShoes
+  - Glasses
   - Trinkets
 
 # Wildcards
@@ -347,6 +370,7 @@
   id: JobZookeeper
   groups:
   - CommonBackpack
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -354,12 +378,14 @@
   groups:
   - ReporterJumpsuit
   - CommonBackpack
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
   id: JobPsychologist
   groups:
   - MedicalBackpack
+  - Glasses
   - Trinkets
 
 - type: roleLoadout
@@ -368,4 +394,5 @@
   - BoxerJumpsuit
   - BoxerGloves
   - CommonBackpack
+  - Glasses
   - Trinkets