Commit Graph

380 Commits

Author SHA1 Message Date
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
LetterJay 8c6c57ff32 Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896
[MIRROR] Removes old debug text
2017-09-22 00:03:30 -04:00
oranges 41277ff110 Removes old debug text 2017-09-21 06:30:11 -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
CitadelStationBot 6e79861679 [MIRROR] fix black box runtimes (#2863)
* fix black box runtimes

* fix black box runtimes
2017-09-20 01:03:17 -05: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
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 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 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 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
pubby a01f3213f5 Traitorbro gamemode 2017-09-17 18:03:12 -05:00
CitadelStationBot 3a7640d436 [MIRROR] Fixes random gamemode instantiation (#2803)
* Fixes random gamemode instantiation

* Fixes random gamemode instantiation
2017-09-17 12:01:33 -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
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 9a4f84da5e [MIRROR] Refactors roundstart centcom threat report. (#2739)
* Refactors roundstart centcom threat report.

* Update blob.dm

* Update changeling.dm

* Update traitor_chan.dm

* Update sandbox.dm

* Update traitor.dm
2017-09-13 22:50:01 -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 c785e53563 Update failsafe.dm 2017-09-12 03:08:20 -05:00
LetterJay dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJay f60d57520b Merge branch 'master' into upstream-merge-29839 2017-09-11 23:22:39 -05:00
LetterJay c3ef612490 Ports MSO's fading note system 2017-09-11 23:07:30 -05:00
LetterJay 935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -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
KorPhaeron d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
kingofkosmos 63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -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
Poojawa ce787e7726 Reverts sav file persistance for poly/pun-pun (#2654)
* Reverts sav file persistance for poly/pun-pun

* makes sure poly writes to poly
2017-09-08 06:58:08 -05:00
LetterJay 21a72cd04c Merge pull request #2640 from Citadel-Station-13/upstream-merge-30436
[MIRROR] More timer debugging for the debug gods.
2017-09-07 10:22:45 -05:00
LetterJay 31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
Kyle Spier-Swenson 4b02f01a66 More timer debugging for the debug gods. (#30436)
* More timer debugging for the debug gods.

* Its times like this I wish I could amend commit from the web interface

* git commit -a -amend&&git push --force
2017-09-07 09:59:28 -05:00
LetterJay 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay a16ba4e4cd Merge pull request #2445 from Citadel-Station-13/upstream-merge-29953
[MIRROR] Add logging of deathgasp last words and suicide stats to the death table
2017-09-06 10:11:16 -05:00
LetterJay 00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
LetterJay 72a8f7aa54 Merge branch 'master' into upstream-merge-29953 2017-09-06 09:17:57 -05:00
LetterJay b6f6970ebb Update disease.dm 2017-09-06 09:06:59 -05:00
LetterJay 1f872675b0 Update disease.dm 2017-09-06 09:06:30 -05:00
LetterJay af409af9cf additional files 2017-09-05 16:29:25 -05:00
LetterJay 92e055be97 Quick sync (#2587)
* sync since the mirror was down

* fucking byond

* can't forget these
2017-09-04 04:38:49 -05:00