Fixes Crutches not working properly (ParadiseSS13#22660)

* Yippeee * Proper order * Update code/game/objects/items/weapons/misc_items.dm Co-authored-by: Nathan Winters <[email protected]> * Apply suggestions from code review Co-authored-by: Luc <[email protected]> * Update code/game/objects/items/weapons/misc_items.dm Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Nathan Winters <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Contrabang <[email protected]>
OctusGit · Oct 1, 2023 · 53c3e89 · 53c3e89
1 parent 4d2482f
commit 53c3e89
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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, "<span class='warning'>You think you're gonna need more than crutches if your employers find out what you just tried to do...</span>")
+			return
 		if(I.flags & ABSTRACT)
 			return
-		if(I.flags & NODROP)
-			to_chat(user, "<span class='notice'>[I] is stuck to your hand!</span>")
+		if(!user.unEquip(I))
+			to_chat(user, "<span class='notice'>[I] doesn't seem to want to go into [src]!</span>")
 			return
 		I.forceMove(src)
 		hidden = I