Merge pull request #571

* Mags

* Fix Security Gear

* Nano Machine Son

* Merge branch 'new-frontiers-14:master' into CombatMagboots

* PirateMags

* Merge branch 'CombatMagboots' of https://github.com/dvir001/frontier-…

* CombatBoots

* MAGS

* Missing Info

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -355,7 +355,8 @@
       - id: OxygenTankFilled # Frontier
       - id: JetpackSecurityFilled # Frontier
       - id: HandheldGPSBasic # Frontier
-
+      - id: ClothingShoesBootsMagCombatFilled # Frontier
+
 - type: entity
   id: LockerHeadOfSecurityFilled
   suffix: Filled

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -28,6 +28,7 @@
       - id: ClothingMaskGasSecurity # Frontier
       - id: JetpackSecurityFilled # Frontier
       - id: HandheldGPSBasic # Frontier
+      - id: ClothingShoesBootsMagCombatFilled # Frontier
 
 - type: entity
   id: LockerWardenFilled

Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml

@@ -90,6 +90,7 @@
         - id: ClothingMaskGas
         - id: JetpackBlackFilled # Frontier
         - id: HandheldGPSBasic # Frontier
+        - id: ClothingShoesBootsMagPirateFilled # Frontier
 
 #NTSRA Voidsuit
 - type: entity
@@ -174,7 +175,7 @@
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
         - id: HandheldGPSBasic # Frontier
-#        - id: ClothingShoesBootsMagCombatFilled # Frontier
+        - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Security"]]
 
@@ -246,7 +247,7 @@
         - id: ClothingOuterHardsuitSecurityRed
         - id: ClothingMaskGasSwat
         - id: HandheldGPSBasic # Frontier
-#        - id: ClothingShoesBootsMagCombatFilled # Frontier
+        - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["HeadOfSecurity"]]
 
@@ -264,7 +265,7 @@
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
         - id: HandheldGPSBasic # Frontier
-#        - id: ClothingShoesBootsMagCombatFilled # Frontier
+        - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Armory"]]
 
@@ -335,7 +336,7 @@
         - id: JetpackBlackFilled # Frontier
         - id: HandheldGPSBasic # Frontier
         - id: HandheldGPSBasic # Frontier
-#        - id: ClothingShoesBootsMagPirateFilled # Frontier - TODO: Add this ones its ready
+        - id: ClothingShoesBootsMagPirateFilled # Frontier
 
 #Wizard
 - type: entity

Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml

@@ -15,9 +15,10 @@
     ClothingUniformJumpsuitSecGrey: 3
     ClothingUniformJumpskirtSecGrey: 3
     ClothingUniformJumpsuitSecBlue: 3
-    ClothingHeadsetSecuritySafe: 3 # Ask SR or Sheriff for keys
+    ClothingHeadsetSecuritySafe: 3 # Frontier - Ask SR or Sheriff for keys
     ClothingOuterWinterSec: 2
     ClothingOuterArmorBasic: 2
     ClothingOuterArmorBasicSlim: 2 
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
+    ClothingShoesBootsMagCombat: 1 # Frontier

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -11,7 +11,7 @@
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"
   requireAdminNotify: true
-  supervisors: job-supervisors-captain
+  supervisors: job-supervisors-centcom # Frontier
   canBeAntag: false
   access:
   - Command

Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml

@@ -29,13 +29,14 @@
     jumpsuit: ClothingUniformJumpsuitBrigmedic
     outerClothing: ClothingOuterCoatAMG
     back: ClothingBackpackBrigmedicFilled
-    shoes: ClothingShoesBootsJack
+    shoes: ClothingShoesBootsCombatFilled
     gloves: ClothingHandsGlovesNitrile
     eyes: ClothingEyesHudMedical
     head: ClothingHeadHatBeretSecurity
     id: BrigmedicPDA
     ears: ClothingHeadsetBrigmedic
     belt: ClothingBeltMedicalFilled
+    pocket1: WeaponPistolMk58Nonlethal # Frontier
   innerClothingSkirt: ClothingUniformJumpskirtBrigmedic
   satchel: ClothingBackpackSatchelBrigmedicFilled
   duffelbag: ClothingBackpackDuffelBrigmedicFilled

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -23,7 +23,7 @@
   startingGear: HoSGear
   icon: "JobIconHeadOfSecurity"
   requireAdminNotify: true
