a lot of stuff

Author: Matt Atlas

code/__DEFINES/organs.dm

@@ -43,14 +43,17 @@
  */
 #define COMSIG_LIVER_FILTER_EVENT "liver_filter_event"
 
-/// Raised external organ (a limb) takes damage. Used for the synthetic endoskeleton at the moment.
+/// Raised external organ (a limb) takes damage. Used for the synthetic endoskeleton at the moment. Must supply damage.
 #define COMSIG_EXTERNAL_ORGAN_DAMAGE "machine_internal_damage"
 
 /// Sent when the burst damage is cleared by the posibrain.
 #define COMSIG_SYNTH_EMP_DAMAGE_CLEARED "emp_damage_cleared"
 
-/// Sent when the synthetic enters self-preservation mode for whatever reason.
-#define COMSIG_SYNTH_SELF_PRESERVATION_TOGGLED "synth_self_preservation_toggle"
+/// Sent when the synthetic enters self-preservation mode. Must supply a TRUE/FALSE state.
+#define COMSIG_SYNTH_SET_SELF_PRESERVATION "synth_self_preservation_set"
 
-/// Sent when endoskeleton repair is done.
+/// Sent when endoskeleton repair is done. Must supply a number of damage healed.
 #define COMSIG_SYNTH_ENDOSKELETON_REPAIR "synth_endoskeleton_repair"
+
+/// Sent when a full endoskeleton repair is done. Unlike the normal one, also restores max_damage to initial state. No extra arguments.
+#define COMSIG_SYNTH_ENDOSKELETON_FULL_REPAIR "synth_endoskeleton_full_repair"

code/datums/components/synthetic_endoskeleton/synthetic_endoskeleton.dm

@@ -1,54 +1,51 @@
 /datum/component/synthetic_endoskeleton
 	/// The synthetic that owns this component. Equivalent to `parent`, we just use this for ease of use.
 	var/mob/living/carbon/human/owner
-	/// The posibrain of our parent.
-	var/obj/item/organ/internal/machine/posibrain/posibrain
 	/**
 	 * The synthetic endoskeleton is our answer to the eternal problem of IPCs being unable to be brainmed complaint because
 	 * of a lack of mechanics to represent pain, organ breaking, or bleeding/respiration, which is how humans in brainmed are
 	 * taken down nonlethally, or before they die.
 	 */
 	var/damage = 0
 	/// The maximum damage the endoskeleton can take before triggering the safety shutdown.
-	var/damage_maximum = 200
+	var/max_damage = 200
+
+	/// Time until next message.
+	var/message_cooldown = 10 SECONDS
+	/// World.time of last message sent.
+	var/last_sent_message = 0
 
 /datum/component/synthetic_endoskeleton/Initialize(...)
 	. = ..()
 	if(isipc(parent))
 		owner = parent
-		var/obj/item/organ/internal/machine/posibrain/possible_brain = owner.internal_organs_by_name[BP_BRAIN]
-		if(!istype(possible_brain))
-			log_debug("Synthetic endoskeleton somehow could not find a brain. Deleting.")
-			qdel_self()
-		else
-			posibrain = possible_brain
 	else
 		log_debug("Synthetic endoskeleton component spawned on non-IPC. Deleting.")
 		qdel_self()
 
 	RegisterSignal(owner, COMSIG_EXTERNAL_ORGAN_DAMAGE, PROC_REF(receive_damage))
 	RegisterSignal(owner, COMSIG_SYNTH_ENDOSKELETON_REPAIR, PROC_REF(heal_damage))
+	RegisterSignal(owner, COMSIG_SYNTH_ENDOSKELETON_FULL_REPAIR, PROC_REF(full_repair))
 
 /datum/component/synthetic_endoskeleton/Destroy(force)
 	owner = null
-	posibrain = null
 	return ..()
 
 /**
  * Signal handler called when an external synthetic limb receives damage.
  */
-/datum/component/synthetic_endoskeleton/proc/receive_damage(amount)
+/datum/component/synthetic_endoskeleton/proc/receive_damage(atom/source, amount)
 	SIGNAL_HANDLER
-	damage = max(damage + amount, damage_maximum)
+	damage = min(damage + amount, max_damage)
 	handle_exoskeleton_damage()
 
 /**
  * Signal handler called when the endoskeleton is repaired.
  */
