shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,290 Commits 5 Branches 0 Tags
2158ea1e671325aaa238e33c995260f3c4ef4881
Commit Graph

140 Commits

Author SHA1 Message Date
CitadelStationBot ac33b9defb Adds some neat tiles and walls for use on lavaland 2017-06-26 09:19:17 -05:00
LetterJay 028752c3de Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564 
[MIRROR] Shuttle engines affecting travel time
 2017-06-26 09:00:54 -05:00
LetterJay b4473bedb2 Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382 
[MIRROR] Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
 2017-06-26 05:57:59 -05:00
CitadelStationBot 1a38b6fd6f Shuttle engines affecting travel time 2017-06-25 20:53:00 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot df815e99bd Lavaland's default atmos is now a define 2017-06-21 08:32:00 -05:00
CitadelStationBot a090e33a15 Adds Prolonging Prism as an application scripture (#1472) 2017-06-17 13:31:04 -07:00
CitadelStationBot 3f92d14933 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. 2017-06-16 20:12:20 -05:00
CitadelStationBot 185d0cd3f4 Adjusted atmos device layers + added new pipe subtypes 2017-06-16 15:25:38 -05:00
LetterJay 4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
LetterJay c720fb8d72 Merge pull request #1425 from Citadel-Station-13/upstream-merge-28068 
[MIRROR] Add status string for server tools
 2017-06-13 00:50:20 -05:00
LetterJay 2a5be91970 compile fixes 2017-06-12 16:12:00 -05:00
LetterJay 55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
LetterJay 11ff6a7628 upstream-merge-27971 2017-06-11 08:21:14 -05:00
CitadelStationBot 1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
LetterJay 1c71b4fd68 cleanup 2017-06-05 23:10:02 -05:00
LetterJay 54549d43a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728 2017-06-05 23:07:52 -05:00
CitadelStationBot 0c6a4a538a Add status string for server tools 2017-06-05 16:28:19 -05:00
LetterJay 60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -05:00
CitadelStationBot e0b5221ebd The Crafting Menu now has subcategories! (#1364) 2017-06-04 09:09:59 -07:00
LetterJay b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -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 9a64d4731c Merge pull request #1167 from Citadel-Station-13/upstream-merge-27589 
[MIRROR] Adds marker beacons to mining as a vendible item
 2017-05-30 15:02:44 -05:00
LetterJay 20ea1dd108 Merge pull request #1165 from Citadel-Station-13/upstream-merge-27601 
[MIRROR] Dot Nonsense: find the current running proc's type!
 2017-05-30 14:21:33 -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 77b4be8b3f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528 2017-05-28 21:49:30 -05:00
CitadelStationBot 29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -05:00
CitadelStationBot c07034f45a The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it 2017-05-27 20:55:08 -05:00
CitadelStationBot 2cc74f4a8f Changes incorporeal movement to use defines 2017-05-27 20:55:04 -05:00
CitadelStationBot fd2c61f3d3 [MIRROR] Adds a minor documentation comment (#1097) 
* Adds a minor documentation comment

* Update subsystems.dm

* Delete subsystems.dm.rej
 2017-05-27 13:42:58 -07:00
kevinz000 0093c4a03d Delete misc.dm.rej 2017-05-27 13:41:18 -07:00
CitadelStationBot e5f2a09622 Pixel projectile ricochets and reflections! (#1220) 2017-05-27 13:27:52 -07:00
CitadelStationBot 83b4c1d8d4 Adds round table to replace tacking some data in feedback table 2017-05-26 15:18:16 -05:00
LetterJay 7ad5837432 Merge pull request #1138 from Citadel-Station-13/upstream-merge-27545 
[MIRROR] Gibtonite now uses defines
 2017-05-25 09:43:50 -05:00
CitadelStationBot 6fb8aa7ee1 Adds marker beacons to mining as a vendible item 2017-05-24 16:32:43 -05:00
CitadelStationBot 62a7537030 Dot Nonsense: find the current running proc's type! 2017-05-24 16:29:31 -05:00
LetterJay 006c74c6ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503 2017-05-24 08:11:07 -05:00
CitadelStationBot 4191e1f7fd Adds the Beach Bum Language 2017-05-24 05:54:42 -05:00
CitadelStationBot b8b879af45 Gibtonite now uses defines 2017-05-23 15:29:11 -05:00
CitadelStationBot 01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -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
LetterJay abbacd2c89 Merge branch 'master' into upstream-merge-27160 2017-05-22 16:29:43 -05:00
LetterJay 3f62929340 Merge branch 'master' into upstream-merge-27379 2017-05-22 12:45:18 -05:00
CitadelStationBot e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -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 f624071766 [MIRROR] Ninja Refactor (#1037) 
* Ninja Refactor

* Update antagonists.dm

* Delete antagonists.dm.rej

* Update antagonists.dm

* Update mind.dm

* Update mind.dm

* whatever, I fixed that cunt
 2017-05-21 00:39:26 -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 448dc20c2b Proto-kinetic crushers are significantly better 2017-05-20 12:42:11 -05:00
LetterJay 96710c56e1 Merge pull request #1046 from Citadel-Station-13/upstream-merge-27292 
[MIRROR] Fixes clicking things under windows/doors.
 2017-05-18 23:46:08 -04:00