From dd47769567f70cc76a4748b3560f8fe2413c909f Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Mon, 6 Mar 2023 22:47:00 -0600 Subject: [PATCH] combat defib tweaks, moved out of the medikit (#20379) * moves the combat defib out of the first aid kit, tweaks both costs * no more synthflesh patches * i just a little stupid Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * we just a little stupid * deletes stims, really not needed webedit lol --------- Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --- code/datums/uplink_item.dm | 11 +++++++++-- code/game/objects/items/weapons/storage/firstaid.dm | 4 +++- code/modules/reagents/reagent_containers/hypospray.dm | 8 ++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 798ea447d58..91b8769df5b 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -552,6 +552,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/twohanded/chainsaw cost = 13 +/datum/uplink_item/dangerous/combat_defib + name = "Combat defibrillator" + desc = "A lifesaving device turned dangerous weapon. Click on someone with the paddles on harm intent to instantly stop their heart. Can be used as a regular defib as well." + reference = "CD" + item = /obj/item/defibrillator/compact/combat/loaded + cost = 12 + // SUPPORT AND MECHAS /datum/uplink_item/support @@ -1414,7 +1421,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) and other medical supplies helpful for a medical field operative." reference = "SCMK" item = /obj/item/storage/firstaid/tactical - cost = 7 + cost = 4 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/device_tools/vtec @@ -1786,7 +1793,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) a medical beam gun and a pair of syndicate magboots." reference = "MEDB" item = /obj/item/storage/backpack/duffel/syndie/med/medicalbundle - cost = 20 // normally 24 + cost = 16 // normally 21 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/bundles_TC/sniper diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 5f3e96f923c..f35f6a75dbf 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -185,7 +185,9 @@ /obj/item/storage/firstaid/tactical/populate_contents() new /obj/item/reagent_containers/hypospray/combat(src) new /obj/item/reagent_containers/applicator/dual/syndi(src) // Because you ain't got no time to look at what damage dey taking yo - new /obj/item/defibrillator/compact/combat/loaded(src) + new /obj/item/reagent_containers/hypospray/autoinjector/emergency_nuclear(src) + new /obj/item/reagent_containers/hypospray/autoinjector/emergency_nuclear(src) + new /obj/item/storage/pill_bottle/painkillers(src) new /obj/item/clothing/glasses/hud/health/night(src) /obj/item/storage/firstaid/tactical/empty/populate_contents() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 9c375e8f2d6..1d44b6a9dca 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -165,6 +165,14 @@ amount_per_transfer_from_this = 42 list_reagents = list("salbutamol" = 10, "teporone" = 15, "epinephrine" = 10, "lavaland_extract" = 2, "weak_omnizine" = 5) //Short burst of healing, followed by minor healing from the saline +/obj/item/reagent_containers/hypospray/autoinjector/emergency_nuclear + name = "emergency stabilization medipen" + desc = "A fast acting life-saving emergency autoinjector. Effective in combat situations, made by the syndicate for the syndicate." + icon_state = "stimpen" + volume = 12 + amount_per_transfer_from_this = 12 + list_reagents = list("perfluorodecalin" = 3, "teporone" = 3, "atropine" = 3, "mannitol" = 3) + /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium name = "protoype nanite autoinjector" desc = "After a short period of time the nanites will slow the body's systems and assist with body repair. Nanomachines son."