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

91 Commits

Author SHA1 Message Date
lm40 005f3a4ecc d (#1) 2017-06-19 17:28:46 -04:00
LetterJay b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot 564426fe3e Makes cable great again 2017-06-05 16:39:37 -05:00
CitadelStationBot 94405f5176 Lowers supermatter damage hardcap by 75% to compensate for high speed atmos processing (#1363) 2017-06-04 09:10:35 -07:00
CitadelStationBot 48c439aaac Fix cable coil dupe and APC icon oddity 2017-06-02 14:11:29 -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 ae22a1876a 41 files changed, original only had 4. SPACES. 2017-05-30 14:36:11 -05:00
LetterJay 775ce7a9eb Merge pull request #1283 from Citadel-Station-13/upstream-merge-27797 
[MIRROR] Speeds up apc visual updates
 2017-05-29 15:02:17 -05:00
CitadelStationBot 8d5c202774 Speeds up apc visual updates 2017-05-29 09:14:01 -05:00
CitadelStationBot 84c9682114 Cable coils New -> Initialize 2017-05-29 06:34:17 -05:00
LetterJay aefca24012 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697 2017-05-29 02:12:41 -05:00
LetterJay 42edd006b8 A BUNCH OF SHIT 2017-05-28 14:57:17 -05:00
LetterJay 7eb798931a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27595 2017-05-28 14:36:01 -05:00
CitadelStationBot 9f665647c2 Ports cable structures to Initialize 2017-05-28 08:13:16 -05:00
CitadelStationBot 29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -05:00
CitadelStationBot 29384db52f Improves collector feedback 2017-05-24 18:20:41 -05:00
CitadelStationBot 11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
LetterJay e966230ed9 logging 2017-05-24 08:19:45 -05:00
CitadelStationBot 01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -05:00
CitadelStationBot 84e30c6824 Adds extra investigate logs for SM 2017-05-22 11:36:40 -05:00
CitadelStationBot 12bbacec25 [MIRROR] Adds framework for cult constructs having the ability to make runes (#1010) 
* Adds framework for cult constructs having the ability to make runes

* Delete mobs.dm.rej

* Update runes.dm

* clean .rej
 2017-05-20 23:12:51 -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 778d809ff3 Fixes gravity generator admin spam 2017-05-19 13:48:39 -05:00
CitadelStationBot f2c83f8ced SM speaks on engineering channel, now with 100% less freeze (#984) 2017-05-18 11:55:47 -05:00
CitadelStationBot 6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -05:00
CitadelStationBot 257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
LetterJay d82f9bf152 Merge pull request #974 from Citadel-Station-13/upstream-merge-27246 
[MIRROR] Fixes Graviton Typo
 2017-05-17 10:48:40 -04:00
LetterJay f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
CitadelStationBot db47433f40 Fixes Graviton Typo 2017-05-14 23:51:13 -05:00
CitadelStationBot b7adb8cd93 SMES units now accept charge even if the available input is less than the input rate. (#969) 2017-05-14 20:07:20 -07:00
LetterJay 8d237cd8bb define var 2017-05-14 00:11:23 -05:00
LetterJay 52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
LetterJay 36de555483 commit 2017-05-13 23:32:23 -05:00
kevinz000 bd8bfe1327 Merge pull request #684 from Citadel-Station-13/upstream-merge-26728 
[MIRROR] A bunch of sparks to do_sparks [Travis error unrelated to PR]
 2017-05-07 22:41:24 -07:00
kevinz000 1c7fa59d6c Merge pull request #798 from Citadel-Station-13/upstream-merge-26910 
This makes Nar'Sie a girl ------------> [MIRROR] hm
 2017-05-06 21:42:22 -07:00
kevinz000 d43e64bcc3 Merge pull request #774 from Citadel-Station-13/upstream-merge-26805 
[MIRROR] Fixes SM Tesla admin log spam, adds containment field count to investigate logs.
 2017-05-06 14:24:08 -07:00
CitadelStationBot a084031dc4 hm 2017-05-06 05:12:36 -05:00
CitadelStationBot 55c71ff5a9 Tesla light 2017-05-05 10:27:18 -05:00
LetterJay 1bb43eb7ae woo 2017-05-05 10:21:53 -05:00
LetterJay 811c74b45d Merge pull request #701 from Citadel-Station-13/upstream-merge-26477 
[MIRROR] Subsystem change for the SM and TEG and slight QoL
 2017-05-05 10:20:11 -05:00
LetterJay bbf43a464a yey 2017-05-05 10:00:17 -05:00
CitadelStationBot 1da6f676f0 Fixes SM Tesla admin log spam, adds containment field count to investigate logs. 2017-05-04 20:59:33 -05:00
LetterJay 6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJay f7fe20887a manual merge 2017-05-02 08:40:10 -05:00
LetterJay 3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 
[MIRROR] Unorphans the blackbox
 2017-05-02 05:13:49 -05:00
CitadelStationBot 036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
CitadelStationBot 00164a49a7 Subsystem change for the SM and TEG and slight QoL 2017-05-01 13:06:07 -05:00
CitadelStationBot 185e077f33 Port SM shards to initialize 2017-05-01 11:38:08 -05:00
CitadelStationBot 55b9c06e63 A bunch of sparks to do_sparks 2017-05-01 08:36:04 -05:00