skull132 22c7748336 Merge branch 'master' into development ...

# Conflicts:
#	code/game/machinery/computer/shuttle.dm
#	code/game/machinery/doors/firedoor.dm
#	code/game/objects/items/weapons/weaponry.dm
#	code/modules/admin/admin_attack_log.dm
#	code/modules/admin/admin_verbs.dm

2017-05-27 20:11:54 +03:00

..

keycard authentication.dm

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

security levels.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00