Merge branch 'master' into upstream-merge-30763

code/datums/antagonists/datum_clockcult.dm

@@ -103,23 +103,22 @@
 		S.laws.associate(S)
 		S.update_icons()
 		S.show_laws()
-		hierophant_network.Grant(S)
 		hierophant_network.title = "Silicon"
 		hierophant_network.span_for_name = "nezbere"
 		hierophant_network.span_for_message = "brass"
 	else if(isbrain(current))
-		hierophant_network.Grant(current)
 		hierophant_network.title = "Vessel"
 		hierophant_network.span_for_name = "nezbere"
 		hierophant_network.span_for_message = "alloy"
 	else if(isclockmob(current))
-		hierophant_network.Grant(current)
 		hierophant_network.title = "Construct"
 		hierophant_network.span_for_name = "nezbere"
 		hierophant_network.span_for_message = "brass"
+	hierophant_network.Grant(current)
 	current.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump)
-	if(!GLOB.clockwork_gateway_activated)
-		current.throw_alert("scripturereq", /obj/screen/alert/clockwork/scripture_reqs)
+	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
+	if(G.active && ishuman(current))
+		current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER))
 
 /datum/antagonist/clockcult/remove_innate_effects(mob/living/mob_override)
 	var/mob/living/current = owner.current
@@ -129,9 +128,10 @@
 	current.faction -= "ratvar"
 	current.remove_language(/datum/language/ratvar)
 	current.clear_alert("clockinfo")
-	current.clear_alert("scripturereq")
-	for(var/datum/action/innate/function_call/F in owner.current.actions) //Removes any bound Ratvarian spears
-		qdel(F)
+	for(var/datum/action/innate/clockwork_arnaments/C in owner.current.actions) //Removes any bound clockwork armor
+		qdel(C)
+	for(var/datum/action/innate/call_weapon/W in owner.current.actions) //and weapons too
+		qdel(W)
 	if(issilicon(current))
 		var/mob/living/silicon/S = current
 		if(isAI(S))
@@ -149,6 +149,8 @@
 		R.module.rebuild_modules()
 	if(temp_owner)
 		temp_owner.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them, we need to update buttons
+	temp_owner.cut_overlays()
+	temp_owner.regenerate_icons()
 
 /datum/antagonist/clockcult/on_removal()
 	SSticker.mode.servants_of_ratvar -= owner

code/datums/antagonists/ninja.dm

@@ -1,6 +1,5 @@
 /datum/antagonist/ninja
 	name = "Ninja"
-	var/team
 	var/helping_station = 0
 	var/give_objectives = TRUE
 
@@ -19,36 +18,8 @@
 	..(new_owner)
 	helping_station = rand(0,1)
 
-/datum/antagonist/ninja/proc/equip_space_ninja(mob/living/carbon/human/H = owner.current, safety=0)//Safety in case you need to unequip stuff for existing characters.
-	if(safety)
-		qdel(H.w_uniform)
-		qdel(H.wear_suit)
-		qdel(H.wear_mask)
-		qdel(H.head)
-		qdel(H.shoes)
-		qdel(H.gloves)
-
-	var/obj/item/clothing/suit/space/space_ninja/theSuit = new(H)
-	var/obj/item/dash/energy_katana/EK = new(H)
-	theSuit.energyKatana = EK
-
-	H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears)
-	H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform)
-	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/space_ninja(H), slot_shoes)
-	H.equip_to_slot_or_del(theSuit, slot_wear_suit)
-	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/space_ninja(H), slot_gloves)
-	H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/space_ninja(H), slot_head)
-	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/space_ninja(H), slot_wear_mask)
-	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), slot_glasses)
-	H.equip_to_slot_or_del(EK, slot_belt)
-	H.equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(H), slot_l_store)
-	H.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen(H), slot_s_store)
-	H.equip_to_slot_or_del(new /obj/item/tank/jetpack/carbondioxide(H), slot_back)
-	theSuit.randomize_param()
-
-	var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(H)
-	E.implant(H)
-	return 1
+/datum/antagonist/ninja/proc/equip_space_ninja(mob/living/carbon/human/H = owner.current)
+	return H.equipOutfit(/datum/outfit/ninja)
 
 /datum/antagonist/ninja/proc/addMemories()
 	owner.store_memory("I am an elite mercenary assassin of the mighty Spider Clan. A <font color='red'><B>SPACE NINJA</B></font>!")