shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,537 Commits 5 Branches 0 Tags
acb20fcde290ff522c1640c224eac2fbbc7ec5e5
Commit Graph

226 Commits

Author SHA1 Message Date
CitadelStationBot 2e4624ee3f Make timer debug info more robust (#1942) 2017-07-07 23:49:10 -07:00
TalkingCactus cb5247d060 Fixes Gamemode Voting & Map Edits (#1937) 
* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta
 2017-07-07 17:54:53 -04:00
CitadelStationBot bf14c1dd61 Machine subsystem now checks qdel status (#1922) 2017-07-07 04:46:36 -07:00
CitadelStationBot 0eb8d9549a Speeds up SSoverlays 2017-07-06 19:21:40 -05:00
Poojawa b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot bb34fa8c8a Speeds up SSoverlays 2017-07-01 13:55:20 -05:00
CitadelStationBot 259d773cec Round ID is now sent to IRC (#1706) 2017-06-30 21:16:44 -07:00
CitadelStationBot ca2d03a082 Moves transit space to separate z level. (#1696) 2017-06-30 20:56:45 -07:00
Poojawa 789064a3a5 Clean up .rej files 2017-06-28 02:24:03 -05:00
LetterJay 028752c3de Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564 
[MIRROR] Shuttle engines affecting travel time
 2017-06-26 09:00:54 -05:00
LetterJay 165e684e9b Update shuttle.dm 2017-06-26 08:01:38 -05:00
LetterJay 61a8d76122 Update shuttle.dm 2017-06-26 06:36:09 -05:00
LetterJay e3b1838e63 Merge pull request #1697 from Citadel-Station-13/upstream-merge-28600 
[MIRROR] Adds a heavily-damaged ripley as a lavaland ruin
 2017-06-26 06:24:31 -05:00
CitadelStationBot 1a38b6fd6f Shuttle engines affecting travel time 2017-06-25 20:53:00 -05:00
CitadelStationBot 8375a2dcf9 Fixes an error message 2017-06-22 11:03:29 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot 50a4f61663 Adds a heavily-damaged ripley as a lavaland ruin 2017-06-20 12:09:15 -05:00
LetterJay e1d6c5d278 increases round time 2017-06-17 22:47:32 -05:00
LetterJay 9842b19282 3 hour rounds 2017-06-17 22:44:42 -05:00
LetterJay 5117b3ea88 Merge pull request #1458 from Citadel-Station-13/upstream-merge-28146 
[MIRROR] Makes processing subsystems respect qdel and PROCESS_KILL
 2017-06-14 08:54:17 -05:00
LetterJay 760dfedeb1 Merge pull request #1530 from Citadel-Station-13/upstream-merge-28250 
[MIRROR] Renames Air subsystem to Atmospherics
 2017-06-12 12:40:37 -05:00
LetterJay d0c1ecc484 Merge pull request #1511 from Citadel-Station-13/upstream-merge-28237 
[MIRROR] Fixes death report giving the wrong damage type
 2017-06-12 12:32:29 -05:00
CitadelStationBot 8aae860c84 Renames Air subsystem to Atmospherics 2017-06-10 19:11:24 -05:00
LetterJay 47687a6d1a cleanup 2017-06-10 09:42:08 -05:00
LetterJay eac4854adf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-28165 2017-06-10 09:38:21 -05:00
LetterJay 79794685c3 Merge branch 'master' into upstream-merge-27890 2017-06-10 08:02:27 -05:00
CitadelStationBot 9a8778b16f Adds /image/proc/copy_overlays 2017-06-09 20:11:51 -05:00
CitadelStationBot 19a1d3555c Fixes death report giving the wrong damage type 2017-06-09 20:06:36 -05:00
CitadelStationBot 9e0488d2d9 Moves borer completion to gamemode 2017-06-09 09:01:03 -05:00
CitadelStationBot 1bdda132e7 Adds Medal Commendations! 2017-06-08 20:39:15 -05:00
CitadelStationBot 7eedaa87c5 Moves station's starting state to ticker post setup, instead of gamemode's 2017-06-07 20:54:37 -05:00
CitadelStationBot 0c2e0d5fb2 Makes processing subsystems respect qdel and PROCESS_KILL 2017-06-07 14:17:28 -05:00
CitadelStationBot c5143880d2 Fixes logged out spawning new_players 2017-06-06 13:28:23 -05:00
LetterJay dbb233b874 missed a few things 2017-06-06 07:49:18 -05:00
LetterJay 905bd168aa commit 2017-06-06 07:13:04 -05:00
LetterJay b93c49bd1d Merge pull request #1410 from Citadel-Station-13/upstream-merge-28090 
[MIRROR] Fixes roundstart spawning
 2017-06-05 05:12:06 -05:00
LetterJay 3429693bc9 Merge pull request #1404 from Citadel-Station-13/upstream-merge-26647 
[MIRROR] Refactors the latejoin list
 2017-06-05 04:49:27 -05:00
LetterJay 5b6907c9e8 yeeehaaaww 2017-06-05 04:24:57 -05:00
CitadelStationBot d22704b37c Fixes roundstart spawning 2017-06-05 04:04:22 -05:00
LetterJay 2eb7872a6a Merge pull request #1285 from Citadel-Station-13/upstream-merge-27782 
[MIRROR] Adds coalesce to world.internet_address
 2017-06-05 02:12:56 -05:00
CitadelStationBot e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
CitadelStationBot 13767b91ad Fixes admiral recall (#1374) 2017-06-04 02:18:42 -07:00
CitadelStationBot a70043afa2 [MIRROR] Reboot initiated by an admin will never be delayed (#1272) 
* Reboot initiated by an admin will never be delayed

* Update ticker.dm

* Delete ticker.dm.rej
 2017-06-02 22:01:39 -07:00
CitadelStationBot 603898adbe Fixes faulty query and logic 2017-05-31 08:39:39 -05:00
LetterJay b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -05:00
LetterJay 872b0e61fd rej cleanup, etc. 2017-05-30 23:43:14 -05:00
LetterJay 1763c4b65d Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530 
[MIRROR] Area Refactor + Var-edit Cleanup
 2017-05-30 20:49:42 -05:00
LetterJay bc5ecc91b5 rej clean 2017-05-30 15:55:00 -05:00
LetterJay a821d90a37 commit 2017-05-30 15:54:42 -05:00
LetterJay dda7ae1658 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27840 2017-05-30 15:54:03 -05:00