Commit Graph

139 Commits

Author SHA1 Message Date
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
duncathan salt 0a99776616 Merge pull request #13456 from KorPhaeron/remove_sc
Removes station collision from away missions
2015-12-08 11:45:37 -06:00
duncathan salt 8efbc0930b Merge pull request #13453 from KorPhaeron/remove_example
Removes example.dmm from away missions
2015-12-08 11:45:21 -06:00
WJohn e4b4800aab Fixes science lockers, adds real eggs to queen chamber in alien hive. 2015-12-08 06:50:00 -05:00
MMMiracles c384aae4c3 more map edits, loot table balancing, bug fixes, also ATV VROOM VROOM 2015-12-08 00:43:53 -05:00
MMMiracles db0f325e10 woops 2015-12-06 14:34:09 -05:00
MMMiracles 81f6c450e5 fianl stuff for now, testing!!!!! 2015-12-06 14:32:10 -05:00
AnturK e91a53760d Swaps Teacher Room Airlock for wooden
Makes Teacher Room APC start with Enviroment channel turned on
2015-12-06 14:14:01 +01:00
MMMiracles 6c685d6d67 wew 2015-12-06 02:14:26 -05:00
MMMiracles f8ab62e92e finalization of the topside part, time to make dungeon designs woo 2015-12-06 01:13:17 -05:00
AnturK 82a7763e67 Academy Fixes & Upgrades. 2015-12-05 23:57:42 +01:00
MMMiracles 8ab579cb21 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
Conflicts:
	icons/mob/animal.dmi
2015-12-04 18:55:10 -05:00
MMMiracles 6ac96194ba snow stuff. 2015-12-04 18:52:17 -05:00
KorPhaeron 896d682e27 Removes station collision
Removes station collision
2015-12-04 17:47:02 -06:00
KorPhaeron 31b1099874 Removes example.dmm 2015-12-04 17:10:14 -06:00
MMMiracles 2624e23b95 mergefix 2015-12-04 16:20:21 -05:00
MMMiracles f97ca7f7c8 im good at what i do 2015-12-04 15:37:53 -05:00
MMMiracles de4c8b8674 snow walls+material 2015-12-04 15:07:05 -05:00
MMMiracles 7eab9a3f76 so smooth it burns 2015-12-03 16:12:56 -05:00
MMMiracles 113298ba1c so smooth it burns 2015-12-03 16:05:46 -05:00
MMMiracles 6b0976afcb updates caves.dm to use the actual basalt asteroid flooring, removes plating variant. 2015-12-03 01:00:43 -05:00
MMMiracles 11c26fb328 updates to use real basalt tiles, removes the shitty plating ones 2015-12-03 00:57:21 -05:00
MMMiracles 77b36e2415 iced windows, more ice variants of shit in general.
more stuff, ice everything.

wew

conflict fix
2015-12-01 16:45:09 -05:00