From 6836626698b8284fbacc3f3ea8f7466067947b1a Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 29 Nov 2023 02:31:30 +0200 Subject: [PATCH 01/27] Merc --- .../Access/Components/IdCardConsoleComponent.cs | 3 ++- Resources/Locale/en-US/_NF/job/job-description.ftl | 2 ++ Resources/Locale/en-US/_NF/job/job-names.ftl | 6 ++++++ .../Locale/en-US/_NF/prototypes/access/accesses.ftl | 3 +++ Resources/Locale/en-US/job/job-description.ftl | 1 - Resources/Locale/en-US/job/job-names.ftl | 2 -- .../Locale/en-US/prototypes/access/accesses.ftl | 1 - Resources/Prototypes/Access/command.yml | 6 +----- Resources/Prototypes/Access/misc.yml | 3 ++- Resources/Prototypes/Access/security.yml | 2 ++ .../Entities/Objects/Tools/access_configurator.yml | 3 ++- Resources/Prototypes/_NF/Access/command.yml | 3 +++ Resources/Prototypes/_NF/Access/security.yml | 3 +++ .../Structures/Storage/Closets/Lockers/lockers.yml | 13 +++++++++++++ .../_NF/Roles/Jobs/Security/mercenary.yml | 1 + 15 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/job/job-description.ftl create mode 100644 Resources/Locale/en-US/_NF/job/job-names.ftl create mode 100644 Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl create mode 100644 Resources/Prototypes/_NF/Access/command.yml create mode 100644 Resources/Prototypes/_NF/Access/security.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 9724f5fdb49..15dc724ca57 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -41,7 +41,7 @@ public sealed partial class IdCardConsoleComponent : Component "Command", "Engineering", "External", - "Frontier", + "Frontier", // Frontier "HeadOfPersonnel", "HeadOfSecurity", "Hydroponics", @@ -49,6 +49,7 @@ public sealed partial class IdCardConsoleComponent : Component "Kitchen", "Maintenance", "Medical", + "Mercenary", // Frontier "Quartermaster", "Research", "ResearchDirector", diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl new file mode 100644 index 00000000000..974263b4e02 --- /dev/null +++ b/Resources/Locale/en-US/_NF/job/job-description.ftl @@ -0,0 +1,2 @@ +job-description-mercenary = Catch criminals and enemies of the corporation, enforce the law, and ensure that the sector does not fall into disarray. +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 new file mode 100644 index 00000000000..fbfa777dfb0 --- /dev/null +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -0,0 +1,6 @@ +job-name-mercenary = Mercenary +job-name-stc = Station Traffic Controller + +# Role timers - Make these alphabetical or I cut you +JobMercenary = Mercenary +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 new file mode 100644 index 00000000000..9fb314d22a7 --- /dev/null +++ b/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl @@ -0,0 +1,3 @@ +id-card-access-level-frontier = Station Traffic Controller + +id-card-access-level-mercenary = Mercenary diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 6e9575dee97..a4aab9e68bb 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -48,4 +48,3 @@ job-description-senior-engineer = Teach new engineers the basics of the station' job-description-senior-researcher = Teach new scientists the basics of item printing, artifact research and anomalous objects. job-description-senior-physician = Teach new medics the basics of tending to the wounded, chemistry, diagnosing the diseased and disposing of the dead. job-description-senior-officer = Teach new deputies the basics of searches, preforming arrests, prison times and how to properly shoot a firearm. -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/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index f1bb9c4ffb7..e2197e9c9c9 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -48,7 +48,6 @@ job-name-senior-engineer = Senior Engineer job-name-senior-researcher = Senior Researcher job-name-senior-physician = Senior Physician job-name-senior-officer = Sergeant -job-name-stc = Station Traffic Controller # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = Atmospheric Technician @@ -97,7 +96,6 @@ JobSeniorOfficer = Sergeant JobSeniorPhysician = Senior Physician JobSeniorResearcher = Senior Researcher JobServiceWorker = Service Worker -JobSTC = Station Traffic Controller JobStationEngineer = Station Engineer JobTechnicalAssistant = Technical Assistant JobWarden = Bailiff diff --git a/Resources/Locale/en-US/prototypes/access/accesses.ftl b/Resources/Locale/en-US/prototypes/access/accesses.ftl index c2f413c97de..a7a7795c11e 100644 --- a/Resources/Locale/en-US/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/prototypes/access/accesses.ftl @@ -1,7 +1,6 @@ id-card-access-level-command = Command id-card-access-level-captain = Captain id-card-access-level-head-of-personnel = Station Representative -id-card-access-level-frontier = Station Traffic Controller id-card-access-level-head-of-security = Sheriff id-card-access-level-security = Security diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml index aaa5f442287..001c35e0162 100644 --- a/Resources/Prototypes/Access/command.yml +++ b/Resources/Prototypes/Access/command.yml @@ -2,10 +2,6 @@ id: Command name: id-card-access-level-command -- type: accessLevel - id: Frontier - name: id-card-access-level-frontier - - type: accessLevel id: Captain name: id-card-access-level-captain @@ -17,7 +13,7 @@ - type: accessGroup id: Command tags: - - Frontier + - Frontier # Frontier - Command - Captain - HeadOfPersonnel diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 60974873b97..f820cb67a78 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -8,7 +8,7 @@ - ChiefMedicalOfficer - HeadOfSecurity - ResearchDirector - - Frontier + - Frontier # Frontier - Command - Security - Detective @@ -16,6 +16,7 @@ - Brig - Engineering - Medical + - Mercenary # Frontier - Quartermaster - Salvage - Cargo diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml index ec832bc761c..4dc9e5943d9 100644 --- a/Resources/Prototypes/Access/security.yml +++ b/Resources/Prototypes/Access/security.yml @@ -26,6 +26,7 @@ - Armory - Brig - Detective + - Mercenary # Frontier - type: accessGroup id: Armory @@ -33,3 +34,4 @@ - Security - Armory - Brig + - Mercenary # Frontier diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 1ff15a91886..75ff960d8c8 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -30,7 +30,7 @@ - Chemistry - ChiefEngineer - ChiefMedicalOfficer - - Frontier + - Frontier # Frontier - Command - Engineering - External @@ -41,6 +41,7 @@ - Kitchen - Maintenance - Medical + - Mercenary # Frontier - Quartermaster - Research - ResearchDirector diff --git a/Resources/Prototypes/_NF/Access/command.yml b/Resources/Prototypes/_NF/Access/command.yml new file mode 100644 index 00000000000..5f09d5dcde8 --- /dev/null +++ b/Resources/Prototypes/_NF/Access/command.yml @@ -0,0 +1,3 @@ +- type: accessLevel + id: Frontier + name: id-card-access-level-frontier diff --git a/Resources/Prototypes/_NF/Access/security.yml b/Resources/Prototypes/_NF/Access/security.yml new file mode 100644 index 00000000000..d97c4d14fd3 --- /dev/null +++ b/Resources/Prototypes/_NF/Access/security.yml @@ -0,0 +1,3 @@ +- type: accessLevel + id: Mercenary + name: id-card-access-level-mercenary diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml new file mode 100644 index 00000000000..630a170c812 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -0,0 +1,13 @@ +# Mercenary +- type: entity + id: LockerMercenary + parent: LockerBaseSecure + name: mercenary locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: sec + stateDoorOpen: sec_open + stateDoorClosed: sec_door + - type: AccessReader + access: [["Mercenary"]] diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index 77095085f02..d0ebb889038 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -13,6 +13,7 @@ setPreference: true access: - Maintenance + - Mercenary - type: startingGear id: MercenaryGear From 51cdfbdd07514d2680cb048264f05dfc9455eac4 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 29 Nov 2023 02:49:28 +0200 Subject: [PATCH 02/27] Jobs --- .../Roles/Jobs/Security/brigmedic.yml | 1 + .../Roles/Jobs/Security/detective.yml | 1 + .../Roles/Jobs/Security/head_of_security.yml | 22 ++++++++++++++++++- .../Roles/Jobs/Security/security_cadet.yml | 1 + .../Roles/Jobs/Security/security_officer.yml | 1 + .../Roles/Jobs/Security/senior_officer.yml | 1 + .../Prototypes/Roles/Jobs/Security/warden.yml | 1 + Resources/Prototypes/StatusEffects/job.yml | 7 ------ .../Prototypes/_NF/Roles/Jobs/Command/stc.yml | 3 ++- .../_NF/Roles/Jobs/Security/mercenary.yml | 4 +++- .../Prototypes/_NF/StatusEffects/job.yml | 20 +++++++++++++++++ 11 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 Resources/Prototypes/_NF/StatusEffects/job.yml diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml index 0decdec2a8f..de6be7569b9 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -19,6 +19,7 @@ - Brig - Maintenance - External + - Mercenary # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index b081773e4cb..b6a6e387923 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -16,6 +16,7 @@ - Maintenance - Service - Detective + - Mercenary # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 76158212fe1..0d26da05982 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -28,7 +28,7 @@ canBeAntag: false access: - HeadOfSecurity - - HeadOfPersonnel + - HeadOfPersonnel # Frontier - This should probably be removed after we confirm they can get into SR office + Bank - Command - Brig - Frontier @@ -38,6 +38,26 @@ - Service - External - Detective + - Mercenary # Frontier + - Bar # Frontier + - Janitor # Frontier + - Theatre # Frontier + - Kitchen # Frontier + - Chapel # Frontier + - Hydroponics # Frontier + - Chemistry # Frontier + - Engineering # Frontier + - Quartermaster # Frontier + - Research # Frontier + - Salvage # Frontier + - Cargo # Frontier + - Atmospherics # Frontier + - Medical # Frontier + - EmergencyShuttleRepealAll # Frontier + - Captain # Frontier + - ChiefEngineer # Frontier + - ChiefMedicalOfficer # Frontier + - ResearchDirector # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index baaaa541c07..ed8c0f39fbf 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -20,6 +20,7 @@ - Maintenance - Service # Frontier - External # Frontier + - Mercenary # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index a1a22a941da..c85f14011a9 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -16,6 +16,7 @@ - Maintenance - Service - External + - Mercenary # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index a21f59e1afe..d62367e08ba 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -26,6 +26,7 @@ - Maintenance - Service - External + - Mercenary # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index e864fe0f6ad..1fa45a53e22 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -21,6 +21,7 @@ - Brig - External - Detective + - Mercenary # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] # Frontier diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index 47430538e86..8be71cc6155 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -367,10 +367,3 @@ icon: sprite: Interface/Misc/job_icons.rsi state: SeniorResearcher -##NF -- type: statusIcon - parent: JobIcon - id: JobIconMailCarrier - icon: - sprite: Interface/Misc/job_icons.rsi - state: MailCarrier \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml index 4321d5cce1c..ccdbdc72659 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml @@ -8,11 +8,12 @@ - !type:OverallPlaytimeRequirement time: 10800 canBeAntag: false - icon: "JobIconServiceWorker" + icon: "JobIconSTC" supervisors: job-supervisors-hop setPreference: true access: - Maintenance + - External - Frontier - type: startingGear diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index d0ebb889038..3179283016f 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -8,11 +8,12 @@ time: 10800 startingGear: MercenaryGear canBeAntag: true - icon: "JobIconSeniorOfficer" + icon: "JobIconMercenary" supervisors: job-supervisors-captain setPreference: true access: - Maintenance + - External - Mercenary - type: startingGear @@ -29,6 +30,7 @@ id: MercenaryPDA ears: ClothingHeadsetGrey belt: ClothingBeltMercWebbing + pocket1: WeaponPistolMk58Nonlethal innerClothingSkirt: ClothingUniformJumpsuitMercenary satchel: ClothingBackpackMercFilled duffelbag: ClothingBackpackMercFilled diff --git a/Resources/Prototypes/_NF/StatusEffects/job.yml b/Resources/Prototypes/_NF/StatusEffects/job.yml new file mode 100644 index 00000000000..8df5c354736 --- /dev/null +++ b/Resources/Prototypes/_NF/StatusEffects/job.yml @@ -0,0 +1,20 @@ +- type: statusIcon + parent: JobIcon + id: JobIconMailCarrier + icon: + sprite: Interface/Misc/job_icons.rsi + state: MailCarrier + +- type: statusIcon + parent: JobIcon + id: JobIconMercenary + icon: + sprite: Interface/Misc/job_icons.rsi + state: SeniorOfficer + +- type: statusIcon + parent: JobIcon + id: JobIconSTC + icon: + sprite: Interface/Misc/job_icons.rsi + state: ServiceWorker From dae054808d48daf3cfe9432691788eff04385d06 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 29 Nov 2023 02:55:33 +0200 Subject: [PATCH 03/27] Missing permas --- Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml | 1 + Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml | 1 + Resources/Prototypes/Roles/Jobs/Security/detective.yml | 1 + Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml | 1 + Resources/Prototypes/Roles/Jobs/Security/security_officer.yml | 1 + Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml | 1 + Resources/Prototypes/Roles/Jobs/Security/warden.yml | 1 + Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml | 2 ++ 8 files changed, 9 insertions(+) diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 23bbc770457..ddd15ae274a 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -47,6 +47,7 @@ # - HeadOfSecurity # Frontier - Whitelist for sheriff only. - ResearchDirector # Frontier - Armory # Frontier + - Mercenary # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] # Frontier - Added TrackingImplant diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml index de6be7569b9..7b501a69b59 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -20,6 +20,7 @@ - Maintenance - External - Mercenary # Frontier + - Captain # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index b6a6e387923..b56d0618cd9 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -17,6 +17,7 @@ - Service - Detective - Mercenary # Frontier + - Captain # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index ed8c0f39fbf..a84c6f37049 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -21,6 +21,7 @@ - Service # Frontier - External # Frontier - Mercenary # Frontier + - Captain # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index c85f14011a9..284fbe2d0d8 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -17,6 +17,7 @@ - Service - External - Mercenary # Frontier + - Captain # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index d62367e08ba..48f36ad0c90 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -27,6 +27,7 @@ - Service - External - Mercenary # Frontier + - Captain # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 1fa45a53e22..9e74dc41675 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -22,6 +22,7 @@ - External - Detective - Mercenary # Frontier + - Captain # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] # Frontier diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml index dbec9b8cb83..c4c4562ed9d 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml @@ -16,6 +16,8 @@ - Maintenance - Service # Frontier - External # Frontier + - Mercenary # Frontier + - Captain # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] From e43bc9cda801ce4285bea0ac335ca0fdec91ff97 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 29 Nov 2023 03:01:04 +0200 Subject: [PATCH 04/27] Update atms.yml --- Resources/Prototypes/_NF/Entities/Structures/atms.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/atms.yml b/Resources/Prototypes/_NF/Entities/Structures/atms.yml index b80411d3a01..22f61efe91a 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/atms.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/atms.yml @@ -481,7 +481,7 @@ - key: enum.BankATMMenuUiKey.ATM type: StationBankATMMenuBoundUserInterface - type: AccessReader - access: [["HeadOfPersonnel"]] + access: [["HeadOfPersonnel"], ["HeadOfSecurity"]] - type: ItemSlots - type: ContainerContainer containers: From b2821874962d64898d1174df83492048f31e2471 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 29 Nov 2023 03:24:41 +0200 Subject: [PATCH 05/27] We Keep Going --- .../Locale/en-US/_NF/job/job-description.ftl | 2 +- Resources/Locale/en-US/_NF/nf-jobs.ftl | 2 -- .../_NF/Catalog/Fills/Lockers/suit_storage.yml | 18 ++++++++++++++++++ .../_NF/Roles/Jobs/Security/mercenary.yml | 10 +++++----- Resources/migration.yml | 9 ++++++++- 5 files changed, 32 insertions(+), 9 deletions(-) delete mode 100644 Resources/Locale/en-US/_NF/nf-jobs.ftl diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl index 974263b4e02..0ee7916ad72 100644 --- a/Resources/Locale/en-US/_NF/job/job-description.ftl +++ b/Resources/Locale/en-US/_NF/job/job-description.ftl @@ -1,2 +1,2 @@ -job-description-mercenary = Catch criminals and enemies of the corporation, enforce the law, and ensure that the sector does not fall into disarray. +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. diff --git a/Resources/Locale/en-US/_NF/nf-jobs.ftl b/Resources/Locale/en-US/_NF/nf-jobs.ftl deleted file mode 100644 index 92f48f35cd2..00000000000 --- a/Resources/Locale/en-US/_NF/nf-jobs.ftl +++ /dev/null @@ -1,2 +0,0 @@ -job-name-mercenary = Mercenary -job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law. \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml index f4b1ad65e6b..f9cd3968c3b 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml @@ -53,3 +53,21 @@ - id: HandheldGPSBasic - type: AccessReader # access: [["Quartermaster"]] + +#Mercenary hardsuit +- type: entity + id: SuitStorageMercenary + parent: SuitStorageBase + suffix: Mercenary + components: + - type: StorageFill + contents: + - id: NitrogenTankFilled + - id: OxygenTankFilled +# - id: ClothingOuterHardsuitMercenary + - id: ClothingMaskGasMercenary + - id: JetpackMiniFilled + - id: HandheldGPSBasic +# - id: ClothingShoesBootsMagMercenaryFilled # Frontier + - type: AccessReader + access: [["Mercenary"]] diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index 3179283016f..530a1a93c52 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -20,9 +20,9 @@ id: MercenaryGear equipment: jumpsuit: ClothingUniformJumpsuitMercenary - back: ClothingBackpackMercFilled - shoes: ClothingShoesBootsMercFilled - mask: ClothingMaskGasMerc + back: ClothingBackpackMercenaryFilled + shoes: ClothingShoesBootsMercenaryFilled + mask: ClothingMaskGasMercenary eyes: ClothingEyesGlassesMercenary gloves: ClothingHandsMercGlovesCombat head: ClothingHeadHatBeretMerc @@ -32,5 +32,5 @@ belt: ClothingBeltMercWebbing pocket1: WeaponPistolMk58Nonlethal innerClothingSkirt: ClothingUniformJumpsuitMercenary - satchel: ClothingBackpackMercFilled - duffelbag: ClothingBackpackMercFilled + satchel: ClothingSatchelMercenaryFilled + duffelbag: ClothingDuffelbagMercenaryFilled diff --git a/Resources/migration.yml b/Resources/migration.yml index 6c2fb582151..c1594acbd6b 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -166,4 +166,11 @@ APCBasicEmpImmune: APCBasic # 2023-11-11 # No need for a copy paste of the locker -LockerResearchDirectorShuttleFilled: LockerResearchDirectorFilled \ No newline at end of file +LockerResearchDirectorShuttleFilled: LockerResearchDirectorFilled + +# 2023-11-29 +# Merc to Mercenary +ClothingMaskGasMerc: ClothingMaskGasMercenary +ClothingBackpackMercFilled: ClothingBackpackMercenaryFilled +ClothingShoesBootsMerc: ClothingShoesBootsMercenary +ClothingShoesBootsMercFilled: ClothingShoesBootsMercenaryFilled \ No newline at end of file From ed39f23226c6b38f7cad7ddc659667a08fb6a30c Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 29 Nov 2023 03:34:30 +0200 Subject: [PATCH 06/27] Skirt Placeholder --- .../_NF/Entities/Clothing/Uniforms/jumpskirts.yml | 11 +++++++++++ .../Prototypes/_NF/Roles/Jobs/Security/mercenary.yml | 8 ++++---- Resources/migration.yml | 6 +++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml index abdd1eb660e..9dbc4386dd4 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml @@ -8,3 +8,14 @@ sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi - type: Clothing sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtMercenary + name: mercenary jumpskirt + description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index 530a1a93c52..400f195b9be 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -24,13 +24,13 @@ shoes: ClothingShoesBootsMercenaryFilled mask: ClothingMaskGasMercenary eyes: ClothingEyesGlassesMercenary - gloves: ClothingHandsMercGlovesCombat - head: ClothingHeadHatBeretMerc + gloves: ClothingHandsMercenaryGlovesCombat + head: ClothingHeadHatBeretMercenary outerClothing: ClothingOuterVestWebMerc id: MercenaryPDA ears: ClothingHeadsetGrey - belt: ClothingBeltMercWebbing + belt: ClothingBeltMercenaryWebbing pocket1: WeaponPistolMk58Nonlethal - innerClothingSkirt: ClothingUniformJumpsuitMercenary + innerClothingSkirt: ClothingUniformJumpskirtMercenary satchel: ClothingSatchelMercenaryFilled duffelbag: ClothingDuffelbagMercenaryFilled diff --git a/Resources/migration.yml b/Resources/migration.yml index c1594acbd6b..532d8171238 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -173,4 +173,8 @@ LockerResearchDirectorShuttleFilled: LockerResearchDirectorFilled ClothingMaskGasMerc: ClothingMaskGasMercenary ClothingBackpackMercFilled: ClothingBackpackMercenaryFilled ClothingShoesBootsMerc: ClothingShoesBootsMercenary -ClothingShoesBootsMercFilled: ClothingShoesBootsMercenaryFilled \ No newline at end of file +ClothingShoesBootsMercFilled: ClothingShoesBootsMercenaryFilled +ClothingHandsMercGlovesCombat: ClothingHandsMercenaryGlovesCombat +ClothingHeadHatBeretMerc: ClothingHeadHatBeretMercenary +ClothingOuterVestWebMerc: ClothingOuterVestWebMercenary +ClothingBeltMercWebbing: ClothingBeltMercenaryWebbing From ed0a893e7a5952e960c6066f5678ee792145ed1f Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 29 Nov 2023 03:46:17 +0200 Subject: [PATCH 07/27] Backpacks --- .../Prototypes/Entities/Clothing/Back/backpacks.yml | 2 +- .../Catalog/Fills/Backpacks/StarterGear/backpack.yml | 4 ++-- .../Fills/Backpacks/StarterGear/duffelbag.yml | 12 ++++++++++++ .../Catalog/Fills/Backpacks/StarterGear/satchel.yml | 12 ++++++++++++ .../Prototypes/_NF/Entities/Clothing/Back/duffel.yml | 9 +++++++++ .../_NF/Entities/Clothing/Back/satchel.yml | 9 +++++++++ .../Prototypes/_NF/Roles/Jobs/Security/mercenary.yml | 4 ++-- 7 files changed, 47 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 54c7f6b4f0a..7b8d8c7271e 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -179,7 +179,7 @@ - type: entity parent: ClothingBackpack - id: ClothingBackpackMerc + id: ClothingBackpackMercenary # Frontier - Merc to Mercenary name: mercenary bag description: A backpack that has been in many dangerous places, a reliable combat backpack. components: diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml index c277b7a2f65..317af5b1ca0 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -1,7 +1,7 @@ - type: entity noSpawn: true - parent: ClothingBackpackMerc - id: ClothingBackpackMercFilled + parent: ClothingBackpackMercenary + id: ClothingBackpackMercenaryFilled components: - type: StorageFill contents: diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 5d603525faa..1a2e4185b70 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -1,3 +1,15 @@ +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelMercenary + id: ClothingBackpackDuffelMercenaryFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: Lighter + - id: CigPackBlack + - id: Flash + - type: entity noSpawn: true parent: ClothingBackpackDuffel diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml index d78ecd674d1..b04a513a46a 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -1,3 +1,15 @@ +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelMercenary + id: ClothingBackpackSatchelMercenaryFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: Lighter + - id: CigPackBlack + - id: Flash + - type: entity noSpawn: true parent: ClothingBackpackSatchel diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml index 13ffd36b16e..cdfff87ea45 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml @@ -1,3 +1,12 @@ +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelMercenary # Frontier - Merc to Mercenary + name: mercenary duffel + description: A duffel that has been in many dangerous places, a reliable combat duffel. + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/merc.rsi + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelArcadia diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml index 7635fa37395..e53bdf9bd6f 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml @@ -1,3 +1,12 @@ +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelMercenary # Frontier - Merc to Mercenary + name: mercenary satchel + description: A satchel that has been in many dangerous places, a reliable combat satchel. + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/merc.rsi + - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelArcadia diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index 400f195b9be..8325d501931 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -32,5 +32,5 @@ belt: ClothingBeltMercenaryWebbing pocket1: WeaponPistolMk58Nonlethal innerClothingSkirt: ClothingUniformJumpskirtMercenary - satchel: ClothingSatchelMercenaryFilled - duffelbag: ClothingDuffelbagMercenaryFilled + satchel: ClothingBackpackSatchelMercenaryFilled + duffelbag: ClothingBackpackDuffelMercenaryFilled From 138428ffa12519511034f544737a6d6fa5569596 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 29 Nov 2023 03:57:01 +0200 Subject: [PATCH 08/27] Merc = Mercenary --- Resources/Prototypes/Catalog/Fills/Items/misc.yml | 5 ++--- Resources/Prototypes/Entities/Clothing/Belt/belts.yml | 2 +- Resources/Prototypes/Entities/Clothing/Hands/gloves.yml | 2 +- Resources/Prototypes/Entities/Clothing/Head/hats.yml | 2 +- Resources/Prototypes/Entities/Clothing/Masks/masks.yml | 2 +- .../Prototypes/Entities/Clothing/OuterClothing/vests.yml | 2 +- Resources/Prototypes/Entities/Clothing/Shoes/boots.yml | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml index 8f58df7ce5b..cb45a1a74bb 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml @@ -8,11 +8,10 @@ - id: CombatKnife - type: entity - id: ClothingShoesBootsMercFilled - parent: ClothingShoesBootsMerc + id: ClothingShoesBootsMercenaryFilled # Frontier - Merc to Mercenary + parent: ClothingShoesBootsMercenary suffix: Filled components: - type: StorageFill contents: - id: KukriKnife - diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 41867960a30..07a64e8354f 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -486,7 +486,7 @@ - type: entity parent: ClothingBeltStorageBase - id: ClothingBeltMercWebbing + id: ClothingBeltMercenaryWebbing # Frontier - Merc to Mercenary name: mercenary webbing description: Ideal for storing everything from ammo to weapons and combat essentials. components: diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index ddecf376e77..be4687e8d01 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -245,7 +245,7 @@ - type: entity parent: ClothingHandsGlovesCombat - id: ClothingHandsMercGlovesCombat + id: ClothingHandsMercenaryGlovesCombat # Frontier - Merc to Mercenary name: mercenary combat gloves description: High-quality combat gloves to protect hands from mechanical damage during combat. components: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 57b3b66001c..10eaa433893 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -124,7 +124,7 @@ - type: entity parent: ClothingHeadBase - id: ClothingHeadHatBeretMerc + id: ClothingHeadHatBeretMercenary # Frontier - Merc to Mercenary name: mercenary beret description: Olive beret, the badge depicts a jackal on a rock. components: diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 4909d6e3937..6986a70451c 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -300,7 +300,7 @@ - type: entity parent: ClothingMaskGasExplorer - id: ClothingMaskGasMerc + id: ClothingMaskGasMercenary # Frontier - Merc to Mercenary name: mercenary gas mask description: Slightly outdated, but reliable military-style gas mask. components: diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index dbba265020d..a3872cafd50 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -22,7 +22,7 @@ #Mercenary web vest - type: entity parent: ClothingOuterStorageBase #web vest so it should have some pockets for ammo - id: ClothingOuterVestWebMerc + id: ClothingOuterVestWebMercenary # Frontier - Merc to Mercenary name: mercenary web vest description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating. components: diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 912e4d8594d..9347f27d80d 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -69,7 +69,7 @@ - type: entity parent: ClothingShoesStorageBase - id: ClothingShoesBootsMerc + id: ClothingShoesBootsMercenary # Frontier - Merc to Mercenary name: mercenary boots description: Boots that have gone through many conflicts and that have proven their combat reliability. components: From 63f2f2687dbc07bdf4ea1c5d771d68afb9a25f44 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 29 Nov 2023 04:02:08 +0200 Subject: [PATCH 09/27] Update backpacks.yml --- Resources/Prototypes/Entities/Clothing/Back/backpacks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 7b8d8c7271e..ea261c5c82c 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -180,7 +180,7 @@ - type: entity parent: ClothingBackpack id: ClothingBackpackMercenary # Frontier - Merc to Mercenary - name: mercenary bag + name: mercenary backpack description: A backpack that has been in many dangerous places, a reliable combat backpack. components: - type: Sprite From 95a1a956a41c2e9b3b3388f68aac212a756f872f Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 30 Nov 2023 03:52:29 +0200 Subject: [PATCH 10/27] Missing Stuff --- .../Clothing/Head/hardsuit-helmets.yml | 25 -------- .../Entities/Clothing/Ears/headsets_alt.yml | 15 +++++ .../Clothing/Head/hardsuit-helmets.yml | 29 +++++++++ .../Clothing/OuterClothing/hardsuits.yml | 61 +++++++++++++++++++ .../Structures/Doors/Airlocks/access.yml | 21 ++++++- .../Structures/Doors/Airlocks/airlocks.yml | 18 ++++++ .../_NF/Roles/Jobs/Security/mercenary.yml | 3 +- Resources/Prototypes/_NF/Wires/layouts.yml | 3 + 8 files changed, 148 insertions(+), 27 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml create mode 100644 Resources/Prototypes/_NF/Wires/layouts.yml diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index ac6ef8be247..8d07dff55d2 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -153,31 +153,6 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - -#Security Patrol Hardsuit -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ClothingHeadHelmetHardsuitSecuritypatrol - noSpawn: true - name: security patrol hardsuit helmet - description: Lightly armored hardsuit helmet for security beat-cop needs. - components: - - type: Sprite - sprite: Clothing/Head/Hardsuits/security-patrol.rsi - - type: Clothing - sprite: Clothing/Head/Hardsuits/security-patrol.rsi - - type: PointLight - color: "#ffeead" - - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 10000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 #Brigmedic Hardsuit - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml index 422179a328a..889a4f941b3 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml @@ -13,3 +13,18 @@ sprite: Clothing/Ears/Headsets/security.rsi - type: Clothing sprite: Clothing/Ears/Headsets/security.rsi + +- type: entity + parent: ClothingHeadsetAlt + id: ClothingHeadsetAltMercenary + name: mercenary over-ear headset + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyCommon + - EncryptionKeyMedical + - type: Sprite + sprite: Clothing/Ears/Headsets/security.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/security.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml new file mode 100644 index 00000000000..82675786c75 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -0,0 +1,29 @@ +#When adding new hardsuits, please try to keep the organization consistent with hardsuit.yml (if possible.) + +#For now, since locational damage is not a thing, all "combat" hardsuits (with the exception of the deathsquad hardsuit) have the equvilent of a helmet in terms of armor. This is so people don't need to wear both regular, on-station helmets and hardsuits to get full protection. +#Generally, unless you're adding something like caustic damage, you should probably avoid messing with armor outside of the above scenario. + +#Mercenary Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitMercenary + noSpawn: true + name: mercenary hardsuit helmet + description: Lightly armored hardsuit helmet for mercenary needs. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/security-patrol.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/security-patrol.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml new file mode 100644 index 00000000000..24f3f008e15 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -0,0 +1,61 @@ +#Security Patrol Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitSecuritypatrol + name: security patrol hardsuit + description: A special suit that protects from the danger of space, employed by security patrol officers. Not certified to be blunderbuss proof. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 + Heat: 0.70 + Radiation: 0.70 + Caustic: 0.8 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.80 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitSecuritypatrol + +#Mercenary Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitMercenary + name: mercenary hardsuit + description: A special suit that protects from the danger of space, employed by mercenary forces. Not certified to be blunderbuss proof. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 +# - type: ExplosionResistance +# damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 + Heat: 0.70 + Radiation: 0.9 + Caustic: 0.9 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.80 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitMercenary diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml index 82fa304a941..a3fc2e3416d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml @@ -1,3 +1,4 @@ +# Airlocks - type: entity parent: AirlockCommand id: AirlockFrontierLocked @@ -16,4 +17,22 @@ - type: AccessReader access: [["Frontier"]] - type: Wires - layoutId: AirlockCommand \ No newline at end of file + layoutId: AirlockCommand + +- type: entity + parent: AirlockMercenary + id: AirlockMercenaryLocked + suffix: Mercenary, Locked + components: + - type: AccessReader + access: [["Mercenary"]] + - type: Wires + layoutId: AirlockMercenary + +- type: entity + parent: AirlockMercenaryGlass + id: AirlockMercenaryGlassLocked + suffix: Mercenary, Locked + components: + - type: AccessReader + access: [["Mercenary"]] diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml new file mode 100644 index 00000000000..e98d6fbe99f --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -0,0 +1,18 @@ +- type: entity + parent: Airlock + id: AirlockMercenary + suffix: Mercenary + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/security.rsi + +# Glass +- type: entity + parent: AirlockGlass + id: AirlockMercenaryGlass + suffix: Mercenary + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/security.rsi + - type: PaintableAirlock + group: Glass diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index 8325d501931..6dd1d4ce616 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -21,6 +21,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitMercenary back: ClothingBackpackMercenaryFilled +# shoes: ClothingShoesBootsMercenaryFilled shoes: ClothingShoesBootsMercenaryFilled mask: ClothingMaskGasMercenary eyes: ClothingEyesGlassesMercenary @@ -28,7 +29,7 @@ head: ClothingHeadHatBeretMercenary outerClothing: ClothingOuterVestWebMerc id: MercenaryPDA - ears: ClothingHeadsetGrey + ears: AirlockSecurityGlassLocked belt: ClothingBeltMercenaryWebbing pocket1: WeaponPistolMk58Nonlethal innerClothingSkirt: ClothingUniformJumpskirtMercenary diff --git a/Resources/Prototypes/_NF/Wires/layouts.yml b/Resources/Prototypes/_NF/Wires/layouts.yml new file mode 100644 index 00000000000..c461fe13a8d --- /dev/null +++ b/Resources/Prototypes/_NF/Wires/layouts.yml @@ -0,0 +1,3 @@ +- type: wireLayout + parent: Airlock + id: AirlockMercenary From 62ebe5f5bd27754400434fe675bcb43c2f9b1a62 Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 30 Nov 2023 03:54:17 +0200 Subject: [PATCH 11/27] Update hardsuit-helmets.yml --- .../Clothing/Head/hardsuit-helmets.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml index 82675786c75..e883a1a7fe7 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -3,6 +3,31 @@ #For now, since locational damage is not a thing, all "combat" hardsuits (with the exception of the deathsquad hardsuit) have the equvilent of a helmet in terms of armor. This is so people don't need to wear both regular, on-station helmets and hardsuits to get full protection. #Generally, unless you're adding something like caustic damage, you should probably avoid messing with armor outside of the above scenario. +#Security Patrol Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitSecuritypatrol + noSpawn: true + name: security patrol hardsuit helmet + description: Lightly armored hardsuit helmet for security beat-cop needs. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/security-patrol.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/security-patrol.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + #Mercenary Hardsuit - type: entity parent: ClothingHeadHardsuitWithLightBase From dde625a146555df6cadba83516d187dcdc997715 Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 30 Nov 2023 03:56:09 +0200 Subject: [PATCH 12/27] Update hardsuits.yml --- .../Clothing/OuterClothing/hardsuits.yml | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 4886bff0bf1..f60a9f4d065 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -186,37 +186,6 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSecurity -#Security Patrol Hardsuit NF14 -- type: entity - parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitSecuritypatrol - name: security patrol hardsuit - description: A special suit that protects from the danger of space, employed by security patrol officers. Not certified to be blunderbuss proof. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi - - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 10000 - - type: ExplosionResistance - damageCoefficient: 0.5 - - type: Armor - modifiers: - coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.65 - Heat: 0.70 - Radiation: 0.70 - Caustic: 0.8 - - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.80 - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitSecuritypatrol - #Brigmedic Hardsuit - type: entity parent: ClothingOuterHardsuitBase From 4745f6e27c985372da6f515cd9f6ed94d25cfcc1 Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 30 Nov 2023 04:04:29 +0200 Subject: [PATCH 13/27] Mags --- .../_NF/Catalog/Fills/Items/misc.yml | 9 +++++++ .../_NF/Entities/Clothing/Shoes/magboots.yml | 25 ++++++++++++++++++- .../_NF/Roles/Jobs/Security/mercenary.yml | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml index 5755ad6305d..a52c245e197 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml @@ -7,6 +7,15 @@ contents: - id: CombatKnife +- type: entity + id: ClothingShoesBootsMagMercenaryFilled + parent: ClothingShoesBootsMagMercenary + suffix: Filled + components: + - type: StorageFill + contents: + - id: KukriKnife + - type: entity id: ClothingShoesBootsMagPirateFilled parent: ClothingShoesBootsMagPirate diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml index 9dc2288c389..2bc69bf3c2c 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml @@ -38,6 +38,20 @@ - key: enum.StorageUiKey.Key type: StorageBoundUserInterface +- type: entity + parent: ClothingShoesBootsMagCombat + id: ClothingShoesBootsMagMercenary + name: mercenary magboots + description: mercenary 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: ActionToggleMagbootsMercenary + - type: entity parent: ClothingShoesBootsMagCombat id: ClothingShoesBootsMagPirate @@ -62,10 +76,19 @@ iconOn: _NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png - type: entity - id: ActionToggleMagbootsPirate + id: ActionToggleMagbootsMercenary parent: ActionBaseToggleMagboots noSpawn: true components: - type: InstantAction icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi, state: icon } iconOn: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png + +- type: entity + id: ActionToggleMagbootsPirate + parent: ActionBaseToggleMagboots + noSpawn: true + components: + - type: InstantAction + icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi, state: icon } + iconOn: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index 6dd1d4ce616..fdd5a56c511 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -22,7 +22,7 @@ jumpsuit: ClothingUniformJumpsuitMercenary back: ClothingBackpackMercenaryFilled # shoes: ClothingShoesBootsMercenaryFilled - shoes: ClothingShoesBootsMercenaryFilled + shoes: ClothingShoesBootsMagMercenaryFilled # Give this only to new spawns mask: ClothingMaskGasMercenary eyes: ClothingEyesGlassesMercenary gloves: ClothingHandsMercenaryGlovesCombat From f69584558d3c858fad009a732689bfbfcb94146e Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 2 Dec 2023 02:06:03 +0200 Subject: [PATCH 14/27] Fixing --- .../Catalog/Fills/Lockers/suit_storage.yml | 4 ++-- .../Clothing/OuterClothing/hardsuits.yml | 24 +++++++++---------- .../_NF/Entities/Clothing/Shoes/magboots.yml | 4 ++-- .../_NF/Roles/Jobs/Security/mercenary.yml | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml index f9cd3968c3b..59452eb97c4 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml @@ -64,10 +64,10 @@ contents: - id: NitrogenTankFilled - id: OxygenTankFilled -# - id: ClothingOuterHardsuitMercenary + - id: ClothingOuterHardsuitMercenary - id: ClothingMaskGasMercenary - id: JetpackMiniFilled - id: HandheldGPSBasic -# - id: ClothingShoesBootsMagMercenaryFilled # Frontier +# - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn. - type: AccessReader access: [["Mercenary"]] diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index 24f3f008e15..31901749c04 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -32,7 +32,7 @@ #Mercenary Hardsuit - type: entity parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitMercenary + id: ClothingOuterHardsuitMercenary # stats are of luxury mining hardsuit name: mercenary hardsuit description: A special suit that protects from the danger of space, employed by mercenary forces. Not certified to be blunderbuss proof. components: @@ -41,21 +41,21 @@ - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 10000 -# - type: ExplosionResistance -# damageCoefficient: 0.5 + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.6 # Removed 10% - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.65 - Heat: 0.70 - Radiation: 0.9 - Caustic: 0.9 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.8 + Heat: 0.9 # Added 10% + Radiation: 0.5 + Caustic: 0.8 - type: ClothingSpeedModifier walkModifier: 0.85 - sprintModifier: 0.80 + sprintModifier: 0.9 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitMercenary diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml index 2bc69bf3c2c..8fbc645176a 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml @@ -81,8 +81,8 @@ noSpawn: true components: - type: InstantAction - icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi, state: icon } - iconOn: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png + 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 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index fdd5a56c511..e829269eed8 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -27,9 +27,9 @@ eyes: ClothingEyesGlassesMercenary gloves: ClothingHandsMercenaryGlovesCombat head: ClothingHeadHatBeretMercenary - outerClothing: ClothingOuterVestWebMerc + outerClothing: ClothingOuterVestWebMercenary id: MercenaryPDA - ears: AirlockSecurityGlassLocked + ears: ClothingHeadsetAltMercenary belt: ClothingBeltMercenaryWebbing pocket1: WeaponPistolMk58Nonlethal innerClothingSkirt: ClothingUniformJumpskirtMercenary From cbaf92ec173535be621582cca9ab8ba5c68ae7f3 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 2 Dec 2023 03:22:59 +0200 Subject: [PATCH 15/27] Lockers + Suit changes --- .../Entities/Clothing/OuterClothing/vests.yml | 11 ++++---- .../Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- .../Entities/Objects/Devices/pinpointer.yml | 4 ++- .../Weapons/Guns/Battery/battery_guns.yml | 4 ++- .../_NF/Catalog/Fills/Lockers/security.yml | 26 +++++++++++++++++++ .../Objects/Tools/handheld_mass_scanner.yml | 6 +++-- 6 files changed, 43 insertions(+), 10 deletions(-) rename Resources/Prototypes/{ => _NF}/Entities/Objects/Tools/handheld_mass_scanner.yml (94%) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index a3872cafd50..8fcf43be654 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -33,12 +33,13 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 #slightly better overall protection but slightly worse than bulletproof armor against bullets seems sensible - Slash: 0.7 - Piercing: 0.5 - Heat: 0.9 + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. + Heat: 0.80 + Caustic: 0.9 - type: ExplosionResistance - damageCoefficient: 0.9 + damageCoefficient: 0.90 #Detective's vest - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index a0e0ea3e15e..c7269763154 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -953,7 +953,7 @@ mode: SensorOff - type: entity - parent: UnsensoredClothingUniformBase + parent: ClothingUniformBase id: ClothingUniformJumpsuitMercenary name: mercenary jumpsuit description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned. diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml index 01a1a8b6fea..2d41ab587a3 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml @@ -65,7 +65,9 @@ shader: unshaded visible: false - type: StaticPrice - price: 150 + price: 20 + - type: VendPrice + price: 1500 - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index aa5a6ee5082..1def71f5749 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -317,8 +317,10 @@ - type: GuideHelp guides: - Security + - type: VendPrice + price: 8000 - type: StaticPrice - price: 800 + price: 190 - type: entity name: practice disabler diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml index 147241c1f66..4cbff825853 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml @@ -70,3 +70,29 @@ - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse prob: 0.15 - id: CrowbarRed + +- type: entity + id: LockerMercenaryFilled + suffix: Filled + parent: LockerMercenary + components: + - type: StorageFill + contents: + - id: PinpointerUniversal + - id: HandHeldMassScanner + - id: WeaponGrapplingGun + - id: BoxZiptie + +- type: entity + parent: GunSafe + id: GunSafeShotgunDoubleBarreled + name: double barreled shotgun safe + suffix: Ship + components: + - type: StorageFill + contents: + - id: WeaponShotgunDoubleBarreledRubber + amount: 2 + - id: BoxBeanbag + - type: AccessReader + access: [["Captain"], ["Mercenary"]] diff --git a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml similarity index 94% rename from Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml rename to Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml index 8273bef0b30..d132701d415 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml @@ -5,7 +5,7 @@ description: A hand-held mass scanner. components: - type: Item - size: 20 + size: 10 - type: Sprite sprite: Objects/Tools/handheld_mass_scanner.rsi state: icon @@ -37,4 +37,6 @@ - key: enum.RadarConsoleUiKey.Key type: RadarConsoleBoundUserInterface - type: StaticPrice - price: 500 + price: 20 + - type: VendPrice + price: 5000 From d0c50ab18cf01b2a3afd5ba78e830557c3567f96 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 2 Dec 2023 03:50:11 +0200 Subject: [PATCH 16/27] Air Tanks --- .../Catalog/Fills/Lockers/cargo.yml | 5 +- .../Catalog/Fills/Lockers/engineer.yml | 10 +- .../Catalog/Fills/Lockers/heads.yml | 25 ++-- .../Catalog/Fills/Lockers/security.yml | 5 +- .../Catalog/Fills/Lockers/suit_storage.yml | 115 +++++++++++------- .../_NF/Catalog/Fills/Lockers/heads.yml | 5 +- .../_NF/Catalog/Fills/Lockers/security.yml | 5 +- .../Catalog/Fills/Lockers/suit_storage.yml | 30 +++-- .../Storage/Closets/Lockers/lockers.yml | 2 +- 9 files changed, 120 insertions(+), 82 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 9fdf7332b9a..6ce5d0204db 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -6,8 +6,9 @@ - type: StorageFill contents: - id: ClothingOuterHardsuitSpatio - - id: YellowOxygenTankFilled - - id: NitrogenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingShoesBootsMag - id: ClothingMaskGasExplorer # Currently do not function as 'true' mesons, so they're useless for salvagers. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index ffb0eb6c62b..a1a2d3a328a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -82,8 +82,9 @@ contents: - id: ClothingOuterHardsuitAtmos - id: ClothingMaskGasAtmos - - id: YellowOxygenTankFilled - - id: NitrogenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterSuitAtmosFire - id: ClothingHeadHelmetAtmosFire - id: GasAnalyzer @@ -125,8 +126,9 @@ - id: ClothingOuterHardsuitEngineering - id: ClothingHandsGlovesColorYellow - id: ClothingMaskGas - - id: OxygenTankFilled - - id: NitrogenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingShoesBootsMag - id: trayScanner # Frontier - id: JetpackMiniFilled # Frontier diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index e2394a86f9f..0a32a8bb5fb 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -64,8 +64,9 @@ - id: ClothingHeadHatCapcap - id: ClothingNeckMantleCap # Frontier - id: DrinkFlask # Frontier - - id: OxygenTankFilled # Frontier - - id: NitrogenTankFilled # Frontier +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: JetpackMiniFilled # Frontier - id: HandheldGPSBasic # Frontier @@ -154,8 +155,9 @@ - id: ClothingMaskBreath # - id: ClothingUniformJumpsuitChiefEngineerTurtle # - id: ClothingUniformJumpskirtChiefEngineerTurtle - - id: OxygenTankFilled - - id: NitrogenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled # - id: ClothingNeckCloakCe - id: ClothingEyesGlassesMeson # - id: ClothingBeltChiefEngineerFilled # Frontier @@ -225,8 +227,9 @@ - id: MaterialBiomass amount: 1 # Frontier - 3<1 # - id: BoxEncryptionKeyMedical # Frontier - bloat - - id: NitrogenTankFilled # Frontier - - id: OxygenTankFilled # Frontier +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingMaskBreathMedical # Frontier - id: JetpackMiniFilled # Frontier - id: HandheldGPSBasic # Frontier @@ -279,8 +282,9 @@ # - id: BoxEncryptionKeyScience # - id: BoxEncryptionKeyRobo # Frontier - id: ClothingBeltUtilityEngineering # Frontier - - id: NitrogenTankFilled # Frontier - - id: OxygenTankFilled # Frontier +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingMaskBreath # Frontier - id: JetpackMiniFilled # Frontier - id: HandheldGPSBasic # Frontier @@ -339,8 +343,9 @@ - id: HoloprojectorSecurity - id: ClothingNeckMantleHOS # Frontier - id: CrowbarRed # Frontier - - id: NitrogenTankFilled # Frontier - - id: OxygenTankFilled # Frontier +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: JetpackSecurityFilled # Frontier - id: HandheldGPSBasic # Frontier - id: ClothingShoesBootsMagCombatFilled # Frontier diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 95ac0e5e975..a6df154ba44 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -23,8 +23,9 @@ - id: HoloprojectorSecurity - id: ClothingEyesHudSecurity - id: CrowbarRed # Frontier - - id: NitrogenTankFilled # Frontier - - id: OxygenTankFilled # Frontier +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingMaskGasSecurity # Frontier - id: JetpackSecurityFilled # Frontier - id: HandheldGPSBasic # Frontier diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 62139b378f8..a79bfe1c2fa 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -7,8 +7,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitEVA - id: ClothingHeadHelmetEVA - id: ClothingMaskBreath @@ -23,8 +24,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitEVA - id: ClothingHeadHelmetEVALarge - id: ClothingMaskBreath @@ -39,8 +41,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterSuitEmergency - id: ClothingMaskBreath - id: JetpackMiniFilled # Frontier @@ -54,8 +57,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitEVAPrisoner - id: ClothingHeadHelmetEVALarge - id: ClothingMaskBreath @@ -68,8 +72,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitSyndicate - id: ClothingHeadHelmetSyndicate - id: ClothingMaskGasSyndicate @@ -84,8 +89,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitPirateEVA - id: ClothingMaskGas - id: JetpackBlackFilled # Frontier @@ -100,7 +106,10 @@ components: - type: StorageFill contents: - - id: JetpackVoidFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled +# - id: JetpackVoidFilled # Frontier - id: ClothingOuterHardsuitAncientEVA - id: ClothingHeadHelmetAncient - id: ClothingMaskBreath @@ -116,8 +125,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitBasic - id: ClothingMaskBreath - id: JetpackMiniFilled # Frontier @@ -131,8 +141,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingShoesBootsMag - id: ClothingOuterHardsuitEngineering - id: ClothingMaskBreath @@ -149,8 +160,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitAtmos - id: ClothingMaskBreath - id: JetpackMiniFilled # Frontier @@ -166,8 +178,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitSecurity orGroup: HardsuitSecurity - id: ClothingOuterHardsuitSecuritypatrol # Frontier - 50% to get the patrol suit @@ -187,8 +200,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled # - id: JetpackVoidFilled # Frontier # - id: ClothingShoesBootsMagAdv # Frontier - id: ClothingShoesBootsMag # Frontier @@ -207,8 +221,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitMedical - id: ClothingMaskBreathMedical - id: JetpackMiniFilled # Frontier @@ -224,8 +239,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitRd - id: ClothingMaskBreath - id: JetpackMiniFilled # Frontier @@ -241,8 +257,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: JetpackSecurityFilled - id: ClothingOuterHardsuitSecurityRed - id: ClothingMaskGasSwat @@ -259,8 +276,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitWarden - id: ClothingMaskBreath - id: JetpackSecurityFilled # Frontier @@ -277,8 +295,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitCap - id: ClothingMaskGasCaptain - id: JetpackMiniFilled # Frontier @@ -294,13 +313,14 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: YellowOxygenTankFilled - - id: ClothingShoesBootsMag - - id: ClothingOuterHardsuitSpatio - - id: ClothingMaskGasExplorer - - id: JetpackMiniFilled # Frontier - - id: HandheldGPSBasic # Frontier +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingShoesBootsMag + - id: ClothingOuterHardsuitSpatio + - id: ClothingMaskGasExplorer + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier - type: AccessReader # access: [["Salvage"]] # Frontier @@ -312,8 +332,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitSyndie - id: ClothingShoesBootsMagSyndie - id: ClothingMaskGasSyndicate @@ -328,8 +349,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitPirateCap - id: ClothingMaskGas - id: ClothingNeckCloakPirateCap # Frontier @@ -346,8 +368,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitWizard - id: ClothingMaskBreath - id: JetpackBlackFilled # Frontier diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml index da9a8e06aff..f56b6e6094d 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml @@ -25,7 +25,8 @@ - id: ClothingHeadsetAltCargo # - id: BoxEncryptionKeyCargo # Frontier - id: ClothingBeltUtilityEngineering # Frontier - - id: OxygenTankFilled # Frontier - - id: NitrogenTankFilled # Frontier +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingMaskGasExplorer # Frontier - id: ClothingOuterHardsuitLuxury # Frontier diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml index 4cbff825853..b30f5b5cd6f 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml @@ -31,8 +31,9 @@ - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse prob: 0.15 - id: CrowbarRed # Frontier - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingMaskBreathMedicalSecurity - id: JetpackSecurityFilled - id: HandheldGPSBasic diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml index 59452eb97c4..090438bc77e 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml @@ -7,8 +7,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingHeadHelmetVoidParamed - id: ClothingOuterHardsuitVoidParamed - id: ClothingMaskBreathMedical @@ -26,8 +27,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitBrigmedic - id: ClothingMaskBreathMedicalSecurity - id: JetpackSecurityFilled @@ -44,13 +46,14 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: YellowOxygenTankFilled - - id: ClothingShoesBootsMag - - id: ClothingOuterHardsuitLuxury - - id: ClothingMaskGasExplorer - - id: JetpackMiniFilled - - id: HandheldGPSBasic +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingShoesBootsMag + - id: ClothingOuterHardsuitLuxury + - id: ClothingMaskGasExplorer + - id: JetpackMiniFilled + - id: HandheldGPSBasic - type: AccessReader # access: [["Quartermaster"]] @@ -62,8 +65,9 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled - id: ClothingOuterHardsuitMercenary - id: ClothingMaskGasMercenary - id: JetpackMiniFilled diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 630a170c812..a010c0b6528 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -10,4 +10,4 @@ stateDoorOpen: sec_open stateDoorClosed: sec_door - type: AccessReader - access: [["Mercenary"]] + access: [["Captain"], ["Mercenary"]] From 084f085e617a770279beb0c1b1350091ce643ef5 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 2 Dec 2023 04:07:29 +0200 Subject: [PATCH 17/27] Fix --- .../Prototypes/Entities/Markers/Spawners/Random/maintenance.yml | 2 +- Resources/Prototypes/Entities/Objects/Decoration/present.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 1d61ca9c7d9..98bb693eb8c 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -41,7 +41,7 @@ - ClothingHandsGlovesNitrile - ClothingHandsGlovesPowerglove - ClothingHeadHatAnimalHeadslime - - ClothingHeadHatBeretMerc + - ClothingHeadHatBeretMercenary # Frontier - Name fix - ClothingHeadHatOutlawHat - ClothingHeadHatUshanka - ClothingHeadHatBunny diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 14a1dfbb5eb..2bfd5c6b93b 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -298,7 +298,7 @@ orGroup: GiftPool - id: ClothingOuterHoodieGrey orGroup: GiftPool - - id: ClothingOuterVestWebMerc + - id: ClothingOuterVestWebMercenary # Frontier - Name fix orGroup: GiftPool - id: ClothingShoesFlippers orGroup: GiftPool From 03420b39662eea0a3dd4a852de6255bb3b14c405 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 2 Dec 2023 04:11:45 +0200 Subject: [PATCH 18/27] Helmet --- Resources/Prototypes/Entities/Clothing/Head/helmets.yml | 2 +- Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml | 3 ++- Resources/migration.yml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 53d24b092ab..553382c633c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -26,7 +26,7 @@ #Mercenary Helmet - type: entity parent: ClothingHeadHelmetBasic - id: ClothingHeadHelmetMerc + id: ClothingHeadHelmetMercenary name: mercenary helmet description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle. components: diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index e829269eed8..0f75626a01c 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -26,7 +26,8 @@ mask: ClothingMaskGasMercenary eyes: ClothingEyesGlassesMercenary gloves: ClothingHandsMercenaryGlovesCombat - head: ClothingHeadHatBeretMercenary +# head: ClothingHeadHatBeretMercenary + head: ClothingHeadHelmetMercenary outerClothing: ClothingOuterVestWebMercenary id: MercenaryPDA ears: ClothingHeadsetAltMercenary diff --git a/Resources/migration.yml b/Resources/migration.yml index 532d8171238..2b0bb362e40 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -178,3 +178,4 @@ ClothingHandsMercGlovesCombat: ClothingHandsMercenaryGlovesCombat ClothingHeadHatBeretMerc: ClothingHeadHatBeretMercenary ClothingOuterVestWebMerc: ClothingOuterVestWebMercenary ClothingBeltMercWebbing: ClothingBeltMercenaryWebbing +ClothingHeadHelmetMerc: ClothingHeadHelmetMercenary From d39a6315a48eb33c66f6267fd56960eedd077029 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 2 Dec 2023 04:22:13 +0200 Subject: [PATCH 19/27] Vend --- .../Entities/Clothing/Head/bandanas.yml | 2 +- .../Entities/Clothing/Head/helmets.yml | 2 +- .../VendingMachines/Inventories/bountyvend.yml | 18 +++++++++++++++++- Resources/migration.yml | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml index 1d1d5878602..1b362065b99 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml @@ -93,7 +93,7 @@ - type: entity parent: ClothingHeadBaseButcherable - id: ClothingHeadBandMerc + id: ClothingHeadBandMercenary # Frontier - Name fix name: mercenary bandana description: To protect the head from the sun, insects and other dangers of the higher path. components: diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 553382c633c..4dbc092a43a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -26,7 +26,7 @@ #Mercenary Helmet - type: entity parent: ClothingHeadHelmetBasic - id: ClothingHeadHelmetMercenary + id: ClothingHeadHelmetMercenary # Frontier - Name fix name: mercenary helmet description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle. components: diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml index b7a28af0799..27be99ca973 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml @@ -9,4 +9,20 @@ Zipties: 20 Flash: 15 ClothingEyesGlassesSunglasses: 12 - ClothingHeadHatHoshat: 4 + ClothingBackpackMercenary: 3 + ClothingBackpackSatchelMercenary: 3 + ClothingBackpackDuffelMercenary: 3 + ClothingUniformJumpsuitMercenary: 3 + ClothingUniformJumpskirtMercenary: 3 + ClothingShoesBootsMercenary: 3 + ClothingHeadHatHoshat: 3 + ClothingHeadBandMercenary: 3 + ClothingHeadHatBeretMercenary: 3 + ClothingHeadHelmetMercenary: 3 + ClothingOuterVestWebMercenary: 3 + ClothingMaskGasMercenary: 3 + ClothingEyesGlassesMercenary: 3 + ClothingBeltMercenaryWebbing: 3 + ClothingHandsGlovesMercFingerless: 3 + ClothingHandsMercenaryGlovesCombat: 3 + ClothingHeadsetAltMercenary: 3 diff --git a/Resources/migration.yml b/Resources/migration.yml index 2b0bb362e40..908a57fd23d 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -179,3 +179,4 @@ ClothingHeadHatBeretMerc: ClothingHeadHatBeretMercenary ClothingOuterVestWebMerc: ClothingOuterVestWebMercenary ClothingBeltMercWebbing: ClothingBeltMercenaryWebbing ClothingHeadHelmetMerc: ClothingHeadHelmetMercenary +ClothingHeadBandMerc: ClothingHeadBandMercenary From 253b81ab6f9e7dbadef2563c1aa6c214e79ce540 Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 5 Dec 2023 23:31:51 +0200 Subject: [PATCH 20/27] bounty hunter's look --- .../_NF/Entities/Clothing/Head/hats.yml | 5 +++++ .../_NF/Entities/Clothing/OuterClothing/coats.yml | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml new file mode 100644 index 00000000000..2b387e73a24 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml @@ -0,0 +1,5 @@ +- type: entity + parent: ClothingHeadHatHoshat + id: ClothingHeadHatBH + name: "bounty hunter's hat" + description: "There's a new bounty hunter in the sector." diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml new file mode 100644 index 00000000000..bd59dc63e24 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml @@ -0,0 +1,15 @@ +- type: entity + parent: ClothingOuterCoatHoSTrench + id: ClothingOuterCoatBHTrench + name: "bounty hunter's flak trenchcoat" + description: A greatcoat enhanced with a bullet proof alloy for some extra protection and style for those with a charismatic presence. + components: + - type: Armor # ClothingOuterArmorBulletproof stats + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.4 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.80 From 488365f3d5a89fd683603b1ad0a8a1a8e08fc92b Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 6 Dec 2023 00:01:11 +0200 Subject: [PATCH 21/27] bounty hunter --- .../VendingMachines/Inventories/bountyvend.yml | 7 ++++++- .../_NF/Entities/Clothing/Uniforms/jumpskirts.yml | 6 ++++++ .../_NF/Entities/Clothing/Uniforms/jumpsuits.yml | 6 ++++++ .../Catalog/Fills/Vending/Inventories/repdrobe.yml | 12 ++++++------ 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml index 27be99ca973..e7e44ac497b 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml @@ -9,13 +9,18 @@ Zipties: 20 Flash: 15 ClothingEyesGlassesSunglasses: 12 +#Bounty hunter + ClothingUniformJumpsuitBH: 3 + ClothingUniformJumpskirtBH: 3 + ClothingOuterCoatBHTrench: 3 + ClothingHeadHatBH: 3 +#Mercenary ClothingBackpackMercenary: 3 ClothingBackpackSatchelMercenary: 3 ClothingBackpackDuffelMercenary: 3 ClothingUniformJumpsuitMercenary: 3 ClothingUniformJumpskirtMercenary: 3 ClothingShoesBootsMercenary: 3 - ClothingHeadHatHoshat: 3 ClothingHeadBandMercenary: 3 ClothingHeadHatBeretMercenary: 3 ClothingHeadHelmetMercenary: 3 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml index 9dbc4386dd4..474b88c29f1 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml @@ -9,6 +9,12 @@ - type: Clothing sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi +- type: entity + parent: ClothingUniformJumpskirtDetective + id: ClothingUniformJumpskirtBH + name: bounty hunter's hard-worn suit + description: Someone who wears this means business. + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtMercenary diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index 9022676028f..8fb9aa5ce58 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -8,3 +8,9 @@ sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi - type: Clothing sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi + +- type: entity + parent: ClothingUniformJumpsuitDetective + id: ClothingUniformJumpsuitBH + name: bounty hunter's hard-worn suit + description: Someone who wears this means business. diff --git a/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml b/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml index 3a5de9711df..7f60cf006cd 100644 --- a/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml +++ b/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml @@ -2,16 +2,16 @@ id: RepDrobeInventory startingInventory: ClothingUniformJumpsuitReporter: 2 - ClothingUniformJumpsuitDetective: 2 - ClothingUniformJumpskirtDetective: 2 +# ClothingUniformJumpsuitDetective: 2 # Frontier - Detective gear, need to replace this. +# ClothingUniformJumpskirtDetective: 2 # Frontier - Detective gear, need to replace this. ClothingShoesColorBrown: 2 ClothingShoesColorBlack: 2 ClothingShoesColorWhite: 2 - ClothingOuterVestDetective: 2 +# ClothingOuterVestDetective: 2 # Frontier - Detective gear, need to replace this. ClothingHeadHatFedoraBrown: 2 - ClothingUniformJumpsuitDetectiveGrey: 2 - ClothingUniformJumpskirtDetectiveGrey: 2 - ClothingNeckTieDet: 2 +# ClothingUniformJumpsuitDetectiveGrey: 2 # Frontier - Detective gear, need to replace this. +# ClothingUniformJumpskirtDetectiveGrey: 2 # Frontier - Detective gear, need to replace this. +# ClothingNeckTieDet: 2 # Frontier - Detective gear, need to replace this. ClothingHeadHatFedoraGrey: 2 ClothingHandsGlovesColorBlack: 2 RadioHandheld: 2 From e1c3d498d19bec2fd88db844d308a7fbdd6cd27e Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 6 Dec 2023 00:06:01 +0200 Subject: [PATCH 22/27] Update security.yml --- .../_NF/Catalog/Fills/Lockers/security.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml index d71d16b715d..7a1498ce24c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml @@ -83,17 +83,3 @@ - id: HandHeldMassScanner - id: WeaponGrapplingGun - id: BoxZiptie - -- type: entity - parent: GunSafe - id: GunSafeShotgunDoubleBarreled - name: double barreled shotgun safe - suffix: Ship - components: - - type: StorageFill - contents: - - id: WeaponShotgunDoubleBarreledRubber - amount: 2 - - id: BoxBeanbag - - type: AccessReader - access: [["Captain"], ["Mercenary"]] From b1afb437980315818aeff94cdce1923255c62b64 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 6 Dec 2023 00:10:21 +0200 Subject: [PATCH 23/27] Update pinpointer.yml --- .../Prototypes/Entities/Objects/Devices/pinpointer.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml index 2d41ab587a3..f5a2f951e57 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml @@ -64,11 +64,8 @@ map: ["enum.PinpointerLayers.Screen"] shader: unshaded visible: false - - type: StaticPrice - price: 20 - - type: VendPrice - price: 1500 - + - type: StaticPrice # Frontier + price: 150 - type: entity parent: PinpointerBase From 7b435fb9f607c4b05f2c8fde3c6e66ab8a7d8090 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 9 Dec 2023 16:18:48 +0200 Subject: [PATCH 24/27] Update battery_guns.yml --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 1def71f5749..f59af15bfd6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -317,10 +317,6 @@ - type: GuideHelp guides: - Security - - type: VendPrice - price: 8000 - - type: StaticPrice - price: 190 - type: entity name: practice disabler From fa095718c3044a95a58200e6a732f98a3e13c012 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 10 Dec 2023 20:26:50 +0200 Subject: [PATCH 25/27] Update job.yml --- Resources/Prototypes/_NF/StatusEffects/job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/StatusEffects/job.yml b/Resources/Prototypes/_NF/StatusEffects/job.yml index 8df5c354736..da51ee1509f 100644 --- a/Resources/Prototypes/_NF/StatusEffects/job.yml +++ b/Resources/Prototypes/_NF/StatusEffects/job.yml @@ -9,8 +9,8 @@ parent: JobIcon id: JobIconMercenary icon: - sprite: Interface/Misc/job_icons.rsi - state: SeniorOfficer + sprite: _NF/Interface/Misc/job_icons.rsi + state: Mercenary - type: statusIcon parent: JobIcon From bec1ee09785cca15591fb36bd88b7a727d39a87c Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 10 Dec 2023 23:01:33 +0200 Subject: [PATCH 26/27] Texture fix --- .../_NF/Entities/Clothing/Back/duffel.yml | 2 +- .../_NF/Entities/Clothing/Back/satchel.yml | 2 +- .../Entities/Clothing/Ears/headsets_alt.yml | 4 +- .../Clothing/Head/hardsuit-helmets.yml | 4 +- .../Clothing/OuterClothing/hardsuits.yml | 4 +- .../_NF/Entities/Clothing/Shoes/magboots.yml | 8 +-- .../Entities/Clothing/Uniforms/jumpskirts.yml | 5 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 1 + .../Devices/Misc/identification_cards.yml | 11 ++-- .../_NF/Entities/Objects/Devices/pda.yml | 21 ++++++-- .../Structures/Doors/Airlocks/airlocks.yml | 4 +- .../Storage/Closets/Lockers/lockers.yml | 20 +++++-- .../mercenary.rsi/alt-equipped-EARS.png} | Bin .../mercenary.rsi/icon_alt.png} | Bin .../{ => Headsets}/mercenary.rsi/meta.json | 4 +- .../Structures/Storage/closet.rsi/generic.png | Bin 0 -> 215 bytes .../Storage/closet.rsi/generic_door.png | Bin 0 -> 206 bytes .../Structures/Storage/closet.rsi/locked.png | Bin 0 -> 127 bytes .../Structures/Storage/closet.rsi/meta.json | 50 ++++++++++++------ .../Storage/closet.rsi/unlocked.png | Bin 0 -> 127 bytes .../Structures/Storage/closet.rsi/welded.png | Bin 0 -> 206 bytes 21 files changed, 95 insertions(+), 45 deletions(-) rename Resources/Textures/_NF/Clothing/Ears/{mercenary.rsi/equipped-EARS.png => Headsets/mercenary.rsi/alt-equipped-EARS.png} (100%) rename Resources/Textures/_NF/Clothing/Ears/{mercenary.rsi/icon.png => Headsets/mercenary.rsi/icon_alt.png} (100%) rename Resources/Textures/_NF/Clothing/Ears/{ => Headsets}/mercenary.rsi/meta.json (85%) create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/generic.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_door.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/locked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/unlocked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/welded.png diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml index cdfff87ea45..ce0dfcbda44 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml @@ -5,7 +5,7 @@ description: A duffel that has been in many dangerous places, a reliable combat duffel. components: - type: Sprite - sprite: Clothing/Back/Backpacks/merc.rsi + sprite: _NF/Clothing/Back/Duffels/mercenary.rsi - type: entity parent: ClothingBackpackDuffel diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml index e53bdf9bd6f..b0953218143 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml @@ -5,7 +5,7 @@ description: A satchel that has been in many dangerous places, a reliable combat satchel. components: - type: Sprite - sprite: Clothing/Back/Backpacks/merc.rsi + sprite: _NF/Clothing/Back/Satchels/mercenary.rsi - type: entity parent: ClothingBackpackSatchel diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml index 889a4f941b3..84b5f9f0975 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml @@ -25,6 +25,6 @@ - EncryptionKeyCommon - EncryptionKeyMedical - type: Sprite - sprite: Clothing/Ears/Headsets/security.rsi + sprite: _NF/Clothing/Ears/Headsets/mercenary.rsi - type: Clothing - sprite: Clothing/Ears/Headsets/security.rsi + sprite: _NF/Clothing/Ears/Headsets/mercenary.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml index e883a1a7fe7..112261a99f6 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -37,9 +37,9 @@ description: Lightly armored hardsuit helmet for mercenary needs. components: - type: Sprite - sprite: Clothing/Head/Hardsuits/security-patrol.rsi + sprite: _NF/Clothing/Head/Hardsuits/mercenary.rsi - type: Clothing - sprite: Clothing/Head/Hardsuits/security-patrol.rsi + sprite: _NF/Clothing/Head/Hardsuits/mercenary.rsi - type: PointLight color: "#ffeead" - type: PressureProtection diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index 31901749c04..06bcab25495 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -37,9 +37,9 @@ description: A special suit that protects from the danger of space, employed by mercenary forces. Not certified to be blunderbuss proof. components: - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi + sprite: _NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi - type: Clothing - sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi + sprite: _NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi - type: PressureProtection highPressureMultiplier: 0.5 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml index 8fbc645176a..d3b98d6bb62 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml @@ -45,10 +45,10 @@ description: mercenary 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 + sprite: _NF/Clothing/Shoes/Boots/magboots-mercenary.rsi state: icon - type: Clothing - sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi + sprite: _NF/Clothing/Shoes/Boots/magboots-mercenary.rsi - type: Magboots toggleAction: ActionToggleMagbootsMercenary @@ -81,8 +81,8 @@ 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 + icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-mercenary.rsi, state: icon } + iconOn: _NF/Clothing/Shoes/Boots/magboots-mercenary.rsi/icon-on.png - type: entity id: ActionToggleMagbootsPirate diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml index 3bc34b92e8f..c7ed9db151b 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml @@ -9,6 +9,7 @@ - type: Clothing sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi +- type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtValet name: valet's uniform @@ -32,7 +33,7 @@ description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned. components: - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi + sprite: _NF/Clothing/Uniforms/Jumpskirt/mercenary.rsi - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi + sprite: _NF/Clothing/Uniforms/Jumpskirt/mercenary.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index d5d11ec7fd7..be2e1376f93 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -9,6 +9,7 @@ - type: Clothing sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi +- type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitValet name: valet's uniform 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 5522509fcbc..991ba893778 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -3,12 +3,17 @@ id: MercenaryIDCard name: mercenary ID card components: + - type: PresetIdCard + job: Mercenary - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi layers: - state: default - - state: idpassenger - - type: PresetIdCard - job: Mercenary + - state: idmercenary + - type: Clothing + slots: + - idcard + sprite: _NF/Objects/Misc/id_cards.rsi - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index 70b6c661a2c..a11512778f3 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -2,17 +2,30 @@ parent: BasePDA id: MercenaryPDA name: mercenary PDA - description: Why isn't it green? + description: This PDA smells of war. components: - type: Pda id: MercenaryIDCard - state: pda + state: pda-mercenary - type: PdaBorderColor borderColor: "#717059" accentVColor: "#A32D26" + - type: Sprite + sprite: _NF/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false - type: Icon - state: pda - + sprite: _NF/Objects/Devices/pda.rsi + state: pda-mercenary + - type: entity parent: BasePDA id: STCPDA diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml index e98d6fbe99f..04e478a80bf 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -4,7 +4,7 @@ suffix: Mercenary components: - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/security.rsi + sprite: _NF/Structures/Doors/Airlocks/Standard/mercenary.rsi # Glass - type: entity @@ -13,6 +13,6 @@ suffix: Mercenary components: - type: Sprite - sprite: Structures/Doors/Airlocks/Glass/security.rsi + sprite: _NF/Structures/Doors/Airlocks/Glass/mercenary.rsi - type: PaintableAirlock group: Glass diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index a010c0b6528..bc090347817 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -6,8 +6,22 @@ components: - type: Appearance - type: EntityStorageVisuals - stateBaseClosed: sec - stateDoorOpen: sec_open - stateDoorClosed: sec_door + stateBaseClosed: mercenary + stateDoorOpen: mercenary_open + stateDoorClosed: mercenary_door + - type: Sprite + sprite: _NF/Structures/Storage/closet.rsi + noRot: true + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.StorageVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] - type: AccessReader access: [["Captain"], ["Mercenary"]] diff --git a/Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/equipped-EARS.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/alt-equipped-EARS.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/equipped-EARS.png rename to Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/alt-equipped-EARS.png diff --git a/Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/icon.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/icon_alt.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/icon_alt.png diff --git a/Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/meta.json b/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/meta.json similarity index 85% rename from Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/meta.json index ee43d990223..7e7e5cc5015 100644 --- a/Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/meta.json @@ -8,10 +8,10 @@ }, "states": [ { - "name": "icon" + "name": "icon_alt" }, { - "name": "equipped-EARS", + "name": "alt-equipped-EARS", "directions": 4 } ] diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic.png new file mode 100644 index 0000000000000000000000000000000000000000..cd0c0ff2ea19a9c505384a6679cd195ce3e22632 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`S0JsSp`ov*XJut&V`Jm! z=;-3&5)crOk)EEPpI=Z=(9qD(*w7Ghe(DaOQpS=XzhDN3XE)M-oH$Px#}JM4$q5Iz zSPn8AOn(!_%A(DpAv9xi_4j$k>ViyXyb=-^#1on#RyPO;n6WWA@8a&*!O*De$+T#p zgFuJBgAOl;kf+cA4t^fzqo*4eOi*DgagJ2HD9~W4$iQ&$pv7zNMF)9+HZgd*`njxg HN@xNAfu=q2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_door.png new file mode 100644 index 0000000000000000000000000000000000000000..26498527779b4d6a73aae5d90c336bfffa1a1410 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`S0F7ZDJdf(qpYm#;NTDt z5D*>`l9-T?k)EEPpI=;DTv=J!*wFC3pz|_NDPu{HUoeBivm0qZPN=7gV~EE2Ef((HlEMJ!%{2~RkfWgz%&t;ucLK6UwoItz) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/locked.png new file mode 100644 index 0000000000000000000000000000000000000000..d90218d19e26a9037ed3fac22986f4c4aca73af6 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0Me**7iS)l>c{f0#Jy# zB*-tA!Nz9UtAopcTp3Rn#}JM4$q5pyM;P54OBkI^7}eBE7?&!(&t{lx!>~3iF>NAH O9fPNph#_&!%v3oMt;US#13y~q-w%fThFV0PoW zMG-=G^~G9b!ZJJ64yPX> literal 0 HcmV?d00001 From 06b3fe4d4c234d07aaa3ea80bc9a26003a514088 Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 11 Dec 2023 17:45:13 +0200 Subject: [PATCH 27/27] Took #682 into this --- .../Structures/Doors/airlock_groups.yml | 2 ++ .../mercenary.rsi/equipped-OUTERCLOTHING.png | Bin 10953 -> 2409 bytes 2 files changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml index b22d11826ce..180f03deab0 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml @@ -13,6 +13,7 @@ science: Structures/Doors/Airlocks/Standard/science.rsi security: Structures/Doors/Airlocks/Standard/security.rsi virology: Structures/Doors/Airlocks/Standard/virology.rsi + mercenary: _NF/Structures/Doors/Airlocks/Standard/mercenary.rsi - type: AirlockGroup id: Glass @@ -28,6 +29,7 @@ medical: Structures/Doors/Airlocks/Glass/medical.rsi security: Structures/Doors/Airlocks/Glass/security.rsi virology: Structures/Doors/Airlocks/Glass/virology.rsi + mercenary: _NF/Structures/Doors/Airlocks/Glass/mercenary.rsi - type: AirlockGroup id: Windoor diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/equipped-OUTERCLOTHING.png index a70cf7f54e54fffabd47190c628a509b59143d78..680865288a0cbe4b22f84a1bd5cb700cf6e63c68 100644 GIT binary patch delta 2399 zcmV-l3841LRp}CtBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ^l`}g9Sx8 zWT;LSL`58>ibb$c+6t{Ym|Xe=O&XFE7e~Rh;NZt%)xpJCR|i)?5c~jfb#YR3krMxx z6k5c1aNLh~_a1le0HI!Hs@X9CsG4OYV^J}aT@|}t5kMb$Fn@%Q#7sS&T1>-peBHyx z*SiSM@;>+H=vQ(k1AHR!9McVpc!PLm)6zNb69-vQQi#uq#|^q5@gvt|m)|%S92R(H z&`2leiG##qp^fD>W<^6Ko+b_}sz&)j#$|=`7H73wWzBo?7Y1_LN{Z_=Lx^DsaU>u@ zMinKLVIe}RMt_QlB<)8%{3DJ(K`xnGB`|UueG%B5iqa~TwJ#_c@MbU0fwJ+$&eh$PgBU} zf%h}|rYtac3-qqJy*2l7`T(SvqAV&cpbrpa z@dv(h&pr2?bI-X3HrQZ;4K~2pVJkR2XAO5pa zB`8Wh(6k~M98^_AyX~M-DdOeJ9x9b0{`_+UhDieeTCLu~{OLs=s?}5|N_{q2HdH{fOSwOWa#o|vdvfiFQZ&Onza9xjn z2*%?n0O0xaHXc6Q3s$w>7v(4Sx;C--r5?^B%q@-KY;*^iVvE`RDK=kv)YchP8=I6Xa29Ua{X z-ev)=>!H)>r;d*91pE6XeEaR$t(@Uye&P%}o&FUIP?S7%esTD3^a0)OfO=PAT7UI= z6{0wg!J^1P6uHPd43kE;J6MSW4D;){43?e${q>^{@!j`d;p;~q&J!9oO|2vj|BZ=| zX%1i*HVzJUf@ZS|O)Jt6s3>{5{uCt-*Y$94uoJXeJ@|fMB?`EX9{|4m;uqv{|E5cD zI-Q}_>c!^2(E<#^hN=p19FJ-`9Djbu?33$rUm$?2-P zKwSQ}t`AKsMnZ|}dI%>ZqR7EY|Fp+&iVhRuhj^^7W+ali=7w#1YlmrMrNsY;Oc%P7{1&l@$h$0u+jfoI;eYse7o*W+sR>}05v0@UQxE+5b)P09>%y~V2Ic?#_gDDi zkL7(&Yy}YFo315=Rr4>b08J|f)v5$V$)nLQVcVlOd3OqhLKge`C6WsSNrXbeZ<+)6 z{wxv!Nd8|cZN=tK$01LrQ*@JY_pTKA?sf-Ar&Fj_r7IcSss?XaLx1@G44DiQxu3}} z@ckJqYZ#k$>L0_I5s&ABt5FA#E_r8q(7u0O;($5iCf`3V$@M7?6f6sX+Vwj9Ow? z#>9MprWIirHhg~u!?3ZpH}ApK>(!;o(sALs9_sZffO-2nEDPxxC8B`GPwvBYJ+xYL z&GS49U6*Oc`03LZYpDtg0!Jo@c>v%-Su0;~4Nf3t8TRVc0Ou0c?95 zk#(hEP}7RRyd~vEN>yaglZlU9E|X|~kVK;4a6;>XuIok4Es<9GqB6v?09}_M2pkR$ zcA%;PJkJNuvv6Gxj^nMRKQJ6l;5hTsVLZ>m^L(hPfPaI79S8ykU6+%!0LS_3P=w=n zkfa=Vo{cmsleB=pW?IB}JcVTqBk~X#7nLEktN>&Q@H|T$p<&pGpBYw^d_Y1k;SMi> zxDya74yyGl#Y zv?6?ehJVS#k7f3^$^?m~v)K$vrLCp=@~c3(ETB}{qUROXvK^j>p7GzVD6_0gOSQ)Z zfyZ<@gJ}-HvT1r~X`Nu%G+w=OF`dr9Flh(^zdj3Sw;g&QBJS>Ml_1=s(d62HqDagF zNX-2^;Bp9Divk!Xg^xdeAB~2IQfUjbS%7So4Oo({28E*#Y1ftT{Pfd**S7=; zg)ABk696E~TZx?uxM}dRyafPgG)xo<+4Wg~ZI5X2fhgi#m_0eGKxzTY;QvuwTH7WK RBP{>`002ovPDHLkV1iGCY^DGJ literal 10953 zcmeHtcQ{<_*7pn|T9l|!Vj_fK%otttPL#nQq{x^VOq5|puOnJWq6ZOCLPSXjf*?vF zN_0UYx@d_`qPKU*bDk&9_nz;(-?^^u{qJz?J+trow|;Bgzk98XJwYyboGsQ719J0r!GJJcSX%(VYq0;J zW!%CW=a8{V8i;D@hiR94EA(&t0;$c?w};1M7T7)Allp{NPl94~RF?KW2j1A^-9sCVc$NA1DVNXLlp z=*WEp6ua#>=OE(Ibe}n1d)I2hY`ZPh!q@#qN6=_!+h%Fn2Z!w?a_35=?ZxoAg8|p= z#?z*hFq(EL*bWMT zTq3L=zMU^39}#KsJ$!{Lx4EuLX?JEVb+nQ;d}}u}%aQWHXMg8>ot8p!NBjL#QFgWJ z?F-5Sr=y<8$>UKoTTLlNyAps4HcRa`cZgHzUr`&4%2FXT42|6@T{kn>Y-pI-w^AEy zADnBv;$ldf@@N@>+YI9#ZF6CZYAJpn>EOe?rT3mP;MT31_EX8Got0B5SC_mKu9$py znqZ|7kkyoOtMKWk!COUHjfqyyPy0Vzn|J!zeSRw0_j_5z=q`u8Jcswn;@eZGcIc$O zL>Fw{v9zn0*rg{@R5EwVd0on5z_o$7dZB7)$(K8j_)%9d9Y2SCmhKufcwc73ukA&} zNI6N$$0(dFS_2U2*S_@n>An5n zPWsHOOeQaA$9Hb5ah%m}4)@!a8S~#9HVPnI+%MW=t5uktsyd|YlB-;Tr0tI20#^pj z%Po!EX3m9X-rLc57tLkJm3c~_>~OVbzuI~$P!9-L-b;s?rKrO02MKeIq_9Z&X=RarwqWrw3J^d8)}GUKzQz z_p2Vhn528BeVA4?vs8gqrVF5Sxwm*DhU4?%_7qKK*8pTQGzgJg{Cb2l*#TAb*ly0V zX>jtf=dzqg0R)}vKhtmk5bGXu$^XJJM1QF?Ygc}o`y_G_$DjDgxu8>&k@?m_Nj-Nz z9n?7rXrzEv%RW#0W>kDTX!3RV)7JNL&#dm`T%BUth*a%d%KH8;U*L2yl71$6yEDZ9 zlKJR+E6YpkDd|zhvr7DR?pNiNQ9+K(=bd!kJzjTAeE8+&u;)b^%YzaB)w8&>DR@Kz5cJK@ z9r-HOp`GF&LHr|(tGKyAHhkT=x_yrhU(d-c%fxOm&en7`cotAeNy}J5`-wQVR%2LI zw&DFOY-hZGX4=HCCE81sNOn?#Tj7J+a#QvtV#DgUQXjtWxgoJR5UyeKmz|>VP6M1S z*Kf;zE-ZVAs;{u#S+y0wcF`iVOv@S*)j3xmmNmzVzs_iC0zGd%RgiF&RC=Joe!~F(YtSQ8oqSeor-nbb~~OX0WkVyEC0hl{4H1_lR`&QIFlK8>Xt*-5YtjfTqcd4}An1UI#8AHhIay$QPS$)q)Ds=*n z&bwJl-M9tzpYa?YN)Uolo?4G;Jpu)RG7!=6)$@BULxllRGxXv&&Nfc`xI^B?I(xR7 zT7L;I5%Fq?o{#&Bd+ClnNq*W$ zoeSq>@~Oc1hknb@Lit8~FOSoVa=EBg*}B|avfI>V`reJ@1qF-sDQ^P`Bfg8%y_q`n z6s;Iax{09bROV>>We987d!6^_;0Z|K*Yc;DQ|CGxPiPm;)?DGnnryTd25AZuRNk5GQ27Z|MCev(t9@q@fK>Qw&A7S+zAP2Ri#b*1pD zA5Lc#-?pkQ7_7oe_9Z*>WtN6Tj)(^8V}PLsdml8{7!STP!Hv`!lBUb03qwF_?cU

