Add sergeant

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

@@ -5,3 +5,4 @@ job-name-centcomm-direggtor = Centcomm Direggtor
 job-name-nanotrasen-spectre = Spectre Agent
 # Security Misc
 job-name-transit-prisoner = Transit Prisoner
+job-name-security-sergeant = Sergeant

Resources/Locale/en-US/_Omu/set-selector/selectable-sets.ftl

@@ -54,6 +54,11 @@ selectable-set-terminus-description =
     A weapon exclusively for oni, this greataxe
     can fire a burst of disabler bolts on command.
 
+selectable-set-ceremonial-rifle-name = Cerimonial rifle
+selectable-set-ceremonial-rifle-description =
+    A weapon exclusively for sergeants,
+    this relic of a rifle has been in service for over 670 years.
+
 selectable-set-antiquelaser-name = Antique Laser Pistol
 selectable-set-antiquelaser-description =
     The classic. An operative's worst nightmare.

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -230,6 +230,7 @@
   weight: 20
   roles:
   - HeadOfSecurity
+  - SecuritySergeant # Omu
   - SecurityCadet
   - SecurityOfficer
   - Detective

Resources/Prototypes/_Omu/Catalog/selectable_sets.yml

@@ -116,6 +116,16 @@
   - SpeedLoaderRevolverLightRifle
   - SpeedLoaderRevolverLightRifle
 
+- type: selectableSet
+  id: WeaponCeremonialRifleSet
+  name: selectable-set-ceremonial-rifle-name
+  description: selectable-set-ceremonial-rifle-description
+  sprite:
+    sprite: _Omu/Objects/Weapons/Guns/Snipers/ceremonial_rifle.rsi
+    state: base
+  content:
+  - WeaponSniperMosinSergeant
+
 - type: selectableSet
   id: WeaponTerminusSet
   name: selectable-set-terminus-name

Resources/Prototypes/_Omu/Entities/Markers/Spawners/jobs.yml

@@ -8,4 +8,16 @@
   - type: Sprite
     layers:
       - state: green
-      - state: prisoner
+      - state: prisoner
+
+- type: entity
+  id: SpawnPointSecuritySergeant
+  parent: SpawnPointJobBase
+  name: securitysergeant
+  components:
+  - type: SpawnPoint
+    job_id: SecuritySergeant
+  - type: Sprite
+    layers:
+      - state: green
+      - state: security_officer

Resources/Prototypes/_Omu/Entities/Objects/Devices/pda.yml

@@ -159,3 +159,22 @@
   - type: Icon
     sprite: _Omu/Objects/Devices/pda.rsi
     state: pda-altblueshield
+
+- type: entity
+  parent: BaseSecurityPDA
+  id: SecuritySergeantPDA
+  name: sergeant PDA
+  description: Beaten, battered and broken, but just barely useable.
+  components:
+  - type: Pda
+    id: SecuritySergeantIDCard
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-securitysergeant
+  - type: PdaBorderColor
+    borderColor: "#A32D26"
+    accentVColor: "#DFDFDF"
+  - type: Icon
+    state: pda-securitysergeant

Resources/Prototypes/_Omu/Entities/Objects/Fun/whistles.yml

@@ -0,0 +1,15 @@
+- type: entity
+  parent: [BaseWhistle, BaseSecurityContraband]
+  id: SecuritySergeantWhistle
+  name: trench whistle
+  description: A whistle used by Sergeants to draw attention. Avanti!
+  components:
+  - type: Sprite
+    state: trench
+  - type: Clothing
+    equippedPrefix: trench
+  - type: EmitSoundOnUse
+    sound:
+      collection: TrenchWhistle
+  - type: Whistle
+    distance: 15 # Let your enemies hear the sound of death approaching

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

@@ -139,3 +139,18 @@
   components:
   - type: PresetIdCard
     job: NanoTrasenSpectre
+
+- type: entity
+  parent: SecurityIDCard
+  id: SecuritySergeantIDCard
+  name: sergeant ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: idseniorofficer
+  - type: PresetIdCard
+    job: SecuritySergeant
+  - type: IdCard
+    jobTitle: job-name-security-sergeant
+    jobIcon: JobIconSecuritySergeant

Resources/Prototypes/_Omu/Entities/Objects/Specifics/Security/Security_Selectors.yml

