3 Commits

Author	SHA1	Message	Date
Jordan Brown	82c388b3e8	Makes thermite a component	2017-10-27 17:36:38 -05:00
CitadelStationBot	adc2e46114	[MIRROR] Does some code standardization/consistency. (#3161) ... * Does some code standardization/consistency. * fixes merge conflict generation * Missed a few, oops * Update pierrot_throat.dm	2017-10-21 06:10:22 -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