From 703b45c6281786be8a3dfacf5bda3fc2e82aa463 Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Sat, 15 Jun 2024 01:37:16 +0200
Subject: [PATCH] Boomerang go brrrr
---
code/datums/uplink_items/uplink_traitor.dm | 2 +-
.../objects/items/weapons/grenades/syndieminibomb.dm | 12 ++----------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm
index 2fa237fac10..45a797b0ceb 100644
--- a/code/datums/uplink_items/uplink_traitor.dm
+++ b/code/datums/uplink_items/uplink_traitor.dm
@@ -44,7 +44,7 @@
/datum/uplink_item/jobspecific/trick_grenade
name = "Trick Grenade"
- desc = "Syndicate Minibomb with glue ejectors that will stick it to the user's hands on activation."
+ desc = "Syndicate Minibomb made from a bananium-boomerangium alloy. Flies back into your hands after throwing for easy reusing!"
reference = "CGN"
item = /obj/item/storage/box/syndie_kit/fake_minibomb
cost = 5
diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
index e2a779b9374..1395441a899 100644
--- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
@@ -13,17 +13,9 @@
/obj/item/grenade/syndieminibomb/fake
-/obj/item/grenade/syndieminibomb/fake/examine(mob/user)
- . = ..()
- if(HAS_TRAIT(user, TRAIT_CLUMSY))
- . += "There are small glue ejectors all over the bomb."
-
-/obj/item/grenade/syndieminibomb/fake/attack_self(mob/user)
- if(!active)
- flags |= NODROP
- to_chat(user, "As you activate the bomb, it emits a substance that sticks to your hand! It won't come off!")
- to_chat(user, "Uh oh.")
+/obj/item/grenade/syndieminibomb/fake/Initialize(mapload)
. = ..()
+ AddComponent(/datum/component/boomerang, throw_range, TRUE)
/obj/item/grenade/syndieminibomb/pen
name = "pen"