Merge remote-tracking branch 'upstream/master' into dynamicport

This commit is contained in:
keronshb
2021-09-19 18:09:18 -04:00
143 changed files with 5772 additions and 4116 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ datum/job/prisoner
department_head = list("The Security Team")
department_flag = CIVILIAN
faction = "Station"
total_positions = 2
total_positions = 0
spawn_positions = 2
supervisors = "the security team"