From 6080189ea3786fa3a89a6e1ea9f1b47fe3ebe810 Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Sat, 26 Jun 2021 21:34:08 +0100 Subject: [PATCH] Fixes powersink not giving you a beacon on purchase. (#16255) * powersink gives you a beacon, as described * no longer a bomb subtype * Update code/game/objects/items/devices/radio/beacon.dm Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com> * Update code/game/objects/items/devices/radio/beacon.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/datums/uplink_item.dm | 2 +- code/game/objects/items/devices/radio/beacon.dm | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 9394344a6f3..9b00eee1553 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -1426,7 +1426,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Power Sink" desc = "When screwed to wiring attached to an electric grid, then activated, this large device places excessive load on the grid, causing a stationwide blackout. The sink cannot be carried because of its excessive size. Ordering this sends you a small beacon that will teleport the power sink to your location on activation." reference = "PS" - item = /obj/item/powersink + item = /obj/item/radio/beacon/syndicate/power_sink cost = 10 /datum/uplink_item/device_tools/singularity_beacon diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 5027676e1d3..675e67aa1a6 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -71,6 +71,18 @@ user.drop_item() qdel(src) +/obj/item/radio/beacon/syndicate/power_sink + name = "suspicious beacon" + desc = "A label on it reads: Warning: Activating this device will send a power sink to your location." + +/obj/item/radio/beacon/syndicate/power_sink/attack_self(mob/user) + if(user) + to_chat(user, "Locked In") + new /obj/item/powersink(user.loc) + playsound(src, 'sound/effects/pop.ogg', 100, TRUE, 1) + user.drop_item() + qdel(src) + /obj/item/radio/beacon/syndicate/bomb name = "suspicious beacon" desc = "A label on it reads: Warning: Activating this device will send a high-ordinance explosive to your location."