Commit Graph

122 Commits

Author SHA1 Message Date
vuonojenmustaturska
456f08001a Merge pull request #34955 from praisenarsie/patch-22
changes a link in the config
2018-01-26 18:05:16 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
Jordan Brown
ab71f0293b Stops the dbadmin warning if SQL_ENABLED isnt set (#34223) 2018-01-11 07:39:29 -06:00
deathride58
d4cf5d2eba Merge branch 'master' into upstream-merge-34067 2018-01-08 20:01:59 +00:00
Jordan Brown
065b616af8 Removes standard resources from config tree 2018-01-07 20:32:08 -06:00
Shadowlight213
7f9725c2ae Updates the exp config default override hours and clarifies it a bit. (#34132) 2018-01-07 18:45:35 -06:00
deathride58
d39b0204fa Merge pull request #4382 from Citadel-Station-13/upstream-merge-33307
[MIRROR] Adds config inclusion system
2017-12-19 19:49:32 +00:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
Jordan Brown
d45b668a39 Adds config inclusion system 2017-12-14 17:24:13 -06:00
deathride58
91530e2747 Update admin_ranks.txt 2017-12-14 14:34:03 -05:00
Kyle Spier-Swenson
55247e9bdf Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on. 2017-12-13 21:04:00 -06:00
Jordan Brown
8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 10:35:23 -06:00
Dax Dupont
91cc5b1024 Adds disco inferno shuttle. (#33230)
* Adds disco inferno shuttle

* step be gone

* Minor wall replacement

* Add no diagonal walls

* Made the dance machine all access

* Makes the statues work as I originally intended in this shuttle

* Fixes a chair

* Changed door and made it to keep fire inside.
2017-12-05 03:22:40 -06:00
Jordan Brown
dc0310eb5d Adds a config to optionally hard reboot DD (#33006) 2017-11-24 13:00:02 -06:00
Emmett Gaines
ab21f8d5ed 511 client fix and a config to make the version warning a popup 2017-11-15 04:39:36 -06:00
LetterJay
851c862ddf Update game_options.txt 2017-11-14 13:08:07 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay
0d3aa9d07b Update config.txt 2017-11-09 03:17:00 -06:00
Jordan Brown
146dfe33ea Adds a config option to change world.sleep_offline 2017-11-09 00:45:48 -06:00
LetterJay
6e17d42c33 updating the roundstart config for ref on master 2017-10-28 02:24:26 -05:00
Poojawa
5cb53d91b8 Update game_options.txt 2017-10-21 22:20:09 -05:00
KorPhaeron
20b17eceec Disentangles blob from blob mode/removes blob mode 2017-10-18 20:55:42 -05:00
AnturK
64b1be05ff Adds logging crew manifest to seperate file (#31665)
* Adds logging crew manifest to seperate file

* Coding blind

* i can spel words

* Not everyone in the lobby please.

* Proper header

* Fix

* Better format
2017-10-15 16:56:48 -05:00
LetterJay
1b03aabf03 Merge pull request #3231 from Citadel-Station-13/upstream-merge-31352
[MIRROR] Allows easy hosting of server side lobby music
2017-10-08 16:24:06 -04:00
LetterJay
981c9b07bc Merge pull request #3205 from Citadel-Station-13/upstream-merge-31374
[MIRROR] High pop reduced MC processing mode.
2017-10-08 15:36:39 -04:00
JamieH
2f41af546e Allows easy hosting of server side lobby music (#31352)
* Allows easy hosting of server side lobby music

* No images here!!!

* Undelete /tg/ sounds... REEE

* Add back the old system and use it if this doesn't find any music

* Documentation++

* Update round_start_sounds.txt

* Allow for rare map specific title music

Also don't attempt to play non-valid sounds/non-sounds

* Fix bad sound filter, fix common sounds

* Update README.txt

* Update ticker.dm

* Update ticker.dm
2017-10-08 13:17:01 -05:00
Jordan Brown
91aa560f0d High pop reduced MC processing mode. 2017-10-07 08:42:43 -05:00
LetterJay
5a65cdc939 Merge branch 'master' into upstream-merge-31309 2017-10-07 01:07:59 -04:00
Jordan Brown
b17a770299 Config option to automatically call the shuttle for high casualties (#31309) 2017-10-06 21:35:49 -05:00
deathride58
5692228379 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:41 -04:00
deathride58
5cefa71992 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:03 -04:00
JJRcop
65a997f929 Hosts can lock config options from admins (#31254)
* Hosts can lock config options from admins

* Optimization of LoadEntries

a very very very small one
2017-10-04 14:59:33 -05:00
deathride58
8e65f4fb23 Merge branch 'master' into crewobjectivesandmiscreants 2017-10-01 23:45:49 +00:00
Jordan Brown
4d610b95bd Maplist is loaded regardless of maprotation config setting (#31172)
* Uncomments map rotation in default config

* Maplist is loaded regardless of maprotation config setting

Also logs loading of the map file
2017-10-01 15:27:51 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
deathride58
9bdc80ba82 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-09-27 23:44:22 -04:00
CitadelStationBot
3aafe338af [MIRROR] Fixes adjust config (#2723)
* Fixes adjust config

* Update configuration.dm

* Update game_options.txt

* fixes persistance
2017-09-22 23:02:09 -05:00
oranges
9ee60af5e8 Merge pull request #30768 from Cyberboss/BringingSexyBack
Adds back required arrivals undockedness with a config
2017-09-20 03:55:14 -05:00
deathride58
e0837a45b6 basic config stuff 2017-09-19 20:29:03 -04:00
LetterJay
19309d76d0 Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344
[MIRROR] Traitorbro gamemode
2017-09-18 08:35:00 -04:00
CitadelStationBot
4bc6e9d522 [MIRROR] Cleaned up some decimal values. (#2797)
* Cleaned up some decimal values.

* Update gas_mixture.dm

* Update color.dm

* Update medsci.dm
2017-09-18 01:45:39 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842)
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
2017-09-17 22:35:51 -05:00
pubby
a01f3213f5 Traitorbro gamemode 2017-09-17 18:03:12 -05:00
Poojawa
dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818)
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
2017-09-17 11:56:55 -05:00
LetterJay
7d4c6a8445 Update config.txt 2017-09-11 18:28:39 -05:00
LetterJay
935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
Jordan Brown
92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -05:00
JJRcop
00dd2f283b Adds Internet admin midi (#30457)
* Adds Internet admin midi

* Moves global regex into proc (shell_url_scrub)

* Moves shelleo to world
Adds quotes around the command in shelleo, to encapsulate it

* Admins can stop playing web sounds

* Revised internet midi extension order
Moved m4a to least preferred,
as it can potentially carry non-aac or non-mpeg-3 audio

* Kills \n in web sound

* play_web_sound availability based on config

* play web sound and shelleo tweaks

istypeless for in play web sound & readability parenthesis around binary AND
add return index defines for shelleo proc

* Security fix for play web sound
2017-09-08 09:32:29 -05:00
Raeschen
0a97730ded Disables oldstation.dmm (#2625) 2017-09-06 07:06:46 -05:00