Merge remote-tracking branch 'citadel/master' into 12742

code/game/gamemodes/clown_ops/clown_ops.dm

@@ -58,6 +58,7 @@
 	if(visualsOnly)
 		return
 	H.dna.add_mutation(SMILE)
+	H.faction |= "clown"
 
 /datum/outfit/syndicate/clownop/leader
 	name = "Clown Operative Leader - Basic"

code/game/gamemodes/gangs/dominator.dm

@@ -149,7 +149,7 @@
 	add_fingerprint(user)
 	return ..()
 
-/obj/machinery/dominator/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
+/obj/machinery/dominator/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(operating || (stat & BROKEN))
 		examine(user)
 		return

code/game/gamemodes/objective_items.dm

@@ -94,6 +94,11 @@
 	targetitem = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's
 	difficulty = 5
 
+/datum/objective_item/steal/blackbox
+	name = "the black box from the onboard blackbox recording device. Take care to wear the proper safety equipment when extracting the black box as the telecommunications array is likely to be under inhospitable conditions."
+	targetitem = /obj/item/blackbox //steal the forbidden ssblackbox
+	difficulty = 10
+
 /datum/objective_item/steal/nuke_core
 	name = "the heavily radioactive plutonium core from the onboard self-destruct. Take care to wear the proper safety equipment when extracting the core!"
 	targetitem = /obj/item/nuke_core

code/game/gamemodes/sandbox/airlock_maker.dm

@@ -7,7 +7,7 @@
 /obj/structure/door_assembly
 	var/datum/airlock_maker/maker = null
 
-/obj/structure/door_assembly/attack_hand()
+/obj/structure/door_assembly/on_attack_hand()
 	. = ..()
 	if(.)
 		return