kevinz000
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
Jordan Brown
44ca2d67f6
Merge pull request #31663 from ninjanomnom/shuttle-subsystem
...
Repopulates SSshuttle recover
2017-10-14 18:49:24 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
LetterJay
813e54e5ae
Merge pull request #3322 from Citadel-Station-13/upstream-merge-31544
...
[MIRROR] Server maint logs when nulls enter the clients list
2017-10-12 07:19:21 -04:00
LetterJay
3c55163ebd
Merge pull request #3319 from Citadel-Station-13/upstream-merge-31464
...
[MIRROR] Make SStgui actually read the html from the disk at runtime
2017-10-12 07:18:42 -04:00
LetterJay
f19437bae9
Merge pull request #3307 from deathride58/crewobjtweaksgalore
...
Crew Obj & Miscreant system optimizations and tweaks
2017-10-12 07:16:13 -04:00
Jordan Brown
acdc5c1380
Server maint logs when nulls enter the clients list ( #31544 )
2017-10-12 00:29:50 -05:00
Jordan Brown
24a85f97ab
Make SStgui actually read the html from the disk at runtime ( #31464 )
...
* Make SStgui actually read the html from the disk at runtime
* Remove the comment
* Back to "
2017-10-12 00:29:28 -05:00
deathride58
2a46696e55
cleans up comments
2017-10-11 18:26:10 -04:00
deathride58
1a3b0c6528
applies optimizations to miscreants
2017-10-11 18:07:08 -04:00
deathride58
bd18903e13
eh it works
2017-10-11 18:03:58 -04:00
LetterJay
822f15f4ae
Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494
...
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 22:32:52 -04:00
Jordan Brown
7b30be0058
Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
...
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
JamieH
9eb83d1598
Fix a bug in the new lobby music system ( #31477 )
...
* Fix a bug in the new lobby music system
* Update ticker.dm
* ...
2017-10-10 13:14:50 -05:00
Leo
0a1b40c01e
Merge pull request #31466 from tgstation/Cyberboss-patch-2
...
Makes config loading messages consistent
2017-10-09 16:03:47 -05:00
vuonojenmustaturska
7cec0bbf67
Adds time dilation data to the feedback table ( #31278 )
...
* adds time dilation data to the feedback table
* Revert "adds time dilation data to the feedback table"
This reverts commit bed0bd78b6e24be7da8269f6af24e51f0c90ded7.
* adds time dilation data to the feedback table 2: electric boogaloo
* Changes
2017-10-08 15:38:15 -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
9f1c6cef0c
Merge branch 'master' into upstream-merge-31371
2017-10-08 15:37:46 -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
deathride58
5d0853e16a
Crew objective/miscreant system tweaks ( #3213 )
...
* Loadsa tweaks
* adds miscreant pref, other fixes
* fixes runtime
* fixes compiling errors for REAL now hopefully
* HOPEFULLY fixes compiling errors
* COMPILE!
2017-10-08 10:05:40 -07:00
CitadelStationBot
f579a3bf74
[MIRROR] Fix adding bad config entries ( #3219 )
...
* Fixes adding bad config entries (#31390 )
* Fix adding bad config entries
2017-10-07 23:04:14 -07:00
LetterJay
4a2d9f82a1
Update config.dm
2017-10-07 23:06:35 -05:00
Kyle Spier-Swenson
988dd75850
Allows editing config.allow_admin_ooccolor
2017-10-07 12:38:17 -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
LetterJay
fe27aa586c
Merge pull request #3181 from Citadel-Station-13/upstream-merge-31336
...
[MIRROR] Fixes lighting object initialization on new zlevels.
2017-10-07 01:05:11 -04:00
Jordan Brown
b17a770299
Config option to automatically call the shuttle for high casualties ( #31309 )
2017-10-06 21:35:49 -05:00
Leo
32fa3cf86b
Merge pull request #31336 from AnturK/Fixes-lighting-on-away-missions
...
Fixes lighting object initialization on new zlevels.
2017-10-06 07:11:47 -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
Jordan Brown
f1dfc1b6db
Merge pull request #31252 from MrStonedOne/whatthefuckcyberboss
...
Partial revert of #30763 (datum config refactor)
2017-10-03 17:55:05 -05:00
LetterJay
cc93f1e546
Merge pull request #3074 from Citadel-Station-13/upstream-merge-31127
...
[MIRROR] Chat command to notify admins when the round ends
2017-10-01 23:53:41 -04:00
LetterJay
872358ecca
Merge pull request #3066 from Citadel-Station-13/upstream-merge-31172
...
[MIRROR] Maplist is loaded regardless of maprotation config setting
2017-10-01 23:40:23 -04:00
oranges
b9f71e9e15
Merge pull request #31127 from Cyberboss/notify_command
...
Chat command to notify admins when the round ends
2017-10-01 21:12:41 -05:00
deathride58
70f06cfe35
config. > CONFIG_GET
2017-10-01 19:56:44 -04: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
oranges
48212ee000
Merge pull request #31082 from Incoming5643/Satchel_Fix
...
Repairs and Intensifies Secret Satchels
2017-10-01 15:02:23 -05:00
LetterJay
9f05ef16df
Merge branch 'master' into upstream-merge-31108
2017-10-01 04:31:36 -04:00
LetterJay
0ab234ceb0
Merge branch 'master' into upstream-merge-31000
2017-10-01 03:31:49 -04:00
LetterJay
4be6f22669
Merge branch 'master' into upstream-merge-31108
2017-10-01 02:53:27 -04:00
LetterJay
747312cb6d
updates
2017-10-01 00:59:59 -05:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
LetterJay
99319f5d4d
Update shuttle.dm
2017-09-30 14:23:40 -05:00
LetterJay
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
LetterJay
2bbc880bf1
Merge pull request #3009 from Citadel-Station-13/upstream-merge-31092
...
[MIRROR] Fixes subsystems not returning a qdel hint
2017-09-30 12:58:30 -04:00
Jordan Brown
3b64e0ec35
[s] Fixes config reading exploit
2017-09-30 09:45:13 -05:00
ShizCalev
7e2873cd46
Corrected shuttle refuel time
2017-09-30 00:59:00 -05:00
