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
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
LetterJay
92b7af7e14
commit
2017-09-02 23:39:20 -05:00
LetterJay
3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
LetterJay
2bfc7872fa
cleanup
2017-09-02 07:06:37 -05:00
LetterJay
8f7368bc57
Update config.txt
2017-09-02 06:58:30 -05:00
kevinz000
5aa4631af8
final
2017-09-01 06:58:59 -07:00
kevinz000
b193d77c1c
hm
2017-09-01 03:36:18 -07:00
kevinz000
41318e715c
Merge branch 'master' into custom_roundstart_items
2017-08-31 18:23:56 -07:00
kevinz000
f5689b656a
Merge pull request #2509
2017-08-29 22:40:08 -07:00
kevinz000
fa9f1ce956
remove cere from configs
2017-08-29 20:10:29 -07:00
kevinz000
0d104b2cd4
update to master
2017-08-29 20:09:18 -07:00
CitadelStationBot
6882163ef6
Moves comms settings into a new config file
2017-08-29 17:01:16 -05:00
kevinz000
62a358574c
sync
2017-08-29 02:37:34 -07:00
CitadelStationBot
65d4c6f938
Delete access levels.txt ( #2507 )
2017-08-27 06:42:40 -07:00
CitadelStationBot
26890c6f81
Pulls the plug on Cerestation (for real this time)
2017-08-26 14:08:30 -05:00
CitadelStationBot
196c9d0597
Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
2017-08-20 06:01:24 -05:00
kevinz000
f91d7799f4
Merge branch 'master' into custom_roundstart_items
2017-08-09 09:46:52 -07:00
kevinz000
97f6bf4410
character separation wip
2017-07-24 04:12:17 -07:00
CitadelStationBot
956f10f2d2
[s]Fixes panic bunker
2017-07-17 07:13:45 -05:00
kevinz000
df590fd8c1
Merge remote-tracking branch 'Citadel-Station-13/master' into Citadel-Station-13/custom_roundstart_items
2017-07-16 20:30:27 -07:00
LetterJay
53afc150f9
Merge pull request #1581 from Citadel-Station-13/upstream-merge-28398
...
[MIRROR] Changes config tag for secret extended
2017-06-26 02:30:58 -05:00
LetterJay
12055144e4
fix it
2017-06-19 16:09:16 -05:00
LetterJay
2ff24e70a5
Merge pull request #1218 from Citadel-Station-13/upstream-merge-27686
...
[MIRROR] No more erros
2017-06-14 08:16:02 -05:00
CitadelStationBot
d079026d26
Changes config tag for secret extended
2017-06-13 17:17:18 -05:00
CitadelStationBot
c178552114
Changes Animal Movement Delay to Match Live
2017-06-11 20:45:50 -05:00
LetterJay
dfe99653fa
Rename server_to_bridge_port.txt to server_to_tool_bridge_port.txt
2017-06-05 07:43:33 -05:00
LetterJay
d12546ef35
Improper mirror
2017-06-05 07:25:02 -05:00
LetterJay
976c1244dd
Config shit for cards ( #1310 )
2017-06-02 21:56:08 -07:00
CitadelStationBot
ab39ece501
No more erros
2017-05-26 23:53:24 -05:00
LetterJay
73dea85b15
commit/rej cleanup
2017-05-22 11:24:17 -05:00
kevinz000
de0131346a
Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items
...
# Conflicts:
# code/controllers/configuration.dm
# code/game/objects/items.dm
2017-05-21 18:17:42 -07:00
CitadelStationBot
b8cbf1a056
[MIRROR] Makes some game options which should be flags flags ( #910 )
...
* Makes some game options which should be flags flags
* Update configuration.dm
* Delete configuration.dm.rej
2017-05-18 07:50:43 -05:00
LetterJay
4710beca0e
Merge pull request #807 from Citadel-Station-13/upstream-merge-26631
...
[MIRROR] 2017 Cult Overhaul P1: Cult Master and Datum Cult
2017-05-16 17:13:30 -04:00
kevinz000
99297bb544
Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items
2017-05-14 20:54:47 -07:00
kevinz000
da615b1440
h
2017-05-14 20:19:26 -07:00
kevinz000
e7c41603f0
new and improved
2017-05-14 19:22:52 -07:00
kevinz000
9e0866871e
lists and stuff
2017-05-13 11:26:07 -07:00
LetterJay
6a1cac4e1e
Merge branch 'master' into upstream-merge-26425
2017-05-12 00:08:32 -04:00
LetterJay
3c131800b6
Merge pull request #722 from Citadel-Station-13/upstream-merge-26645
...
[MIRROR] Persistent investigate and game logs separated by round ID
2017-05-10 21:12:08 -04:00
