No more accidental put baton on table/in backpack (#21946)

* fixing putting baton on the table by accident

* storage items support

* storage item check tweak
This commit is contained in:
HMBGERDO
2023-09-01 23:01:12 +01:00
committed by GitHub
parent e5ca69bd06
commit 6d890ca3e6
2 changed files with 3 additions and 1 deletions
@@ -533,6 +533,8 @@
var/obj/item/hand_labeler/labeler = I
if(labeler.mode)
return FALSE
if(user.a_intent != INTENT_HELP && issimulatedturf(loc)) // Stops you from putting your baton in the storage on accident
return FALSE
. = TRUE //no afterattack
if(isrobot(user))
return //Robots can't interact with storage items.
+1 -1
View File
@@ -227,7 +227,7 @@
if(isrobot(user))
return
if(user.a_intent != INTENT_HARM && !(I.flags & ABSTRACT))
if(user.a_intent == INTENT_HELP && !(I.flags & ABSTRACT))
if(user.drop_item())
I.Move(loc)
var/list/click_params = params2list(params)