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
CitadelStationBot
ecce4cf138
[MIRROR] New DCS signals ( #2741 )
...
* New DCS signals
* Update atoms.dm
* actually ports comsigs
2017-09-19 07:00:08 -05:00
CitadelStationBot
1edd7b82d1
[MIRROR] Minor weather code split/refactor ( #2837 )
...
* Minor weather code split/refactor
* Delete weather_types.dm
* Update radiation_storm.dm
2017-09-18 01:46:41 -05:00
CitadelStationBot
a94a8f9ab4
[MIRROR] Enables Dead OOC at round-end ( #2835 )
...
* Enables Dead OOC at round-end (#30716 )
* Enables Dead OOC at roundend
* proc
* proc #2
* Enables Dead OOC at round-end
2017-09-17 22:20:15 -05:00
CitadelStationBot
08083581c3
[MIRROR] (Hopefully) Lessens preferences and manifest injection lag ( #2796 )
...
* (Hopefully) Lessens preferences and manifest injection lag
* Update datacore.dm
* Update preferences_setup.dm
2017-09-17 11:59:40 -05:00
CitadelStationBot
1cca85a58e
[MIRROR] Fixes null modes being picked ( #2802 )
...
* Fixes null modes being picked
* Fixes null modes being picked
2017-09-17 11:58:33 -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
deathride58
c4e3b778b3
Merge branch 'master' into crewobjectivesandmiscreants
2017-09-17 02:26:07 +00:00
AnturK
556e6806f8
Fixes ReportDeath
2017-09-15 05:15:06 -05:00
CitadelStationBot
d86060dcff
[MIRROR] Lobby music won't be the same as the last round ( #2727 )
...
* Merge pull request #30636 from Cyberboss/NoDupeMusic
Lobby music won't be the same as the last round
* Lobby music won't be the same as the last round
2017-09-14 07:51:34 -05:00
CitadelStationBot
82d0aae420
[MIRROR] Changes shuttle port direction var from an angle to a dir ( #2613 )
...
* Changes shuttle port direction var from an angle to a dir
* actually ports the directions
* Update shuttle.dm
* how
2017-09-13 20:39:55 -05:00
LetterJay
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
Kyle Spier-Swenson
3da71799ab
Garbage collection tweaks and refactors. ( #30118 )
...
* Garbage collection queuing rewriting
* Some Tweaks
* Fixes some queue tracking oddities
* More tweaks
* Remove the middle two queue steps. tis was a silly idea
* New logging.
We store logging datums for use in tracking the stats of shit qdeleted
Added logging for destroy time as well as hard delete time, per type. As well as a few others
* Fix compile for testing
* Does the cyberboss
* does the antur
2017-09-13 01:47:12 -05:00
LetterJay
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
LetterJay
c7ae892e8d
Update persistence.dm
2017-09-11 15:53:35 -05:00
LetterJay
e0e552829c
Update persistence.dm
2017-09-11 15:47:18 -05:00
