shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,204 Commits 5 Branches 0 Tags
4d23dd56b8577aef6bb165cac2e55e34e5dcfec7
Commit Graph

378 Commits

Author SHA1 Message Date
LetterJay
3c0a9c23e1 Merge pull request #3081 from Citadel-Station-13/upstream-merge-31196 
[MIRROR] Fixes check antagonists for blood brothers
 2017-10-02 21:12:40 -04: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
oranges
139ebadc52 Merge pull request #31196 from kevinz000/patch-303 
Fixes check antagonists for blood brothers
 2017-10-02 15:52:10 -05: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
LetterJay
87690e3bb7 Merge pull request #3072 from Citadel-Station-13/upstream-merge-31186 
[MIRROR] played_url now includes ckey
 2017-10-02 02:31:39 -04: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
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
JJRcop
7c88f10db0 played_url now includes ckey 2017-10-01 19:30:43 -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