From 3a38344a04aec6932776a4e30cb5c6d129079cd3 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 23 Jul 2020 00:25:06 -0700
Subject: [PATCH] fix

---
 code/_onclick/hud/screen_objects/clickdelay.dm | 4 ++--
 code/datums/status_effects/debuffs.dm          | 5 -----
 code/modules/mob/living/carbon/carbon.dm       | 3 ---
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/code/_onclick/hud/screen_objects/clickdelay.dm b/code/_onclick/hud/screen_objects/clickdelay.dm
index ec8f13329b..8b6a2f5328 100644
--- a/code/_onclick/hud/screen_objects/clickdelay.dm
+++ b/code/_onclick/hud/screen_objects/clickdelay.dm
@@ -17,7 +17,7 @@
 /obj/screen/action_bar/proc/update_to_mob(mob/living/L)
 	return FALSE
 
-/datum/hud/var/obj/screen/action_bar/clickdelay
+/datum/hud/var/obj/screen/action_bar/clickdelay/clickdelay
 
 /obj/screen/action_bar/clickdelay
 	name = "click delay"
@@ -41,7 +41,7 @@
 	icon = 'icons/effects/progessbar.dmi'
 	icon_state = "prog_bar_100"
 
-/obj/screen/clickdelay/proc/update_to_mob(mob/living/L)
+/obj/screen/action_bar/clickdelay/proc/update_to_mob(mob/living/L)
 	var/diff = L.next_resist - L.last_resist
 	var/left = L.next_resist - world.time
 	if(left < 0 || diff < 0)
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index faed65e9c4..8c64a8faca 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -144,7 +144,6 @@
 	id = "tased"
 	alert_type = null
 	var/movespeed_mod = /datum/movespeed_modifier/status_effect/tased
-	var/nextmove_modifier = 1
 	var/stamdmg_per_ds = 0		//a 20 duration would do 20 stamdmg, disablers do 24 or something
 	var/last_tick = 0			//fastprocess processing speed is a goddamn sham, don't trust it.
 
@@ -173,13 +172,9 @@
 			C.adjustStaminaLoss(max(0, stamdmg_per_ds * diff)) //if you really want to try to stamcrit someone with a taser alone, you can, but it'll take time and good timing.
 	last_tick = world.time
 
-/datum/status_effect/electrode/nextmove_modifier() //why is this a proc. its no big deal since this doesnt get called often at all but literally w h y
-	return nextmove_modifier
-
 /datum/status_effect/electrode/no_combat_mode
 	id = "tased_strong"
 	movespeed_mod = /datum/movespeed_modifier/status_effect/tased/no_combat_mode
-	nextmove_modifier = 2
 	blocks_combatmode = TRUE
 	stamdmg_per_ds = 1
 
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 43595b9571..2acba560cb 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -324,13 +324,10 @@
 
 /mob/living/carbon/resist_restraints()
 	var/obj/item/I = null
-	var/type = 0
 	if(handcuffed)
 		I = handcuffed
-		type = 1
 	else if(legcuffed)
 		I = legcuffed
-		type = 2
 	if(I)
 		MarkResistTime()
 		cuff_resist(I)