Commit Graph

277 Commits

Author SHA1 Message Date
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
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
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
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
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
da6e3d7c8e readds toggle_hear_radio admin verb 2017-08-19 06:45:50 -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
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
LetterJay
fdfdd4fc21 Update admin_investigate.dm 2017-08-14 08:24:34 -05:00
CitadelStationBot
2476d59be6 Makes the ahelp topic give the permissions warning 2017-08-14 06:54:44 -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
Poojawa
5a7126a0dd Panic Bunker for moderator/trialmin access 2017-08-12 01:15:42 -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
CitadelStationBot
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
c2419e84f5 Adds a Test Areas (Station Z) verb 2017-08-08 05:50:22 -05:00
CitadelStationBot
fbabd14798 Fixes adminhelp sending the wrong message to players 2017-08-07 12:26:15 -05:00
LetterJay
fc450fd561 Merge pull request #2291 from Citadel-Station-13/upstream-merge-29725
[MIRROR] Sounds played with sound_to_playing_players are less tinny
2017-08-07 07:26:18 -05:00
CitadelStationBot
d071a78888 Sounds played with sound_to_playing_players are less tinny 2017-08-06 18:02:47 -05:00
CitadelStationBot
a90448b262 Fixes oversight with APCs using areastring 2017-08-05 19:28:33 -05:00
CitadelStationBot
795dcece74 Fixes admin buildmode not returning a qdel hint (#2254) 2017-08-04 08:42:33 -07:00