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>
This commit is contained in:
Timberpoes
2020-12-22 17:31:20 -08:00
committed by GitHub
co-authored by Jared-Fogle
parent ae48c88e88
commit 6e277b5b4a
5 changed files with 12 additions and 14 deletions
@@ -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 ..()
@@ -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, "<span class='notice'>[A] is too big to load into [src].</span>")
return TRUE
if(istype(A, /obj/item/reagent_containers/syringe))
if(syringes.len < max_syringes)
if(!user.transferItemToLoc(A, src))
@@ -37,3 +37,6 @@
/obj/projectile/bullet/dart/syringe
name = "syringe"
icon_state = "syringeproj"
/obj/projectile/bullet/dart/piercing
piercing = TRUE
+2 -10
View File
@@ -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
+1 -1
View File
@@ -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"