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 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,744 Commits 55 Branches 0 Tags
754c24748edbe3c729f6e9615b12e7587cba6da2
Commit Graph

1926 Commits

Author SHA1 Message Date
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
CitadelStationBot
2fadc0e58b Fixes Gang War's infinity shuttle 2017-05-26 11:27:38 -05:00
LetterJay
a90e1404dd Merge pull request #1161 from Citadel-Station-13/upstream-merge-27594 
[MIRROR] Fixes DBCore Recovery
 2017-05-25 09:39:14 -05:00
CitadelStationBot
1cfd18a757 Fixes SSlighting Recovery 2017-05-24 18:28:56 -05:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
CitadelStationBot
0742aa525b Fixes DBCore Recovery 2017-05-24 16:16:56 -05:00
CitadelStationBot
20089a34e8 Fixes full controller recovery not restoring appropriate runlevel 2017-05-24 08:25:49 -05:00
LetterJay
e0ada1b4c6 Merge pull request #1137 from Citadel-Station-13/upstream-merge-27541 
[MIRROR] If you're gonna make a subsystem do it right
 2017-05-23 16:47:32 -05:00
CitadelStationBot
7abd50a97d If you're gonna make a subsystem do it right 2017-05-23 13:45:27 -05:00
CitadelStationBot
795ae0111d Fixes Blackbox subsystem def 2017-05-23 13:45:23 -05:00
LetterJay
cd583208b5 Merge pull request #1099 from Citadel-Station-13/upstream-merge-27459 
[MIRROR] Fixes ordering of text2file params
 2017-05-23 07:14:46 -05:00
CitadelStationBot
4afae3d03b Makes global master vars static 2017-05-22 22:12:58 -05:00
CitadelStationBot
efa9de6da9 Area Refactor + Var-edit Cleanup 2017-05-22 22:08:35 -05:00
kevinz000
0508b613a5 automatic config load and dme 2017-05-22 17:53:24 -07:00
LetterJay
cbae09b538 rej cleanup/commit 2017-05-22 16:59:39 -05:00
LetterJay
aad357bd74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27450 2017-05-22 16:56:18 -05:00
LetterJay
8791ad036f Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268 
[MIRROR] World.dm Refactor
 2017-05-22 12:39:52 -05:00
LetterJay
e0f65beb37 World > SSticker 2017-05-22 12:31:05 -05:00
LetterJay
a0e5170e40 Merge pull request #1086 from Citadel-Station-13/upstream-merge-27476 
[MIRROR] Megafauna and lavaland mobs will no longer spawn directly on top of the mining base
 2017-05-22 08:23:23 -05:00
kevinz000
ff4ef6a1f5 reset 2017-05-21 21:58:11 -07:00
CitadelStationBot
20dd169998 Fixes ordering of text2file params 2017-05-21 22:29:19 -05:00
CitadelStationBot
4e5617ad54 Megafauna and lavaland mobs will no longer spawn directly on top of the mining base 2017-05-21 22:28:10 -05:00