mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Fix storing several recently-migrated items. (#32383)
* Fix storing light replacers, handheld defibs. * Apply suggestion from CRUNCH review. * Fix similar mishap in body analyzer, flash, gas analyzer, laser pointer, garrote, evidence bag, and organ extractor.
This commit is contained in:
@@ -12,6 +12,11 @@
|
||||
if(loc == target)
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
|
||||
if(isstorage(target))
|
||||
var/obj/item/storage/target_storage = target
|
||||
if(istype(target_storage, /obj/item/storage/box) || target_storage.w_class > WEIGHT_CLASS_NORMAL)
|
||||
return NONE
|
||||
|
||||
evidencebag_equip(target, user)
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
|
||||
|
||||
@@ -52,6 +52,10 @@
|
||||
if(in_use)
|
||||
to_chat(user, SPAN_WARNING("[src] is already busy!"))
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
|
||||
if(!ismob(target))
|
||||
return NONE
|
||||
|
||||
if(!iscarbon(target))
|
||||
to_chat(user, SPAN_WARNING("ERROR: [target] has no organs to harvest!"))
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
|
||||
Reference in New Issue
Block a user