diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index bc167910747..7347e8eb3e9 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -615,11 +615,11 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, return TRUE /mob/living/carbon/restrained() - if(get_retraining_item()) + if(get_restraining_item()) return TRUE return FALSE -/mob/living/carbon/get_retraining_item() +/mob/living/carbon/get_restraining_item() return handcuffed /mob/living/carbon/unEquip(obj/item/I, force) //THIS PROC DID NOT CALL ..() @@ -776,7 +776,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, spawn(0) resist_muzzle() var/obj/item/I - if((I = get_retraining_item())) // If there is nothing to restrain him then he is not restrained + if((I = get_restraining_item())) // If there is nothing to restrain him then he is not restrained var/breakouttime = I.breakouttime var/displaytime = breakouttime / 10 changeNext_move(CLICK_CD_BREAKOUT) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index fef44d69e9d..7060a139a60 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -312,7 +312,7 @@ return 0 ..() -/mob/living/carbon/human/get_retraining_item() +/mob/living/carbon/human/get_restraining_item() . = ..() if(!. && istype(wear_suit, /obj/item/clothing/suit/straight_jacket)) . = wear_suit diff --git a/code/modules/mob/update_status.dm b/code/modules/mob/update_status.dm index 555486ebf10..1708bcfb7a2 100644 --- a/code/modules/mob/update_status.dm +++ b/code/modules/mob/update_status.dm @@ -50,7 +50,7 @@ // All are created free return FALSE -/mob/proc/get_retraining_item() +/mob/proc/get_restraining_item() return null // Procs that update other things about the mob