From 53c3e893c254cb015a39cac9f1648ddfe3fba309 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Sun, 1 Oct 2023 17:38:36 +0200 Subject: [PATCH] Fixes Crutches not working properly (#22660) * Yippeee * Proper order * Update code/game/objects/items/weapons/misc_items.dm Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/game/objects/items/weapons/misc_items.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --- code/game/objects/items/weapons/misc_items.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/misc_items.dm b/code/game/objects/items/weapons/misc_items.dm index 9f7ade94a64..4a8642bc8c8 100644 --- a/code/game/objects/items/weapons/misc_items.dm +++ b/code/game/objects/items/weapons/misc_items.dm @@ -75,10 +75,13 @@ if(!is_open) return if(!hidden && I.tool_behaviour != TOOL_SCREWDRIVER && I.w_class == WEIGHT_CLASS_TINY) + if(istype(I, /obj/item/disk/nuclear)) + to_chat(user, "You think you're gonna need more than crutches if your employers find out what you just tried to do...") + return if(I.flags & ABSTRACT) return - if(I.flags & NODROP) - to_chat(user, "[I] is stuck to your hand!") + if(!user.unEquip(I)) + to_chat(user, "[I] doesn't seem to want to go into [src]!") return I.forceMove(src) hidden = I