Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds an overflow borg job slot to Frontier Outpost #2855

Merged
merged 6 commits into from
Feb 8, 2025
Merged

Adds an overflow borg job slot to Frontier Outpost #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
74261a0
Add round-start cyborgs to Frontier Outpost
whatston3 Feb 4, 2025
3ab61a1
Increase borg time requirements to 12h
whatston3 Feb 4, 2025
10a3dd4
borg SetPrefs true (note: science dept unlisted)
whatston3 Feb 4, 2025
b5971e9
Fix borg setPreference, add roundstart job spawns
whatston3 Feb 4, 2025
3c7d6a5
Merge branch 'master' of https://github.com/new-frontiers-14/frontier…
whatston3 Feb 4, 2025
3e3e968
Merge branch 'master' into 2025-02-03-return-the-borg
dvir001 Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions Resources/Maps/_NF/Outpost/frontier.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Science/borg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
name: job-name-borg
description: job-description-borg
playTimeTracker: JobBorg
setPreference: false # Frontier
setPreference: true
requirements:
- !type:OverallPlaytimeRequirement
time: 10800 # 3 hrs # Frontier: 40<3 hrs
time: 43200 # 12 hrs # Frontier: 40<12 hrs
canBeAntag: false
icon: JobIconBorg
supervisors: job-supervisors-hire # Frontier
Expand Down
3 changes: 1 addition & 2 deletions Resources/Prototypes/_NF/Maps/Outpost/frontier.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
Contractor: [ -1, -1 ]
Pilot: [ -1, -1 ]
Mercenary: [ -1, -1 ]
Borg: [ -1, -1 ]
StationRepresentative: [ 1, 1 ]
StationTrafficController: [ 1, 1 ]
SecurityGuard: [ 1, 1 ]
Expand All @@ -34,5 +35,3 @@
tags:
- HeadOfPersonnel
- HeadOfSecurity
# Others:
# Borg: [ 0, 0 ]
Loading