From 39b38a223e9fe0ac4b74265e82096db8ca75b0f8 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Fri, 19 Jun 2020 12:08:19 +0200 Subject: [PATCH 1/4] Fixes altclicking wallet while unconscious or in soft crit --- code/datums/components/storage/concrete/wallet.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/storage/concrete/wallet.dm b/code/datums/components/storage/concrete/wallet.dm index 0b8638d1675..74cf4fe04ec 100644 --- a/code/datums/components/storage/concrete/wallet.dm +++ b/code/datums/components/storage/concrete/wallet.dm @@ -1,5 +1,5 @@ /datum/component/storage/concrete/wallet/on_alt_click(datum/source, mob/user) - if(!isliving(user) || !user.CanReach(parent)) + if(!isliving(user) || !user.CanReach(parent) || SOFT_CRIT || UNCONSCIOUS) return if(locked) to_chat(user, "[parent] seems to be locked!") From 8622bcfa3e0fcd0de632fef398708c5bf78ccfa8 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Fri, 19 Jun 2020 18:48:42 +0200 Subject: [PATCH 2/4] Makes it == to something --- code/datums/components/storage/concrete/wallet.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/storage/concrete/wallet.dm b/code/datums/components/storage/concrete/wallet.dm index 74cf4fe04ec..36f7e3fd2b1 100644 --- a/code/datums/components/storage/concrete/wallet.dm +++ b/code/datums/components/storage/concrete/wallet.dm @@ -1,5 +1,5 @@ /datum/component/storage/concrete/wallet/on_alt_click(datum/source, mob/user) - if(!isliving(user) || !user.CanReach(parent) || SOFT_CRIT || UNCONSCIOUS) + if(!isliving(user) || !user.CanReach(parent) || (user.stat == SOFT_CRIT || UNCONSCIOUS)) return if(locked) to_chat(user, "[parent] seems to be locked!") From 6351f3837d6c7b17af90e266dc11ccd53c0bb072 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Fri, 19 Jun 2020 22:54:51 +0200 Subject: [PATCH 3/4] replaces the thing with user.incapacitated() --- code/datums/components/storage/concrete/wallet.dm | 2 +- code/datums/components/storage/storage.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/components/storage/concrete/wallet.dm b/code/datums/components/storage/concrete/wallet.dm index 36f7e3fd2b1..c019bb0a596 100644 --- a/code/datums/components/storage/concrete/wallet.dm +++ b/code/datums/components/storage/concrete/wallet.dm @@ -1,5 +1,5 @@ /datum/component/storage/concrete/wallet/on_alt_click(datum/source, mob/user) - if(!isliving(user) || !user.CanReach(parent) || (user.stat == SOFT_CRIT || UNCONSCIOUS)) + if(!isliving(user) || !user.CanReach(parent) || user.incapacitated()) return if(locked) to_chat(user, "[parent] seems to be locked!") diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index 8a62b34a9a8..038b656f94b 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -780,7 +780,7 @@ return hide_from(target) /datum/component/storage/proc/on_alt_click(datum/source, mob/user) - if(!isliving(user) || !user.CanReach(parent)) + if(!isliving(user) || !user.CanReach(parent) || user.incapacitated()) return if(locked) to_chat(user, "[parent] seems to be locked!") From 4e666f1325763e75415d9c0771cc7a34c93328e9 Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Sat, 27 Jun 2020 14:39:20 -0700 Subject: [PATCH 4/4] Remove unnecessary incapacitated check --- code/datums/components/storage/storage.dm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index 038b656f94b..367fbc42d8d 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -793,17 +793,15 @@ playsound(A, "rustle", 50, TRUE, -5) return - if(!user.incapacitated()) - var/obj/item/I = locate() in real_location() - if(!I) - return - A.add_fingerprint(user) - remove_from_storage(I, get_turf(user)) - if(!user.put_in_hands(I)) - to_chat(user, "You fumble for [I] and it falls on the floor.") - return - user.visible_message("[user] draws [I] from [parent]!", "You draw [I] from [parent].") + var/obj/item/I = locate() in real_location() + if(!I) return + A.add_fingerprint(user) + remove_from_storage(I, get_turf(user)) + if(!user.put_in_hands(I)) + to_chat(user, "You fumble for [I] and it falls on the floor.") + return + user.visible_message("[user] draws [I] from [parent]!", "You draw [I] from [parent].") /datum/component/storage/proc/action_trigger(datum/signal_source, datum/action/source) gather_mode_switch(source.owner)