Fixes kirbyplants (yogstation13#19899)

code/datums/components/tactical.dm

@@ -15,12 +15,14 @@
 	UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
 	unmodify()
 
-/datum/component/fantasy/Destroy()
+/datum/component/tactical/Destroy()
 	unmodify()
 	return ..()
 
 /datum/component/tactical/proc/modify(obj/item/source, mob/user, slot)
-	if(allowed_slot && slot != allowed_slot)
+	SIGNAL_HANDLER
+
+	if(allowed_slot && !(slot & allowed_slot))
 		unmodify()
 		return
 
@@ -32,6 +34,8 @@
 	I.layer = ABOVE_MOB_LAYER
 
 /datum/component/tactical/proc/unmodify(obj/item/source, mob/user)
+	SIGNAL_HANDLER
+
 	var/obj/item/master = source || parent
 	if(!user)
 		if(!ismob(master.loc))

code/game/objects/structures/flora.dm

@@ -319,8 +319,9 @@
 
 /obj/item/kirbyplants/Initialize(mapload)
 	. = ..()
-	AddComponent(/datum/component/two_handed, require_twohands = TRUE)
 	AddComponent(/datum/component/tactical)
+	AddComponent(/datum/component/two_handed, require_twohands = TRUE)
+	AddComponent(/datum/component/storage/concrete/kirbyplants)
 
 /obj/item/kirbyplants/random
 	icon = 'icons/obj/flora/_flora.dmi'
@@ -358,10 +359,6 @@
 	light_color = "#2cb2e8"
 	light_range = 3
 
-/obj/item/kirbyplants/Initialize(mapload)
-	. = ..()
-	AddComponent(/datum/component/storage/concrete/kirbyplants)
-
 /datum/component/storage/concrete/kirbyplants
 	max_items = 1
 	max_w_class = WEIGHT_CLASS_NORMAL