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
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
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
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
LetterJay
5225aa7d65
Merge pull request #2493 from Citadel-Station-13/upstream-merge-30192
...
[MIRROR] Adds volume control to admin-played sounds
2017-08-28 08:45:34 -05:00
CitadelStationBot
2a0f617f68
Adds more round id tracking
2017-08-28 05:50:05 -05:00
CitadelStationBot
0b1c36c938
Changes playtime verb name
2017-08-28 02:20:21 -05:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07: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
CitadelStationBot
0ca8580715
Corrects column name
2017-08-24 15:45:07 -05: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
15b378ddf4
adminrank hotfix
2017-08-22 03:51:21 -05: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
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
CitadelStationBot
e6650e6f35
Refined Test Areas (Station Z) debug output ( #2321 )
2017-08-21 20:25:20 -07:00
