shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,218 Commits 5 Branches 0 Tags
4da91bc330c976fe0353cf949b860e87d90302b9
Commit Graph

188 Commits

Author SHA1 Message Date
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
LetterJay
6b5fbc9bcd Update one_click_antag.dm 2017-09-13 03:49:32 -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
c82a2af526 Merge pull request #2725 from Citadel-Station-13/upstream-merge-30637 
[MIRROR] Adds 5s delay to current immediate ahelp verb returns
 2017-09-12 18:19:04 -05:00
oranges
3e6c0624fc Merge pull request #30637 from tgstation/Cyberboss-patch-6 
Adds 5s delay to current immediate ahelp verb returns
 2017-09-12 17:09:31 -05:00
JJRcop
b1dccf49a3 Adds 360p MP4 a+v stream to play_web_sound (#30598) 
Also moves aac to the bottom
 2017-09-12 14:16:36 -05:00
LetterJay
4cd4c6df70 Merge pull request #2697 from Citadel-Station-13/upstream-merge-30574 
[MIRROR] Adds a few SDQL2 list wrappers
 2017-09-12 02:41:30 -05:00
LetterJay
1cea5d6e4b Update one_click_antag.dm 2017-09-11 23:41:45 -05:00
LetterJay
f60d57520b Merge branch 'master' into upstream-merge-29839 2017-09-11 23:22:39 -05:00
LetterJay
e5cc2c1e4e Update one_click_antag.dm 2017-09-11 18:28:09 -05:00
LetterJay
16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
LetterJay
935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -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
kevinz000
9b0e43f7c3 Adds a few SDQL2 list wrappers (#30574) 
* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm
 2017-09-11 12:19:07 -05:00
CitadelStationBot
8ee6fdb76a [MIRROR] Fixes stop-sounds not force-stopping internet midis (#2692) 
* Fixes stop-sounds not force-stopping internet midis (#30571)

* Update playsound.dm

* Update preferences_toggles.dm (#17)

* Fixes stop-sounds not force-stopping internet midis
 2017-09-10 20:29:12 -07: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
LetterJay
7aa042cff1 Update randomverbs.dm 2017-09-02 07:33:45 -05:00
LetterJay
7711b73ca7 Update randomverbs.dm 2017-09-02 07:31:52 -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
7fea74994f Update randomverbs.dm 2017-09-02 06:53:49 -05:00
CitadelStationBot
50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00
kevinz000
874bad1203 Merge pull request #2524 2017-08-29 22:40:05 -07:00
kevinz000
88093698f2 sync 2017-08-29 09:33:37 -07:00
kevinz000
80221fa874 sync 2017-08-29 09:32:40 -07:00
LetterJay
7474aa3edb Merge pull request #2492 from Citadel-Station-13/upstream-merge-30191 
[MIRROR] Fixes empty adminhelp tickets messages
 2017-08-28 08:45:49 -05:00
CitadelStationBot
0b1c36c938 Changes playtime verb name 2017-08-28 02:20:21 -05:00
CitadelStationBot
f21f2c8207 Adds volume control to admin-played sounds 2017-08-26 11:07:11 -05:00
CitadelStationBot
8be784e667 Fixes empty adminhelp tickets messages 2017-08-26 11:07:06 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
e6650e6f35 Refined Test Areas (Station Z) debug output (#2321) 2017-08-21 20:25:20 -07: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
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
acc75bfb5f Removes admin type shortcut for /weapon 2017-08-16 18:50:57 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
CitadelStationBot
3d83b55cf6 Annihilates the colons! 2017-08-15 10:49:55 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
LetterJay
1520c4facd Merge pull request #2327 from Citadel-Station-13/upstream-merge-29800 
[MIRROR] Massively improves downloading/viewing logs.
 2017-08-12 06:34:41 -05:00
LetterJay
962d983079 Merge pull request #2294 from Citadel-Station-13/upstream-merge-29746 
[MIRROR] Fixes adminhelp sending the wrong message to players
 2017-08-12 06:33:29 -05:00
CitadelStationBot
bd8289b29f Massively improves downloading/viewing logs. 2017-08-10 10:49:22 -05:00
LetterJay
9e0b151240 Merge pull request #2303 from Citadel-Station-13/upstream-merge-29768 
[MIRROR] Standardized CENTCOM spelling
 2017-08-09 02:20:26 -05:00