Commit Graph
5 Commits
Author SHA1 Message Date
orangesandCitadelStationBot 1068b8f22d Merge pull request #32456 from vuonojenmustaturska/ghostmemes
[s] Removes a handful of ways ghosts can affect the world
2017-11-06 21:48:42 -06:00
Jordan BrownandCitadelStationBot 3a83b28bae Adds the Cargo-Tech-of-the-Shift award 2017-10-01 09:43:20 -05:00
kingofkosmosandCitadelStationBot f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
kevinz000 301a581e64 sync 2017-08-29 09:41:11 -07: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