@@ -72,6 +72,23 @@
     - WeaponTerminusSet
     maxSelectedSets: 1
 
+- type: entity
+  id: SergeantGunCase
+  name: sergeant duty case
+  description: A case, used to securely store your duty weapon of choice.
+  parent: [ BaseItem, BaseSetSelector, BaseSecurityContraband ]
+  components:
+  - type: Sprite
+    sprite: _Omu/Objects/Misc/GunCases/officercase.rsi
+    state: icon
+  - type: SetSelector
+    possibleSets:
+    - WeaponMk58Set
+    - WeaponT8Set
+    - WeaponTerminusSet
+    - WeaponCeremonialRifleSet
+    maxSelectedSets: 1
+
 - type: entity
   id: CaptainGunCase
   name: captain's duty case

Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -0,0 +1,59 @@
+- type: entity
+  name: Ceremonial Rifle
+  parent: [BaseWeaponSniper, BaseGunWieldable, BaseSecurityContraband]
+  id: WeaponSniperMosinSergeant
+  description: A true relic, this has served in nearly every armed conflict since its creation 670 years ago. The bolt-action design of the rifle remains virtually identical to its original design, whether used for hunting, sniping, or endless trench warfare. Loads 10 rounds of .30 Rifle.
+  suffix: sergeant, ceremonial rifle
+  components:
+  - type: Clothing
+    sprite: _Omu/Objects/Weapons/Guns/Snipers/ceremonial_rifle.rsi
+  - type: Sprite
+    sprite: _Omu/Objects/Weapons/Guns/Snipers/ceremonial_rifle.rsi
+    layers:
+    - state: base
+    - state: base1
+      map: [ "enum.SolutionContainerLayers.Fill" ]
+      visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    fillBaseName: base
+    inHandsFillBaseName: -fill-
+    inHandsMaxFillLevels: 1
+    equippedFillBaseName: -fill-
+    equippedMaxFillLevels: 1
+  - type: Gun
+    fireRate: 1 # Slighty higher fire rate (1, instead of 0.75)
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    animationRotation: -135 # WWDP
+    damage:
+      types:
+        Piercing: 12
+    angle: 0
+    animation: WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: MeleeRequiresWield
+  - type: AltFireMelee
+    attackType: Heavy
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 2
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 2
+  - type: Sharp
+    butcherDelayModifier: 2 #It's a bayonet
+  - type: GunRequiresWield
+  - type: StaticPrice
+    price: 500
+  - type: Item  # Goob edit
+    size: Large
+    storedRotation: 45

Resources/Prototypes/_Omu/Loadouts/Jobs/Security/sergeant.yml

@@ -0,0 +1,22 @@
+- type: loadout
+  id: SecuritySergeantMosin
+  dummyEntity: WeaponSniperMosinSergeant
+  equipment:
+    suitstorage: WeaponSniperMosinSergeant
+#  storage:
+#    back:
+#    - MagazinePistol # Todo: repalce these with whatever ammo mosin uses.
+#    - MagazinePistol
+  groupBy: "Main weapon"
+
+- type: loadout
+  id: SecuritySergeantGunCase
+  equipment:
+    pocket1: SergeantGunCase
+  groupBy: "Main weapon"
+
+- type: loadout
+  id: SecuritySergeantPDA
+  equipment:
+    id: SecuritySergeantPDA
+  groupBy: "ID"

Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml

@@ -185,7 +185,7 @@
   maxLimit: 1
   loadouts:
   - GreyTideStamp
-  
+
 # Security
 
 - type: loadoutGroup
@@ -200,6 +200,25 @@
   - SecurityOfficerTerminus
   - WeaponPistolMk58Gold
 
+- type: loadoutGroup
+  id: TrinketsSecuritySergeant
+  name: loadout-group-trinkets-job
+  minLimit: 1
+  maxLimit: 1
+  loadouts:
+  - SecuritySergeantGunCase
+  - SecurityOfficerMk58
+  - SecurityOfficerSecurityDutyRevolver
+  - SecurityOfficerTerminus
+  - WeaponPistolMk58Gold
+  - SecuritySergeantMosin
+
+- type: loadoutGroup
+  id: SecuritySergeantPDA
+  name: loadout-group-security-id
+  loadouts:
+  - SecuritySergeantPDA
+
 # We have a separate one for detective cause holster
 - type: loadoutGroup
   id: TrinketsSecurityDetective

