Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements

2019-08-17 23:41:28 -05:00
parent b671384015 13f27c040e
commit 2922f08ef6
35 changed files with 210 additions and 90 deletions
@@ -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