Commit Graph

22 Commits

Author SHA1 Message Date
tkdrg c02ccab8c0 Merge pull request #15758 from AnturK/spawners
Refactor of map and corpse spawners.
2016-02-29 23:44:38 -03:00
AnturK 5edc60ed0a Unifies corpse spawners 2016-02-25 18:36:16 +01:00
AndrewJacksonThe2nd 38f3f1dada Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA
Conflicts:
	code/game/objects/items.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/under/chameleon.dm
2016-02-23 21:06:36 -08:00
KorPhaeron 72c4becd95 Removes die of fate from snowdin 2016-02-21 23:25:04 -06:00
AndrewJacksonThe2nd 5d5d2427f4 temp 2016-02-20 22:12:25 -08: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 1c34479376 Fix uplink code once and for all
Fixes #14733
2016-01-19 16:42:57 -06:00
Bjorn Neergaard b33c6f216d Tidy tooltips; hide lock button from non-lockable uplinks 2016-01-18 14:27:34 -06:00
Bjorn Neergaard ff5d6292c8 tgui uplinks; repath uplinks 2016-01-18 14:22:00 -06:00
KorPhaeron 7bafb9e1fd Snowdin 2016-01-08 07:37:57 -06:00
KorPhaeron 9466b33819 Fixes the other away missions 2016-01-01 23:49:42 -06:00
KorPhaeron 9c8a0cb0a5 Implant 2015-12-31 10:47:33 -06:00
MMMiracles 55ebaf3bdb snow stuff i guess 2015-12-15 17:33:34 -05:00
MMMiracles d07f300063 i did things 2015-12-15 16:46:24 -05:00
MMMiracles d61d655076 oh my 2015-12-10 23:14:42 -05:00
MMMiracles f222dfe36e mostly final changes, wowzers 2015-12-08 21:20:31 -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 81f6c450e5 fianl stuff for now, testing!!!!! 2015-12-06 14:32:10 -05:00
MMMiracles f8ab62e92e finalization of the topside part, time to make dungeon designs woo 2015-12-06 01:13:17 -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
MMMiracles f67dde21d5 foundation set, demands given. 2015-11-29 12:34:49 -05:00