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

Fix configuration errors on master #907

Merged
merged 1 commit into from
Apr 13, 2024
Merged

Fix configuration errors on master #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 0 additions & 47 deletions config/game_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ STATION_GOAL_BUDGET 1
## Uncomment to not send a roundstart intercept report. Gamemodes may override this.
#NO_INTERCEPT_REPORT

## Percent weight reductions for three of the most recent modes

REPEATED_MODE_ADJUST 45 30 10

## The amount of time it takes for the emergency shuttle to be called, from round start.
SHUTTLE_REFUEL_DELAY 12000

Expand Down Expand Up @@ -309,37 +305,8 @@ ROUNDSTART_RACES ethereal
#ROUNDSTART_RACES jelly
#ROUNDSTART_RACES abductor
#ROUNDSTART_RACES synth

ROUNDSTART_RACES skrell
ROUNDSTART_RACES vox

## Including all the various golem subtypes that are better than humans in some ways, but worse in others
#ROUNDSTART_RACES iron_golem
#ROUNDSTART_RACES adamantine_golem
#ROUNDSTART_RACES plasma_golem
#ROUNDSTART_RACES diamond_golem
#ROUNDSTART_RACES gold_golem
#ROUNDSTART_RACES silver_golem
#ROUNDSTART_RACES uranium_golem
#ROUNDSTART_RACES plasteel_golem
#ROUNDSTART_RACES titanium_golem
#ROUNDSTART_RACES plastitanium_golem
#ROUNDSTART_RACES alloy_golem
#ROUNDSTART_RACES wood_golem
#ROUNDSTART_RACES sand_golem
#ROUNDSTART_RACES glass_golem
#ROUNDSTART_RACES bluespace_golem
#ROUNDSTART_RACES bananium_golem
#ROUNDSTART_RACES runic_golem
#ROUNDSTART_RACES cloth_golem
#ROUNDSTART_RACES plastic_golem
#ROUNDSTART_RACES bronze_golem
#ROUNDSTART_RACES cardboard_golem
#ROUNDSTART_RACES leather_golem
#ROUNDSTART_RACES durathread_golem
#ROUNDSTART_RACES bone_golem
#ROUNDSTART_RACES snow_golem
#ROUNDSTART_RACES metallic_hydrogen_golem

## Races that are straight upgrades. If these are on expect powergamers to always pick them
#ROUNDSTART_RACES skeleton
Expand Down Expand Up @@ -392,17 +359,6 @@ BOMBCAP 20
## LagHell (7, 14, 28)
#BOMBCAP 28


## Lavaland "Budget"
## Lavaland ruin spawning has an imaginary budget to spend on ruins, where
## a less lootfilled or smaller or less round effecting ruin costs less to
## spawn, while the converse is true. Alter this number to affect the amount
## of ruins.
LAVALAND_BUDGET 60

## Ice Moon Budget
ICEMOON_BUDGET 90

## Space Ruin Budget
Space_Budget 16

Expand All @@ -427,9 +383,6 @@ MICE_ROUNDSTART 10
## This used to be named traits, hence the config name, but it handles quirks, not the other kind of trait!
ROUNDSTART_TRAITS

## Uncomment to disable human moods.
DISABLE_HUMAN_MOOD

## Enable night shifts ##
#ENABLE_NIGHT_SHIFTS

Expand Down
6 changes: 0 additions & 6 deletions config/maps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,5 @@ endmap
map runtimestation
endmap

map atmostest
endmap

map atmostest_multiz
endmap

map multiz_debug
endmap
Loading