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
eeadba6f18
Merge pull request #2696 from Citadel-Station-13/upstream-merge-30494
...
[MIRROR] Adds missing span-endings
2017-09-12 06:32:45 -05:00
LetterJay
e2536975dc
Merge pull request #2675 from Citadel-Station-13/upstream-merge-30554
...
[MIRROR] Fixes admin topics
2017-09-12 03:07:04 -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
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
LetterJay
8223692c32
Merge pull request #2684 from Citadel-Station-13/upstream-merge-30558
...
[MIRROR] Adds href tokens to topic.dm
2017-09-12 02:37:49 -05:00
LetterJay
4fdc313486
Update topic.dm
2017-09-12 02:36:28 -05:00
LetterJay
b8f2fe00e5
Update topic.dm
2017-09-12 02:31:25 -05:00
LetterJay
4d7c4e6da9
Merge branch 'master' into upstream-merge-30554
2017-09-12 01:20:05 -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
c3ef612490
Ports MSO's fading note system
2017-09-11 23:07:30 -05:00
LetterJay
e5cc2c1e4e
Update one_click_antag.dm
2017-09-11 18:28:09 -05:00
LetterJay
c03fb31b1c
Update sql_message_system.dm
2017-09-11 18:27:47 -05:00
LetterJay
5fafa90538
Update secrets.dm
2017-09-11 18:27:20 -05:00
LetterJay
584bb8dc64
Update holder2.dm
2017-09-11 18:27:04 -05:00
LetterJay
15c4d34b55
Update create_turf.dm
2017-09-11 18:26:50 -05:00
LetterJay
98f6cf208b
Update create_object.dm
2017-09-11 18:26:36 -05:00
LetterJay
bb463cef48
Update create_mob.dm
2017-09-11 18:26:13 -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
LetterJay
532d8bd0a6
Merge pull request #2558 from Citadel-Station-13/upstream-merge-30268
...
[MIRROR] Adds db connectivity check to jobban cache building
2017-09-11 13:12:38 -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
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -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
LetterJay
b89fa8ab15
Update topic.dm
2017-09-10 15:54:31 -05:00
Leo
0e24ac55a5
Merge pull request #30558 from Cyberboss/IFUCKINGHATETHISGODAMNSTUPIDASSFILE
...
Adds href tokens to topic.dm
2017-09-10 09:35:21 -05:00
AnturK
dc2c9fb07d
Fixes admin topics
2017-09-09 17:13:25 -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
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
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
LetterJay
2f3f56352c
Merge branch 'master' into upstream-merge-30176
2017-09-06 17:43:07 -05:00
LetterJay
b07ebeed57
Merge pull request #2480 from Citadel-Station-13/upstream-merge-30140
...
[MIRROR] Corrects column name
2017-09-06 09:26:12 -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
a94ffca643
Update admin.dm
2017-09-02 07:28:33 -05:00
LetterJay
f4b08d32a7
Update admin.dm
2017-09-02 07:26:16 -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
CitadelStationBot
acd129ac37
Adds db connectivity check to jobban cache building
2017-08-30 08:01:27 -05:00
kevinz000
874bad1203
Merge pull request #2524
2017-08-29 22:40:05 -07:00
kevinz000
5dc670e282
Merge pull request #2401
2017-08-29 22:27:07 -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
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
