From 96e0d10f8e8a238c8bd34ffe96f00f0851e3c3c5 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Mon, 14 Mar 2016 05:13:58 -0400 Subject: [PATCH] flavor tweaks --- code/game/objects/items/weapons/weaponry.dm | 2 +- code/modules/customitems/item_defines.dm | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 9202405cb2f..c77015ca0d1 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -28,7 +28,7 @@ w_class = 1 var/transformed = 0 var/transform_into = /obj/item/weapon/nullrod/sword - var/transform_via = list(/obj/item/clothing/suit/armor/riot/knight/templar) + var/transform_via = list(/obj/item/clothing/suit/armor/riot/knight/templar, /obj/item/clothing/suit/chaplain_hoodie/fluff/chronx) suicide_act(mob/user) viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 04b0d889e18..c68a2d0ca6a 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -285,7 +285,6 @@ /obj/item/weapon/nullrod/fluff/chronx //chronx100: Hughe O'Splash transform_into = /obj/item/weapon/nullrod/sword/fluff/chronx - transform_via = list(/obj/item/clothing/suit/armor/riot/knight/templar, /obj/item/clothing/suit/chaplain_hoodie/fluff/chronx) /obj/item/weapon/nullrod/sword/fluff/chronx name = "Soul Collector" @@ -311,9 +310,7 @@ set name = "Transform Hood" set category = "Object" set src in usr - if(!isliving(src)) - return - if(!usr.incapacitated()) + if(isliving(usr) && !usr.incapacitated()) if(adjusted) icon_state = initial(icon_state) item_state = initial(item_state)