6 Commits

Author	SHA1	Message	Date
LetterJay	7af461539f	Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"	2017-12-16 13:08:50 -06:00
kevinz000	253c819bc1	TG Sync 12/15/17 ... s s	2017-12-15 06:27:57 -08:00
deathride58	b6630b41d1	merges #3877 proper	2017-11-22 17:37:22 -05:00
CitadelStationBot	2757fae7e2	[MIRROR] Fixes shaving headless mobs (#2890) ... * Fixes shaving headless mobs * Update cosmetics.dm	2017-09-22 22:31:54 -05: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