From 09a0eee87575b005b898bf24e92a26121268e968 Mon Sep 17 00:00:00 2001 From: Bone White Date: Sun, 14 Sep 2014 20:25:50 +0100 Subject: [PATCH] Fix for hardsuit modifications When suits are turned to tajaran or unathi types, any helmets on the suit are put on the floor. --- code/modules/clothing/spacesuits/rig.dm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index dd3b2778aa4..00319350361 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -35,7 +35,13 @@ if(istype(I,/obj/item/weapon/modkit/tajaran)) user.drop_item() playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user << "\red You painstakingly modify [src] to make it more suitable for a Tajaran user." + if(helmet) + helmet.loc = get_turf(src) + src.helmet = null + user << "\red You painstakingly modify [src] to make it more suitable for a Tajaran user. You pop the helmet on the floor" + else + user << "\red You painstakingly modify [src] to make it more suitable for a Tajaran user." + new /obj/item/clothing/suit/space/rig/tajara(user.loc) del(I) del(src) @@ -43,7 +49,13 @@ if(istype(I,/obj/item/weapon/modkit/unathi)) user.drop_item() playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user << "\red You painstakingly modify [src] to make it more suitable for a Tajaran user." + if(helmet) + helmet.loc = get_turf(src) + src.helmet = null + user << "\red You painstakingly modify [src] to make it more suitable for a Unathi user. You pop the helmet on the floor" + else + user << "\red You painstakingly modify [src] to make it more suitable for a Unathi user." + new /obj/item/clothing/suit/space/rig/unathi(user.loc) del(I) del(src)