2 Commits

Author	SHA1	Message	Date
CitadelStationBot	083fc1a7b4	[MIRROR] Standardized power displays (#2539) ... * Standardized power displays * Update tgui.js * Delete tgui.js.rej	2017-09-13 17:57:16 -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