Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

code/datums/ert.dm

@@ -55,3 +55,13 @@
 	rename_team = "Inquisition"
 	mission = "Destroy any traces of paranormal activity aboard the station."
 	polldesc = "a Nanotrasen paranormal response team"
+
+/datum/ert/greybois
+	code = "Green"
+	teamsize = 1
+	opendoors = FALSE
+	enforce_human = FALSE
+	roles = /datum/antagonist/greybois
+	leader_role = /datum/antagonist/greybois/greygod
+	rename_team = "Emergency Assistants"
+	polldesc = "an Emergency Assistant"

code/datums/traits/_quirk.dm

@@ -13,7 +13,6 @@
 	var/mob/living/quirk_holder
 
 /datum/quirk/New(mob/living/quirk_mob, spawn_effects)
-	..()
 	if(!quirk_mob || (human_only && !ishuman(quirk_mob)) || quirk_mob.has_quirk(type))
 		qdel(src)
 	quirk_holder = quirk_mob