Colonial Navy Update

Resources/Locale/en-US/_HL/access/access.ftl

@@ -10,4 +10,4 @@ id-card-access-level-nanotrasen-admiral = Nanotrasen Admiral
 id-card-access-level-interdyne = Interdyne
 id-card-access-level-interdyne-head = Interdyne Head
 id-card-access-level-directorate = Directorate
-id-card-access-level-intelligence = Intelligence
+id-card-access-level-naval = Naval

Resources/Locale/en-US/_HL/job/job-descriptions.ftl

@@ -1,4 +1,4 @@
 job-description-mantis = Solve mysteries from the nature of the universe to the meaning of life. Be the main person to deal with Psionic beings.
 job-description-interdyne = You shouldn't be able to see this...
 job-description-directorate = You shouldn't be able to see this...
-job-description-intelligence = You shouldn't be able to see this...
+job-description-naval = You shouldn't be able to see this...

Resources/Locale/en-US/_HL/job/job-names.ftl

@@ -1,7 +1,7 @@
 job-name-station-captain = Station Captain
 job-name-mantis = Mantis
 job-name-directorate = Directorate
-job-name-intelligence = LAMBA Operator
+job-name-naval = Colonial Navyman
 
 # Job titles
 job-title-bounty-hunter = Bounty Hunter

Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml

@@ -347,8 +347,8 @@
 
 - type: entity
   parent: DoorElectronics
-  id: DoorElectronicsCCIntelligence
-  suffix: Intelligence, Locked
+  id: DoorElectronicsCCNaval
+  suffix: Naval, Locked
   components:
   - type: AccessReader
-    access: [["Intelligence"]]
+    access: [["Naval"]]

Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml

@@ -142,7 +142,7 @@
     - Interdyne # Hardlight
     - InterdyneHead # Hardlight
     - Directorate # Hardlight
-    - Intelligence # Hardlight
+    - Naval # Hardlight
     privilegedIdSlot:
       name: id-card-console-privileged-id
       ejectSound: /Audio/Machines/id_swipe.ogg

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -1404,9 +1404,9 @@
 
 - type: entity
   parent: AirlockCentralCommand
-  id: AirlockCCIntelligenceLocked
-  suffix: Intelligence, Locked
+  id: AirlockCCNavalLocked
+  suffix: Naval, Locked
   components:
   - type: ContainerFill
     containers:
-      board: [ DoorElectronicsCCIntelligence ]
+      board: [ DoorElectronicsCCNaval ]

Resources/Prototypes/_HL/Access/factions.yml

@@ -47,5 +47,5 @@
   name: id-card-access-level-directorate
 
 - type: accessLevel
-  id: Intelligence
-  name: id-card-access-level-intelligence
+  id: Naval
+  name: id-card-access-level-naval

Resources/Prototypes/_HL/Entities/Clothing/Back/hardlight.yml

