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

1515 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
tkdrg 1da99d9be8 Merge pull request #15906 from Buggy123/beachfix 
Fixes the beach away mission.
 2016-03-04 21:33:08 -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
Buggy123 e7292acb80 Uses real floors instead of holofloors. 2016-03-03 17:05:19 -05:00
Buggy123 66b20c2666 Fixes the beach away mission. 2016-03-03 16:54:00 -05:00
AnturK ae9e56d21f Merge pull request #15852 from KazeEspada/Cabin 
Cabin Away Mission
 2016-03-03 22:18:12 +01:00
KazeEspada 6d2a95eb43 Moves the mapGenerator to mapGeneratorObj.dm. 
Cabin was given new carpets, and some fixes.

The snowy map generator now spawns bunnies.

New type of bunny that is not easter related.

Chickens now have support for no eggs.
 2016-03-03 13:47:11 -07: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 d6e842f9f9 Merge pull request #15853 from KorPhaeron/biodome 
Lavaland Ruin
 2016-03-02 22:56:26 -03: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
KorPhaeron 8beaf412d3 Fixes crash area 2016-03-01 19:06:22 -06: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
KorPhaeron 44b13777bb Removes offensive plant 2016-03-01 15:04:26 -06:00
KorPhaeron 31cdbbc872 Uses real windows 2016-03-01 00:39:43 -06:00
KorPhaeron 71ebef7ba7 Biodome 2016-02-29 23:59:39 -06:00
KazeEspada 7bfe258241 Cabin ready for testing commit. Cabin is mostly finished and just needs some eyes to look over it and see if I missed anything. 2016-02-29 22:47:38 -07: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
KazeEspada f1d903dadb Add fireplace and a map generator. Finishes more the cabin map. 2016-02-28 14:18:08 -07:00
c0 3898243d6a Removed cocroaches 2016-02-28 04:44:27 +03:00
KazeEspada 03c168c2b3 Begins work on Cabin away mission. Its a quiet away mission that resembles beach. 2016-02-27 17:36:09 -07: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
Cheridan 2dfebaa77e Merge pull request #15708 from KorPhaeron/sins 
Five lavaland ruins
 2016-02-26 08:46:32 -06:00
AnturK 5edc60ed0a Unifies corpse spawners 2016-02-25 18:36:16 +01:00
KorPhaeron de89460706 Envy 2016-02-23 06:31:40 -06:00
KorPhaeron 9d208197ba Sloth 2016-02-23 05:05:11 -06:00
Steelpoint 71e53ac71e NoDestin 2016-02-23 15:21:23 +08:00
KorPhaeron d17d34edc9 Three lavaland ruins 2016-02-23 01:07:06 -06: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