From 74261a057a53ac9452d3d55d94b608126b734473 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 3 Feb 2025 22:47:18 -0500 Subject: [PATCH 1/4] Add round-start cyborgs to Frontier Outpost --- Resources/Prototypes/Roles/Jobs/Science/borg.yml | 2 +- Resources/Prototypes/_NF/Maps/Outpost/frontier.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index 3b8249b9a5d..21ddd0e270c 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -26,7 +26,7 @@ setPreference: false # Frontier requirements: - !type:OverallPlaytimeRequirement - time: 10800 # 3 hrs # Frontier: 40<3 hrs + time: 21600 # 6 hrs # Frontier: 40<6 hrs canBeAntag: false icon: JobIconBorg supervisors: job-supervisors-hire # Frontier diff --git a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml index aac8912f5f7..9f0f878262c 100644 --- a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml +++ b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml @@ -25,11 +25,10 @@ Contractor: [ -1, -1 ] Pilot: [ -1, -1 ] Mercenary: [ -1, -1 ] + Borg: [ -1, -1 ] StationRepresentative: [ 1, 1 ] StationTrafficController: [ 1, 1 ] SecurityGuard: [ 1, 1 ] Valet: [ 1, 1 ] NFJanitor: [ 1, 1 ] MailCarrier: [ 1, 1 ] -# Others: -# Borg: [ 0, 0 ] From 3ab61a1d6d5fb77b1a1cec4b263b652a309001d2 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 3 Feb 2025 22:48:25 -0500 Subject: [PATCH 2/4] Increase borg time requirements to 12h --- Resources/Prototypes/Roles/Jobs/Science/borg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index 21ddd0e270c..4fd581d5a2c 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -26,7 +26,7 @@ setPreference: false # Frontier requirements: - !type:OverallPlaytimeRequirement - time: 21600 # 6 hrs # Frontier: 40<6 hrs + time: 43200 # 12 hrs # Frontier: 40<12 hrs canBeAntag: false icon: JobIconBorg supervisors: job-supervisors-hire # Frontier From 10a3dd4a97ecd363f0388d56aa46ba7612545fef Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 3 Feb 2025 23:13:27 -0500 Subject: [PATCH 3/4] borg SetPrefs true (note: science dept unlisted) --- Resources/Prototypes/Roles/Jobs/Science/borg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index 4fd581d5a2c..c3f3b69ebaa 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -16,7 +16,7 @@ jobEntity: StationAiBrain jobPreviewEntity: PlayerStationAiPreview applyTraits: false - setPreference: false # Frontier + setPreference: true - type: job id: Borg From b5971e95307b37c3b761a5558fe5d9c6b61b5892 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 3 Feb 2025 23:39:29 -0500 Subject: [PATCH 4/4] Fix borg setPreference, add roundstart job spawns --- Resources/Maps/_NF/Outpost/frontier.yml | 17 +++++++++++++++++ .../Prototypes/Roles/Jobs/Science/borg.yml | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index ed88e1e34aa..f637fad634f 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -31897,6 +31897,23 @@ entities: - type: Transform pos: 27.5,18.5 parent: 2173 +- proto: SpawnPointBorg + entities: + - uid: 5230 + components: + - type: Transform + pos: 6.5,28.5 + parent: 2173 + - uid: 5244 + components: + - type: Transform + pos: 51.5,15.5 + parent: 2173 + - uid: 5248 + components: + - type: Transform + pos: 30.5,5.5 + parent: 2173 - proto: SpawnPointContractor entities: - uid: 411 diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index c3f3b69ebaa..8abdc885b2a 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -16,14 +16,14 @@ jobEntity: StationAiBrain jobPreviewEntity: PlayerStationAiPreview applyTraits: false - setPreference: true + setPreference: false # Frontier - type: job id: Borg name: job-name-borg description: job-description-borg playTimeTracker: JobBorg - setPreference: false # Frontier + setPreference: true requirements: - !type:OverallPlaytimeRequirement time: 43200 # 12 hrs # Frontier: 40<12 hrs