From 6e277b5b4afec0108823be66f092c33cc607b476 Mon Sep 17 00:00:00 2001 From: Timberpoes Date: Wed, 23 Dec 2020 01:31:20 +0000 Subject: [PATCH] Syringe gun and rapid fire syringe gun nerfs, uplink reagent gun buffs. (#55642) Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com> --- .../projectiles/ammunition/special/syringe.dm | 6 +++--- code/modules/projectiles/guns/misc/syringe_gun.dm | 3 +++ .../projectiles/projectile/bullets/dart_syringe.dm | 3 +++ code/modules/research/techweb/all_nodes.dm | 12 ++---------- code/modules/uplink/uplink_items.dm | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/code/modules/projectiles/ammunition/special/syringe.dm b/code/modules/projectiles/ammunition/special/syringe.dm index 8486c700781..d67202b0504 100644 --- a/code/modules/projectiles/ammunition/special/syringe.dm +++ b/code/modules/projectiles/ammunition/special/syringe.dm @@ -34,8 +34,8 @@ /obj/item/ammo_casing/chemgun name = "dart synthesiser" - desc = "A high-power spring, linked to an energy-based dart synthesiser." - projectile_type = /obj/projectile/bullet/dart + desc = "A high-power spring, linked to an energy-based piercing dart synthesiser." + projectile_type = /obj/projectile/bullet/dart/piercing firing_effect_type = null /obj/item/ammo_casing/chemgun/ready_proj(atom/target, mob/living/user, quiet, zone_override = "") @@ -46,7 +46,7 @@ if(CG.syringes_left <= 0) return CG.reagents.trans_to(BB, 15, transfered_by = user) - BB.name = "chemical dart" + BB.name = "piercing chemical dart" CG.syringes_left-- return ..() diff --git a/code/modules/projectiles/guns/misc/syringe_gun.dm b/code/modules/projectiles/guns/misc/syringe_gun.dm index 9061c7cd056..a12d1464b79 100644 --- a/code/modules/projectiles/guns/misc/syringe_gun.dm +++ b/code/modules/projectiles/guns/misc/syringe_gun.dm @@ -60,6 +60,9 @@ return TRUE /obj/item/gun/syringe/attackby(obj/item/A, mob/user, params, show_msg = TRUE) + if(istype(A, /obj/item/reagent_containers/syringe/bluespace)) + to_chat(user, "[A] is too big to load into [src].") + return TRUE if(istype(A, /obj/item/reagent_containers/syringe)) if(syringes.len < max_syringes) if(!user.transferItemToLoc(A, src)) diff --git a/code/modules/projectiles/projectile/bullets/dart_syringe.dm b/code/modules/projectiles/projectile/bullets/dart_syringe.dm index 77a1bed9ce8..729c8258920 100644 --- a/code/modules/projectiles/projectile/bullets/dart_syringe.dm +++ b/code/modules/projectiles/projectile/bullets/dart_syringe.dm @@ -37,3 +37,6 @@ /obj/projectile/bullet/dart/syringe name = "syringe" icon_state = "syringeproj" + +/obj/projectile/bullet/dart/piercing + piercing = TRUE diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index d331c7324aa..c9eb9502944 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -576,14 +576,6 @@ design_ids = list("nuclear_gun") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) -/datum/techweb_node/medical_weapons - id = "medical_weapons" - display_name = "Medical Weaponry" - description = "Weapons using medical technology." - prereq_ids = list("adv_biotech", "weaponry") - design_ids = list("rapidsyringe") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - /datum/techweb_node/beam_weapons id = "beam_weapons" display_name = "Beam Weaponry" @@ -620,7 +612,7 @@ id = "exotic_ammo" display_name = "Exotic Ammunition" description = "They won't know what hit em." - prereq_ids = list("adv_weaponry", "medical_weapons") + prereq_ids = list("adv_weaponry") design_ids = list("techshotshell", "c38_hotshot", "c38_iceblox") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) @@ -962,7 +954,7 @@ display_name = "Illegal Technology" description = "Dangerous research used to create dangerous objects." prereq_ids = list("adv_engi", "adv_weaponry", "explosive_weapons") - design_ids = list("decloner", "borg_syndicate_module", "ai_cam_upgrade", "suppressor", "largecrossbow", "donksofttoyvendor", "donksoft_refill", "advanced_camera") + design_ids = list("decloner", "borg_syndicate_module", "ai_cam_upgrade", "suppressor", "largecrossbow", "donksofttoyvendor", "donksoft_refill", "advanced_camera", "rapidsyringe") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000) hidden = TRUE diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 7fc7c69bb05..e2957341b74 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1897,7 +1897,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) desc = "A heavily modified syringe gun which is capable of synthesizing its own chemical darts using input reagents. Can hold 100u of reagents." item = /obj/item/gun/chem cost = 12 - restricted_roles = list("Chemist", "Chief Medical Officer") + restricted_roles = list("Chemist", "Chief Medical Officer", "Botanist") /datum/uplink_item/role_restricted/reverse_bear_trap name = "Reverse Bear Trap"