From 080a0f0b4501f519ac4a79a4d92ee8b6cc05dc11 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 10 Jan 2024 20:05:51 +0200 Subject: [PATCH 01/11] Create blue_shield.yml --- .../_NF/Roles/Jobs/Security/blue_shield.yml | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Resources/Prototypes/_NF/Roles/Jobs/Security/blue_shield.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/blue_shield.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/blue_shield.yml new file mode 100644 index 00000000000..376f5755c24 --- /dev/null +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/blue_shield.yml @@ -0,0 +1,41 @@ +- type: job + id: BlueShield + name: job-name-security + description: job-description-security + playTimeTracker: JobBlueShield + requirements: + - !type:OverallPlaytimeRequirement + time: 21600 + startingGear: BlueShieldGear + icon: "JobIconBlueShield" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + - Mercenary # Frontier + - Captain # Frontier + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, TrackingImplant ] + +- type: startingGear + id: BlueShieldGear + equipment: + jumpsuit: ClothingUniformJumpsuitSec + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesSecurity + head: ClothingHeadHelmetBasic + outerClothing: ClothingOuterArmorBasic + id: SecurityPDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58Nonlethal + gloves: ClothingHandsGlovesCombat # Frontier + innerClothingSkirt: ClothingUniformJumpskirtSec + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled From 7eb2ebb2cd3257beebcec2aa040261c0e5908881 Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 23 Jan 2024 01:47:11 +0200 Subject: [PATCH 02/11] Guard --- .../Locale/en-US/_NF/job/job-description.ftl | 4 +++- Resources/Locale/en-US/_NF/job/job-names.ftl | 6 ++++-- .../en-US/_NF/prototypes/access/accesses.ftl | 6 ++---- .../Prototypes/_NF/Maps/Outpost/frontier.yml | 3 ++- .../{blue_shield.yml => security_guard.yml} | 16 ++++++++-------- .../Prototypes/_NF/Roles/play_time_trackers.yml | 7 +++++-- 6 files changed, 24 insertions(+), 18 deletions(-) rename Resources/Prototypes/_NF/Roles/Jobs/Security/{blue_shield.yml => security_guard.yml} (78%) diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl index 8d90993933a..054c021c7c2 100644 --- a/Resources/Locale/en-US/_NF/job/job-description.ftl +++ b/Resources/Locale/en-US/_NF/job/job-description.ftl @@ -1,3 +1,5 @@ job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law. -job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships. job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar. +job-description-security-guard = WIP +job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships. + diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl index ef760e87d29..7c34eb3e226 100644 --- a/Resources/Locale/en-US/_NF/job/job-names.ftl +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -1,8 +1,10 @@ job-name-mercenary = Mercenary -job-name-stc = Station Traffic Controller job-name-pilot = Pilot +job-name-security-guard = Security Guard +job-name-stc = Station Traffic Controller # Role timers - Make these alphabetical or I cut you JobMercenary = Mercenary -JobSTC = Station Traffic Controller JobPilot = Pilot +JobSecurityGuard = Security Guard +JobSTC = Station Traffic Controller diff --git a/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl index b31848bd937..cf0684630b5 100644 --- a/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl @@ -1,5 +1,3 @@ -id-card-access-level-frontier = Station Traffic Controller - -id-card-access-level-mercenary = Mercenary - +id-card-access-level-frontier = Frontier id-card-access-level-pilot = Pilot +id-card-access-level-mercenary = Mercenary diff --git a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml index fb09242be18..17dc5ea8e6c 100644 --- a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml +++ b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml @@ -20,14 +20,15 @@ Passenger: [ -1, -1 ] HeadOfPersonnel: [ 1, 1 ] HeadOfSecurity: [ 1, 1 ] + SecurityGuard: [ 1, 1 ] SeniorOfficer: [ 0, 0 ] Brigmedic: [ 0, 0 ] SecurityOfficer: [ 0, 0 ] SecurityCadet: [ 0, 0 ] StationTrafficController: [ 0, 0 ] Valet: [ 1, 1 ] - MailCarrier: [ 0, 0 ] Janitor: [ 1, 1 ] + MailCarrier: [ 0, 0 ] # Others: Borg: [ 0, 0 ] Musician: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/blue_shield.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml similarity index 78% rename from Resources/Prototypes/_NF/Roles/Jobs/Security/blue_shield.yml rename to Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml index 376f5755c24..52cd059a599 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/blue_shield.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml @@ -1,14 +1,14 @@ - type: job - id: BlueShield - name: job-name-security - description: job-description-security - playTimeTracker: JobBlueShield + id: SecurityGuard + name: job-name-security-guard + description: job-description-security-guard + playTimeTracker: JobSecurityGuard requirements: - !type:OverallPlaytimeRequirement time: 21600 - startingGear: BlueShieldGear - icon: "JobIconBlueShield" - supervisors: job-supervisors-hos + startingGear: SecurityGuardGear + icon: "JobIconSecurityGuard" + supervisors: job-supervisors-hop canBeAntag: false access: - Security @@ -23,7 +23,7 @@ implants: [ MindShieldImplant, TrackingImplant ] - type: startingGear - id: BlueShieldGear + id: SecurityGuardGear equipment: jumpsuit: ClothingUniformJumpsuitSec back: ClothingBackpackSecurityFilled diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml index d71b8812e11..da5ab2ebdf7 100644 --- a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml @@ -2,7 +2,10 @@ id: JobMercenary - type: playTimeTracker - id: JobStc + id: JobPilot - type: playTimeTracker - id: JobPilot + id: JobSecurityGuard + +- type: playTimeTracker + id: JobStc From ab64d808bed37c29ba92739350ff6cbafcef3b46 Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 23 Jan 2024 12:41:50 +0200 Subject: [PATCH 03/11] Rename Station Guard to Security Guard --- .../Entities/Structures/Machines/lathe.yml | 4 ++-- .../_NF/Entities/Clothing/Uniforms/jumpskirts.yml | 10 +++++----- .../_NF/Entities/Clothing/Uniforms/jumpsuits.yml | 10 +++++----- .../_NF/Recipes/Construction/clothing.yml | 8 ++++---- .../equipped-INNERCLOTHING-monkey.png | Bin .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING-monkey.png | Bin .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 16 files changed, 16 insertions(+), 16 deletions(-) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/{security_stationguard.rsi => security_guard.rsi}/equipped-INNERCLOTHING-monkey.png (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/{security_stationguard.rsi => security_guard.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/{security_stationguard.rsi => security_guard.rsi}/icon.png (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/{security_stationguard.rsi => security_guard.rsi}/inhand-left.png (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/{security_stationguard.rsi => security_guard.rsi}/inhand-right.png (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/{security_stationguard.rsi => security_guard.rsi}/meta.json (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/{security_stationguard.rsi => security_guard.rsi}/equipped-INNERCLOTHING-monkey.png (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/{security_stationguard.rsi => security_guard.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/{security_stationguard.rsi => security_guard.rsi}/icon.png (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/{security_stationguard.rsi => security_guard.rsi}/inhand-left.png (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/{security_stationguard.rsi => security_guard.rsi}/inhand-right.png (100%) rename Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/{security_stationguard.rsi => security_guard.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 5f86857f882..bf0c3ac85ff 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -795,8 +795,8 @@ - ClothingUniformJumpskirtBrigmedic - ClothingUniformJumpsuitWarden - ClothingUniformJumpskirtWarden - - ClothingUniformJumpsuitSecStationGuard #Frontier - - ClothingUniformJumpskirtSecStationGuard #Frontier + - ClothingUniformJumpsuitSecGuard #Frontier + - ClothingUniformJumpskirtSecGuard #Frontier - ClothingOuterWinterCap - ClothingOuterWinterCE - ClothingOuterWinterCMO diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml index 03de3bc313b..d1754c0fb65 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml @@ -45,11 +45,11 @@ - type: entity parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtSecStationGuard - name: station guard jumpskirt - description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business. + id: ClothingUniformJumpskirtSecGuard + name: security guard jumpskirt + description: A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business. components: - type: Sprite - sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi + sprite: _NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi - type: Clothing - sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi + sprite: _NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index b96125472f8..0a36e9ef1f2 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -45,14 +45,14 @@ - type: entity parent: ClothingUniformBase - id: ClothingUniformJumpsuitSecStationGuard - name: station guard jumpsuit - description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business. + id: ClothingUniformJumpsuitSecGuard + name: security guard jumpsuit + description: A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business. components: - type: Sprite - sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi + sprite: _NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi - type: Clothing - sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi + sprite: _NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml index d0b1ad095d6..ac757119c23 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml @@ -10,15 +10,15 @@ objectType: Item - type: latheRecipe - id: ClothingUniformJumpskirtSecStationGuard - result: ClothingUniformJumpskirtSecStationGuard + id: ClothingUniformJumpskirtSecGuard + result: ClothingUniformJumpskirtSecGuard completetime: 4 materials: Cloth: 300 - type: latheRecipe - id: ClothingUniformJumpsuitSecStationGuard - result: ClothingUniformJumpsuitSecStationGuard + id: ClothingUniformJumpsuitSecGuard + result: ClothingUniformJumpsuitSecGuard completetime: 4 materials: Cloth: 300 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/meta.json From 18a4fded2efd4b04bed169cdd0e4cf94a869d253 Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 23 Jan 2024 13:28:11 +0200 Subject: [PATCH 04/11] Guard --- .../_NF/Roles/Jobs/Security/security_guard.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml index 52cd059a599..b5edc743787 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml @@ -25,17 +25,17 @@ - type: startingGear id: SecurityGuardGear equipment: - jumpsuit: ClothingUniformJumpsuitSec + jumpsuit: ClothingUniformJumpsuitSecGuard back: ClothingBackpackSecurityFilled - shoes: ClothingShoesBootsCombatFilled - eyes: ClothingEyesGlassesSecurity - head: ClothingHeadHelmetBasic + shoes: ClothingShoesLeather #ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesSunglasses #ClothingEyesGlassesSecurity + head: ClothingHeadHatBeretSecurity #ClothingHeadHelmetBasic outerClothing: ClothingOuterArmorBasic id: SecurityPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal gloves: ClothingHandsGlovesCombat # Frontier - innerClothingSkirt: ClothingUniformJumpskirtSec + innerClothingSkirt: ClothingUniformJumpskirtSecGuard satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled From 90d690ad0601bb0aebd61874dc6d9da231a35034 Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 23 Jan 2024 14:38:01 +0200 Subject: [PATCH 05/11] Security Guard --- .../Catalog/VendingMachines/Inventories/cart.yml | 1 + Resources/Prototypes/Roles/Jobs/departments.yml | 7 ++++--- .../Objects/Devices/Misc/identification_cards.yml | 8 ++++++++ .../_NF/Entities/Objects/Devices/pda.yml | 14 ++++++++++++++ .../_NF/Recipes/Construction/clothing.yml | 2 +- .../_NF/Roles/Jobs/Security/security_guard.yml | 3 ++- Resources/Prototypes/_NF/StatusEffects/job.yml | 7 +++++++ 7 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index e2b52bb693e..cba0210c493 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -16,6 +16,7 @@ # ParamedicPDA: 3 # Frontier # ChemistryPDA: 3 # Frontier # CMOPDA: 3 # Frontier + SecurityGuardPDA: 3 # Frontier SecurityPDA: 3 # Frontier BrigmedicPDA: 3 # Frontier WardenPDA: 3 # Frontier diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index a749c56e042..f080ca0e8ea 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -33,9 +33,9 @@ - MartialArtist - MailCarrier - Gladiator - - Mercenary ## NF Job below - - StationTrafficController - + - Mercenary # Frontier + - Pilot # Frontier + - StationTrafficController # Frontier - type: department id: Command @@ -89,6 +89,7 @@ - PrisonGuard ##nyano - Prisoner ##nyano - Brigmedic + - SecurityGuard # Frontier - type: department id: Science diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml index da0d31daefa..6c2491a800d 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -50,3 +50,11 @@ sprite: _NF/Objects/Misc/id_cards.rsi - type: Item heldPrefix: silver + +- type: entity + parent: SecurityIDCard + id: SecurityGuardIDCard + name: security guard ID card + components: + - type: PresetIdCard + job: SecurityGuard diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index adae535b533..d5fdb1a48bd 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -68,3 +68,17 @@ accentVColor: "#A32D26" - type: Icon state: pda + +- type: entity + parent: SecurityPDA + id: SecurityGuardPDA + name: security guard PDA + description: Red to hide the stains of passenger blood. + components: + - type: Pda + id: SecurityGuardIDCard + state: pda-security + - type: PdaBorderColor + borderColor: "#A32D26" + - type: Icon + state: pda-security diff --git a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml index ac757119c23..4e799b9710c 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml @@ -15,7 +15,7 @@ completetime: 4 materials: Cloth: 300 - + - type: latheRecipe id: ClothingUniformJumpsuitSecGuard result: ClothingUniformJumpsuitSecGuard diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml index b5edc743787..c9df8525177 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml @@ -18,6 +18,7 @@ - External - Mercenary # Frontier - Captain # Frontier + - Frontier # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] @@ -31,7 +32,7 @@ eyes: ClothingEyesGlassesSunglasses #ClothingEyesGlassesSecurity head: ClothingHeadHatBeretSecurity #ClothingHeadHelmetBasic outerClothing: ClothingOuterArmorBasic - id: SecurityPDA + id: SecurityGuardPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal diff --git a/Resources/Prototypes/_NF/StatusEffects/job.yml b/Resources/Prototypes/_NF/StatusEffects/job.yml index 7b5dea47389..0a927fc83ab 100644 --- a/Resources/Prototypes/_NF/StatusEffects/job.yml +++ b/Resources/Prototypes/_NF/StatusEffects/job.yml @@ -19,6 +19,13 @@ sprite: _NF/Interface/Misc/job_icons.rsi state: Pilot +- type: statusIcon + parent: JobIcon + id: JobIconSecurityGuard + icon: + sprite: Interface/Misc/job_icons.rsi + state: SecurityOfficer + - type: statusIcon parent: JobIcon id: JobIconStc From 5d666d49d42896bfa8bdf2be4e3154003b08b4e4 Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 23 Jan 2024 15:03:40 +0200 Subject: [PATCH 06/11] Security Guard Fixing --- Resources/Locale/en-US/_NF/job/job-description.ftl | 3 +-- .../Prototypes/_NF/Roles/Jobs/Security/security_guard.yml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl index 054c021c7c2..1d9a6c2bf8d 100644 --- a/Resources/Locale/en-US/_NF/job/job-description.ftl +++ b/Resources/Locale/en-US/_NF/job/job-description.ftl @@ -1,5 +1,4 @@ job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law. job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar. -job-description-security-guard = WIP +job-description-security-guard = Patrol the empty halls, whistle simple tunes you heard on radio, jingle your keychain and scurry away at the sight of danger. job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships. - diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml index c9df8525177..87719ca508d 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml @@ -5,10 +5,10 @@ playTimeTracker: JobSecurityGuard requirements: - !type:OverallPlaytimeRequirement - time: 21600 + time: 36000 # Frontier - 10 hrs startingGear: SecurityGuardGear icon: "JobIconSecurityGuard" - supervisors: job-supervisors-hop + supervisors: job-supervisors-hop # not hos canBeAntag: false access: - Security From 76cd74024b50b54ac64ad00d5bfd9cbd7da65acc Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 23 Jan 2024 16:14:04 +0200 Subject: [PATCH 07/11] Job Requirements. --- .../Roles/Jobs/Security/senior_officer.yml | 2 +- .../Prototypes/_NF/Maps/Outpost/frontier.yml | 4 +-- .../Prototypes/_NF/Markers/Spawners/jobs.yml | 26 +++++++++++++++++++ .../Prototypes/_NF/Roles/Jobs/Command/stc.yml | 5 +++- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index d624f95bddc..07fb74c34b6 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -15,7 +15,7 @@ time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Security - time: 216000 # 60 hrs + time: 72000 # 20 hrs startingGear: SeniorOfficerGear icon: "JobIconSeniorOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml index 17dc5ea8e6c..8704aac3a2d 100644 --- a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml +++ b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml @@ -25,10 +25,10 @@ Brigmedic: [ 0, 0 ] SecurityOfficer: [ 0, 0 ] SecurityCadet: [ 0, 0 ] - StationTrafficController: [ 0, 0 ] + StationTrafficController: [ 1, 1 ] Valet: [ 1, 1 ] Janitor: [ 1, 1 ] - MailCarrier: [ 0, 0 ] + MailCarrier: [ 1, 1 ] # Others: Borg: [ 0, 0 ] Musician: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml index 08291492756..3082bfd3885 100644 --- a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml @@ -23,3 +23,29 @@ layers: - state: green - state: pilot + +- type: entity + id: SpawnPointStc + parent: SpawnPointJobBase + name: stc + components: + - type: SpawnPoint + job_id: Stc + - type: Sprite + sprite: _NF/Markers/jobs.rsi + layers: + - state: green + - state: stc + +- type: entity + id: SpawnPointSecurityGuard + parent: SpawnPointJobBase + name: stastion + components: + - type: SpawnPoint + job_id: SecurityGuard + - type: Sprite + sprite: _NF/Markers/jobs.rsi + layers: + - state: green + - state: securityguard diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml index fe90e391947..9ff92a0d55e 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml @@ -6,7 +6,10 @@ startingGear: StcGear requirements: - !type:OverallPlaytimeRequirement - time: 10800 + time: 72000 # 20 hours + - !type:DepartmentTimeRequirement + department: Security + time: 10800 # 3 hrs as sec also. canBeAntag: false icon: "JobIconStc" supervisors: job-supervisors-hop From 36c917a4724456a73e6a523875bad045a926469a Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 23 Jan 2024 16:43:31 +0200 Subject: [PATCH 08/11] Spawn Points --- .../Textures/_NF/Markers/jobs.rsi/meta.json | 6 ++++++ .../_NF/Markers/jobs.rsi/security_guard.png | Bin 0 -> 3213 bytes Resources/Textures/_NF/Markers/jobs.rsi/stc.png | Bin 0 -> 305 bytes 3 files changed, 6 insertions(+) create mode 100644 Resources/Textures/_NF/Markers/jobs.rsi/security_guard.png create mode 100644 Resources/Textures/_NF/Markers/jobs.rsi/stc.png diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/meta.json b/Resources/Textures/_NF/Markers/jobs.rsi/meta.json index 388f334486b..9ad93ed4426 100644 --- a/Resources/Textures/_NF/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/_NF/Markers/jobs.rsi/meta.json @@ -15,6 +15,12 @@ }, { "name": "pilot" + }, + { + "name": "security_guard" + }, + { + "name": "stc" } ] } diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/security_guard.png b/Resources/Textures/_NF/Markers/jobs.rsi/security_guard.png new file mode 100644 index 0000000000000000000000000000000000000000..fe9aea69e94d0437d64c47767adec5f8adb5c437 GIT binary patch literal 3213 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 fa%XClR(xeJNj946(aN_CXgh Date: Tue, 23 Jan 2024 16:57:51 +0200 Subject: [PATCH 09/11] RSI Issue --- Resources/Textures/_NF/Markers/jobs.rsi/meta.json | 2 +- .../{security_guard.png => securityguard.png} | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename Resources/Textures/_NF/Markers/jobs.rsi/{security_guard.png => securityguard.png} (100%) diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/meta.json b/Resources/Textures/_NF/Markers/jobs.rsi/meta.json index 9ad93ed4426..0f8d397d17b 100644 --- a/Resources/Textures/_NF/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/_NF/Markers/jobs.rsi/meta.json @@ -17,7 +17,7 @@ "name": "pilot" }, { - "name": "security_guard" + "name": "securityguard" }, { "name": "stc" diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/security_guard.png b/Resources/Textures/_NF/Markers/jobs.rsi/securityguard.png similarity index 100% rename from Resources/Textures/_NF/Markers/jobs.rsi/security_guard.png rename to Resources/Textures/_NF/Markers/jobs.rsi/securityguard.png From 502333d36d2e2ea57a9d39b08ac8dc001d87252e Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 23 Jan 2024 17:05:35 +0200 Subject: [PATCH 10/11] Name fix for spawn point --- Resources/Prototypes/_NF/Markers/Spawners/jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml index 3082bfd3885..a3d546ff2d3 100644 --- a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml @@ -40,7 +40,7 @@ - type: entity id: SpawnPointSecurityGuard parent: SpawnPointJobBase - name: stastion + name: security guard components: - type: SpawnPoint job_id: SecurityGuard From f72fbaa4ebcf6af46939f37bd8066cfa9821e04f Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 23 Jan 2024 19:51:32 +0200 Subject: [PATCH 11/11] STC PlayTime --- Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml index 9ff92a0d55e..f3f90975f69 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml @@ -6,10 +6,10 @@ startingGear: StcGear requirements: - !type:OverallPlaytimeRequirement - time: 72000 # 20 hours + time: 72000 # 20 hrs - !type:DepartmentTimeRequirement department: Security - time: 10800 # 3 hrs as sec also. + time: 10800 # 3 hrs as sec canBeAntag: false icon: "JobIconStc" supervisors: job-supervisors-hop