Merge branch 'master' into upstream-merge-30763

code/datums/action.dm

@@ -485,7 +485,7 @@
 
 /datum/action/spell_action/New(Target)
 	..()
-	var/obj/effect/proc_holder/spell/S = target
+	var/obj/effect/proc_holder/S = target
 	S.action = src
 	name = S.name
 	desc = S.desc
@@ -495,36 +495,40 @@
 	button.name = name
 
 /datum/action/spell_action/Destroy()
-	var/obj/effect/proc_holder/spell/S = target
+	var/obj/effect/proc_holder/S = target
 	S.action = null
 	return ..()
 
 /datum/action/spell_action/Trigger()
 	if(!..())
-		return 0
+		return FALSE
 	if(target)
-		var/obj/effect/proc_holder/spell = target
-		spell.Click()
-		return 1
+		var/obj/effect/proc_holder/S = target
+		S.Click()
+		return TRUE
 
 /datum/action/spell_action/IsAvailable()
 	if(!target)
-		return 0
-	var/obj/effect/proc_holder/spell/spell = target
-	if(owner)
-		return spell.can_cast(owner)
-	return 0
+		return FALSE
+	return TRUE
 
+/datum/action/spell_action/spell/IsAvailable()
+	if(!target)
+		return FALSE
+	var/obj/effect/proc_holder/spell/S = target
+	if(owner)
+		return S.can_cast(owner)
+	return FALSE
 
 /datum/action/spell_action/alien
 
 /datum/action/spell_action/alien/IsAvailable()
 	if(!target)
-		return 0
+		return FALSE
 	var/obj/effect/proc_holder/alien/ab = target
 	if(owner)
 		return ab.cost_check(ab.check_turf,owner,1)
-	return 0
+	return FALSE
 
 
 

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>!")

code/datums/components/README.md

@@ -94,7 +94,8 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
     * Allows the component to react to ownership transfers
 1. `/datum/component/proc/_RemoveNoSignal()` (private, final)
     * Internal, clears the parent var and removes the component from the parents component list
-1. `/datum/component/proc/RegisterSignal(signal(string), proc_ref(type), override(boolean))` (protected, final) (Consider removing for performance gainz)
+1. `/datum/component/proc/RegisterSignal(signal(string/list of strings), proc_ref(type), override(boolean))` (protected, final) (Consider removing for performance gainz)
+    * If signal is a list it will be as if RegisterSignal was called for each of the entries with the same following arguments
     * Makes a component listen for the specified `signal` on it's `parent` datum.
     * When that signal is recieved `proc_ref` will be called on the component, along with associated arguments
     * Example proc ref: `.proc/OnEvent`

code/datums/components/_component.dm

@@ -95,7 +95,7 @@
 			P.datum_components = null
 		parent = null
 
-/datum/component/proc/RegisterSignal(sig_type, proc_on_self, override = FALSE)
+/datum/component/proc/RegisterSignal(sig_type_or_types, proc_on_self, override = FALSE)
 	if(QDELETED(src))
 		return
 	var/list/procs = signal_procs
@@ -103,12 +103,14 @@
 		procs = list()
 		signal_procs = procs
 	
-	if(!override)
-		. = procs[sig_type]
-		if(.)
-			stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning")
-	
-	procs[sig_type] = CALLBACK(src, proc_on_self)    
+	var/list/sig_types = islist(sig_type_or_types) ? sig_type_or_types : list(sig_type_or_types)
+	for(var/sig_type in sig_types)
+		if(!override)
+			. = procs[sig_type]
+			if(.)
+				stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning")
+		
+		procs[sig_type] = CALLBACK(src, proc_on_self)    
 
 /datum/component/proc/InheritComponent(datum/component/C, i_am_original)
 	return

code/datums/components/slippery.dm

@@ -6,10 +6,7 @@
 /datum/component/slippery/Initialize(_intensity, _lube_flags = NONE)
 	intensity = max(_intensity, 0)
 	lube_flags = _lube_flags
