diff --git a/Resources/Locale/en-US/_Omu/job/job-description.ftl b/Resources/Locale/en-US/_Omu/job/job-description.ftl index 1ef2be36713..cfaa555b53e 100644 --- a/Resources/Locale/en-US/_Omu/job/job-description.ftl +++ b/Resources/Locale/en-US/_Omu/job/job-description.ftl @@ -1,2 +1,3 @@ job-description-nanotrasen-spectre = Complete your assigned tasks, Terminate the given targets. Good luck. job-description-transit-prisoner = A bureaucratic error caused your stay on this station. Bide your time in this layover confinement. Scheme with other inmates. Make the cadet regret walking into the brig. +job-description-sergeant = Help lead security alongside hos, be the first one to face the threat, and most importantly, Yell at the cadets. diff --git a/Resources/Locale/en-US/_Omu/job/job-names.ftl b/Resources/Locale/en-US/_Omu/job/job-names.ftl index 0d67f5a0b5c..14452cd7ff1 100644 --- a/Resources/Locale/en-US/_Omu/job/job-names.ftl +++ b/Resources/Locale/en-US/_Omu/job/job-names.ftl @@ -3,5 +3,7 @@ job-name-exec-intern = Executive Intern job-name-centcomm-intern = CentComm Intern job-name-centcomm-direggtor = Centcomm Direggtor job-name-nanotrasen-spectre = Spectre Agent +# Security +job-name-sergeant = Sergeant # Security Misc job-name-transit-prisoner = Transit Prisoner diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index ae5077003cf..ed3013e590c 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -236,6 +236,7 @@ - Brigmedic # Goob - SecurityClown # event-restricted, Goob - TransitPrisoner # Omu + - Sergeant # Omu - type: department id: Science diff --git a/Resources/Prototypes/_Omu/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Omu/Entities/Markers/Spawners/jobs.yml index 106bae27dac..e6d93006b8e 100644 --- a/Resources/Prototypes/_Omu/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Omu/Entities/Markers/Spawners/jobs.yml @@ -8,4 +8,16 @@ - type: Sprite layers: - state: green - - state: prisoner \ No newline at end of file + - state: prisoner + +- type: entity + id: SpawnPointSergeant + parent: SpawnPointJobBase + name: sergeant + components: + - type: SpawnPoint + job_id: Sergeant + - type: Sprite + layers: + - state: green + - state: sergeant diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Omu/Entities/Objects/Devices/pda.yml index c38c9337d06..4b9ba29d0ed 100644 --- a/Resources/Prototypes/_Omu/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Omu/Entities/Objects/Devices/pda.yml @@ -64,3 +64,17 @@ components: - type: Pda id: ERTSecurityIDCardBlue + +- type: entity + parent: SeniorOfficerPDA + id: SergeantPDA + name: sergeant PDA + description: battered and bruised, but still kicking like its owner + components: + - type: Pda + id: SergeantIDCard + - type: Icon + sprite: _Omu/Objects/Devices/pda.rsi + state: pda-sergeant + + diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Omu/Entities/Objects/Misc/identification_cards.yml index 70b62c289d3..a43daf95d31 100644 --- a/Resources/Prototypes/_Omu/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Omu/Entities/Objects/Misc/identification_cards.yml @@ -131,3 +131,17 @@ components: - type: PresetIdCard job: ERTSecurityBlue + + +- type: entity + parent: SeniorOfficerIDCard + id: SergeantIDCard + name: sergeant ID card + components: + - type: Sprite + sprite: _Omu/Objects/Misc/id_cards.rsi + layers: + - state: idsergeant + - type: IdCard + jobTitle: job-name-sergeant + jobIcon: JobIconSergeant diff --git a/Resources/Prototypes/_Omu/Loadouts/Jobs/Security/sergeant.yml b/Resources/Prototypes/_Omu/Loadouts/Jobs/Security/sergeant.yml new file mode 100644 index 00000000000..736369935fc --- /dev/null +++ b/Resources/Prototypes/_Omu/Loadouts/Jobs/Security/sergeant.yml @@ -0,0 +1,8 @@ +#Belt +#- type: loadout +# id: SecuritySwordBelt +# effects: +# - !type:GroupLoadoutEffect +# proto: SeniorOfficer +# equipment: +# belt: ClothingBeltSheathStunswordFilled diff --git a/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml index 643b74b84a4..663cda4cbfb 100644 --- a/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml @@ -139,3 +139,23 @@ - BrigmedicAltHeadset +# placeholder items +- type: loadoutGroup + id: SergeantHead + name: loadout-group-sergeant-head + minLimit: 1 + maxLimit: 1 + loadouts: + - SecurityBeret + - TrooperHat + +- type: loadoutGroup + id: SergeantOuterClothing + name: loadout-group-sergeant-outerclothing + minLimit: 1 + maxLimit: 1 + loadouts: + - ArmorVest + - ArmorVestSlim + - SecurityOfficerWintercoat + - WinterCoatSeniorSecArmored diff --git a/Resources/Prototypes/_Omu/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Omu/Loadouts/role_loadouts.yml index 52bdec32624..d12a808c4d1 100644 --- a/Resources/Prototypes/_Omu/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Omu/Loadouts/role_loadouts.yml @@ -14,3 +14,24 @@ - PrisonerEnvirohelm - PrisonerEnvirosuit - PrisonerEnvirogloves + + +- type: roleLoadout + id: JobSergeant + groups: + - SergeantHead + - SecurityJumpsuit + - SecurityBackpack + - SecurityMelee + - SergeantOuterClothing + - SecurityShoes + - SecurityNeck + - SecurityBelt + - SurvivalSecurity + - Trinkets + - SecurityStar + - Animals + - GroupSpeciesBreathToolSecurity + - SecurityOfficerEnvirohelm + - SecurityOfficerEnvirosuit + - SecurityOfficerEnvirogloves diff --git a/Resources/Prototypes/_Omu/Roles/Jobs/Security/sergeant.yml b/Resources/Prototypes/_Omu/Roles/Jobs/Security/sergeant.yml new file mode 100644 index 00000000000..464dc64670e --- /dev/null +++ b/Resources/Prototypes/_Omu/Roles/Jobs/Security/sergeant.yml @@ -0,0 +1,54 @@ + +- type: job + id: Sergeant + name: job-name-sergeant + description: job-description-sergeant + playTimeTracker: JobSergeant + requirements: + - !type:RoleTimeRequirement + role: JobHeadofSecurity + time: 72000 #50 hrs + - !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 72000 #50 hrs + - !type:DepartmentTimeRequirement + department: Security + time: 360000 #100 hrs + weight: 10 + startingGear: SergeantGear + icon: "JobIconSergeant" + supervisors: job-supervisors-hos + canBeAntag: false + guides: + - Security + - SpaceLaw + - Legal SOP + - Security SOP + - Alert Levels + - SecurityTrainingManual + goobcoins: 40 + access: + - Brig + - Security + - Maintenance + - Service + - External + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: SecurityStaff + +- type: startingGear + id: SergeantGear + equipment: + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + ears: ClothingHeadsetAltSecurityRegular + id: SergeantPDA + storage: + back: + - Flash + - MagazinePistol diff --git a/Resources/Prototypes/_Omu/Roles/play_time_trackers.yml b/Resources/Prototypes/_Omu/Roles/play_time_trackers.yml index 125fbe15715..b971698fba7 100644 --- a/Resources/Prototypes/_Omu/Roles/play_time_trackers.yml +++ b/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: JobSergeant diff --git a/Resources/Textures/_Omu/Interface/Misc/job_icons.rsi/sergeant.png b/Resources/Textures/_Omu/Interface/Misc/job_icons.rsi/sergeant.png new file mode 100644 index 00000000000..fffc7d2a065 Binary files /dev/null and b/Resources/Textures/_Omu/Interface/Misc/job_icons.rsi/sergeant.png differ diff --git a/Resources/Textures/_Omu/Objects/Devices/pda-sergeant.png b/Resources/Textures/_Omu/Objects/Devices/pda-sergeant.png new file mode 100644 index 00000000000..87b0ee43142 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Devices/pda-sergeant.png differ diff --git a/Resources/Textures/_Omu/Objects/Misc/id_card.rsi/idsergeant.png b/Resources/Textures/_Omu/Objects/Misc/id_card.rsi/idsergeant.png new file mode 100644 index 00000000000..fffc7d2a065 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Misc/id_card.rsi/idsergeant.png differ