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

..

new_player

autoloading

2017-05-18 21:24:02 -07:00

observer

[MIRROR] Harvesters are more fun to play (#894)

2017-05-18 07:12:29 -05:00

dead.dm

commit

2017-05-14 00:05:53 -05:00