mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 04:57:12 +01:00
restrict food tray pickup items to food, fix sliceable tray click pickup (#29216)
This commit is contained in:
@@ -361,7 +361,11 @@
|
||||
flags = CONDUCT
|
||||
slot_flags = null
|
||||
materials = list(MAT_METAL=3000)
|
||||
cant_hold = list(/obj/item/disk/nuclear) // Prevents some cheesing
|
||||
can_hold = list(
|
||||
/obj/item/food,
|
||||
/obj/item/reagent_containers/drinks,
|
||||
/obj/item/reagent_containers/condiment,
|
||||
)
|
||||
|
||||
/obj/item/storage/bag/tray/attack__legacy__attackchain(mob/living/M, mob/living/user)
|
||||
..()
|
||||
|
||||
@@ -330,7 +330,7 @@
|
||||
if(istype(I, /obj/item/kitchen/knife) || istype(I, /obj/item/scalpel))
|
||||
inaccurate = FALSE
|
||||
else
|
||||
return TRUE
|
||||
return ..()
|
||||
if(!isturf(loc) || !(locate(/obj/structure/table) in loc) && \
|
||||
!(locate(/obj/machinery/optable) in loc) && !(locate(/obj/item/storage/bag/tray) in loc))
|
||||
to_chat(user, "<span class='warning'>You cannot slice [src] here! You need a table or at least a tray to do it.</span>")
|
||||
|
||||
Reference in New Issue
Block a user