Commit Graph

369 Commits

Author SHA1 Message Date
oranges
b9f71e9e15 Merge pull request #31127 from Cyberboss/notify_command
Chat command to notify admins when the round ends
2017-10-01 21:12:41 -05:00
LetterJay
e3810ef517 Merge branch 'master' into upstream-merge-31128 2017-10-01 15:46:15 -04: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
Leo
d845fc7aa8 Removes irccheck admin restriction 2017-09-30 21:34:22 -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
LetterJay
6fe6cfd68e Update ipintel.dm 2017-09-29 23:42:35 -05:00
Jordan Brown
116041d621 Server tools API v3.1 2017-09-28 22:20:46 -05:00
Jordan Brown
eb27276765 Profile access is granted when holder is created 2017-09-28 21:53:12 -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
Jordan Brown
41276ce631 Fixes missing Href tokens (#30987)
* Fixes missing Href tokens

* Add missing form field. Fixes #30986
2017-09-26 07:27:49 -05:00
AnturK
fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
LetterJay
196caaf3e1 Merge pull request #2931 from Citadel-Station-13/upstream-merge-30984
[MIRROR] Makes keywords_lookup use the global token
2017-09-25 13:27:46 -04: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
oranges
6278d49662 Href tokens 2017-09-24 17:34:37 -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
518e04a653 [MIRROR] Fixes game panel href token (#2898)
* Fixes game panel href token

* wew
2017-09-23 00:30:09 -05:00
CitadelStationBot
eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895)
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
2017-09-22 23:35: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
LetterJay
8c6c57ff32 Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896
[MIRROR] Removes old debug text
2017-09-22 00:03:30 -04:00
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
oranges
9788c425be Merge pull request #30891 from vuonojenmustaturska/adminhref
Fixes banning panel href errors, adds href helper functions
2017-09-21 06:28:55 -05:00
CitadelStationBot
51786b346e [MIRROR] Fixes it so Deadmin properly hides the Player Panel verb for admins. (#2861)
* Fixes it so Deadmin properly hides the Player Panel verb for admins.

* Update admin_verbs.dm
2017-09-20 01:04:13 -05:00
LetterJay
7c626edca4 fk u 2017-09-19 12:32:10 -05:00
LetterJay
51007614e6 sql fix 2017-09-19 09:24:43 -05:00
LetterJay
19309d76d0 Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344
[MIRROR] Traitorbro gamemode
2017-09-18 08:35:00 -04: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
CitadelStationBot
a94a8f9ab4 [MIRROR] Enables Dead OOC at round-end (#2835)
* Enables Dead OOC at round-end (#30716)

* Enables Dead OOC at roundend

* proc

* proc #2

* Enables Dead OOC at round-end
2017-09-17 22:20:15 -05:00
pubby
a01f3213f5 Traitorbro gamemode 2017-09-17 18:03:12 -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
CitadelStationBot
9961ecabf1 [MIRROR] More admin auth fixes (#2769)
* More admin auth fixes (#30688)

* More admin auth fixes
2017-09-14 13:17:08 -05:00
CitadelStationBot
5ed14bfedd [MIRROR] Adds more missing href tokens (#2749)
* Adds more missing href tokens (#30664)

* Adds more missing href tokens
2017-09-14 07:37:25 -05:00
CitadelStationBot
40e0bae912 [MIRROR] Nope (#2715)
* Nope

* Update secrets.dm
2017-09-13 22:50:15 -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