-/datum/component/synthetic_endoskeleton/proc/heal_damage(amount)
+/datum/component/synthetic_endoskeleton/proc/heal_damage(atom/source, amount)
 	SIGNAL_HANDLER
 	damage = max(damage - amount, 0)
-	var/damage_ratio = damage_maximum / damage
+	var/damage_ratio = damage / max_damage
 	switch(damage_ratio)
 		if(0 to 0.3)
 			owner.remove_movespeed_modifier(/datum/movespeed_modifier/endoskeleton)
@@ -61,42 +58,63 @@
 	if(!damage)
 		STOP_PROCESSING(SSprocessing, src)
 
+/**
+ * Does a full repair of the endoskeleton, also restoring max_damage to initial state.
+ */
+/datum/component/synthetic_endoskeleton/proc/full_repair(atom/source)
+	max_damage = initial(max_damage)
+	heal_damage(source, max_damage)
+
 /**
  * The function that handles exoskeleton damage effects.
  */
 /datum/component/synthetic_endoskeleton/proc/handle_exoskeleton_damage()
 	if(damage)
 		START_PROCESSING(SSprocessing, src)
-		var/damage_ratio = damage_maximum / damage
+		var/damage_ratio = damage / max_damage
 		switch(damage_ratio)
 			if(0.3 to 0.5)
-				to_chat(owner, SPAN_WARNING("Your self-preservation warning system notifies you of moderate damage to your endoskeleton's supports!"))
+				notify_owner(owner, SPAN_WARNING("Your self-preservation warning system notifies you of moderate damage to your endoskeleton's supports!"))
 				owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 1)
 			if(0.5 to 0.75)
-				to_chat(owner, SPAN_WARNING("Your self-preservation warning system notifies you of major damage to your endoskeleton!"))
+				notify_owner(owner, SPAN_WARNING("Your self-preservation warning system notifies you of major damage to your endoskeleton!"))
+				spark(owner, 2, GLOB.alldirs)
 				owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 2)
-			if(0.75 to 1)
-				to_chat(owner, SPAN_DANGER(FONT_LARGE("Your self-preservation routines are starting to kick in! Your endoskeleton is falling apart!")))
+			if(0.75 to 0.99)
+				notify_owner(owner, SPAN_DANGER("Your self-preservation routines are starting to kick in! Your endoskeleton is falling apart!"))
+				spark(owner, 3, GLOB.alldirs)
 				owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 3)
 			if(1 to INFINITY)
-				owner.visible_message(SPAN_DANGER("[owner]'s limbs seize up and [owner.get_pronoun("he")] falls to the ground!"), SPAN_DANGER(FONT_LARGE("Your self-preservation routines kick in and you enter a safety shutdown mode!")))
-				SEND_SIGNAL(owner, COMSIG_SYNTH_SELF_PRESERVATION_TOGGLED)
+				SEND_SIGNAL(owner, COMSIG_SYNTH_SET_SELF_PRESERVATION, TRUE)
 
 /datum/component/synthetic_endoskeleton/process()
-	var/damage_ratio = damage_maximum / damage
+	if(owner.stat)
+		return
+
+	var/damage_ratio = damage / max_damage
 	switch(damage_ratio)
 		if(0.3 to 0.5)
 			if(prob(5))
-				to_chat(owner, SPAN_MACHINE_WARNING("Warning: Endoskeleton integrity at [100 - (damage_ratio * 100)]%."))
+				notify_owner(owner, SPAN_MACHINE_WARNING("Warning: Endoskeleton integrity at [100 - (damage_ratio * 100)]%."))
 		if(0.5 to 0.75)
 			if(prob(10))
-				to_chat(owner, SPAN_MACHINE_WARNING("WARNING: Endoskeleton integrity at [100 - (damage_ratio * 100)]%!"))
-				to_chat(owner, SPAN_WARNING("The mangled and exposed wires in your endoskeleton spark!"))
+				notify_owner(owner, SPAN_MACHINE_WARNING("WARNING: Endoskeleton integrity at [100 - (damage_ratio * 100)]%!"))
+				notify_owner(owner, SPAN_WARNING("The mangled and exposed wires in your endoskeleton spark!"))
 				spark(owner, 3, GLOB.alldirs)
 				owner.bodytemperature += 10
 		if(0.75 to 1)