@@ -0,0 +1,114 @@
+- type: entity
+  parent: ClothingBackpackCNIRifleman
+  id: ClothingBackpackCNISquadleader
+  name: CNI Squad Leader backpack
+  description: A rugged backpack worn by the squad leader of a naval infantry squad, made with a radio pocket on the side.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/Back/ColNavInf/cnisquadleader.rsi
+    state: icon
+  - type: Clothing
+    sprite: _HL/Clothing/Back/ColNavInf/cnisquadleader.rsi
+    clothingVisuals:
+      back:
+      - state: equipped-BACKPACK-shaded
+      - state: equipped-BACKPACK-unshaded
+        color: "#b00020"
+        shader: unshaded
+  - type: Storage
+    grid:
+    - 3,0,8,7
+    - 0,4,1,7
+    - 10,6,11,7
+
+- type: entity
+  parent: [ ClothingBackpack, ContentsExplosionResistanceBase, BaseColcommContraband ]
+  id: ClothingBackpackCNIRifleman
+  name: CNI Rifleman backpack
+  description: A rugged backpack worn by non-specialist riflemen in naval infantry fireteams.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/Back/ColNavInf/cnirifleman.rsi
+  - type: Storage
+    grid:
+    - 3,0,8,7
+    - 0,4,1,7
+    - 10,4,11,7
+  - type: ExplosionResistance
+    damageCoefficient: 0.1
+
+- type: entity
+  parent: ClothingBackpackCNIRifleman
+  id: ClothingBackpackCNICombatengineer
+  name: CNI Combat Engineer backpack
+  description: A rugged backpack worn by combat engineers in naval infantry squads.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/Back/ColNavInf/cnicombatengineer.rsi
+  - type: Storage
+    grid:
+    - 3,0,8,7
+    - 0,4,1,7
+    - 10,4,11,7
+    - 1,9,10,11
+
+- type: entity
+  parent: ClothingBackpackCNIRifleman
+  id: ClothingBackpackCNIExplosivespecialist
+  name: CNI EWS backpack
+  description: A rugged backpack worn by explosive weapons specialists in naval infantry platoons, with an additional specialized compartment for carrying a missile launcher.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/Back/ColNavInf/cniexplosivespecialist.rsi
+  - type: Storage
+    grid:
+    - 3,0,8,7
+    - 0,3,1,7
+    - 10,1,13,6
+
+- type: entity
+  parent: ClothingBackpackCNIRifleman
+  id: ClothingBackpackCNICorpsman
+  name: CNI Corpsman backpack
+  description: A rugged backpack worn by corpsmen in naval infantry platoons.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/Back/ColNavInf/cnicorpsman.rsi
+
+- type: entity
+  parent: ClothingBackpackCNIRifleman
+  id: ClothingBackpackCNIMachinegunner
+  name: CNI Machine Gunner backpack
+  description: A rugged backpack worn by suppression gunners in naval infantry squads.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/Back/ColNavInf/cnimachinegunner.rsi
+
+- type: entity
+  parent: [ ClothingMaskGas, BaseColcommContraband ]
+  id: ClothingMaskGasCNI
+  name: Colonial Navy gas mask
+  description: A military-grade gas mask used by the Colonial Navy.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/Mask/cni.rsi
+  - type: Clothing
+    sprite: _HL/Clothing/Mask/cni.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - Snout
+    hideOnToggle: true
+  - type: FlashImmunity
+  - type: EyeProtection
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
+  - type: IngestionBlocker # Goobstation

Resources/Prototypes/_HL/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -201,9 +201,64 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSyndicateNavy
 
+#Colonial Naval Infantry/Marines Hardsuit
+- type: entity
+  parent: [ClothingOuterHardsuitBase, BaseColcommContraband, ContrabandClothing]
+  id: ClothingOuterHardsuitColonialNavalInfantry
+  name: Colonial Navy M21 infantry hardsuit
+  description: A moderately armored mobile hardsuit used by the Colonial Navy. It features a distinctive pale-blue and black color scheme, and is equipped with a reinforced helmet for enhanced protection.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/OuterClothing/Hardsuits/colonialnavalinfantryHS.rsi
+  - type: Clothing
+    sprite: _HL/Clothing/OuterClothing/Hardsuits/colonialnavalinfantryHS.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitColonialNavalInfantry
+  - type: ExplosionResistance
+    damageCoefficient: 0.5
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.35
+        Slash: 0.25
+        Piercing: 0.2
+        Heat: 0.25
+        Radiation: 0.4
+        Caustic: 0.4
+  - type: ClothingSpeedModifier
+    walkModifier: 0.75
+    sprintModifier: 0.75
+
 # Faction Hardsuit Helmets
 # All inherit from Blood-red hardsuit helmet (ClothingHeadHelmetHardsuitSyndie) with modifications
 
+#Colonial Naval Infantry/Marines Hardsuit Helmet
+- type: entity
+  parent: NFClothingHeadHardsuitWithLightBaseNfsd
+  id: ClothingHeadHelmetHardsuitColonialNavalInfantry
+  categories: [ HideSpawnMenu ]
+  name: Colonial Navy M21 infantry hardsuit helmet
+  description: A reinforced hardsuit helmet used by the Colonial Navy.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/OuterClothing/Hardsuits/colonialnavalinfantryHSHelm.rsi
+  - type: Clothing
+    sprite: _HL/Clothing/OuterClothing/Hardsuits/colonialnavalinfantryHSHelm.rsi
+  - type: PointLight
+    color: "#5162FF"
+  - type: PressureProtection
+    highPressureMultiplier: 0.35
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.85
+        Heat: 0.85
+        Radiation: 0.95
+        Caustic: 0.9
+
 # Arcadia Hardsuit Helmet
 - type: entity
   parent: [ClothingHeadHelmetHardsuitSyndie, BaseC2ContrabandUnredeemable, ContrabandClothing]

