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

Jump to bottom

Employs All Assisstants as Miners #149

Merged
merged 4 commits into from
Sep 13, 2023
Merged

Employs All Assisstants as Miners #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b466910
Overflow = Shaft Miners
chesse20 Sep 13, 2023
c600d9d
Merge branch 'DS-13-Dev-Team:master' into assissantsareminers
chesse20 Sep 13, 2023
5229949
use map json instead
chesse20 Sep 13, 2023
9cd474f
remove unneccsary comment
chesse20 Sep 13, 2023
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
3 changes: 3 additions & 0 deletions _maps/aegis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
"assistant": {
"total_positions": 0
},
"shaft_miner": {
"total_positions": 100
},
"atmospheric_technician": {
"total_positions": 0
},
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/configuration/entries/game_options.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
min_val = -1

/datum/config_entry/string/overflow_job
default = JOB_ASSISTANT
default = JOB_SHAFT_MINER

/datum/config_entry/flag/starlight
/datum/config_entry/flag/grey_assistants
Expand Down
2 changes: 1 addition & 1 deletion config/game_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ ROUNDSTART_RACES vox
#ROUNDSTART_NO_HARD_CHECK felinid

##Overflow job. Default is assistant
OVERFLOW_JOB Assistant
OVERFLOW_JOB Shaft Miner

## Overflow slot cap. Set to -1 for unlimited. If limited, it will still open up if every other job is full.
OVERFLOW_CAP -1
Expand Down
Loading