GunHog 5a7e4a30d9 Merge remote-tracking branch 'remotes/upstream/master' into Common_comms_MicOff ...

Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/tgstation.2.1.3.dmm

2014-11-16 13:56:41 -06:00

..

map_files

Merge remote-tracking branch 'remotes/upstream/master' into Common_comms_MicOff

2014-11-16 13:56:41 -06:00

RandomZLevels

Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel

2014-11-12 22:50:32 -03:00

metastation.dm

*Added a lot more helpful gear and wall mounted flashers to the emergency shuttle.

2014-04-05 15:43:28 +01:00

ministation.dm

Fixed map conflicts.

2014-02-04 00:18:07 +00:00

tgstation2.dm

Fixed remaining bugs with the map. Edited tgstation2.dm to include 2.1.3

2014-04-01 21:29:02 -06:00