coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,164 Commits 9 Branches 11 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

1313 Commits

Author SHA1 Message Date
tkdrg 4b683584c8 Merge pull request #15900 from kyrahabattoir/ministation-recreation-area 
[MAP][MiniStation] Replaced the useless visitor console by the full library console
 2016-03-04 21:36:09 -03:00
Cheridan 1ae539e2d1 Merge pull request #15908 from Core0verload/plantrefactor1 
Plant Refactor: It came from the Conflicts Hell
 2016-03-04 01:02:50 -06:00
c0 fdaf04cbc0 Fuck dreamstation 2016-03-04 05:37:17 +03:00
c0 a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
KyrahAbattoir e1d8a0fdba Replaced the useless visitor console by the full library console so books can actually be checked out. 2016-03-03 15:51:46 +01:00
Cheridan aa9196a725 Merge pull request #15880 from Core0verload/plantrefactor1 
Plant Refactor: Revenge of the Grown
 2016-03-03 00:16:34 -06:00
tkdrg e2137ea4ef Merge pull request #15718 from kyrahabattoir/ministation-mapfix 
[MiniStation] Fixed recycler conveyer belt and converted the map.
 2016-03-02 19:12:26 -03:00
c0 5ba08b5151 fuck birdstation, box is the best 2016-03-02 08:53:06 +03:00
KyrahAbattoir 1f76d6bd54 Ministation: 
Fixed that one conveyer tile.
Converted the map.
 2016-03-02 04:45:18 +01:00
Buggy123 2987cda4cb Fixed chapel driver controller being solid. 2016-03-01 22:07:36 -05:00
tkdrg 2d6d340bce Merge pull request #15842 from WJohn/eff_fixes_4 
Converts efficiency to TGM (and other fixes)
 2016-03-01 21:31:14 -03:00
tkdrg c02ccab8c0 Merge pull request #15758 from AnturK/spawners 
Refactor of map and corpse spawners.
 2016-02-29 23:44:38 -03:00
WJohn 815c4a796c Converts efficiency to TGM 2016-02-29 18:55:52 -05:00
KorPhaeron 31a723d543 Merge pull request #15783 from hornygranny/laws 
removes roundstart paladin and robocop boards
 2016-02-29 14:37:29 -06:00
c0 3898243d6a Removed cocroaches 2016-02-28 04:44:27 +03:00
hornygranny e13620c3b4 extra line 2016-02-26 20:21:47 -08:00
hornygranny 69473f9221 removes roundstart robocop and paladin boards 2016-02-26 20:20:32 -08:00
AnturK 5edc60ed0a Unifies corpse spawners 2016-02-25 18:36:16 +01:00
Steelpoint 71e53ac71e NoDestin 2016-02-23 15:21:23 +08:00
Steelpoint 81aee973dc MergeConflict 2016-02-23 11:28:41 +08:00
Steelpoint ff5443201b Merge branch 'master' of https://github.com/tgstation/-tg-station into SyndiShip 
Conflicts:
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
 2016-02-23 10:18:21 +08:00
Joan Lung 725d76df00 Merge pull request #15683 from WJohn/eff_fixes_the_third 
More efficiency fixes.
 2016-02-22 20:12:43 -05:00
WJohn d4a5c20fbe Fixes SMES cells starting empty, and by extension emitters not working. 2016-02-22 11:36:23 -05:00
Steelpoint 36f9a7e5f0 MergeConflict 2016-02-22 17:54:56 +08:00
Steelpoint 135e903410 Merge branch 'master' of https://github.com/tgstation/-tg-station into SyndiShip 
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
 2016-02-22 17:49:50 +08:00
Steelpoint b73e8ed9a5 FinalChange 2016-02-22 17:48:18 +08:00
Cheridan 86538260a5 Merge pull request #15378 from Buggy123/chapeledit2 
Added mass driver computer to chapel, for real this time.
 2016-02-22 01:10:26 -06:00
WJohn 9c99559c7e Adds missing department shuttles, fixes missing area over door in sci break room, fixes cargo consoles. 2016-02-21 23:10:57 -05:00
Steelpoint 3ad73c4b5c SyndiShip 2016-02-21 22:53:59 +08:00
Steelpoint 2a7a9ed462 MergeConflict+NewStuff 2016-02-21 20:34:04 +08:00
Steelpoint 5a592e6b62 Merge branch 'master' of https://github.com/tgstation/-tg-station into SyndiShip 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2016-02-21 20:06:45 +08:00
Buggy123 ab91940d68 Added a mass driver control computer to the chapel. 2016-02-21 01:11:05 -05:00
Nerd Lord 435021f053 The tesla no longer shocks things outside of containment on Dreamstation 2016-02-20 19:45:10 -05:00
xxalpha 1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
Steelpoint 5b22b461c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into SyndiShip 2016-02-19 21:26:04 +08:00
duncathan salt db5c47b6b2 Merge pull request #15598 from Incoming5643/ape_escape_2 
Adds the new pun pun to the maps
 2016-02-19 04:09:18 -06:00
Steelpoint 31537b86e4 MergeConflict 2016-02-19 01:43:14 +08:00
Steelpoint 7963dd154b Merge branch 'master' of https://github.com/tgstation/-tg-station into SyndiShip 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2016-02-19 01:37:29 +08:00
Steelpoint e799a82e2f FirstFix 2016-02-19 01:30:43 +08:00
AnturK ba750e34e9 Repaths 2016-02-18 17:56:43 +01:00
Steelpoint b1edec6326 SyndiShip 2016-02-19 00:07:26 +08:00
Incoming 2ec1b145fe Adds the new pun pun to the maps 2016-02-18 02:42:19 -05:00
xxalpha 569797531c Fixed map 2016-02-18 00:00:07 +00:00
xxalpha 1bee6b5365 Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-17 15:04:51 +00:00
Joan Lung 2b41743ac8 Merge pull request #15468 from WJohn/efficiency_fixes2 
Updates Efficiency Station
 2016-02-16 11:07:39 -05:00
Cheridan 46235edb67 Merge pull request #15516 from Buggy123/miningfix 
Added barricades to the old smelter on the asteroid.
 2016-02-16 03:29:47 -06:00
Buggy123 b8b7ecb290 Added barricades to the old smelter on the asteroid. 2016-02-13 23:42:23 -05:00
tkdrg a7ba087517 Merge pull request #15478 from neersighted/remiepls 
Repath janicarts/secways/atvs
 2016-02-13 22:10:53 -03:00
Bjorn Neergaard 80515f1d38 Repath janicarts/secways/atvs 
Remove the path compability in favor of true pathing
 2016-02-12 17:10:00 -06:00
WJohn 1fe348fbe7 Updates efficiency. 2016-02-12 11:35:12 -05:00