Merge pull request #111 from Gorox221/Bridge_officer

Очередной фикс офицера мостика

Resources/Prototypes/Ganimed/Catalog/Loadout/Belt/belts.yml

@@ -13,6 +13,7 @@
     - SeniorOfficer
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingBeltMilitaryWebbing
 
 - type: loadout
@@ -30,6 +31,7 @@
     - SeniorOfficer
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingBeltSecurityWebbing
 
 - type: loadout
@@ -56,6 +58,7 @@
     - SeniorOfficer
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingBeltMilitaryWebbingMed
 
 - type: loadout
@@ -75,6 +78,7 @@
     - ServiceWorker
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingBeltBandolier
 
 - type: loadout
@@ -169,6 +173,7 @@
     - SeniorOfficer
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingBeltSecurityFilled
 
 - type: loadout
@@ -221,6 +226,7 @@
     - SeniorOfficer
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingBeltAssault
 
 - type: loadout
@@ -231,4 +237,4 @@
   sponsorOnly: true
   whitelistJobs:
     - HeadOfSecurity
-  prototype: ClothingBeltHoS
+  prototype: ClothingBeltHoS

Resources/Prototypes/Ganimed/Catalog/Loadout/Eyes/glasses.yml

@@ -74,6 +74,7 @@
     - SalvageSpecialist
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingEyesGlassesMercenary
 
 - type: loadout
@@ -169,6 +170,7 @@
     - Captain
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingEyesGlassesSunglasses
 
 - type: loadout
@@ -187,4 +189,4 @@
     - Captain
     - Brigmedic
     - BlueShield
-  prototype: ClothingEyesGlassesSecurity
+  prototype: ClothingEyesGlassesSecurity

Resources/Prototypes/Ganimed/Catalog/Loadout/Eyes/huds.yml

@@ -61,4 +61,5 @@
     - Captain
     - Brigmedic
     - BlueShield
-  prototype: ClothingEyesHudSecurity
+    - BridgeOfficer
+  prototype: ClothingEyesHudSecurity

Resources/Prototypes/Ganimed/Catalog/Loadout/Hands/gloves.yml

@@ -29,6 +29,7 @@
     - SalvageSpecialist
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingHandsGlovesMercFingerless
 
 - type: loadout
@@ -40,6 +41,7 @@
     - HeadOfSecurity
     - Captain
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingHandsGlovesCombat
 
 - type: loadout
@@ -51,6 +53,7 @@
     - HeadOfSecurity
     - Captain
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingHandsMercGlovesCombat
 
 - type: loadout
@@ -62,6 +65,7 @@
     - HeadOfSecurity
     - Captain
     - BlueShield
+    - BridgeOfficer
   sponsorOnly: true
   prototype: ClothingHandsTacticalMaidGloves
 
@@ -238,4 +242,4 @@
   sponsorOnly: true
   whitelistJobs:
     - Chaplain
-  prototype: ClothingHandsWatchDivine
+  prototype: ClothingHandsWatchDivine

Resources/Prototypes/Ganimed/Catalog/Loadout/Head/berets.yml

@@ -87,6 +87,7 @@
     - SeniorOfficer
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingHeadHatBeretSecurity
 
 - type: loadout
@@ -111,4 +112,4 @@
     - SeniorResearcher
     - Roboticist
   prototype: ClothingHeadHatBeretRND
-
+

Resources/Prototypes/Ganimed/Catalog/Loadout/Masks/masks.yml

@@ -130,6 +130,7 @@
     - SeniorOfficer
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingMaskGasSecurity
 
 - type: loadout
@@ -159,6 +160,7 @@
     - SeniorOfficer
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingMaskGasMerc
 
 - type: loadout

Resources/Prototypes/Ganimed/Catalog/Loadout/Neck/misc.yml

@@ -132,6 +132,7 @@
     - Detective
     - Brigmedic
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingNeckSecuritymedal
 
 - type: loadout
@@ -176,4 +177,4 @@
     - Paramedic
     - Brigmedic
     - Coroner
