Merge branch 'master' into Bartender-Weapon-Loadouts

Signed-off-by: VMSolidus <[email protected]>

Resources/Changelog/Changelog.yml

@@ -6271,3 +6271,10 @@ Entries:
   id: 6354
   time: '2024-09-12T00:15:18.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/895
+- author: stellar-novas
+  changes:
+    - type: Add
+      message: Airlocks once again have access wires. Happy hacking!
+  id: 6355
+  time: '2024-09-14T00:48:34.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/916

Resources/Locale/en-US/loadouts/categories.ftl

@@ -20,6 +20,7 @@ loadout-category-JobsCommandQM = Logistics Officer
 loadout-category-JobsCommandRD = Mystagogue
 loadout-category-JobsEngineering = Engineering
 loadout-category-JobsMedical = Medical
+loadout-category-JobsScience = Epistemics
 loadout-category-JobsSecurity = Security
 loadout-category-JobsService = Service
 loadout-category-JobsServiceUncategorized = Uncategorized

Resources/Prototypes/CharacterItemGroups/scienceGroups.yml

@@ -0,0 +1,103 @@
+- type: characterItemGroup
+  id: LoadoutUniformsScience
+  items:
+    - type: loadout
+      id: LoadoutScienceUniformJumpskirtSenior
+    - type: loadout
+      id: LoadoutScienceUniformJumpsuitSenior
+    - type: loadout
+      id: LoadoutScienceUniformJumpskirtRoboticist
+    - type: loadout
+      id: LoadoutScienceUniformJumpsuitRoboticist
+    - type: loadout
+      id: LoadoutScienceUniformJumpsuitMonasticRobeDark
+    - type: loadout
+      id: LoadoutScienceUniformJumpsuitMonasticRobeLight
+
+- type: characterItemGroup
+  id: LoadoutOuterScience
+  items:
+    - type: loadout
+      id: LoadoutScienceOuterCoat
+    - type: loadout
+      id: LoadoutScienceOuterLabcoat
+    - type: loadout
+      id: LoadoutSciencegOuterCoatRobo
+    - type: loadout
+      id: LoadoutScienceOuterWinterSci
+    - type: loadout
+      id: LoadoutScienceOuterLabcoatSeniorResearcher
+    - type: loadout
+      id: LoadoutScienceOuterExplorerLabcoat
+    - type: loadout
+      id: LoadoutOuterRobeTechPriest
+    - type: loadout
+      id: LoadoutOuterPlagueSuit
+    - type: loadout
+      id: LoadoutOuterNunRobe
+    - type: loadout
+      id: LoadoutOuterHoodieBlack
+    - type: loadout
+      id: LoadoutOuterHoodieChaplain
+    - type: loadout
+      id: LoadoutScienceOuterWinterCoatMantis
+
+- type: characterItemGroup
+  id: LoadoutGlovesScience
+  items:
+    - type: loadout
+      id: LoadoutScienceHandsGlovesColorPurple
+    - type: loadout
+      id: LoadoutScienceHandsGlovesLatex
+    - type: loadout
+      id: LoadoutScienceHandsGlovesRobohands
+
+- type: characterItemGroup
+  id: LoadoutNeckScience
+  items:
+    - type: loadout
+      id: LoadoutScienceNeckTieSci
+    - type: loadout
+      id: LoadoutScienceNeckScarfStripedPurple
+    - type: loadout
+      id: LoadoutScienceNeckStoleChaplain
+    - type: loadout
+      id: LoadoutScienceNeckScarfStripedBlack
+
+- type: characterItemGroup
+  id: LoadoutMaskScience
+  items:
+    - type: loadout
+      id: LoadoutScienceMaskPlague
+
+- type: characterItemGroup
+  id: LoadoutHeadScience
+  items:
+    - type: loadout
+      id: LoadoutScienceHeadHatBeret
+    - type: loadout
+      id: LoadoutHeadHoodTechPriest
+    - type: loadout
+      id: LoadoutScienceHeadHatFez
+    - type: loadout
+      id: LoadoutScienceHeadHatHoodNunHood
+    - type: loadout
+      id: LoadoutScienceHeadHatPlaguedoctor
+    - type: loadout
+      id: LoadoutScienceHeadHatWitch
+    - type: loadout
+      id: LoadoutScienceHeadHatWitch1
+
+- type: characterItemGroup
+  id: LoadoutEyesScience
+  items:
+    - type: loadout
+      id: LoadoutScienceEyesHudDiagnostic
+    - type: loadout
+      id: LoadoutScienceEyesEyepatchHudDiag
+
+- type: characterItemGroup
+  id: LoadoutShoesScience
+  items:
+    - type: loadout
+      id: LoadoutScienceShoesBootsWinterSci

Resources/Prototypes/Loadouts/Categories/categories.yml

@@ -31,6 +31,7 @@
     - JobsCommand
     - JobsEngineering
     - JobsMedical
