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

..

job_types

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

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

map_changes

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

access.dm

[MIRROR] Fixes language code ignoring holder restrictions (#858)

2017-05-18 04:13:57 -05:00

jobs.dm

[MIRROR] Fixes language code ignoring holder restrictions (#858)

2017-05-18 04:13:57 -05:00