Revert "Revert "Merge remote-tracking branch 'upstream/master'""

This reverts commit 1509d9d183.
This commit is contained in:
Fermi
2019-11-24 03:33:02 +00:00
parent ba4fa1ef67
commit 614a462176
186 changed files with 764 additions and 405 deletions
@@ -422,7 +422,7 @@
implants = list(/obj/item/implant/weapons_auth)
id = /obj/item/card/id/syndicate
/datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H)
/datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
H.faction |= ROLE_SYNDICATE
/obj/effect/mob_spawn/human/syndicate/battlecruiser