Resources/Prototypes/_Omu/Loadouts/role_loadouts.yml

@@ -14,3 +14,26 @@
   - PrisonerEnvirohelm
   - PrisonerEnvirosuit
   - PrisonerEnvirogloves
+
+- type: roleLoadout
+  id: JobSecuritySergeant
+  groups:
+  - SecurityHead
+  - SecurityJumpsuit
+  - SecurityBackpack
+  - SecurityMelee # Goobstation
+  - TrinketsSecuritySergeant # Actually is their guns, not trinkets.
+  - SecurityOuterClothing
+  - SecurityShoes
+  - SecurityNeck
+  - SecuritySergeantPDA
+  - SecurityBelt
+  - SurvivalSecurity
+  - Trinkets
+  - SecurityStar
+  - Animals
+  - GroupSpeciesBreathToolSecurity
+  # Goobstation - EE Plasmeme Change.
+  - SecurityOfficerEnvirohelm
+  - SecurityOfficerEnvirosuit
+  - SecurityOfficerEnvirogloves

Resources/Prototypes/_Omu/Roles/Jobs/Security/sergeant.yml

@@ -0,0 +1,63 @@
+- type: job
+  id: SecuritySergeant
+  name: job-name-security-sergeant
+  description: job-description-security
+  playTimeTracker: JobSecuritySergeant
+  requirements:
+    - !type:OverallPlaytimeRequirement
+      time: 360000 #100 hours
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 360000 #100 hours
+    - !type:RoleTimeRequirement
+      role: JobHeadOfSecurity
+      time: 36000 #10 hrs
+    - !type:RoleTimeRequirement
+      role: JobWarden
+      time: 36000 #10 hrs
+  startingGear: SecuritySergeantGear
+  icon: "JobIconSecuritySergeant"
+  supervisors: job-supervisors-hos
+  canBeAntag: false
+  guides: # goobstation
+  - Security
+  - LegalSOP
+  - OfficerCadetSOP
+  - CorporateJudo
+  - AlertLevels
+  - SecurityTrainingManual # Omu
+  goobcoins: 30 #Goob content
+  access:
+  - Security
+  - Brig
+  - Maintenance
+  - Service
+  - External
+  - Cryogenics
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial # goobstation
+    components:
+      - type: SecurityStaff
+
+- type: startingGear
+  id: SecuritySergeantGear
+  equipment:
+    eyes: ClothingEyesGlassesSecurity
+    ears: ClothingHeadsetAltSecurityRegular # Goobstation
+    #pocket1: OfficerGunCase #Omu, item in loadout instead
+  storage:
+    back:
+    - Flash
+    - SecuritySergeantWhistle
+
+- type: chameleonOutfit
+  id: SecuritySergeantChameleonOutfit
+  job: SecuritySergeant
+  hasMindShield: true
+  equipment:
+    head: ClothingHeadHatBeretSecurity
+    mask: ClothingMaskGasSecurity
+    neck: Dinkystar
+    gloves: ClothingHandsGlovesColorBlack

Resources/Prototypes/_Omu/Roles/play_time_trackers.yml

@@ -6,7 +6,7 @@
 
 - type: playTimeTracker
   id: JobTransitPrisoner
-  
+
 - type: playTimeTracker
   id: JobNanoTrasenSpectre
 
@@ -27,3 +27,6 @@
 
 - type: playTimeTracker
   id: JobERTSecurityBlue
+
+- type: playTimeTracker
+  id: JobSecuritySergeant

Resources/Prototypes/_Omu/StatusEffects/job.yml

@@ -5,3 +5,11 @@
     sprite: /Textures/_Omu/Interface/Misc/job_icons.rsi
     state: direggtor
   jobName: job-name-centcomm-direggtor
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSecuritySergeant
+  icon:
+    sprite: /Textures/_Omu/Interface/Misc/job_icons.rsi
+    state: securitysergeant
+  jobName: job-name-security-sergeant

Resources/Textures/Objects/Devices/pda.rsi/meta.json

@@ -246,6 +246,9 @@
     {
       "name": "equipped-IDCARD",
       "directions": 4
-    }
+    },
+	{
+		"name": "pda-securitysergeant"
+	}
   ]
 }