Fixes camera assemblies and orange shoes not respecting NODROP (#4654)

* Fixes camera assemblies not respecting NODROP

* Shoes fix
This commit is contained in:
TheDZD
2016-06-13 01:39:26 -04:00
committed by Fox McCloud
parent cf2e294f7c
commit 01f0738e11
4 changed files with 19 additions and 11 deletions
+3 -4
View File
@@ -95,13 +95,12 @@
src.icon_state = "orange"
return
/obj/item/clothing/shoes/orange/attackby(H as obj, loc, params)
/obj/item/clothing/shoes/orange/attackby(obj/H, loc, params)
..()
if ((istype(H, /obj/item/weapon/restraints/handcuffs) && !( src.chained )))
//H = null
if (istype(H, /obj/item/weapon/restraints/handcuffs) && !chained && !(H.flags & NODROP))
if (src.icon_state != "orange") return
qdel(H)
src.chained = 1
src.slowdown = 15
src.icon_state = "orange1"
return
return
@@ -246,4 +246,4 @@
if(!module)
hands.icon_state = "nomod"
else
hands.icon_state = lowertext(module.module_type)
hands.icon_state = lowertext(module.module_type)