From f48693ef4c595031fdd0e167170c7b5ef4b2a51d Mon Sep 17 00:00:00 2001 From: matttheficus <57759731+matttheficus@users.noreply.github.com> Date: Mon, 24 Jul 2023 10:42:11 -0400 Subject: [PATCH] Adds Fragmentation Grenades to the Uplink (#21726) * boom boom pow * ctrl + c / ctrl + v is bad --- code/datums/uplink_items/uplink_general.dm | 15 ++++++++++++++- .../objects/items/weapons/storage/uplink_kits.dm | 7 +++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index b5617f7d185..44bbb9206af 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -374,7 +374,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/storage/box/syndie_kit/c4 cost = 4 - /datum/uplink_item/explosives/syndicate_minibomb name = "Syndicate Minibomb" desc = "The minibomb is a grenade with a five-second fuse." @@ -382,6 +381,20 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/grenade/syndieminibomb cost = 6 +/datum/uplink_item/explosives/frag_grenade + name = "Fragmentation Grenade" + desc = "A frag grenade. Upon detonation, releases shrapnel that can embed in nearby victims." + reference = "FG" + item = /obj/item/grenade/frag + cost = 2 + +/datum/uplink_item/explosives/frag_grenade_pack + name = "Pack of 5 Fragmentation Grenades" + desc = "A box of 5 frag grenades. Upon detonation, releases shrapnel that can embed in nearby victims. And it seems you'll have a LOT of victims." + reference = "FGP" + item = /obj/item/storage/box/syndie_kit/frag_grenades + cost = 8 + /datum/uplink_item/explosives/pizza_bomb name = "Pizza Bomb" desc = "A pizza box with a bomb taped inside of it. The timer needs to be set by opening the box; afterwards, opening the box again will trigger the detonation." diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 00d249bfd12..0f3d41f96f6 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -196,6 +196,13 @@ for(var/I in 1 to 5) new /obj/item/grenade/plastic/c4(src) +/obj/item/storage/box/syndie_kit/frag_grenades + name = "pack of fragmentation grenades" + +/obj/item/storage/box/syndie_kit/frag_grenades/populate_contents() + for(var/I in 1 to 5) + new /obj/item/grenade/frag(src) + /obj/item/storage/box/syndie_kit/throwing_weapons name = "boxed throwing kit" can_hold = list(/obj/item/throwing_star, /obj/item/restraints/legcuffs/bola/tactical)