kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items ...

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

2017-05-21 18:17:42 -07:00

..

dmm_suite.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

map_template.dm

Fixes templates/ruins not updating area list

2017-04-27 17:02:33 -05:00

reader.dm

Makes the map loader immune to sleeps in the shit it creates (#406)

2017-04-15 14:50:29 -04:00

ruins.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00