Commit Graph

161 Commits

Author SHA1 Message Date
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 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
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
KazeEspada f1d903dadb Add fireplace and a map generator. Finishes more the cabin map. 2016-02-28 14:18:08 -07: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
AnturK 5edc60ed0a Unifies corpse spawners 2016-02-25 18:36:16 +01:00
AnturK ba750e34e9 Repaths 2016-02-18 17:56:43 +01:00
KorPhaeron 30fe8f3d40 Merge pull request #15484 from MMMiracles/smartlocks
Spacebattle Rework
2016-02-17 18:30:47 -06:00
oranges e1cb49a55c Add syndicate faction to snowdin medbot 2016-02-14 08:08:36 +00:00
MMMiracles 18b8526d74 makes changes more lore-friendly 2016-02-13 14:17:10 -05:00
MMMiracles 252fb9ae39 deletes two whole chairs to fit lore 2016-02-12 21:33:36 -05:00
MMMiracles 677971def0 spacebattle rework 2016-02-12 20:15:20 -05: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
Shadowlight213 ec6fcc057d Removes Radio mmi subtype and adds radio to regular MMI 2016-02-10 00:32:41 -08:00
Bjorn Neergaard ddab6823d3 Fix up crates
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
Bjorn Neergaard 796cca2753 tgui scrubbers
removes area atmos computer
2016-02-05 17:06:02 -06:00
Bjorn Neergaard 68e1269ea7 Repath thank dispensers; fix ASSteroid station; repath SSU ract 2016-01-25 12:03:13 -06:00
Bjorn Neergaard f3697fc7d6 Repath air alarms 2016-01-25 12:02:58 -06:00
Bjorn Neergaard dae73b28e8 Refactor atmos_control into only one computer 2016-01-23 18:56:37 -06:00
Bjorn Neergaard 4c192d705a Rewrite heaters/freezers; port to tgui
They are now one type, thermomachine.
2016-01-22 19:25:35 -06:00
MMMiracles 8b13e0cfdd i love map conflicts 2016-01-21 01:20:25 -05:00
MMMiracles af5f726089 lodesmapedits 2016-01-21 01:07:06 -05:00
Bjorn Neergaard 1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
kilkun e8d4d2f06d Challenge emitter fix
Fixes emitter pointing the wrong way on the Challenge away mission.
2016-01-14 15:58:40 -05:00
tkdrg e0a16b4467 Merge pull request #14304 from MMMiracles/snowbuck
Snowdin Edits
2016-01-03 21:11:13 -03:00
MMMiracles 1f8be3da58 nice nice 2016-01-02 17:32:57 -05:00
MMMiracles a090a37581 why live 2016-01-02 00:56:32 -05:00
MMMiracles c2bba8d2ff probably fine 2016-01-01 15:24:02 -05:00
MMMiracles 2be090aee1 Merge branch 'master' of https://github.com/tgstation/-tg-station into geneticsishard 2016-01-01 15:03:45 -05:00
tkdrg d8dac477af Merge pull request #14192 from Steelpoint/SpaceBattleSpawns
[MAP] Removes Deathtrap Spawn on Space Battle Away Mission
2016-01-01 16:35:47 -03:00
Steelpoint 7eb0353be3 SpawnPointRemoval 2015-12-31 17:45:45 +08:00
KorPhaeron f5e0637534 Fixes active turfs on wildwest 2015-12-24 06:11:47 -06:00
MMMiracles d57d059b8b makes asteroids more child-friendly 2015-12-22 19:32:27 -05:00
MMMiracles 1c1e892ddf New Away Mission: Research Facility 2015-12-22 17:34:04 -05:00
MMMiracles 8758ca1a72 various map edits 2015-12-19 22:27:40 -05:00
Cheridan 9a8e604738 Merge pull request #13773 from KorPhaeron/cheridan_in_space
Black Market Ship moved to Z6
2015-12-19 11:54:23 -06:00
KorPhaeron c7dde204fb Black Market 2015-12-18 12:56:55 -06:00
KorPhaeron 39c9067e94 Removes space hotel 2015-12-18 03:26:09 -06:00
MMMiracles 55ebaf3bdb snow stuff i guess 2015-12-15 17:33:34 -05:00
MMMiracles b3d992a832 conflict fix 2015-12-11 16:21:18 -05:00
MMMiracles d61d655076 oh my 2015-12-10 23:14:42 -05:00
Cheridan 51c16dfa7f Merge pull request #13510 from WJohn/awaymissionfixesdeux
Fixes science lockers in MO19, adds a few real xeno eggs to queen chamber in nest.
2015-12-10 00:00:18 -06:00
MMMiracles cb2b81f80c thats not suppose to be there 2015-12-08 23:43:59 -05:00
Cheridan f29336a4f8 Merge pull request #13470 from AnturK/academytwo
Academy Fixes & Upgrades.
2015-12-08 22:25:05 -06:00
MMMiracles f222dfe36e mostly final changes, wowzers 2015-12-08 21:20:31 -05:00