4 Commits

Author	SHA1	Message	Date
LetterJay	2fe2912fa3	Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173 ... [MIRROR] Traitor, a traitor is a traitor.	2017-08-28 08:46:53 -05:00
kevinz000	3254fcf535	goddamnit_again (#2511)	2017-08-26 18:43:57 -07:00
CitadelStationBot	3a6a277f08	Traitor, a traitor is a traitor.	2017-08-26 11:07:24 -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