cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Issue 1082 - 'Orange' shoes dyed still being chained by handcuffs.

Browse Source 
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
This commit is contained in:
aranclanos@hotmail.com
2012-11-08 05:51:20 +00:00
parent c870d5e158
commit 0b3ca8d0a6
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/washing_machine.dm
View File

@@ -141,6 +141,10 @@
if(new_shoe_icon_state && new_shoe_name) if(new_shoe_icon_state && new_shoe_name)
for(var/obj/item/clothing/shoes/S in contents) for(var/obj/item/clothing/shoes/S in contents)
//world << "DEBUG: YUP! FOUND IT!" //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.icon_state = new_shoe_icon_state
S.color = color S.color = color
S.name = new_shoe_name S.name = new_shoe_name

1
code/modules/clothing/clothing.dm
View File

@@ -78,6 +78,7 @@ BLIND // can't see anything
icon = 'icons/obj/clothing/shoes.dmi' icon = 'icons/obj/clothing/shoes.dmi'
desc = "Comfortable-looking shoes." desc = "Comfortable-looking shoes."
gender = PLURAL //Carn: for grammarically correct text-parsing gender = PLURAL //Carn: for grammarically correct text-parsing
var/chained = 0
body_parts_covered = FEET body_parts_covered = FEET
slot_flags = SLOT_FEET slot_flags = SLOT_FEET

2
code/modules/clothing/shoes/colour.dm
View File

@@ -77,7 +77,6 @@
/obj/item/clothing/shoes/orange /obj/item/clothing/shoes/orange
name = "orange shoes" name = "orange shoes"
icon_state = "orange" icon_state = "orange"
var/chained = 0
color = "orange" color = "orange"
/obj/item/clothing/shoes/orange/attack_self(mob/user as mob) /obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
@@ -92,6 +91,7 @@
..() ..()
if ((istype(H, /obj/item/weapon/handcuffs) && !( src.chained ))) if ((istype(H, /obj/item/weapon/handcuffs) && !( src.chained )))
//H = null //H = null
if (src.icon_state != "orange") return
del(H) del(H)
src.chained = 1 src.chained = 1
src.slowdown = 15 src.slowdown = 15