From 570b7c685009e38d93cf9d7b92ca9fafeb338641 Mon Sep 17 00:00:00 2001 From: sadkermit Date: Mon, 23 May 2022 13:18:47 +0100 Subject: [PATCH] Reduces Parapen Duration to 5 Minutes (#13875) --- .../stealthy and inconspicuous weapons.dm | 5 ++- .../items/weapons/storage/uplink_kits.dm | 9 +++- code/modules/paperwork/pen.dm | 10 ++++- .../Chemistry-Reagents-Toxins.dm | 2 +- html/changelogs/dextrotoxin-metabolism.yml | 42 +++++++++++++++++++ 5 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/dextrotoxin-metabolism.yml diff --git a/code/datums/uplink/stealthy and inconspicuous weapons.dm b/code/datums/uplink/stealthy and inconspicuous weapons.dm index a4bb846af58..bb2dfc49bd9 100644 --- a/code/datums/uplink/stealthy and inconspicuous weapons.dm +++ b/code/datums/uplink/stealthy and inconspicuous weapons.dm @@ -26,9 +26,10 @@ path = /obj/item/storage/box/syndie_kit/special_pens /datum/uplink_item/item/stealthy_weapons/parapen - name = "Paralysis pen" + name = "Paralysis Pen" + desc = "A kit containing: a red parapen (lasts approximately 5 minutes) and a green pen loaded with a purging chemical if you want to remove the paralytic early." item_cost = 3 - path = /obj/item/pen/reagent/paralysis + path = /obj/item/storage/box/syndie_kit/parapen /datum/uplink_item/item/stealthy_weapons/concealed_cane name = "Concealed Cane Sword" diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 263e752c2c7..9c54275c9b1 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -146,13 +146,20 @@ ) /obj/item/storage/box/syndie_kit/special_pens - name = "box (P)" + name = "penjector kit" starts_with = list( /obj/item/pen/reagent/healing = 1, /obj/item/pen/reagent/pacifier = 1, /obj/item/pen/reagent/hyperzine = 1 ) +/obj/item/storage/box/syndie_kit/parapen + name = "parapen kit" + starts_with = list( + /obj/item/pen/reagent/paralysis = 1, + /obj/item/pen/reagent/purge = 1 + ) + /obj/item/storage/box/syndie_kit/spy name = "spy kit" desc = "For when you want to conduct voyeurism from afar." diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 0310f66c64e..8556446a195 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -211,8 +211,16 @@ Pen exclusive commands */ /obj/item/pen/reagent/paralysis origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) - reagents_to_add = list(/decl/reagent/toxin/dextrotoxin = 10) + reagents_to_add = list(/decl/reagent/toxin/dextrotoxin = 10) //~~5 minutes worth of Dextrotoxin + icon_state = "pen_red" + colour = "red" +/obj/item/pen/reagent/purge + origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) + reagents_to_add = list(/decl/reagent/fluvectionem = 5) + icon_state = "pen_green" + colour = "green" + /obj/item/pen/reagent/healing origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) reagents_to_add = list(/decl/reagent/tricordrazine = 10, /decl/reagent/dermaline = 5, /decl/reagent/bicaridine = 5) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index 74e768bc7c0..907de81e83b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -774,7 +774,7 @@ reagent_state = LIQUID color = "#002067" spectro_hidden = TRUE - metabolism = REM * 0.2 + metabolism = REM/3 strength = 0 taste_description = "danger" diff --git a/html/changelogs/dextrotoxin-metabolism.yml b/html/changelogs/dextrotoxin-metabolism.yml new file mode 100644 index 00000000000..0bfd5de691b --- /dev/null +++ b/html/changelogs/dextrotoxin-metabolism.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: kermit + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Increases dextrotoxin's metabolism speed. Parapens should last ~5 minutes instead of ~8 minutes." + - rscadd: "Adds a Purgepen which comes alongside the Parapen in a box. It's used to remove the dextrotoxin and end the paralysis early."