mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
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:
@@ -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.
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user