From ec78e51760f2524100c36da0220867896cc78fd3 Mon Sep 17 00:00:00 2001 From: Jerry Wester Date: Tue, 13 Dec 2022 19:12:17 -0700 Subject: [PATCH] remove piercing injector, doesn't work properly --- code/modules/mod/mod_types.dm | 4 +-- code/modules/mod/modules/modules_medical.dm | 25 +------------------ code/modules/research/designs/mod_designs.dm | 8 ------ .../research/techweb/nodes/mod_nodes.dm | 1 - 4 files changed, 3 insertions(+), 35 deletions(-) diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index 3296cf7ba3..ed48580dbe 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -34,7 +34,7 @@ /obj/item/mod/control/pre_equipped/rescue theme = /datum/mod_theme/rescue cell = /obj/item/stock_parts/cell/super - initial_modules = list(/obj/item/mod/module/storage, /obj/item/mod/module/flashlight, /obj/item/mod/module/health_analyzer, /obj/item/mod/module/injector) + initial_modules = list(/obj/item/mod/module/storage, /obj/item/mod/module/flashlight, /obj/item/mod/module/health_analyzer) /obj/item/mod/control/pre_equipped/research theme = /datum/mod_theme/research @@ -135,7 +135,7 @@ /obj/item/mod/control/pre_equipped/debug theme = /datum/mod_theme/debug cell = /obj/item/stock_parts/cell/bluespace - initial_modules = list(/obj/item/mod/module/storage, /obj/item/mod/module/welding, /obj/item/mod/module/flashlight, /obj/item/mod/module/bikehorn, /obj/item/mod/module/rad_protection, /obj/item/mod/module/injector) //one of every type of module, for testing if they all work correctly + initial_modules = list(/obj/item/mod/module/storage, /obj/item/mod/module/welding, /obj/item/mod/module/flashlight, /obj/item/mod/module/bikehorn, /obj/item/mod/module/rad_protection) //one of every type of module, for testing if they all work correctly /obj/item/mod/control/pre_equipped/administrative theme = /datum/mod_theme/administrative diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm index 974e7e31ad..431c2fbf0c 100644 --- a/code/modules/mod/modules/modules_medical.dm +++ b/code/modules/mod/modules/modules_medical.dm @@ -81,30 +81,7 @@ removable = FALSE complexity = 0 -///Injector - Gives the suit an extendable large-capacity piercing syringe. -/obj/item/mod/module/injector - name = "MOD injector module" - desc = "A module installed into the wrist of the suit, this functions as a high-capacity syringe, \ - with a tip fine enough to locate the emergency injection ports on any suit of armor, \ - penetrating it with ease. Even yours." - icon_state = "injector" - module_type = MODULE_ACTIVE - complexity = 1 - active_power_cost = DEFAULT_CHARGE_DRAIN * 0.3 - device = /obj/item/reagent_containers/syringe/mod - incompatible_modules = list(/obj/item/mod/module/injector) - cooldown_time = 0.5 SECONDS - -/obj/item/reagent_containers/syringe/mod - name = "MOD injector syringe" - desc = "A high-capacity syringe, with a tip fine enough to locate \ - the emergency injection ports on any suit of armor, penetrating it with ease. Even yours." - icon_state = "mod_0" - base_icon_state = "mod" - amount_per_transfer_from_this = 30 - possible_transfer_amounts = list(5, 10, 15, 20, 30) - volume = 30 - proj_piercing = 1 +///Injector - No piercing syringes, replace another time ///Organ Thrower diff --git a/code/modules/research/designs/mod_designs.dm b/code/modules/research/designs/mod_designs.dm index 70a3180355..d66e28bafc 100644 --- a/code/modules/research/designs/mod_designs.dm +++ b/code/modules/research/designs/mod_designs.dm @@ -299,14 +299,6 @@ build_type = PROTOLATHE departmental_flags = DEPARTMENTAL_FLAG_CARGO -/datum/design/module/mod_injector - name = "Injector Module" - id = "mod_injector" - materials = list(/datum/material/iron = 1000, /datum/material/diamond = 500) - build_path = /obj/item/mod/module/injector - build_type = PROTOLATHE - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL - /datum/design/module/mod_bikehorn name = "Bike Horn Module" id = "mod_bikehorn" diff --git a/code/modules/research/techweb/nodes/mod_nodes.dm b/code/modules/research/techweb/nodes/mod_nodes.dm index e578cc6a8f..e8521a10ec 100644 --- a/code/modules/research/techweb/nodes/mod_nodes.dm +++ b/code/modules/research/techweb/nodes/mod_nodes.dm @@ -70,7 +70,6 @@ "mod_visor_medhud", "mod_health_analyzer", "mod_quick_carry", - "mod_injector", "mod_dna_lock", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)