From a2f6a7c20763da3d2f3cfb982e9ccd7922df6162 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 31 Jul 2020 21:45:17 -0500 Subject: [PATCH] Automatic changelog generation for PR #12979 [ci skip] --- .../objects/items/implants/implant_misc.dm | 17 +++++++++++++++++ .../game/objects/items/storage/uplink_kits.dm | 8 ++++++++ .../uplink/uplink_items/uplink_implants.dm | 6 ++++++ html/changelogs/AutoChangeLog-pr-12979.yml | 4 ++++ icons/obj/implants.dmi | Bin 2638 -> 2768 bytes 5 files changed, 35 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12979.yml diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index 6cdc5ee824..897cb9b750 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -38,6 +38,23 @@ if(!uses) qdel(src) +/obj/item/implant/warp + name = "warp implant" + desc = "Saves your position somewhere, and then warps you back to it after five seconds." + icon_state = "warp" + uses = 15 + +/obj/item/implant/warp/activate() + . = ..() + uses-- + imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list(/datum/reagent/fermi/eigenstate = 1.2), "You feel an internal prick as as the bluespace starts ramping up!") + to_chat(imp_in, "You feel an internal prick as as the bluespace starts ramping up!") + if(!uses) + qdel(src) + +/obj/item/implanter/warp + name = "implanter (warp)" + imp_type = /obj/item/implant/warp /obj/item/implant/emp name = "emp implant" diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 3b66e32d0a..bad858aa21 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -169,6 +169,14 @@ O.imp = new /obj/item/implant/freedom(O) O.update_icon() +/obj/item/storage/box/syndie_kit/imp_warp + name = "boxed warp implant (with injector)" + +/obj/item/storage/box/syndie_kit/imp_warp/PopulateContents() + var/obj/item/implanter/O = new(src) + O.imp = new /obj/item/implant/warp(O) + O.update_icon() + /obj/item/storage/box/syndie_kit/imp_microbomb name = "Microbomb Implant (with injector)" diff --git a/code/modules/uplink/uplink_items/uplink_implants.dm b/code/modules/uplink/uplink_items/uplink_implants.dm index 02b8b1e01d..5252e719ef 100644 --- a/code/modules/uplink/uplink_items/uplink_implants.dm +++ b/code/modules/uplink/uplink_items/uplink_implants.dm @@ -29,6 +29,12 @@ item = /obj/item/storage/box/syndie_kit/imp_freedom cost = 5 +/datum/uplink_item/implants/warp + name = "Warp Implant" + desc = "An implant injected into the body and later activated at the user's will. It will inject eigenstasium which saves the user's location and teleports them there after five seconds. Lasts only fifteen times." + item = /obj/item/storage/box/syndie_kit/imp_warp + cost = 6 + /datum/uplink_item/implants/hijack name = "Hijack Implant" desc = "An implant that will let you hack into the APCs on station, allowing you to control them at will and the machinery within those rooms." diff --git a/html/changelogs/AutoChangeLog-pr-12979.yml b/html/changelogs/AutoChangeLog-pr-12979.yml new file mode 100644 index 0000000000..eed3d857e6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12979.yml @@ -0,0 +1,4 @@ +author: "Auris456852" +delete-after: True +changes: + - rscadd: "Added B.O.O.P. Remote Control cartridges to the PTech." diff --git a/icons/obj/implants.dmi b/icons/obj/implants.dmi index a6d4697673ba812416ebeeacad8f73f8c8281838..b7cb90e9f4ac16dbbd09f56d36853757350e5a46 100644 GIT binary patch delta 2035 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