4 Commits

Author	SHA1	Message	Date
Jordan Brown	4d110d9b70	Merge pull request #31661 from ninjanomnom/custom-docker ... Fixes custom shuttle docker display	2017-10-14 18:55:03 -05:00
KorPhaeron	6fca708b33	Advanced camera consoles use a list for z lock rather than a single z level (#30661) ... * Refactor Abductor Console * Station lock	2017-09-28 10:44:12 -05:00
KorPhaeron	d05fdb0eb0	Makes the station Z level into a list instead of a single define	2017-09-11 12:40:35 -05:00
kevinz000	c638386507	Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) ... * fuck pubby * fuck you too ceres * ree * this is going to be a disaster isn't it * disaster * dme * -_- * tg * woops * proper sync * Welcome to conflict hell. * lets hope this fixes more things than it breaks * gdi * goddamnit	2017-08-24 21:07:58 -07:00