4 Commits

Include renames

Author	SHA1	Message	Date
bawhoppenandCitadelStationBot	82981339ed	Adds desc to things lacking them.	2017-10-01 15:07:37 -05:00
LetterJayandGitHub	74588305ce	Update vending_items.dm	2017-09-11 17:50:49 -05:00
Kerbin-FiberandCitadelStationBot	d158ec9528	Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter	2017-09-10 03:43:09 -05:00
kevinz000andGitHub	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