From 0b3ca8d0a648b54b1e9701364c537d16d330b5be Mon Sep 17 00:00:00 2001 From: "aranclanos@hotmail.com" Date: Thu, 8 Nov 2012 05:51:20 +0000 Subject: [PATCH] Fixes Issue 1082 - 'Orange' shoes dyed still being chained by handcuffs. Washing machine code makes me cry, I will rewrite that... Soon(TM) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5028 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/washing_machine.dm | 4 ++++ code/modules/clothing/clothing.dm | 1 + code/modules/clothing/shoes/colour.dm | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 3372329ad4..5a903c3f97 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -141,6 +141,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 ) S.icon_state = new_shoe_icon_state S.color = color S.name = new_shoe_name diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 3b47d89bf2..a623a8500a 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -78,6 +78,7 @@ BLIND // can't see anything icon = 'icons/obj/clothing/shoes.dmi' desc = "Comfortable-looking shoes." gender = PLURAL //Carn: for grammarically correct text-parsing + var/chained = 0 body_parts_covered = FEET slot_flags = SLOT_FEET diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index c1765a5d56..e9930cda95 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -77,7 +77,6 @@ /obj/item/clothing/shoes/orange name = "orange shoes" icon_state = "orange" - var/chained = 0 color = "orange" /obj/item/clothing/shoes/orange/attack_self(mob/user as mob) @@ -92,6 +91,7 @@ ..() if ((istype(H, /obj/item/weapon/handcuffs) && !( src.chained ))) //H = null + if (src.icon_state != "orange") return del(H) src.chained = 1 src.slowdown = 15