shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,781 Commits 5 Branches 0 Tags
ab12f2eef9fb1c3642e4e95ffbeddeb2d6339a13
Commit Graph

2094 Commits

Author SHA1 Message Date
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
CitadelStationBot 4acbd4af2c Fixes Master/Recover not restoring previous runlevel 2017-05-21 22:27:58 -05:00
kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items 
# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm
 2017-05-21 18:17:42 -07: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
kevinz000 c58c6ffdd8 autoloading 2017-05-18 21:24:02 -07: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 293a895d92 [MIRROR] Fixes a bug where shuttles would not function (#1016) 
* Fixes a bug where shuttles would not function

* Update master.dm

* Delete master.dm.rej
 2017-05-18 13:58:52 -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
CitadelStationBot c61bb0476f [MIRROR] Cleans up some Initializes (#943) 
* Cleans up some Initializes

* Update farm_animals.dm

* Delete farm_animals.dm.rej

* Update farm_animals.dm
 2017-05-18 11:13:53 -05:00
CitadelStationBot 7a9e05e9d9 Cerestation Tweaks MK VII: BEES edition (#925) 2017-05-18 10:36:51 -05:00
CitadelStationBot a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -05:00
CitadelStationBot b8cbf1a056 [MIRROR] Makes some game options which should be flags flags (#910) 
* Makes some game options which should be flags flags

* Update configuration.dm

* Delete configuration.dm.rej
 2017-05-18 07:50:43 -05:00
CitadelStationBot 4a9ef49cf3 [MIRROR] Fixes SSShuttle not checking for missing arrivals (#908) 
* Fixes SSShuttle not checking for missing arrivals

* Update shuttle.dm

* Delete shuttle.dm.rej
 2017-05-18 07:34:31 -05:00
LetterJay d7c24de679 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26492 2017-05-17 09:58:53 -05:00
LetterJay bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
CitadelStationBot 59b609c79d Reverts favoring empty positions 2017-05-15 10:36:56 -05:00
kevinz000 99297bb544 Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items 2017-05-14 20:54:47 -07:00
kevinz000 da615b1440 h 2017-05-14 20:19:26 -07:00
CitadelStationBot fde364e82f The punisher! (#967) 2017-05-14 20:06:13 -07:00
kevinz000 e7c41603f0 new and improved 2017-05-14 19:22:52 -07:00