-	if(ismovableatom(parent))
-		RegisterSignal(COMSIG_MOVABLE_CROSSED, .proc/Slip)
-	else
-		RegisterSignal(COMSIG_ATOM_ENTERED, .proc/Slip)
+	RegisterSignal(list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip)
 
 /datum/component/slippery/proc/Slip(atom/movable/AM)
 	var/mob/victim = AM

code/datums/components/squeek.dm

@@ -24,22 +24,9 @@
 	if(use_delay_override)
 		use_delay = use_delay_override
 
-	if(istype(parent, /atom))
-		RegisterSignal(COMSIG_ATOM_BLOB_ACT, .proc/play_squeak)
-		RegisterSignal(COMSIG_ATOM_HULK_ATTACK, .proc/play_squeak)
-		RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/play_squeak)
-		if(istype(parent, /atom/movable))
-			RegisterSignal(COMSIG_MOVABLE_CROSSED, .proc/play_squeak)
-			RegisterSignal(COMSIG_MOVABLE_COLLIDE, .proc/play_squeak)
-			RegisterSignal(COMSIG_MOVABLE_IMPACT, .proc/play_squeak)
-			if(istype(parent, /obj/item))
-				RegisterSignal(COMSIG_ITEM_ATTACK, .proc/play_squeak)
-				RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak)
-				RegisterSignal(COMSIG_ITEM_ATTACK_OBJ, .proc/play_squeak)
-				if(istype(parent, /obj/item/clothing/shoes))
-					RegisterSignal(COMSIG_SHOES_STEP_ACTION, .proc/step_squeak)
-		else
-			RegisterSignal(COMSIG_ATOM_ENTERED, .proc/play_squeak)
+	RegisterSignal(list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_CROSSED, COMSIG_MOVABLE_COLLIDE, COMSIG_MOVABLE_IMPACT, COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_ATTACK_OBJ), .proc/play_squeak)
+	RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak)
+	RegisterSignal(COMSIG_SHOES_STEP_ACTION, .proc/step_squeak)
 
 /datum/component/squeak/proc/play_squeak()
 	if(prob(squeak_chance))

code/datums/map_config.dm

@@ -11,11 +11,14 @@
 
 	var/minetype = "lavaland"
 
