From 551eb8ee76d46b1187b78d94185c2b9158c9d87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B8=D1=80=D0=BE=D1=82=D0=BA=D0=B0?= <114731039+ErdGinalD@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:26:36 +0300 Subject: [PATCH] TWEAK: Love pen now higly peaceful (#26995) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * TWEAK: Love pen now higly peaceful * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> --------- Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --- code/datums/uplink_items/uplink_traitor.dm | 2 +- code/modules/paperwork/pen.dm | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index 006039d2b94..ce46ae3db35 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -337,7 +337,7 @@ //skrell /datum/uplink_item/species_restricted/lovepen name = "Aggression Suppression Pen" - desc = "A syringe disguised as a functional pen which is filled with a potent aggression supressing chemical. The pen holds four doses of the mixture and it cannot be refilled." + desc = "A hypospray disguised as a functional pen which is filled with a potent aggression suppressing chemical. The pen holds four doses of the mixture which slowly regenerates over time, but cannot be refilled." reference = "LP" item = /obj/item/pen/sleepy/love cost = 20 diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index ebe264a4471..a1395f0f19a 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -179,19 +179,25 @@ name = "fancy pen" desc = "A fancy metal pen. An inscription on one side reads, \"L.L. - L.R.\"" icon_state = "fancypen" - container_type = DRAINABLE //cannot be refilled, love can be extracted for use in other items with syringe + container_type = (DRAINABLE | TRANSPARENT) //cannot be refilled, but pax can be extracted for use in other items with syringe origin_tech = "engineering=4;syndicate=2" transfer_amount = 25 // 4 Dosages instead of 2 -/obj/item/pen/sleepy/love/attack(mob/living/M, mob/user) - var/can_transfer = reagents.total_volume && M.reagents +/obj/item/pen/sleepy/love/Initialize(mapload) . = ..() - if(can_transfer && .) - M.apply_status_effect(STATUS_EFFECT_PACIFIED) //pacifies for 40 seconds - return TRUE + START_PROCESSING(SSobj, src) + +/obj/item/pen/sleepy/love/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() /obj/item/pen/sleepy/love/fill_pen() - reagents.add_reagent("love", 100) + reagents.add_reagent("pax", 100) // strong and unique reagent, making you a pacifist for a long time. + +/obj/item/pen/sleepy/love/process() + if(reagents.total_volume < 100) + reagents.add_reagent("pax", 0.5) // slow refill over time. In average 1 dose every 100 seconds. + /obj/item/pen/sleepy/undisguised name = "sleepy pen"