Commit Graph

223 Commits

Author SHA1 Message Date
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
kevinz000
7f08bf08e3 Adds walk and step SDQL2 wrappers (#31447)
* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm
2017-10-10 03:18:43 -05:00
Jordan Brown
4f32b7a0d4 Moves assert_gas() into a define it should always have been, speeding up atmos slightly 2017-10-07 13:37:28 -05:00
ExcessiveUseOfCobblestone
f2102c68f1 Resolving tickets now informs the player. (#31357)
* Update adminhelp.dm

* Update adminhelp.dm
2017-10-06 21:25:53 -05:00
oranges
bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup
Cleans up and fixes old landmarks
2017-10-05 03:05:40 -05:00
LetterJay
9026f029d5 Merge pull request #3079 from Citadel-Station-13/upstream-merge-31103
[MIRROR] Refactor quick create antag panel code, fixed AFK revs not properly ending the round.
2017-10-02 21:12:31 -04:00
LetterJay
4d68cd0803 Merge pull request #3078 from Citadel-Station-13/upstream-merge-31191
[MIRROR] Makes the reply link for ahelps use the global token
2017-10-02 21:12:17 -04:00
ShizCalev
e402c4350c Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103)
* Refactor quick create antag, fixed AFK revs not ending

* More cleanup

* Simplified one of the checks
The other half was covered by considered_alive already.

* Reordered check

Eliminate current antags sooner before running them through the rest of
the checks.

* removed switch
2017-10-02 02:48:51 -05:00
Jordan Brown
bd76e658b0 Makes the reply link for ahelps use the global token (#31191) 2017-10-02 01:14:14 -05:00
LetterJay
684d888366 Update playsound.dm 2017-10-01 22:51:34 -05:00
JJRcop
7c88f10db0 played_url now includes ckey 2017-10-01 19:30:43 -05:00
LetterJay
5ec781502c Merge branch 'master' into upstream-merge-31116 2017-10-01 15:09:10 -04:00
LetterJay
80a84db919 Update adminhelp.dm 2017-10-01 02:39:24 -05:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJay
49c63dd794 Update randomverbs.dm 2017-10-01 01:57:03 -05:00
LetterJay
747312cb6d updates 2017-10-01 00:59:59 -05:00
AnturK
6afd603fe6 Fixes some hardset dna misuse 2017-09-30 14:51:52 -05:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
Jordan Brown
3b64e0ec35 [s] Fixes config reading exploit 2017-09-30 09:45:13 -05:00
Jordan Brown
116041d621 Server tools API v3.1 2017-09-28 22:20:46 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
CitadelStationBot
4f281e5ea1 [MIRROR] Blackbox stat for internet midis (#2964)
* Blackbox stat for internet midis

* Blackbox stat for internet midis
2017-09-28 05:56:26 -07:00
LetterJay
7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
LetterJay
d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
LetterJay
ec3fc4441c Update cinematic.dm 2017-09-26 14:02:49 -05:00
AnturK
fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
ShizCalev
169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
oranges
a6ae23aefb Merge pull request #30984 from tgstation/Cyberboss-patch-4
Makes keywords_lookup use the global token
2017-09-24 17:35:49 -05:00
Poojawa
f004c09346 seriously, 1,261 lines changed over 2? 2017-09-23 06:18:54 -05:00
Jordie
1030130672 Fixes create outfit Href issues 2017-09-23 05:32:36 -05:00
CitadelStationBot
fd64d4fdfa [MIRROR] Fixes IRC ahelp answer notifications (#2888)
* Merge pull request #30912 from tgstation/Cyberboss-patch-4

Fixes IRC ahelp answer notifications

* Fixes IRC ahelp answer notifications
2017-09-22 04:45:24 -05:00
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
CitadelStationBot
9284bdd205 [MIRROR] Admins in chat are notified if an ahelp is answered in game (#2828)
* Admins in chat are notified if an ahelp is answered in game (#30638)

* Admins in chat are notified if an ahelp is answered in game

* Further sanity

* Admins in chat are notified if an ahelp is answered in game
2017-09-17 22:25:43 -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
Poojawa
0eb8cf0235 Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)
* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.
2017-09-16 04:29:22 -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
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