Resources/Prototypes/_HL/Entities/Objects/Devices/PDA.yml

@@ -363,20 +363,20 @@
 
 - type: entity
   parent: CentcomPDA
-  id: IntelPDA
-  name: special forces PDA
-  description: This thing looks way more advanced then anything you've seen- It looks like it holds the secrets to everything.
+  id: NavalPDA
+  name: naval PDA
+  description: A rugged naval-issue PDA with a dark blue casing.
   components:
   - type: Pda
-    id: IntelIDCard
+    id: NavalIDCard
   - type: Tag #  Ignore Chameleon tags
     tags:
     - Admin
     - DoorBumpOpener
   - type: PdaBorderColor
-    borderColor: "#010101"
-    accentHColor: "#6E0F14"
-    accentVColor: "#6E0F14"
+    borderColor: "#1A1A2E"
+    accentHColor: "#2A4A7F"
+    accentVColor: "#1E3A5F"
   - type: Icon
     sprite: _NF/Objects/Devices/pda.rsi # Frontier
     state: pda-sof

Resources/Prototypes/_HL/Entities/Objects/Misc/identification_cards.yml

@@ -131,18 +131,18 @@
     tags:
     - CentralCommand
     - Directorate
-    - Intelligence
-    
+    - Naval
+
 - type: entity
   parent: CentcomIDCardDeathsquad
-  id: IntelIDCard
-  name: CACD ID Card
+  id: NavalIDCard
+  name: Naval ID Card
   components:
   - type: PresetIdCard
-    job: CentralCommandIntel
+    job: ColonialNavyman
   - type: Access
     groups:
     - AllAccess
     tags:
     - CentralCommand
-    - Intelligence
+    - Naval

Resources/Prototypes/_HL/Roles/Jobs/ColComm/command_directorate.yml

@@ -13,7 +13,7 @@
   access:
   - CentralCommand
   - Directorate
-  - Intelligence
+  - Naval
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, DeathRattleImplantColcomm ]

Resources/Prototypes/_HL/Roles/Jobs/ColComm/command_intelligence.yml

@@ -1,32 +1,31 @@
 - type: job
-  id: CentralCommandIntel
-  name: job-name-intelligence
-  description: job-description-intelligence
-  playTimeTracker: JobCentralCommandIntel
+  id: ColonialNavyman
+  name: job-name-naval
+  description: job-description-naval
+  playTimeTracker: JobColonialNavyman
   setPreference: false
-  startingGear: CentcomGear
+  startingGear: ColonialNavymanGear
   icon: "JobIconColComm"
   supervisors: job-supervisors-hos
   canBeAntag: false
   accessGroups:
   - AllAccess
   access:
   - CentralCommand
-  - Intelligence
+  - Naval
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, DeathRattleImplantColcomm ]
 
 - type: startingGear
-  id: CentralCommandIntelGear
+  id: ColonialNavymanGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitCentcomOfficerBlack
+    jumpsuit: ClothingUniformColonialNavy
     shoes: ClothingShoesBootsCombatFilled
-    head: ClothingHeadHatBeretCommander
     eyes: ClothingEyesGlassesSunglasses
-    gloves: ClothingHandsGlovesColorBlack
-    outerClothing: ClothingOuterArmorBasic
-    id: IntelPDA
+    belt: ClothingBeltAssault
+    gloves: ClothingHandsGlovesCombat
+    id: NavalPDA
     ears: ClothingHeadsetAltColCom
-    pocket1: BoxFolderBlack
-    pocket2: PenCentcom
+    pocket1: WeaponPistolMk58
+    pocket2: Magazine45_ACPPistolHighCapacityFMJ

Resources/Prototypes/_HL/Roles/Play_Time_Trackers.yml

@@ -23,4 +23,4 @@
   id: JobCentralCommandDirectorate
 
 - type: playTimeTracker
-  id: JobCentralCommandIntel
+  id: JobColonialNavyman

Resources/Prototypes/_HL/StatusIcon/job.yml

@@ -57,9 +57,9 @@
 
 - type: jobIcon
   parent: JobIcon
-  id: JobIconIntel
+  id: JobIconNaval
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi # place holder
     state: ColComm # place holder
-  jobName: job-name-intelligence
+  jobName: job-name-naval
   allowSelection: false