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

..

environmental

[MIRROR] Cleans up some Initializes (#943)

2017-05-18 11:13:53 -05:00

gasmixtures

[MIRROR] Canisters only notify admins if they contain a meaningful amount of dangerous gas when opened (#901)

2017-05-18 07:55:27 -05:00

machinery

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

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