On39_%~ zX+StMrvW+fhEGWMKr-&X1$%)-DlZNSI`YV~02tU1v>ZO*d%l+E{fevYUoy*PpJ!A< z6P2HaGM%W>nd@8cs5!qtafwl)9?cbpUi`3QL`C=NDSKkPirn%$ruW+74EJ&dluYU^ z>!W0Dg2~fi?IWvLk^TDWrHY$$RFkdpnUDGFw*6fdeHx>`D0ojVz~`FFCMK<(SaaBZ zhOVtu^cmu_MWH^a2pe%&!EFvLKv*r4IP{KPkoerEc8dFc3sY3~do3YCve^_$aw9~~ zWWY4V{O(ID=h>XYl;B~P z0d^IXZ>cEEQXYb#j~;%tiF|@kcAzRPGols`{8*{XJ1fedYk%>)@ZH#=;u!l z8q+Psmz46{Z#S=3vGXsdhK+g!KZReruVQomtj0Ys{O&ekp1d^35o1(FF)KMzpMxY< zK93+IoLh^&sT-3$-c%k<#^nMWb-VgnOwZ+UbZc@+-V-Ung(8ZZPwWKe#;lEhw)Mn% zCfLVfx|un(I$0VY!oE{8HwG2wU4k2xdr&((p^XywpvlpnIK8H^$M%{Lm~mR@>dxUu zDwWWmhwzA#Y+`#BSd&#Q59zqR({Pi*%eyRIE=oHCjIz+lkW!+M_0!Jb9EH!VgOPueCy-`GzX1CB|yq5i+5ejHRkAEL`?x zHn#wGq@=|+1lbLpYi|{7FATL5Z;}(?KF4vOHul!unGXmNUOXqBTXD-+`qMJ!;#Hr4 z=zekSh&%EWCsE~d-8uWO?sg}z!S^jeW+Fu)ruglprkWFPn4=HAxG=d!^u@`ljo-V^ zf@iVOtH~zBd58#aTy#y$E2s{LvzS5{m6-UH(HyjBfBv{C)R}ckKEx0k9^TZi+1g=m zK%M(3vi=;lopSJM0U7=&;qYB7T)|g%IEiawO&UC!sut0Aaa+grs=(5tGfUd^6#S2T z95aBc^sgTfH_u_L%R{W@_P;}-GB@fZM#iF+#`fPGE(akd$XK%b4>Fm7XM(ldjSE8* zoV8tbd}2526MWaJ5h9<`sa+XWdkprka@VzLoRdsHznCqbm@j1aB#DAbKM!|Z*t$d5 zLGF}Ee^i_@TKd~Hspx*%-a!RjGo#y4rL}JNf~Z_S%_KvU)yxU5fQAtB9}I}f8{VsT zuRR*#_ikxC)W9!AKi`b++zM{zxJ;AxXpKH>*o^n-K*4>1 zmS-h2Qj6kw0A4>xJs!m?Rcog1C8E?f6kz*kqC(B(RGEg*tpq*)c50#%rj4OKXK(5S zE<)kVrvajUegwJ5(*9=3Tu^lONVQcehQDk>2iwdKDCo-n`r__RZVg}#NB2GN`M6Bm zB?-m+yJbJ)#`MziL(rM+I|g0P>pY{H)x-=ftZTfiYp$@6*I^&k?oMv1KQGTsTY(SD zw9#nTp^_huh&&sTq2g^EHI_3On4U@QKgW5eK?0-c4!8kOCUcR+&9*;;EePbRwx88O z)a2*UaNNer-#(IpNO^2^V`JH=ApylARW`ww>d4~xaj`^O;SKAn+QVsgfZdfTU3mE*=UGkZ- zTXG4!M=KP8QEDDzAf=<~LvGQDE0hWY2zMDFETdJBg8qoXL;-cPVIF`goF zJJOw!Nl~Sx>YL|-7zhh}{>9WDco-*FXKa&W)6Dz#KI;=4T?ivx*X+XLi4dZ|gCt6F zVZ~s6nS!SisrZ2x84q-8TE~R52rA;UHW{M(tx2#}vmkNi+>>9%TRf^x3jLE?63p3e4j zHA?;Kn@Wd_-zIw5O|gNevxEt_#?23 zqL2M1@vW0VAMkY8f(x0T;_VyIk6D~tgG=9*2TroqmDws;1=h0(XDnU5-~&SQz#s5T zU5-oi9iv3Ia$>3g0 zoKz-F;+;gl7xk>5S%1n6^+aw(O?Z%N#9YPs*t{^%j9!XjY{O znn2>En$E&fLObB!N6K4Kr;W{fHqgE=S90Ctn(f~deoshvCe_SRbE_lCvlz3-wR5O1 zsPiTAxn6ngxJ}JPHAB{OzIACVxlR#6mP|~sd5r1#+LxX&A_hFw%1mgQY1ZO(rCFu~ za)S#6(JjhB^92&8wbil}9qx~%Y%LW%_&RIfwT(g$uHSDcmSn66;d*{Uec!Fcck3BXAdf+8Y2*}(l#jwKBW(w@QvR9OO|o+( zHC>pV`_WR7#h>Oi9d>PvYURI<&6TY36xeo5C7oT}S;^B)Ox8c~K^vU*;v`1+S{Ph= z@S5HSUZh9ZUE$>DJQnmywqDqf$$EMYo|84!DmYp^wazs+?cJsK1Cs|_LiH@u4+v}2 z001x)tF8{$RagJV8zItrpj7`@MV$sXOQ?~lW>4fDo@^m>t|6O-Cil}w&6n^&niulP zZ+GWLi)nnpe^#Rb6>N+@d=D3u~@zLnpjopte#yN^(Vq1 z68#Iw07M5Yt~fXOLt*6gqHm22VTg#+f5# zlbx@;=Xx*kD6!K!UA84MPR-9y!MXcH1aGBS^QujC#8MVpy&{x z@Z$HV@gJsygJMxY*4!9w<5EiY-XCY+(HE>bK*kg5k@EB7c zLj=ml0VRj#Q&yr;@RBDHIAPq7ATK9JXM((!BHuBuJn8$4o)x@hQ=O6!2(Uc@qt-KPX67ihTBNZZ7f=h^MEgn5Tpo4sQn$my?r& zKw%IV3`|0R3Es|bNH4H6;rtQBFAfb10foo9xM6Y5pd(JC4bI(7k&llw5Bh_gG>g*o zA`SlG;OP38p5TUt=#nlZN$Vj2ATTIY77T@fVRDe)?Mbr+27g*R6aG+icK zgF>8~{$@dN)Aabu-#@h=AV_aYAto3C&K-}!XnJ6r-Om5+)Wy-A@VifU0_JGwIBrL@ zErb-*vFG1yv~>;Of7%?$Xoq!jIkq@L|BghX{=~Vs;~kGNXcPqFh;bqXLLf1V{|)bk zwf$>@{S`$R9mOk;#-Xri`QxuP;MxKv22UWR`4Ou)R15|?opcla@o07I{=1BKUS-7)PoERmDVdsk@7d zBNl`IyH5YeoBs>$H~T+w^nWt{9rnvw9p~ars$zRLBTwgl>HePpe=+D|Q5a_e?q7xe zJLH!vzukyPG5;DP-QY;~OUR!$%s;Z^sF3~_fBwk6|3wcZ>i;p{l-%{Y; z0{PtpVRBL5pQ(!)5V&1G#3(tp^f04~NS zZ={e$s9kg{2><{s^U(nWq@;3?22Z-_8fc!JrR4##iQgz0C(WIt)zwf%cnvOIy^j0( ziS7D9eb`NgcVQGpCj1=F72G8aQuN}Jlr+o&TK6Kik;Y@sObQ;FFEZ=F5W~Le7o-ir zyijrRT85vg4xp5qHiT!VFRQU_p&plZttsuM)&QjkZU&z^J|$|DS=}=y2L zykN@;vxqrjaBd2|Wd@mvsN>bM}^0=;P|z3s5@N*;#+v zY|#Yv+4Sc8z2TCnq8t6=Ri0E0)KO6$t{xt5J7peW_6~Lhxw$!FFigt(KZ_9e;Uphg zS^AewHo$x4z3rvjwzgK;I&9Ab?n~VUtpJFIvmV%hfQNVK>FE#!jSr1+(rpXsIz*ou z3QM+3q0{vA_Ym5L9Pr)m_=g$EF8Rn+lx3Cdgyi)b6u8KP=na$aTsyg*bES{d5 z03rjgkE~MRv#%`iE4@E-w<(%#$ zhBQ4oIy#7}g?K$!Ne+V{e0D!{Ve}9!p!D;$7!(1hA03r=tQ=HvDfU=(C zn3XZ$dD5bs3oxFt_!@`+uKQ4r6w)@pW7?=0Db5~I0C<26@a}o0?%lL}qHJK1whC)T z{%M*}ZofdfE?V;$l2O9&53-h$7A?>c`PcK~-atBa)r$F?CnWSWU{2m-$0OXA+@jV) z%Xvx8=`(^)uqQ5P%hUAjNCJ#murp^KcP_TlB+m-+t0;iMgSRll1}R5EnOSq#Xp}?zl#cR+gz@6wCX0`5`^_ zsot}!m{x+@tGgp3Sir05T{>;;YL5F&BBzM2_0&Zj>J?TxIsmoGP4cTt*OOKcSDOX* zwrA&R1&e_~tEf6m=&S7{X_YMFC@b)({##6o<)=RL?DKdMgdVI7j1_e=%C*`EXYZ9O zYH%3Z+5$KaErhQ|Y;W^VDRdQUHr-_(Y%d<;y*(@U%4$%JBFTJ~r&*iBkhF6WvjjOH zQZ{IED`GndM$BOymsN7~r5ZY`)=TsHjT-=vlteH2qP|lus!RI9N3!Y9ugLUG!{?(0 zI6()B0V9-LjxXOHpR5>*PU&2tNsXrB{kq3Tx3aTtVVw9lnrmWxzQ{zRW!&Ps;~v59 zTJ$%q4Bu+shWP zJ*`a2uNR4wZJgs3V}+zjG_gKq^3_Wz>h=ZDH~JoVmCCbv0ggC!=Iu-kEZO@Dbmv;#qIFzjtX(VgNohgi&RDg5qr*ru&z9bsbsF9_n zl>>;=hxS+PKM66DzwzHyq@wQrt`9bH0NOWgEiBl8tKUWPi8ppsWcF5`I0qc9-B%iUwmWN;RpFBPrtStwMgEZJ0b09~}>yOa8pq-K_wb%H5G zf1dR=C=2chs=@;PBZ>m!8ouBD? z@44DK1Z{r~VlxoP>o6dk7_?6yDSWRP$@fM1;_2+f&RGIU0`tzcXF*m5s!vNA=U6|L zaHkn6dRhUgHm+73(iy!Ueu z-}gBY1Nc&p{oZ)G5X=hc&ep8Hm=bk#ZoQs`i29^?KCf&+A}-O0`oKqP55fSa`|i5knv2A;Xtms}oi1 dFKG^F&sfP%+{vf7N4ir2bTth%3e|4j{x9?g!)pKl