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
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
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
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
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
5cefa71992
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-10-04 20:18:03 -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
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
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
ShizCalev
7e2873cd46
Corrected shuttle refuel time
2017-09-30 00:59:00 -05:00
Jordan Brown
116041d621
Server tools API v3.1
2017-09-28 22:20:46 -05:00
kevinz000
724fa8ce54
[READY]Refactors timestops to use fields ( #30858 )
...
* kek
* fixes
* Fixes
* fixes
* throw freeze
* woops
* double woops
2017-09-28 21:46:34 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
Jordan Brown
659c92a0d6
Fixes SSqueak not returning ..()
2017-09-28 10:43:16 -05:00
deathride58
226ad9ddde
adjustments
2017-09-28 01:10:42 -04:00
deathride58
9bdc80ba82
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-09-27 23:44:22 -04:00
LetterJay
7a0ffb8a67
Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
...
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
LetterJay
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
LetterJay
69fa79f974
Update ticker.dm
2017-09-27 15:33:42 -05:00
LetterJay
0387f81ed5
Update ticker.dm
2017-09-27 15:16:05 -05:00
Ashe Higgs
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
AnturK
fd0bc465cc
Refactors cinematics.
2017-09-26 04:20:59 -05:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
oranges
6278d49662
Href tokens
2017-09-24 17:34:37 -05:00
vuonojenmustaturska
d111c582b4
Meteors can now qdel normally ( #30970 )
2017-09-23 23:35:14 -05: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
CitadelStationBot
e783c39419
[MIRROR] Mice spawn now chooses correct z-level ( #2887 )
...
* Merge pull request #30897 from AutomaticFrenzy/squeakFix
Mice spawn now chooses correct z-level
* Mice spawn now chooses correct z-level
* Update squeak.dm
2017-09-22 04:47:08 -05:00
oranges
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
deathride58
fb7f2d0ab8
fixes all the roundstart related issues
2017-09-20 16:03:56 -04:00
CitadelStationBot
6e79861679
[MIRROR] fix black box runtimes ( #2863 )
...
* fix black box runtimes
* fix black box runtimes
2017-09-20 01:03:17 -05:00
deathride58
fac0e75103
blegh
2017-09-19 20:49:42 -04:00
