Merge branch 'master' into dynamicport

This commit is contained in:
keronshb
2021-09-19 17:59:09 -04:00
91 changed files with 6778 additions and 2292 deletions
+1
View File
@@ -368,6 +368,7 @@ GLOBAL_LIST_INIT(job_heirlooms, list(
"Janitor" = list(/obj/item/mop),
"Scientist" = list(/obj/item/toy/plush/slimeplushie),
"Assistant" = list(/obj/item/clothing/gloves/cut/family),
"Prisoner" = list (/obj/item/pen/blue),
"Chaplain" = list(/obj/item/camera/spooky/family),
"Head of Personnel" = list(/obj/item/pinpointer/ian)
))