shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,509 Commits 5 Branches 0 Tags
b5cfa6709eebbcb76cbb5a19f36d75d2cb83b99a
Commit Graph

181 Commits

Author SHA1 Message Date
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
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
efa9de6da9 Area Refactor + Var-edit Cleanup 2017-05-22 22:08:35 -05: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
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
CitadelStationBot
26448d7016 Removes the mess added with recalling with a message 2017-05-21 07:57:17 -05:00
Poojawa
2be5022536 Merge branch 'master' into upstream-merge-27268 2017-05-21 01:22:16 -05:00
CitadelStationBot
c8e9e34d2b [MIRROR] Fixes stat gathering (#1025) 
* Fixes stat gathering

* Delete blackbox.dm.rej

* Update blackbox.dm
 2017-05-21 01:07:14 -05:00
Poojawa
7a3fb9e62e update ticker.dm 2017-05-21 01:05:10 -05:00
Poojawa
110de7902e Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 01:01:11 -05:00
CitadelStationBot
63c64a00f1 [MIRROR] >mysql (#987) 
* >mysql

* Update dbcore.dm

* Delete dbcore.dm.rej
 2017-05-21 00:46:24 -05:00
Poojawa
d8299bdcfd delete .rej 2017-05-21 00:45:55 -05:00
Poojawa
186ed2acbb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 00:44:08 -05:00
CitadelStationBot
e0af0df435 [MIRROR] Adds Mass Insert proc to sql (#986) 
* Adds Mass Insert proc to sql

* Update blackbox.dm

* Update dbcore.dm

* Delete dbcore.dm.rej
 2017-05-20 23:43:16 -05:00
CitadelStationBot
88ede32216 [MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994) 
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition

* Rej cleanup

* update mob.dmi

* Update living_defense.dm
 2017-05-20 23:00:02 -05:00
CitadelStationBot
94b7e560ab World.dm Refactor 2017-05-18 16:37:46 -05:00
CitadelStationBot
36072177f9 [READY]Peacekeeper cyborg projectile dampening fields, attempt three 2017-05-18 16:36:50 -05:00
CitadelStationBot
4463646952 [MIRROR] MC Runlevels (#988) 
* MC Runlevels

* Update ticker.dm

* Delete ticker.dm.rej
 2017-05-18 12:42:43 -05:00
CitadelStationBot
fe60185171 Initialize failures are now sent to their own logfile (#1015) 2017-05-18 12:38:28 -05:00
CitadelStationBot
f1a158e0a2 Qdel failures now have their own log file (#1014) 2017-05-18 12:38:03 -05:00
CitadelStationBot
946013ac22 Fixes rcds working on transit space (#981) 2017-05-18 11:54:10 -05:00