From e878ca4c8c20e22deffa46d6756803e2df672783 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Mon, 20 Apr 2015 19:12:27 +0300 Subject: [PATCH 1/2] Fixes #9071 --- code/game/objects/items/devices/taperecorder.dm | 2 +- code/modules/clothing/clothing.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 8258d6dc4e2..693271398e2 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -69,7 +69,7 @@ /obj/item/device/taperecorder/proc/can_use(mob/user) if(user && ismob(user)) - if(!user.stat && user.canmove && !user.restrained()) + if(!user.incapacitated()) return 1 return 0 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index ac18e4dc922..b8391bd840a 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -409,7 +409,7 @@ atom/proc/generate_female_clothing(index,t_color,icon,type) /obj/item/clothing/proc/can_use(mob/user) if(user && ismob(user)) - if(!user.stat && user.canmove && !user.restrained()) + if(!user.incapacitated()) return 1 return 0 From d54509c23fb45f30227870ec2b8a0a529a6bf8c5 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Wed, 22 Apr 2015 18:17:35 +0300 Subject: [PATCH 2/2] Fix for watertank toggling while buckled. --- code/game/objects/items/weapons/tanks/watertank.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 72389fa1df1..f9cd8dec7c2 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -28,7 +28,7 @@ if (usr.get_item_by_slot(slot_back) != src) usr << "The watertank needs to be on your back to use." return - if(usr.stat || !usr.canmove || usr.restrained()) + if(usr.incapacitated()) return on = !on