From c56ab301d1e46189818934af331b50171bc6a06c Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 12 Jun 2014 02:11:40 +0400 Subject: [PATCH] Compile fix for a fix for legcuffs. --- code/game/machinery/washing_machine.dm | 8 ++++---- code/modules/clothing/shoes/colour.dm | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 12ab6f5176..77fde8ef7e 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -147,10 +147,10 @@ if(new_shoe_icon_state && new_shoe_name) for(var/obj/item/clothing/shoes/S in contents) //world << "DEBUG: YUP! FOUND IT!" - if (S.chained == 1) - S.chained = 0 - S.slowdown = SHOES_SLOWDOWN - new /obj/item/weapon/handcuffs( src ) + if (istype(S,/obj/item/clothing/shoes/orange)) + var/obj/item/clothing/shoes/orange/L = S + if (L.chained) + L.remove_cuffs() S.icon_state = new_shoe_icon_state S.item_color = wash_color S.name = new_shoe_name diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 5fa427843c..55d0591a37 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -84,9 +84,9 @@ name = "orange shoes" icon_state = "orange" item_color = "orange" - var/chained = null + var/obj/item/weapon/handcuffs/chained = null -/obj/item/clothing/shoes/orange/proc/attach_cuffs(/obj/item/weapon/handcuffs/cuffs) +/obj/item/clothing/shoes/orange/proc/attach_cuffs(var/obj/item/weapon/handcuffs/cuffs) if (src.chained) return cuffs.loc = src @@ -96,7 +96,7 @@ /obj/item/clothing/shoes/orange/proc/remove_cuffs() if (!src.chained) return - + src.chained.loc = get_turf(src) src.slowdown = initial(slowdown) src.icon_state = "orange"