-			if(prob(20))
-				to_chat(owner, SPAN_MACHINE_DANGER("ENDOSKELETON INTEGRITY CRITICAL. Your self preservation blares at you to return to safety!"))
-				to_chat(owner, SPAN_WARNING("Your frame creaks and groans, threatening to break apart at the metallic seams!"))
+			if(prob(15))
+				notify_owner(owner, SPAN_MACHINE_DANGER(FONT_LARGE("ENDOSKELETON INTEGRITY CRITICAL. Your self preservation blares at you to return to safety!")))
+				notify_owner(owner, SPAN_DANGER("Your frame creaks and groans, threatening to break apart at the metallic seams!"))
 				spark(owner, 4, GLOB.alldirs)
 				owner.bodytemperature += 20
+
+/**
+ * Wrapper to_chat proc with a stat check.
+ */
+/datum/component/synthetic_endoskeleton/proc/notify_owner(mob/living/carbon/human/user, message)
+	if(user.is_asystole() || (last_sent_message + message_cooldown > world.time))
+		return
+
+	to_chat(user, message)
+	last_sent_message = world.time

code/game/objects/items/stacks/nanopaste.dm

@@ -83,6 +83,25 @@
 		var/obj/item/organ/external/S = H.get_organ(target_zone)
 
 		if (S && (S.status & ORGAN_ASSISTED))
+			var/datum/component/synthetic_endoskeleton/endoskeleton = H.GetComponent(/datum/component/synthetic_endoskeleton)
+			if(istype(endoskeleton) && endoskeleton.damage)
+				if(target_mob == user)
+					if(endoskeleton.damage >= endoskeleton.max_damage * 0.5)
+						to_chat(user, SPAN_WARNING("Your control over your limbs is too damaged to apply the nanopaste precisely!"))
+						return
+					application_time *= application_multiplier // It takes longer to apply nanopaste to yourself than to someone else.
+
+				if (application_in_progress == FALSE)
+					application_in_progress = TRUE
+					user.visible_message(SPAN_NOTICE("\The [user] begins to apply nanite past to the broken support systems of [user != target_mob ? " \the [target_mob]'s" : "\the [user]'s"] endoskeleton..."), \
+						SPAN_NOTICE("You begin to apply nanite paste to the broken support systems of [user != target_mob ? " \the [target_mob]'s" : "your"] [endoskeleton]..."))
+					if(do_mob(user, target_mob, application_time))
+						SEND_SIGNAL(target_mob, COMSIG_SYNTH_ENDOSKELETON_REPAIR, rand(15, 30))
+						user.visible_message(SPAN_NOTICE("\The [user] mends the broken links in [user != target_mob ? " \the [target_mob]'s" : "\the [user]'s"] endoskeleton with \the [src]."),\
+												SPAN_NOTICE("You successfully mend the broken links in[user == target_mob ? "your" : "[target_mob]'s"] endoskeleton with \the [src]."))
+						use(1)
+					application_in_progress = FALSE
+
 			if(S.get_damage())
 				user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 

code/modules/mob/living/carbon/human/human_organs.dm

@@ -198,11 +198,11 @@
 	if(isSynthetic())
 		var/obj/item/organ/internal/machine/power_core/C = internal_organs_by_name[BP_CELL]
 		if(istype(C) && C.is_usable() && C.percent())
-			return FALSE
-		var/obj/item/organ/internal/machine/posibrain/posi = internal_organs_by_name[BP_BRAIN]
-		if(istype(posi) && !posi.self_preservation_activated)
-			return FALSE
+			var/obj/item/organ/internal/machine/posibrain/posi = internal_organs_by_name[BP_BRAIN]
+			if(istype(posi) && !posi.self_preservation_activated)
+				return FALSE
 		return TRUE
+
 	else if(should_have_organ(BP_HEART))
 		var/obj/item/organ/internal/heart/heart = internal_organs_by_name[BP_HEART]
 		if(!istype(heart) || !heart.is_working())

code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm

@@ -200,7 +200,7 @@
 	if(!endoskeleton)
 		return 6 //how?
 
-	var/damage_ratio = endoskeleton.damage_maximum / endoskeleton.damage
+	var/damage_ratio = endoskeleton.damage / endoskeleton.max_damage
 	switch(damage_ratio)
 		if(0.3 to 0.5)
 			stance_damage += 1

code/modules/organs/internal/species/machine/posibrain.dm

@@ -37,7 +37,7 @@
 	/// Stores the current status of EMP damage.
 	var/emp_damage_counter = 0
 	/// Maximum EMP damage points we can have.
-	var/emp_damage_maximum = 3
+	var/emp_max_damage = 3
 	/// The amount of seconds the brain should be scrambled for, while this is above 0, it'll add a flat 2 evaluate_damage()'s damage points
 	var/brain_scrambling = 0
 	/// Whether or not the positronic's self-preservation is toggled. Basically knocks the IPC out.
@@ -53,7 +53,7 @@
 		set_max_damage(species.total_health)
 	else
 		set_max_damage(200)
-	RegisterSignal(owner, COMSIG_SYNTH_SELF_PRESERVATION_TOGGLED, PROC_REF(toggle_self_preservation))
+	RegisterSignal(owner, COMSIG_SYNTH_SET_SELF_PRESERVATION, PROC_REF(set_self_preservation))
 	sizzle = new(owner)
 
 /obj/item/organ/internal/machine/posibrain/Destroy()
@@ -63,9 +63,7 @@
 
 /obj/item/organ/internal/machine/posibrain/rejuvenate()
 	. = ..()
-	var/datum/component/synthetic_endoskeleton/endoskeleton = owner.GetComponent(/datum/component/synthetic_endoskeleton)
-	if(endoskeleton)
-		endoskeleton.heal_damage(endoskeleton.damage_maximum)
+	SEND_SIGNAL(owner, COMSIG_SYNTH_ENDOSKELETON_FULL_REPAIR)
 	emp_damage_counter = 0
 	brain_scrambling = 0
 	remove_fragmentation(max_damage)
@@ -176,7 +174,7 @@
  * This proc adds to the EMP damage counter, and automatically starts a unique/override timer to clear it.
  */
 /obj/item/organ/internal/machine/posibrain/proc/add_emp_damage_counter()
-	emp_damage_counter = min(emp_damage_counter + 1, emp_damage_maximum)
+	emp_damage_counter = min(emp_damage_counter + 1, emp_max_damage)
 	handle_emp_damage()
 	addtimer(CALLBACK(src, PROC_REF(clear_emp_damage_counter)), emp_damage_counter * 20, TIMER_OVERRIDE | TIMER_UNIQUE)
 
@@ -350,14 +348,16 @@
 
 	var/datum/component/synthetic_endoskeleton/endoskeleton = owner.GetComponent(/datum/component/synthetic_endoskeleton)
 	if(endoskeleton && endoskeleton.damage)
-		var/damage_ratio = endoskeleton.damage_maximum / endoskeleton.damage
+		var/damage_ratio = endoskeleton.damage / endoskeleton.max_damage
 		switch(damage_ratio)
 			if(0.3 to 0.5)
 				damage_points++
 			if(0.5 to 0.75)
 				damage_points += 2
-			if(0.75 to INFINITY)
-				damage_points += 3
+			if(0.75 to 0.85)
+				damage_points += 4
+			if(0.85 to INFINITY)
+				damage_points += 5
 
 	if(damage_points)
 		damage_points = min(6, damage_points)
@@ -457,15 +457,21 @@
 	cooling_unit.locked_thermostat = FALSE
 	cooling_unit.take_internal_damage(20)
 
-/obj/item/organ/internal/machine/posibrain/proc/toggle_self_preservation()
+/obj/item/organ/internal/machine/posibrain/proc/set_self_preservation(atom/source, state)
 	SIGNAL_HANDLER
-	if(self_preservation_activated)
+	if(state == self_preservation_activated)
+		return
+
+	self_preservation_activated = state
+	if(!self_preservation_activated)
 		owner.visible_message(SPAN_WARNING("A crackle of electricity is heard as [owner]'s limbs twitch almost imperceptibly."), SPAN_MACHINE_WARNING("Your control is restored to you as your self-preservation protocols ease up."))
-		playsound(owner, 'sound/species/synthetic/synthetic_restart.ogg', 100)
+		if(!is_broken())
+			playsound(owner, 'sound/species/synthetic/synthetic_restart.ogg', 100)
 		self_preservation_activated = FALSE
 	else
-		owner.visible_message(SPAN_DANGER("[owner]'s limbs seize up as the light from [owner.get_pronoun("his")] eyes fades."), SPAN_MACHINE_DANGER("You lose control over your limbs as your self-preservation protocols take over!"))
-		playsound(owner, 'sound/species/synthetic/synthetic_stun.ogg', 100)
+		owner.visible_message(SPAN_DANGER("[owner]'s limbs seize up as the light from [owner.get_pronoun("his")] eyes fades."), FONT_LARGE(SPAN_MACHINE_DANGER("You lose control over your limbs as your self-preservation protocols take over!")))
+		if(!is_broken())
+			playsound(owner, 'sound/species/synthetic/synthetic_stun.ogg', 100)
 		self_preservation_activated = TRUE
 
 /obj/item/organ/internal/machine/posibrain/Topic(href, href_list)

code/modules/organs/internal/species/machine/targeting_core.dm

@@ -66,7 +66,7 @@
 		if(magazine)
 			do_reload(user, gun, magazine)
 		else
-			to_chat(owner, SPAN_DANGER("Your targeting core can't locate any applicable magazines!"))
+			to_chat(owner, SPAN_DANGER("Your hands come up empty!"))
 
 /**
 * Reloads the gun itself.
@@ -82,4 +82,5 @@
 	if(istype(storage))
 		for(var/obj/item/item in storage.contents)
 			if(item.type == magazine_type)
+				storage.remove_from_storage(item)
 				return item

code/modules/surgery/robotics.dm

@@ -761,12 +761,12 @@
 			user.visible_message(SPAN_WARNING("[user]'s [tool] shut off before the procedure was finished."), \
 			SPAN_WARNING("Your [tool] is shut off!"))
 			return
-	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	user.visible_message("<b>[user]</b> finishes repairing damage to [target]'s endoskeleton with \the [tool].", \
 		SPAN_NOTICE("You finish repairing damage to [target]'s endoskeleton with \the [tool]."))
 	SEND_SIGNAL(target, COMSIG_SYNTH_ENDOSKELETON_REPAIR, rand(30, 50))
 
 /singleton/surgery_step/robotics/repair_endoskeleton/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+	var/obj/item/organ/external/affected = target.get_organ(target_zone)
 	user.visible_message(SPAN_WARNING("[user]'s [tool.name] slips, damaging some of the support structure of [target]'s endoskeleton!"),
-		SPAN_WARNING("Your [tool.name] slips, damaging some of the support structure of [target]'s [affected.name]!"))
+		SPAN_WARNING("Your [tool.name] slips, damaging some of the support structure of [target]'s endoskeleton!"))
 	target.apply_damage(rand(5,10), DAMAGE_BURN, affected)

code/modules/tgui/modules/ipc_diagnostic.dm

@@ -67,7 +67,7 @@
 		var/datum/component/synthetic_endoskeleton/endoskeleton = ipc.GetComponent(/datum/component/synthetic_endoskeleton)
 		if(istype(endoskeleton))
 			data["endoskeleton_damage"] = endoskeleton.damage
-			data["endoskeleton_damage_maximum"] = endoskeleton.damage_maximum
+			data["endoskeleton_max_damage"] = endoskeleton.max_damage
 
 		var/datum/component/armor/synthetic/synth_armor = ipc.GetComponent(/datum/component/armor/synthetic)
 		if(istype(synth_armor))

tgui/packages/tgui/interfaces/IPCDiagnostics.tsx

@@ -20,7 +20,7 @@ export type DiagnosticsData = {
   armor_data: ArmorDamage[];
 
   endoskeleton_damage: number;
-  endoskeleton_damage_maximum: number;
+  endoskeleton_max_damage: number;
 };
 
 type ArmorDamage = {
@@ -110,12 +110,12 @@ export const DiagnosticsWindow = (props, context) => {
             bold
             textColor={endoskeletonDamageLabel(
               data.endoskeleton_damage,
-              data.endoskeleton_damage_maximum
+              data.endoskeleton_max_damage
             )}>
             {capitalize(
               describeEndoskeletonIntegrity(
                 data.endoskeleton_damage,
-                data.endoskeleton_damage_maximum
+                data.endoskeleton_max_damage
               )
             )}
           </Box>