cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,151 Commits 55 Branches 0 Tags
8375a2dcf9a4509737d579b502033d175a9852b8
Commit Graph

239 Commits

Author SHA1 Message Date
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
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
d12546ef35 Improper mirror 2017-06-05 07:25:02 -05:00
LetterJay
60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -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
LetterJay
976c1244dd Config shit for cards (#1310) 2017-06-02 21:56:08 -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
LetterJay
f259908266 Merge pull request #1196 from Citadel-Station-13/upstream-merge-27675 
[MIRROR] Fixes Gang War's infinity shuttle
 2017-05-30 15:48:23 -05:00
LetterJay
f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361 
[MIRROR]  Refactors explosions
 2017-05-30 15:15:51 -05:00
LetterJay
80896d0371 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27675 2017-05-30 14:14:25 -05:00
LetterJay
601636f4a1 map rotation 2017-05-30 01:55:28 -05:00
CitadelStationBot
3ba2db8bcb Fixes SSmachines using colons 2017-05-29 11:04:13 -05:00
CitadelStationBot
9dd40f1fad Adds coalesce to world.internet_address 2017-05-29 09:15:12 -05:00
CitadelStationBot
2ad5c8ac7e Fixes doubled post-round end time. 2017-05-29 09:15:08 -05:00
LetterJay
5fe7f7083a woo 2017-05-29 01:59:49 -05:00
LetterJay
1f618ab39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27576 2017-05-29 01:57:56 -05:00
CitadelStationBot
de3d21902a Fixes typo in garbage subsystem 2017-05-27 20:56:17 -05:00
CitadelStationBot
83b4c1d8d4 Adds round table to replace tacking some data in feedback table 2017-05-26 15:18:16 -05:00
LetterJay
fabe1e98a7 update blackbox.dm 2017-05-26 12:02:26 -05:00