5 Commits

Author	SHA1	Message	Date
LetterJay	24a7aa5a9f	Merge branch 'master' into upstream-merge-30079	2017-09-06 09:24:23 -05:00
CitadelStationBot	5f3775388c	Gives cult blades updated item and inhand sprites	2017-08-29 17:08:43 -05:00
kevinz000	5591afc9ce	double wew	2017-08-29 09:53:11 -07:00
kevinz000	3254fcf535	goddamnit_again (#2511)	2017-08-26 18:43:57 -07: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