Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Fermi
2019-06-01 03:12:38 +01:00
100 changed files with 1729 additions and 1245 deletions
+2
View File
@@ -21,6 +21,8 @@
/datum/ert/amber
code = "Amber"
leader_role = /datum/antagonist/ert/commander/red
roles = list(/datum/antagonist/ert/security/red, /datum/antagonist/ert/medic/red, /datum/antagonist/ert/engineer/red)
/datum/ert/red
leader_role = /datum/antagonist/ert/commander/red