+	//Order matters here.
 	var/list/transition_config = list(CENTCOM = SELFLOOPING,
+									CITY_OF_COGS = SELFLOOPING,
 									MAIN_STATION = CROSSLINKED,
 									EMPTY_AREA_1 = CROSSLINKED,
 									EMPTY_AREA_2 = CROSSLINKED,
 									MINING = SELFLOOPING,
+									CITY_OF_COGS = SELFLOOPING,
 									EMPTY_AREA_3 = CROSSLINKED,
 									EMPTY_AREA_4 = CROSSLINKED,
 									EMPTY_AREA_5 = CROSSLINKED,
@@ -28,6 +31,7 @@
 	var/config_min_users = 0
 	var/voteweight = 1
 	var/allow_custom_shuttles = "yes"
+
 /datum/map_config/New(filename = "data/next_map.json", default_to_box, delete_after)
 	if(default_to_box)
 		return
@@ -119,6 +123,8 @@
 			return MAIN_STATION
 		if("CENTCOM")
 			return CENTCOM
+		if("CITY_OF_COGS")
+			return CITY_OF_COGS
 		if("MINING")
 			return MINING
 		if("EMPTY_AREA_1")

code/datums/mind.dm

@@ -672,7 +672,7 @@
 		text = "<i><b>[text]</b></i>: "
 		if(is_servant_of_ratvar(current))
 			text += "not mindshielded | <a href='?src=\ref[src];clockcult=clear'>employee</a> | <b>SERVANT</b>"
-			text += "<br><a href='?src=\ref[src];clockcult=slab'>Give slab</a>"
+			text += "<br><a href='?src=\ref[src];clockcult=slab'>Equip</a>"
 		else if(is_eligible_servant(current))
 			text += "not mindshielded | <b>EMPLOYEE</b> | <a href='?src=\ref[src];clockcult=servant'>servant</a>"
 		else
@@ -1035,9 +1035,9 @@
 					log_admin("[key_name(usr)] has made [current] into a servant of Ratvar.")
 			if("slab")
 				if(!SSticker.mode.equip_servant(current))
-					to_chat(usr, "<span class='warning'>Failed to outfit [current] with a slab!</span>")
+					to_chat(usr, "<span class='warning'>Failed to outfit [current]!</span>")
 				else
-					to_chat(usr, "<span class='notice'>Successfully gave [current] a clockwork slab!</span>")
+					to_chat(usr, "<span class='notice'>Successfully gave [current] servant equipment!</span>")
 
 	else if (href_list["wizard"])
 		switch(href_list["wizard"])

code/datums/outfit.dm

@@ -102,10 +102,10 @@
 		if(implants)
 			for(var/implant_type in implants)
 				var/obj/item/implant/I = new implant_type(H)
-				I.implant(H, null, silent=TRUE)
+				I.implant(H, null, TRUE)
 
 	H.update_body()
-	return 1
+	return TRUE
 
 /datum/outfit/proc/apply_fingerprints(mob/living/carbon/human/H)
 	if(!istype(H))

code/datums/status_effects/debuffs.dm

@@ -148,21 +148,6 @@
 	if(owner.m_intent == MOVE_INTENT_WALK)
 		owner.toggle_move_intent()
 
-/datum/status_effect/geis_tracker
-	id = "geis_tracker"
-	duration = -1
-	alert_type = null
-	var/obj/structure/destructible/clockwork/geis_binding/binding
-
-/datum/status_effect/geis_tracker/on_creation(mob/living/new_owner, obj/structure/destructible/clockwork/geis_binding/new_binding)
-	. = ..()
-	if(.)
-		binding = new_binding
-
-/datum/status_effect/geis_tracker/tick()
-	if(QDELETED(binding))
-		qdel(src)
-
 /datum/status_effect/maniamotor
 	id = "maniamotor"
 	duration = -1
@@ -200,7 +185,7 @@
 		return
 	if(!motor.active) //it being off makes it fall off much faster
 		if(!is_servant && !warned_turnoff)
-			if(motor.total_accessable_power() > motor.mania_cost)
+			if(can_access_clockwork_power(motor, motor.mania_cost))
 				to_chat(owner, "<span class='sevtug[span_part]'>\"[text2ratvar(pick(turnoff_messages))]\"</span>")
 			else
 				var/pickedmessage = pick(powerloss_messages)
@@ -461,3 +446,40 @@
 /obj/effect/temp_visual/curse/Initialize()
 	. = ..()
 	deltimer(timerid)
+
+
+//Kindle: Used by servants of Ratvar. 10-second knockdown, reduced by 1 second per 5 damage taken while the effect is active.
+/datum/status_effect/kindle
+	id = "kindle"
+	status_type = STATUS_EFFECT_UNIQUE
+	tick_interval = 5
+	duration = 100
+	alert_type = /obj/screen/alert/status_effect/kindle
+	var/old_health
+
+/datum/status_effect/kindle/tick()
+	owner.Knockdown(15)
+	if(iscarbon(owner))
+		var/mob/living/carbon/C = owner
+		C.silent = max(2, C.silent)
+		C.stuttering = max(5, C.stuttering)
+	if(!old_health)
+		old_health = owner.health
+	var/health_difference = old_health - owner.health
+	if(!health_difference)
+		return
+	owner.visible_message("<span class='warning'>The light in [owner]'s eyes dims as they're harmed!</span>", \
+	"<span class='boldannounce'>The dazzling lights dim as you're harmed!</span>")
+	health_difference *= 2 //so 10 health difference translates to 20 deciseconds of stun reduction
+	duration -= health_difference
+	old_health = owner.health
+
+/datum/status_effect/kindle/on_remove()
+	owner.visible_message("<span class='warning'>The light in [owner]'s eyes fades!</span>", \
+	"<span class='boldannounce'>You snap out of your daze!</span>")
+
+/obj/screen/alert/status_effect/kindle
+	name = "Dazzling Lights"
+	desc = "Blinding light dances in your vision, stunning and silencing you. <i>Any damage taken will shorten the light's effects!</i>"
+	icon_state = "kindle"
+	alerttooltipstyle = "clockcult"