Skip to content

Commit

Permalink
rahh
Browse files Browse the repository at this point in the history
  • Loading branch information
XeonMations committed Nov 18, 2024
1 parent 770d32c commit 1091a0e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
7 changes: 0 additions & 7 deletions code/datums/components/tactical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@

current_slot = slot

// update the item name to remove the wielded status, copied from twohanded.dm
var/sf = findtext(source.name, " (Wielded)", -10) // 10 == length(" (Wielded)")
if(sf)
source.name = copytext(source.name, 1, sf)
else
source.name = "[initial(source.name)]"

on_icon_update(source)

/datum/component/tactical/proc/on_icon_update(obj/item/source)
Expand Down
5 changes: 1 addition & 4 deletions code/game/objects/structures/flora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@

/obj/item/kirbyplants/ComponentInitialize()
. = ..()
AddComponent(/datum/component/tactical)
AddComponent(/datum/component/two_handed, require_twohands=TRUE, force_unwielded=10, force_wielded=10)
AddComponent(/datum/component/storage/concrete/kirbyplants)

Expand All @@ -331,10 +332,6 @@
insert_while_closed = FALSE // We don't want clicking plants with items to insert it, you have to alt click then click the slots
animated = FALSE

/obj/item/kirbyplants/Initialize(mapload)
. = ..()
AddComponent(/datum/component/tactical)

/obj/item/kirbyplants/random
icon = 'icons/obj/flora/_flora.dmi'
icon_state = "random_plant"
Expand Down

0 comments on commit 1091a0e

Please sign in to comment.