Merge pull request #10700 from Ghommie/Ghommie-cit526

Anomalous honking crystal pet peeve & co.
2020-02-06 00:38:31 -07:00
parent 1288a463cf 32ee2f6197
commit 73aa761c69
4 changed files with 5 additions and 3 deletions
@@ -7,10 +7,10 @@

 /datum/antagonist/nukeop/clownop/on_gain()
 	. = ..()
-	ADD_TRAIT(owner, TRAIT_CLOWN_MENTALITY, NUKEOP_ANTAGONIST)
+	ADD_TRAIT(owner, TRAIT_CLOWN_MENTALITY, CLOWNOP_TRAIT)

 /datum/antagonist/nukeop/clownop/on_removal()
-	REMOVE_TRAIT(owner, TRAIT_CLOWN_MENTALITY, NUKEOP_ANTAGONIST)
+	REMOVE_TRAIT(owner, TRAIT_CLOWN_MENTALITY, CLOWNOP_TRAIT)
 	return ..()

 /datum/antagonist/nukeop/leader/clownop
@@ -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
@@ -432,6 +432,7 @@ Difficulty: Very Hard
 			H.dropItemToGround(W)
 		var/datum/job/clown/C = new /datum/job/clown()
 		C.equip(H)
+		C.after_spawn(H, H, TRUE)
 		qdel(C)
 		affected_targets.Add(H)