shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,500 Commits 5 Branches 0 Tags
7b5734d6848469448feecdaca0a6e0bb1bbefbd1
Commit Graph

342 Commits

Author SHA1 Message Date
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
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
eeadba6f18 Merge pull request #2696 from Citadel-Station-13/upstream-merge-30494 
[MIRROR] Adds missing span-endings
 2017-09-12 06:32:45 -05:00
LetterJay
e2536975dc Merge pull request #2675 from Citadel-Station-13/upstream-merge-30554 
[MIRROR] Fixes admin topics
 2017-09-12 03:07:04 -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
dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJay
8223692c32 Merge pull request #2684 from Citadel-Station-13/upstream-merge-30558 
[MIRROR] Adds href tokens to topic.dm
 2017-09-12 02:37:49 -05:00
LetterJay
4fdc313486 Update topic.dm 2017-09-12 02:36:28 -05:00
LetterJay
b8f2fe00e5 Update topic.dm 2017-09-12 02:31:25 -05:00
LetterJay
4d7c4e6da9 Merge branch 'master' into upstream-merge-30554 2017-09-12 01:20:05 -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
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
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
kevinz000
9b0e43f7c3 Adds a few SDQL2 list wrappers (#30574) 
* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm
 2017-09-11 12:19:07 -05:00