shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

Browse Source 
# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm
This commit is contained in:
kevinz000
2017-05-21 18:17:42 -07:00
parent c58c6ffdd8 c7de3024b1
commit de0131346a
571 changed files with 74297 additions and 79090 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/game_options.txt
+3 -3
View File
@@ -6,10 +6,10 @@ DAMAGE_MULTIPLIER 1
### REVIVAL ###
# whether pod plants work or not
REVIVAL_POD_PLANTS 1
REVIVAL_POD_PLANTS
# whether cloning tubes work or not
REVIVAL_CLONING 1
REVIVAL_CLONING
# amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite)
REVIVAL_BRAIN_LIFE -1
@@ -166,7 +166,7 @@ MIDROUND_ANTAG ABDUCTION
#MIN_POP GANG 20
#MAX_POP GANG -1
#MIN_POP CULT 24
#MIN_POP CULT 0
#MAX_POP CULT -1
#MIN_POP CLOCKWORK_CULT 24
config/game_options.txt.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/config/game_options.txt b/config/game_options.txt (rejected hunks)
@@ -482,7 +482,7 @@ Space_Budget 16
#Must be at least 30 to not break parallax I recommended at least 55 to be visually/aurally appropriate
ARRIVALS_SHUTTLE_DOCK_WINDOW 55
-#Set this to 1 to prevent late join players from spawning if the arrivals shuttle is depressurized
+#Uncomment to prevent late join players from spawning if the arrivals shuttle is depressurized
#ARRIVALS_SHUTTLE_REQUIRE_SAFE_LATEJOIN
# How many wirechewing rodents you want to spawn on exposed maintenane wires at the start of the round. You may wish to set this to 0 if you're testing powernets.