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

..

areas

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)

2017-08-24 21:07:58 -07:00

ai_monitored.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

areas.dm

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)

2017-08-24 21:07:58 -07:00

areas.dm.rej

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

Space_Station_13_areas.dm

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)

2017-08-24 21:07:58 -07:00

Space_Station_13_areas.dm.rej

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00