merge fixes

This commit is contained in:
Seris02
2020-02-07 15:28:05 +08:00
198 changed files with 7137 additions and 6861 deletions
+1
View File
@@ -17,6 +17,7 @@
display_order = JOB_DISPLAY_ORDER_MIME
/datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M)
. = ..()
H.apply_pref_name("mime", M.client)
/datum/outfit/job/mime