Golden plunger + security star(s) moved to job trinkets loadout tab (#41094)

* Golden plunger + security star(s) moved to job trinkets loadout tam

* Fixed being unable to pick both job-plushie and the plunger/star at the same time

* Whoops, forgot to commit the bartender fix

* SecStar playtime baked into prototype itself

* Removed increased job-trinket limit (likely bad to hardcode these for very specific roles)

diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
index d902481f9cfa32e8c06c24eb0782d1c00a83e53a..431b83a99d21e060d0b49e721234e0039dc660c1 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
@@ -45,13 +45,3 @@
   id: JanitorWintercoat
   equipment:
     outerClothing: ClothingOuterWinterJani
-
-# Misc
-- type: loadout
-  id: JanitorGoldenPlunger
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorJanitorial
-  storage:
-    back:
-    - GoldenPlunger

diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
index 482e3ab89662446ac7f7bc716f49a8bbe746f4fa..e0b0ce1a3f1ff14829754f8f9f170eb177781687 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -13,16 +13,6 @@
       department: Security
       time: 60h
 
-#Security Star
-- type: loadoutEffectGroup
-  id: SecurityStarWorthy
-  effects:
-    - !type:JobRequirementLoadoutEffect
-      requirement:
-        !type:DepartmentTimeRequirement
-        department: Security
-        time: 100h
-
 # Head
 - type: loadout
   id: SecurityHelmet
@@ -158,13 +148,3 @@
     proto: SeniorOfficer
   equipment:
     id: SeniorOfficerPDA
-
-# Misc
-- type: loadout
-  id: SecStar
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SecurityStarWorthy
-  storage:
-    back:
-    - Dinkystar

diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
index fd674b19017fcea4d00ad718aee6b44bbf0c083d..b5e3f6bdd7610357c130c5b3ae361b3d825d95bb 100644 (file)
--- a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
@@ -120,6 +120,15 @@
     back:
     - PlushieLizardJobJanitor
 
+- type: loadout
+  id: JanitorGoldenPlunger
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorJanitorial
+  storage:
+    back:
+    - GoldenPlunger
+
 - type: loadout
   id: LizardPlushieBotanist
   effects:
@@ -336,6 +345,18 @@
     back:
     - PlushieLizardJobSecurityofficer
 
+- type: loadout
+  id: SecStar
+  effects:
+    - !type:JobRequirementLoadoutEffect
+      requirement:
+        !type:DepartmentTimeRequirement
+        department: Security
+        time: 100h
+  storage:
+    back:
+    - Dinkystar
+
 - type: loadout
   id: LizardPlushieSecurityCadet
   effects:

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 185b68ab36260c3646b3779a761da97ee849f40d..c79689d5a0de5c2cf0279e148f619188e969c21d 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -484,19 +484,13 @@
   loadouts:
   - JanitorWintercoat
 
-- type: loadoutGroup
-  id: JanitorPlunger
-  name: loadout-group-janitor-plunger
-  minLimit: 0
-  loadouts:
-  - JanitorGoldenPlunger
-
 - type: loadoutGroup
   id: JanitorJobTrinkets
   name: loadout-group-jobtrinkets
   minLimit: 0
   loadouts:
   - LizardPlushieJanitor
+  - JanitorGoldenPlunger
 
 - type: loadoutGroup
   id: BotanistHead
@@ -1184,6 +1178,7 @@
   minLimit: 0
   loadouts:
   - LizardPlushieHeadofSecurity
+  - SecStar
 
 - type: loadoutGroup
   id: WardenHead
@@ -1213,6 +1208,7 @@
   minLimit: 0
   loadouts:
   - LizardPlushieWarden
+  - SecStar
 
 - type: loadoutGroup
   id: SecurityHead
@@ -1279,6 +1275,7 @@
   minLimit: 0
   loadouts:
   - LizardPlushieSecurity
+  - SecStar
 
 - type: loadoutGroup
   id: DetectiveHead
@@ -1318,6 +1315,7 @@
   minLimit: 0
   loadouts:
   - LizardPlushieDetective
+  - SecStar
 
 - type: loadoutGroup
   id: SecurityCadetJumpsuit
@@ -1343,13 +1341,6 @@
   - EmergencyOxygenSecurity
   - LoadoutSpeciesVoxNitrogen
 
-- type: loadoutGroup
-  id: SecurityStar
-  name: loadout-group-security-star
-  minLimit: 0
-  loadouts:
-  - SecStar
-
 # Medical
 - type: loadoutGroup
   id: ChiefMedicalOfficerHead

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index bbdb21e17cae8273d05fd5f7e203cf86dbc414fd..d0ab791a30678d93fc242c70d15b1ca7747459c5 100644 (file)
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -152,7 +152,6 @@
   - Survival
   - Trinkets
   - JanitorJobTrinkets
-  - JanitorPlunger
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -378,7 +377,6 @@
   - SurvivalSecurity
   - Trinkets
   - HeadofSecurityJobTrinkets
-  - SecurityStar
   - GroupSpeciesBreathToolSecurity
 
 - type: roleLoadout
@@ -393,7 +391,6 @@
   - SurvivalSecurity
   - Trinkets
   - WardenJobTrinkets
-  - SecurityStar
   - GroupSpeciesBreathToolSecurity
 
 - type: roleLoadout
@@ -409,7 +406,6 @@
   - SurvivalSecurity
   - Trinkets
   - SecurityJobTrinkets
-  - SecurityStar
   - GroupSpeciesBreathToolSecurity
 
 - type: roleLoadout
@@ -424,7 +420,6 @@
   - SurvivalSecurity
   - Trinkets
   - DetectiveJobTrinkets
-  - SecurityStar
   - GroupSpeciesBreathToolSecurity
 
 - type: roleLoadout