From 3e41bf62b426f14468d98c4bff065152fcf88420 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Mon, 15 Feb 2016 19:22:04 -0800 Subject: [PATCH] Adds further checks to attaching accessories --- code/modules/clothing/under/accessories/accessory.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index fdd1bb07541..ed9e9c1bf2e 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -37,13 +37,18 @@ /obj/item/clothing/accessory/attack(mob/living/carbon/human/H, mob/living/user) // This code lets you put accessories on other people by attacking their sprite with the accessory if(istype(H)) + if(H.wear_suit && H.wear_suit.flags_inv & HIDEJUMPSUIT) + user << "[H]'s body is covered, and you cannot attach \the [src]." + return 1 var/obj/item/clothing/under/U = H.w_uniform if(istype(U)) user.visible_message("[user] is putting a [src.name] on [H]'s [U.name]!", "You begin to put a [src.name] on [H]'s [U.name]...") if(do_after(user,40,target=H)) user.visible_message("[user] puts a [src.name] on [H]'s [U.name]!", "You finish putting a [src.name] on [H]'s [U.name].") U.attackby(src, user) - return 1 + else + user << "[H] is not wearing anything to attach \the [src] to." + return 1 return ..() //default attackby behaviour