-  prototype: ClothingNeckStethoscope
+  prototype: ClothingNeckStethoscope

Resources/Prototypes/Ganimed/Catalog/Loadout/Shoes/boots.yml

@@ -14,6 +14,7 @@
     - Captain
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingShoesBootsCombat
 
 - type: loadout
@@ -40,6 +41,7 @@
     - Quartermaster
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingShoesBootsMerc
 
 - type: loadout
@@ -57,6 +59,7 @@
     - SeniorOfficer
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingShoesSwat
 
 - type: loadout
@@ -112,6 +115,7 @@
     - HeadOfPersonnel
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingShoesBootsJack
 
 - type: loadout
@@ -128,6 +132,7 @@
     - SeniorOfficer
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingShoesBootsJackSecFilled
 
 - type: loadout

Resources/Prototypes/Ganimed/Catalog/Loadout/Uniform/uniform.yml

@@ -254,6 +254,7 @@
     - HeadOfSecurity
     - SeniorOfficer
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpsuitBrigmedic
 
 - type: loadout
@@ -287,6 +288,7 @@
     - HeadOfSecurity
     - SeniorOfficer
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpskirtBrigmedic
 
 - type: loadout
@@ -782,6 +784,7 @@
     - Quartermaster
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpsuitScientist
 
 - type: loadout
@@ -881,6 +884,7 @@
     - SeniorOfficer
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpsuitSec
 
 - type: loadout
@@ -898,6 +902,7 @@
     - SeniorOfficer
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpskirtSec
 
 - type: loadout
@@ -1214,6 +1219,7 @@
     - SeniorOfficer
     - IAA
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingUniformJumpsuitLawyerGood
 
 - type: loadout
@@ -1229,6 +1235,7 @@
     - SeniorOfficer
     - IAA
     - BlueShield
+    - BridgeOfficer
   prototype: ClothingUniformJumpskirtLawyerGood
 
 - type: loadout
@@ -1389,6 +1396,7 @@
     - SeniorOfficer
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpsuitSecGrey
 
 - type: loadout
@@ -1405,6 +1413,7 @@
     - SeniorOfficer
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpskirtSecGrey
 
 - type: loadout
@@ -1475,6 +1484,7 @@
     - SeniorOfficer
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpsuitTacticool
 
 - type: loadout
@@ -1491,6 +1501,7 @@
     - SeniorOfficer
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpskirtTacticool
 
 - type: loadout
@@ -1508,6 +1519,7 @@
     - SeniorOfficer
     - BlueShield
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpskirtTacticalMaid
 
 - type: loadout
@@ -1727,6 +1739,7 @@
     - HeadOfSecurity
     - SeniorOfficer
     - Brigmedic
+    - BridgeOfficer
   prototype: ClothingUniformJumpskirtBrigmedicBlack
 
 - type: loadout
@@ -1744,4 +1757,5 @@
     - HeadOfSecurity
     - SeniorOfficer
     - Brigmedic
-  prototype: ClothingUniformJumpsuitBrigmedicBlack
+    - BridgeOfficer
+  prototype: ClothingUniformJumpsuitBrigmedicBlack

Resources/Prototypes/Roles/Jobs/Wildcards/bridge_officer.yml

@@ -15,6 +15,7 @@
   canBeAntag: true
   access:
   - Command
+  - Maintenance
   special:
   - !type:AddComponentSpecial
     components:
@@ -24,7 +25,7 @@
   id: BridgeOfficerGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitBridgeOfficer
-    back: ClothingBackpackSecurity
+    back: ClothingBackpackSecurityFilled
     shoes: ClothingShoesBootsJack
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat
@@ -33,5 +34,5 @@
     neck: ClothingNeckNanoTrasenPin
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponDisabler
-  satchel: ClothingBackpackSatchelSecurity
-  duffelbag: ClothingBackpackDuffelSecurity
+  satchel: ClothingBackpackSatchelSecurityFilled
+  duffelbag: ClothingBackpackDuffelSecurityFilled