shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,405 Commits 5 Branches 0 Tags
f650d8bb5ef990649a668e59ea82515d22355b80
Commit Graph

63 Commits

Author SHA1 Message Date
Jordan Brown
6a09d5c981 Merge pull request #33578 from lzimann/job 
Changes manage job slots to use a browser datum, also lets it be used before roundstart
 2017-12-17 04:09:45 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
Jordan Brown
87c16e3939 Merge pull request #33112 from AnturK/devilfix 
Fixes devilstuff
 2017-11-28 06:29:25 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58
eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
Emmett Gaines
3c35202b5e Performance and usability improvement for blueprints 2017-11-13 03:32:35 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04: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
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
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -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
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
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -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
Jordan Brown
92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -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
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
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot
ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
fcf09e06e0 Allows admins to set messages when they delay the round end (#1965) 2017-07-10 16:13:51 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
07cb1ab1de Fix related CID/IPs on player panel 2017-06-09 08:59:57 -05:00
LetterJay
60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -05:00
CitadelStationBot
e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
LetterJay
b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -05:00
CitadelStationBot
29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -05:00
LetterJay
25059558cb admin related shit 2017-05-26 15:26:08 -05:00
CitadelStationBot
83b4c1d8d4 Adds round table to replace tacking some data in feedback table 2017-05-26 15:18:16 -05:00
CitadelStationBot
94b7e560ab World.dm Refactor 2017-05-18 16:37:46 -05:00
CitadelStationBot
7a9e05e9d9 Cerestation Tweaks MK VII: BEES edition (#925) 2017-05-18 10:36:51 -05:00
CitadelStationBot
c6a671a11b [MIRROR] Devil refactor+small revamp (#887) 
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
 2017-05-18 09:06:01 -05:00
CitadelStationBot
eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBot
2ee5ff82a2 [MIRROR] Adds a way to check related accounts by CID or IP in game (#863) 
* Adds a way to check related accounts by CID or IP in game

* resolve rej
 2017-05-18 04:20:49 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
LetterJay
55492bb8ec even more client fixes! this time with added admin fixes 2017-05-12 09:52:42 -05:00
LetterJay
c7fce18213 travis 2017-05-12 01:54:20 -05:00
CitadelStationBot
09655ed5e8 Adds player age and byond account age to player panel 2017-05-05 20:08:07 -05:00
LetterJay
fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJay
991fb8335c manual merge 2017-04-29 11:42:28 -05:00
CitadelStationBot
08a01aa11b Refactors roundstart checks slightly 2017-04-26 17:06:29 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
LetterJay
6070000c9a Merge pull request #537 from Citadel-Station-13/upstream-merge-26485 
[MIRROR] Renames "Hard Reset" to "Reboot World"
 2017-04-24 21:23:31 -05:00