-  supervisors: job-supervisors-captain
+  supervisors: job-supervisors-hop # Frontier
   whitelistRequired: true
   canBeAntag: false
   access:

Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml

@@ -12,12 +12,14 @@
       inverted: true # stop playing intern if you're good at security!
   startingGear: SecurityCadetGear
   icon: "JobIconSecurityCadet"
-  supervisors: job-supervisors-security
+  supervisors: job-supervisors-hos # Frontier
   canBeAntag: false
   access:
   - Security
   - Brig
   - Maintenance
+  - Service # Frontier
+  - External # Frontier
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ]

Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml

@@ -0,0 +1,17 @@
+- type: entity
+  id: ClothingShoesBootsMagCombatFilled
+  parent: ClothingShoesBootsMagCombat
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CombatKnife
+
+- type: entity
+  id: ClothingShoesBootsMagPirateFilled
+  parent: ClothingShoesBootsMagPirate
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: KukriKnife

Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml

@@ -36,6 +36,7 @@
       - id: ClothingMaskBreathMedicalSecurity
       - id: JetpackSecurityFilled
       - id: HandheldGPSBasic
+      - id: ClothingShoesBootsMagCombatFilled
 
 - type: entity
   id: LockerBrigmedicFilled
@@ -68,4 +69,4 @@
         prob: 0.7
       - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
         prob: 0.15
-      - id: CrowbarRed # Frontier
+      - id: CrowbarRed

Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml

@@ -32,7 +32,7 @@
         - id: ClothingMaskBreathMedicalSecurity
         - id: JetpackSecurityFilled
         - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagCombatFilled
+        - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Security"]]
 

Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml

@@ -0,0 +1,71 @@
+- type: entity
+  parent: ClothingShoesBootsMag
+  id: ClothingShoesBootsMagCombat
+  name: combat magboots
+  description: combat magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi
+    state: icon
+  - type: Clothing
+    sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi
+  - type: Magboots
+    toggleAction: ActionToggleMagbootsCombat
+  - type: ClothingSpeedModifier
+    walkModifier: 0.95
+    sprintModifier: 0.9
+    enabled: false
+  - type: NoSlip
+  - type: MovementSpeedModifier
+    weightlessAcceleration: 1
+    weightlessFriction: 0.3
+    weightlessModifier: 1.2
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: Storage
+    capacity: 10
+    whitelist:
+      tags:
+        - Knife
+        - Sidearm
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+  - type: UserInterface
+    interfaces:
+    - key: enum.StorageUiKey.Key
+      type: StorageBoundUserInterface
+
+- type: entity
+  parent: ClothingShoesBootsMagCombat
+  id: ClothingShoesBootsMagPirate
+  name: pirate magboots
+  description: pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi
+    state: icon
+  - type: Clothing
+    sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi
+  - type: Magboots
+    toggleAction: ActionToggleMagbootsPirate
+
+- type: entity
+  id: ActionToggleMagbootsCombat
+  parent: ActionBaseToggleMagboots
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi, state: icon }
+    iconOn: _NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png
+
+- type: entity
+  id: ActionToggleMagbootsPirate
+  parent: ActionBaseToggleMagboots
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi, state: icon }
+    iconOn: _NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png

Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml

@@ -7,14 +7,15 @@
     - !type:OverallPlaytimeRequirement
       time: 21600
   startingGear: PrisonGuardGear
-  canBeAntag: false
   icon: "JobIconWarden" 
-  supervisors: job-supervisors-warden
-  setPreference: true
+  supervisors: job-supervisors-hos # Frontier
+  canBeAntag: false
   access:
   - Security
   - Brig
   - Maintenance
+  - Service # Frontier
+  - External # Frontier
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ]
@@ -24,12 +25,14 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitPrisonGuard
     back: ClothingBackpackSecurityFilled
-    shoes: ClothingShoesBootsJack
+    shoes: ClothingShoesBootsCombatFilled
     eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadPrisonGuard
+    outerClothing: ClothingOuterArmorBasic # Frontier
     id: GuardPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
+    pocket1: WeaponPistolMk58Nonlethal # Frontier
   innerClothingSkirt: ClothingUniformJumpsuitPrisonGuard
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled

Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/debf90acfcafa4fb8d6723a37e0b8ac556c0702b",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy",
     "size": {
         "x": 32,
         "y": 32

Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-on"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-on"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-right",
+            "directions": 4
+        }
+    ]
+}