+    - JobsScience
     - JobsSecurity
     - JobsService
 
@@ -82,6 +83,9 @@
 - type: loadoutCategory
   id: JobsMedical
 
+- type: loadoutCategory
+  id: JobsScience
+
 - type: loadoutCategory
   id: JobsSecurity
 

Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml

@@ -1,7 +1,7 @@
 - type: loadout
   id: LoadoutCommandCapNeckMantle
   category: JobsCommandCaptain
-  cost: 2
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -13,7 +13,7 @@
 - type: loadout
   id: LoadoutCommandCapNeckCloak
   category: JobsCommandCaptain
-  cost: 2
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -25,7 +25,7 @@
 - type: loadout
   id: LoadoutCommandCapNeckCloakFormal
   category: JobsCommandCaptain
-  cost: 2
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -37,7 +37,7 @@
 - type: loadout
   id: LoadoutCommandCapJumpsuitFormal
   category: JobsCommandCaptain
-  cost: 3
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -49,7 +49,7 @@
 - type: loadout
   id: LoadoutCommandCapJumpskirtFormal
   category: JobsCommandCaptain
-  cost: 3
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -61,7 +61,7 @@
 - type: loadout
   id: LoadoutCommandCapOuterWinter
   category: JobsCommandCaptain
-  cost: 2
+  cost: 1
   requirements:
     - !type:CharacterJobRequirement
       jobs:
@@ -72,7 +72,7 @@
 - type: loadout
   id: LoadoutCommandCapGloves
   category: JobsCommandCaptain
-  cost: 1
+  cost: 0
   requirements:
     - !type:CharacterJobRequirement
       jobs:
@@ -83,7 +83,7 @@
 - type: loadout
   id: LoadoutCommandCapHat
   category: JobsCommandCaptain
-  cost: 1
+  cost: 0
   requirements:
     - !type:CharacterJobRequirement
       jobs:
@@ -94,7 +94,7 @@
 - type: loadout
   id: LoadoutCommandCapHatCapcap
   category: JobsCommandCaptain
-  cost: 1
+  cost: 0
   requirements:
     - !type:CharacterJobRequirement
       jobs:
@@ -105,7 +105,7 @@
 - type: loadout
   id: LoadoutCommandCapHatBeret
   category: JobsCommandCaptain
-  cost: 1
+  cost: 0
   requirements:
     - !type:CharacterJobRequirement
       jobs:
@@ -116,7 +116,7 @@
 - type: loadout
   id: LoadoutCommandCapMaskGas
   category: JobsCommandCaptain
-  cost: 1
+  cost: 0
   requirements:
     - !type:CharacterJobRequirement
       jobs:
@@ -127,7 +127,7 @@
 - type: loadout
   id: LoadoutCommandCapShoesBootsWinter
   category: JobsCommandCaptain
-  cost: 1
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement

Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml

@@ -1,7 +1,7 @@
 - type: loadout
   id: LoadoutCommandCENeckMantle
   category: JobsCommandCE
-  cost: 2
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -13,7 +13,7 @@
 - type: loadout
   id: LoadoutCommandCENeckCloak
   category: JobsCommandCE
-  cost: 2
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -25,7 +25,7 @@
 - type: loadout
   id: LoadoutCommandCEOuterWinter
   category: JobsCommandCE
-  cost: 2
+  cost: 1
   requirements:
     - !type:CharacterJobRequirement
       jobs:
@@ -36,7 +36,7 @@
 - type: loadout
   id: LoadoutCommandCEShoesBootsWinter
   category: JobsCommandCE
-  cost: 1
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement

Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml

@@ -1,7 +1,7 @@
 - type: loadout
   id: LoadoutCommandCMONeckMantle
   category: JobsCommandCMO
-  cost: 2
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -13,7 +13,7 @@
 - type: loadout
   id: LoadoutCommandCMONeckCloak
   category: JobsCommandCMO
-  cost: 2
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -25,7 +25,7 @@
 - type: loadout
   id: LoadoutCommandCMOOuterWinter
   category: JobsCommandCMO
-  cost: 2
+  cost: 1
   requirements:
     - !type:CharacterJobRequirement
       jobs:
@@ -36,7 +36,7 @@
 - type: loadout
   id: LoadoutCommandCMOOuterLab
   category: JobsCommandCMO
-  cost: 1
+  cost: 0
   requirements:
     - !type:CharacterJobRequirement
       jobs:
@@ -47,7 +47,7 @@
 - type: loadout
   id: LoadoutCommandCMOHatBeret
   category: JobsCommandCMO
-  cost: 1
+  cost: 0
   requirements:
     - !type:CharacterJobRequirement
       jobs:
@@ -58,7 +58,7 @@
 - type: loadout
   id: LoadoutCommandCMOShoesBootsWinter
   category: JobsCommandCMO
-  cost: 1
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement