Cyborg Damage, Movement, and Power Overhaul

code/__DEFINES/combat_defines.dm

@@ -22,6 +22,7 @@
 #define MAGIC		"magic"
 
 #define STUN		"stun"
+#define STAM_CRIT   "stam_crit"
 #define WEAKEN		"weaken"
 #define KNOCKDOWN	"knockdown"
 #define PARALYZE	"paralize"

code/__DEFINES/dcs/signals.dm

@@ -460,6 +460,10 @@
 	#define COMPONENT_NO_ATTACH (1<<0)
 ///sent from borg recharge stations: (amount, repairs)
 #define COMSIG_PROCESS_BORGCHARGER_OCCUPANT "living_charge"
+///sent when a mob enters a borg charger
+#define COMSIG_ENTERED_BORGCHARGER "enter_charger"
+///sent when a mob exits a borg charger
+#define COMSIG_EXITED_BORGCHARGER "exit_charger"
 ///sent when a mob/login() finishes: (client)
 #define COMSIG_MOB_CLIENT_LOGIN "comsig_mob_client_login"
 ///sent from borg mobs to itself, for tools to catch an upcoming destroy() due to safe decon (rather than detonation)

code/controllers/configuration/sections/movement_configuration.dm

@@ -9,7 +9,7 @@
 	/// Move delay for humanoids
 	var/human_delay = 1.5
 	/// Move delay for cyborgs
-	var/robot_delay = 2.5
+	var/robot_delay = 1.5
 	/// Move delay for xenomorphs
 	var/alien_delay = 1.5
 	/// Move delay for slimes (xenobio, not slimepeople)

code/game/machinery/rechargestation.dm

@@ -165,6 +165,7 @@
 /obj/machinery/recharge_station/proc/go_out()
 	if(!occupant)
 		return
+	SEND_SIGNAL(occupant, COMSIG_EXITED_BORGCHARGER)
 	UnregisterSignal(occupant, COMSIG_MOVABLE_MOVED)
 	occupant.forceMove(loc)
 	occupant = null
@@ -232,6 +233,7 @@
 
 	target.stop_pulling()
 	QDEL_LIST_CONTENTS(target.grabbed_by)
+	SEND_SIGNAL(target, COMSIG_ENTERED_BORGCHARGER)
 	target.forceMove(src)
 	occupant = target
 	RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(go_out))

code/game/objects/items/devices/flash.dm

@@ -133,7 +133,6 @@
 	else if(issilicon(M))
 		add_attack_logs(user, M, "Flashed with [src]")
 		if(M.flash_eyes(affect_silicon = 1))
-			M.Weaken(rand(8 SECONDS, 12 SECONDS))
 			user.visible_message("<span class='disarm'>[user] overloads [M]'s sensors with [src]!</span>", "<span class='danger'>You overload [M]'s sensors with [src]!</span>")
 		return 1
 	user.visible_message("<span class='disarm'>[user] fails to blind [M] with [src]!</span>", "<span class='warning'>You fail to blind [M] with [src]!</span>")

code/game/objects/items/robot/robot_upgrades.dm

@@ -253,7 +253,7 @@
 
 /obj/item/borg/upgrade/vtec
 	name = "robotic VTEC Module"
-	desc = "Used to activate a cyborg's VTEC systems, increasing their speed."
+	desc = "Used to activate a vehicle's VTEC systems, increasing their speed."
 	icon_state = "cyborg_upgrade2"
 	require_module = TRUE
 	origin_tech = "engineering=4;materials=5;programming=4"

code/modules/mob/living/carbon/carbon_status_procs.dm

@@ -12,8 +12,8 @@
 	stam_regen_start_time = world.time + (STAMINA_REGEN_BLOCK_TIME * stamina_regen_block_modifier)
 	var/prev = stam_paralyzed
 	stam_paralyzed = TRUE
-	ADD_TRAIT(src, TRAIT_IMMOBILIZED, "stam_crit") // make defines later
-	ADD_TRAIT(src, TRAIT_FLOORED, "stam_crit")
-	ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, "stam_crit")
+	ADD_TRAIT(src, TRAIT_IMMOBILIZED, STAM_CRIT)
+	ADD_TRAIT(src, TRAIT_FLOORED, STAM_CRIT)
+	ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, STAM_CRIT)
 	if(!prev && getStaminaLoss() < 120) // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems.
 		adjustStaminaLoss(30, FALSE)

code/modules/mob/living/carbon/carbon_update_status.dm

@@ -28,9 +28,9 @@
 	else if(stam_paralyzed)
 		SEND_SIGNAL(src, COMSIG_CARBON_EXIT_STAMINACRIT)
 		stam_paralyzed = FALSE
-		REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, "stam_crit") // make defines later
-		REMOVE_TRAIT(src, TRAIT_FLOORED, "stam_crit")
-		REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, "stam_crit")
+		REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, STAM_CRIT)
+		REMOVE_TRAIT(src, TRAIT_FLOORED, STAM_CRIT)
+		REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, STAM_CRIT)
 
 /mob/living/carbon/can_hear()
 	. = FALSE

code/modules/mob/living/silicon/robot/component.dm

@@ -12,9 +12,14 @@
 	var/mob/living/silicon/robot/owner
 	var/external_type = null // The actual device object that has to be installed for this.
 	var/obj/item/wrapped = null // The wrapped device(e.g. radio), only set if external_type isn't null
+	///How much a component is contributing to slowdown
+	var/current_slowdown_factor = 0
+	///The max amount of slowness a component can contribute, set to be 1% of the max damage
+	var/max_slowdown_factor
 
 /datum/robot_component/New(mob/living/silicon/robot/R)
 	owner = R
+	max_slowdown_factor = (max_damage / 100)
 
 // Should only ever be destroyed when a borg gets destroyed
 /datum/robot_component/Destroy(force, ...)
@@ -35,7 +40,7 @@
 	go_offline()
 	owner.updatehealth("component '[src]' removed")
 
-/datum/robot_component/proc/destroy()
+/datum/robot_component/proc/break_component()
 	if(wrapped)
 		qdel(wrapped)
 	uninstall()
@@ -50,9 +55,9 @@
 
 	brute_damage += brute
 	electronics_damage += electronics
-
+	current_slowdown_factor = clamp((current_slowdown_factor + ((brute_damage + electronics_damage) / 100)), 0, max_slowdown_factor)
 	if(brute_damage + electronics_damage >= max_damage)
-		destroy()
+		break_component()
 
 	SStgui.update_uis(owner.self_diagnosis)
 
@@ -66,7 +71,7 @@
 
 	brute_damage = max(0, brute_damage - brute)
 	electronics_damage = max(0, electronics_damage - electronics)
-
+	current_slowdown_factor = clamp((current_slowdown_factor - ((brute_damage + electronics_damage) / 100)), 0, max_slowdown_factor)
 	SStgui.update_uis(owner.self_diagnosis)
 
 /datum/robot_component/proc/is_powered()
@@ -112,6 +117,9 @@
 /datum/robot_component/proc/go_offline()
 	return
 
+/datum/robot_component/proc/get_movement_delay()
+	return (is_destroyed() ? max_slowdown_factor : current_slowdown_factor)
+
 /datum/robot_component/armour
 	name = "armour plating"
 	external_type = /obj/item/robot_parts/robot_component/armour
@@ -136,13 +144,13 @@
 	owner.cell = null
 
 /datum/robot_component/cell/is_powered()
-	return ..() && owner.cell
+	return ..() && owner.cell?.charge
 
 /datum/robot_component/cell/Destroy(force, ...)
 	owner.cell = null
 	return ..()
 
-/datum/robot_component/cell/destroy()
+/datum/robot_component/cell/break_component()
 	..()
 	owner.cell = null
 

code/modules/mob/living/silicon/robot/robot_damage.dm

@@ -32,6 +32,13 @@
 		heal_overall_damage(0, -amount, updating_health)
 	return STATUS_UPDATE_HEALTH
 
+/mob/living/silicon/robot/update_stamina()
+	if(rebooting)
+		return
+	var/current_stam_damage = getStaminaLoss()
+	if(current_stam_damage > DAMAGE_PRECISION && (maxHealth - current_stam_damage) <= HEALTH_THRESHOLD_CRIT && !stat)
+		start_emergency_reboot()
+
 /mob/living/silicon/robot/proc/get_damaged_components(get_brute, get_burn, get_borked = FALSE, get_missing = FALSE)
 	var/list/datum/robot_component/parts = list()
 	for(var/V in components)
@@ -58,11 +65,29 @@
 
 /mob/living/silicon/robot/proc/get_armour()
 	if(!LAZYLEN(components))
-		return 0
+		return TRUE
 	var/datum/robot_component/C = components["armour"]
 	if(C && C.installed)
 		return C
-	return 0
+	return FALSE
+
+/mob/living/silicon/robot/proc/get_cell_component()
+	if(!LAZYLEN(components))
+		return FALSE
+	var/datum/robot_component/C = components["power cell"]
+	if(C && C.installed)
+		return C
+	return FALSE
+
+/mob/living/silicon/robot/proc/get_total_component_slowdown()
+	var/total_slowdown = 0
+	for(var/V in components)
+		var/datum/robot_component/C = components[V]
+		total_slowdown += C.get_movement_delay()
+	return total_slowdown
+
+/mob/living/silicon/robot/proc/get_stamina_slowdown()
+	return round((staminaloss / 50), 0.125)
 
 /mob/living/silicon/robot/heal_organ_damage(brute, burn, updating_health = TRUE)
 	var/list/datum/robot_component/parts = get_damaged_components(brute, burn)
@@ -131,3 +156,33 @@
 
 		parts -= picked
 	updatehealth()
+
+/*
+Begins the stamcrit reboot process for borgs. Stuns them, and warns people if the borg has no power source.
+*/
+/mob/living/silicon/robot/proc/start_emergency_reboot()
+	rebooting = TRUE
+	if(!has_power_source())
+		visible_message(
+		"<span class='warning'>[src]'s system sounds an alarm,</span> <span class='robot>\"ERROR: NO POWER SOURCE DETECTED. SYSTEM SHUTDOWN EMINENT.\"</span>",
+		"<span class='warning'>EMERGENCY: FULL SYSTEM SHUTDOWN EMINENT.</span>"
+	)
+	else
+		visible_message(
+			"<span class='notice'>[src]'s lights suddenly go dark and [p_they()] seem to shut down.</span>",
+			"<span class='notice'>A fatal error has occured in the neural connections. Beginning emergency reboot.</span>"
+		)
+	var/stun_time = rand(10 SECONDS, 15 SECONDS)
+	Weaken(stun_time)
+	addtimer(CALLBACK(src, PROC_REF(end_emergency_reboot)), stun_time)
+/*
+Finishes the stamcrit process. If the borg doesn't have a power source for the reboot, they die.
+*/
+/mob/living/silicon/robot/proc/end_emergency_reboot()
+	rebooting = FALSE
+	if(!has_power_source())
+		death()
+	if(!stat)
+		return
+	setStaminaLoss(0) //Have you tried turning it off and on again?
+	to_chat(src, "<span class='notice'>Reboot complete, neural interface operational.")

code/modules/mob/living/silicon/robot/robot_defense.dm

@@ -55,3 +55,10 @@
 				step_away(src, user, 15)
 				sleep(3)
 				step_away(src, user, 15)
+
+/mob/living/silicon/robot/flash_eyes(intensity, override_blindness_check, affect_silicon, visual, type)
+	if(affect_silicon)
+		var/software_damage = (intensity * 30)
+		adjustStaminaLoss(software_damage)
+		to_chat(src, "<span class='warning'>Error: Optical sensors overstimulated.</span>")
+		..()

code/modules/mob/living/silicon/robot/robot_life.dm

@@ -16,33 +16,35 @@
 
 
 /mob/living/silicon/robot/proc/handle_robot_cell()
-	if(stat != DEAD)
-		if(!is_component_functioning("power cell"))
-			uneq_all()
-			low_power_mode = TRUE
-			update_headlamp()
-			diag_hud_set_borgcell()
-			return
-		if(low_power_mode)
-			if(is_component_functioning("power cell") && cell.charge)
-				low_power_mode = FALSE
-				update_headlamp()
-		else if(stat == CONSCIOUS)
-			use_power()
+	if(stat == DEAD)
+		return
+	if(externally_powered)
+		return
+	if(low_power_mode)
+		handle_no_power()
+	else if(!is_component_functioning("power cell")) //This makes it so you'll only get the warnings once per running out of charge
+		enter_low_power_mode()
+	else if(stat == CONSCIOUS)
+		use_power()
 
 /mob/living/silicon/robot/proc/use_power()
-	// this check is safe because `cell` is guaranteed to be set when the power cell is functioning
-	if(is_component_functioning("power cell") && cell.charge)
-		if(cell.charge <= 100)
-			uneq_all()
-		var/amt = clamp((lamp_intensity - 2) * 2,1,cell.charge) //Always try to use at least one charge per tick, but allow it to completely drain the cell.
-		cell.use(amt) //Usage table: 1/tick if off/lowest setting, 4 = 4/tick, 6 = 8/tick, 8 = 12/tick, 10 = 16/tick
-	else
-		uneq_all()
-		low_power_mode = TRUE
-		update_headlamp()
+	var/amt = clamp((lamp_intensity - 2) * 2,1,cell.charge) //Always try to use at least one charge per tick, but allow it to completely drain the cell.
+	cell.use(amt) //Usage table: 1/tick if off/lowest setting, 4 = 4/tick, 6 = 8/tick, 8 = 12/tick, 10 = 16/tick
 	diag_hud_set_borgcell()
 
+/mob/living/silicon/robot/proc/handle_no_power()
+	diag_hud_set_borgcell()
+	if(is_component_functioning("power cell"))
+		low_power_mode = FALSE
+		return
+	adjustStaminaLoss(1)
+
+/mob/living/silicon/robot/proc/enter_low_power_mode()
+	low_power_mode = TRUE
+	playsound(src, "sound/mecha/lowpower.ogg", 50, FALSE, SOUND_RANGE_SET(10))
+	to_chat(src, "<span_class='warning'>Alert: Power cell requires immediate charging.</span>")
+	handle_no_power()
+
 /mob/living/silicon/robot/proc/handle_equipment()
 	if(camera && !scrambledcodes)
 		if(stat == DEAD || wires.is_cut(WIRE_BORG_CAMERA))

code/modules/mob/living/silicon/robot/robot_mob.dm

@@ -66,7 +66,10 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	var/brute_mod = 1
 	/// Value incoming burn damage to borgs is multiplied by.
 	var/burn_mod = 1
-
+	///If the cyborg is rebooting from stamcrit
+	var/rebooting = FALSE
+	///If the cyborg is in a charger, or otherwise receiving power from an outside source.
+	var/externally_powered = FALSE
 	var/list/force_modules
 	var/allow_rename = TRUE
 	var/weapons_unlock = FALSE
@@ -185,7 +188,8 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	scanner = new(src)
 	scanner.Grant(src)
 	RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(create_trail))
-
+	RegisterSignal(src, COMSIG_ENTERED_BORGCHARGER, PROC_REF(gain_external_power))
+	RegisterSignal(src, COMSIG_EXITED_BORGCHARGER, PROC_REF(lose_external_power))
 	robot_module_hat_offset(icon_state)
 
 /mob/living/silicon/robot/get_radio()
@@ -1724,3 +1728,15 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 		old_ai.connected_robots -= src
 	if(connected_ai)
 		connected_ai.connected_robots |= src
+
+/mob/living/silicon/robot/proc/gain_external_power()
+	SIGNAL_HANDLER //COMSIG_ENTERED_BORGCHARGER
+	externally_powered = TRUE
+
+/mob/living/silicon/robot/proc/lose_external_power()
+	SIGNAL_HANDLER //COMSIG_EXITED_BORGCHARGER
+	externally_powered = FALSE
+
+/mob/living/silicon/robot/proc/has_power_source()
+	var/datum/robot_component/cell/cell = get_cell_component()
+	return cell.is_powered() || externally_powered

code/modules/mob/living/silicon/robot/robot_movement.dm

@@ -9,9 +9,12 @@
 /mob/living/silicon/robot/movement_delay()
 	. = ..()
 	. += speed
+	. += get_total_component_slowdown()
+	. += get_stamina_slowdown()
 	if(module_active && istype(module_active,/obj/item/borg/destroyer/mobility))
 		. -= 3
 	. += GLOB.configuration.movement.robot_delay
+	log_debug("total slowdown: [.]")
 
 /mob/living/silicon/robot/mob_negates_gravity()
 	return HAS_TRAIT(src, TRAIT_MAGPULSE)

code/modules/mob/living/silicon/robot/robot_update_status.dm

@@ -14,7 +14,7 @@
 			death()
 			create_debug_log("died of damage, trigger reason: [reason]")
 			return
-		if(!is_component_functioning("actuator") || !is_component_functioning("power cell") || HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || IsStunned() || IsWeakened() || getOxyLoss() > maxHealth * 0.5) // Borgs need to be able to sleep for adminfreeze
+		if(HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || IsStunned() || IsWeakened() || getOxyLoss() > maxHealth * 0.5) // Borgs need to be able to sleep for adminfreeze
 			if(stat == CONSCIOUS)
 				KnockOut()
 				create_debug_log("fell unconscious, trigger reason: [reason]")
@@ -23,11 +23,11 @@
 				WakeUp()
 				create_debug_log("woke up, trigger reason: [reason]")
 	else
-		if(health > 0 && !suiciding)
+		if(health > 0 && !suiciding && has_power_source())
 			update_revive()
 			var/mob/dead/observer/ghost = get_ghost()
 			if(ghost)
-				to_chat(ghost, "<span class='ghostalert'>Your cyborg shell has been repaired, re-enter if you want to continue!</span> (Verbs -> Ghost -> Re-enter corpse)")
+				to_chat(ghost, "<span class='ghostalert'>Your cyborg shell has been repaired and repowered, re-enter if you want to continue!</span> (Verbs -> Ghost -> Re-enter corpse)")
 				SEND_SOUND(ghost, sound('sound/effects/genetics.ogg'))
 			create_attack_log("revived, trigger reason: [reason]")
 			create_log(MISC_LOG, "revived, trigger reason: [reason]")

code/modules/mob/living/silicon/silicon_mob.dm

@@ -230,10 +230,8 @@
 	switch(severity)
 		if(EMP_HEAVY)
 			take_organ_damage(20)
-			Stun(16 SECONDS)
 		if(EMP_LIGHT)
 			take_organ_damage(10)
-			Stun(6 SECONDS)
 	flash_eyes(affect_silicon = 1)
 	to_chat(src, "<span class='danger'>*BZZZT*</span>")
 	to_chat(src, "<span class='warning'>Warning: Electromagnetic pulse detected.</span>")