Skip to content

Commit

Permalink
Revert "Farewell Syringe Guns (#17466)"
Browse files Browse the repository at this point in the history
This reverts commit ee2ded1.
  • Loading branch information
ReddicusDragon committed Jan 14, 2023
1 parent af2982b commit 0b5cfbf
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
new /obj/item/clipboard/yog/paperwork/cmo(src)
new /obj/item/storage/backpack/duffelbag/clothing/med/chief(src)
new /obj/item/storage/lockbox/medal/med(src)
new /obj/item/gun/syringe(src)


/obj/structure/closet/secure_closet/paramedic
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/guns/misc/syringe_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
/obj/item/gun/syringe/attackby(obj/item/A, mob/user, params, show_msg = TRUE)
if(istype(A, /obj/item/reagent_containers/syringe))
if(syringes.len < max_syringes)
if(istype(A, /obj/item/reagent_containers/syringe/piercing) && !istype(src, /obj/item/gun/syringe/syndicate))
to_chat(user, "<span class='notice'>[A] is designed to not be able to fit into [src].</span>")
return TRUE
if(!user.transferItemToLoc(A, src))
return FALSE
to_chat(user, span_notice("You load [A] into \the [src]."))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/reagent_containers/syringes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@

/obj/item/reagent_containers/syringe/piercing
name = "piercing syringe"
desc = "A diamond-tipped syringe that can safely inject its contents into those wearing bulky clothing. It can hold up to 15 units."
desc = "A diamond-tipped syringe that can safely inject its contents into those wearing bulky clothing, it's been designed to be unable to fit into a syringe gun. It can hold up to 15 units."
proj_piercing = 1
/obj/item/reagent_containers/syringe/crude
name = "crude syringe"
Expand Down
8 changes: 8 additions & 0 deletions code/modules/research/designs/autolathe_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,14 @@
build_path = /obj/item/ammo_casing/shotgun/buckshot
category = list("hacked", "Security")

/datum/design/shotgun_dart
name = "Shotgun Dart"
id = "shotgun_dart"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 4000)
build_path = /obj/item/ammo_casing/shotgun/dart
category = list("hacked", "Security")

/datum/design/incendiary_slug
name = "Incendiary Slug"
id = "incendiary_slug"
Expand Down
12 changes: 6 additions & 6 deletions code/modules/research/designs/weapon_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,15 @@
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_ARMORY

/datum/design/syringegun
name = "Syringe Gun"
desc = "A gun that fires syringes."
id = "syringegun"
/datum/design/rapidsyringe
name = "Rapid Syringe Gun"
desc = "A gun that fires many syringes."
id = "rapidsyringe"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000)
build_path = /obj/item/gun/syringe
build_path = /obj/item/gun/syringe/rapidsyringe
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_ARMORY | DEPARTMENTAL_FLAG_MEDICAL //uwu
departmental_flags = DEPARTMENTAL_FLAG_ARMORY //uwu

/datum/design/temp_gun
name = "Temperature Gun"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/research/techweb/all_nodes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// Default research tech, prevents bricking
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "desttagger", "handlabel", "packagewrap",
"destructive_analyzer", "circuit_imprinter", "rack_creator", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab", "paystand", "ticket_machine", "ticket_remote", "light_tube", "light_bulb",
"space_heater", "beaker", "large_beaker", "vial", "large_vial", "bucket", "fork", "tray","plate", "bowl", "mixing_bowl", "drinking_glass", "shot_glass", "shaker", "xlarge_beaker", "sec_rshot", "sec_beanbag_slug", "sec_bshot", "sec_slug", "sec_Islug", "sec_Brslug", "sec_38", "apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "blastdoorcontroller", "aac_electronics", "mousetrap",
"space_heater", "beaker", "large_beaker", "vial", "large_vial", "bucket", "fork", "tray","plate", "bowl", "mixing_bowl", "drinking_glass", "shot_glass", "shaker", "xlarge_beaker", "sec_rshot", "sec_beanbag_slug", "sec_bshot", "sec_slug", "sec_Islug", "sec_Brslug", "sec_dart", "sec_38", "apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "blastdoorcontroller", "aac_electronics", "mousetrap",
"rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","wallframe/flasher", "rsf", "oven_tray", "bounced_radio", "signaler", "intercom_frame", "infrared_emitter", "health_sensor", "timer", "voice_analyser", "camera_assembly", "newscaster_frame", "prox_sensor", "flashlight", "extinguisher", "pocketfireextinguisher")

/datum/techweb_node/mmi
Expand Down Expand Up @@ -685,8 +685,8 @@
id = "medical_weapons"
display_name = "Medical Weaponry"
description = "Weapons using medical technology."
prereq_ids = list("adv_biotech", "adv_weaponry","syndicate_basic")
design_ids = list("syringegun", "dartsyringe","sec_dart")
prereq_ids = list("adv_biotech", "adv_weaponry")
design_ids = list("rapidsyringe", "dartsyringe")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)

/datum/techweb_node/beam_weapons
Expand Down
10 changes: 5 additions & 5 deletions code/modules/uplink/uplink_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/stealthy_weapons/dart_pistol
name = "Dart Pistol"
desc = "A miniaturized version of a normal syringe gun. It is very quiet when fired and can fit into any \
space a small item can."
space a small item can, and it features a modified reciever capable of chambering piercing syringes."
item = /obj/item/gun/syringe/syndicate
cost = 4
surplus = 50
Expand Down Expand Up @@ -2407,10 +2407,10 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
restricted_roles = list("Geneticist", "Chief Medical Officer")

/datum/uplink_item/role_restricted/chemical_gun
name = "Rapid Syringe Gun"
desc = "A modified syringe gun with a rotating drum, capable of holding and quickly firing six syringes."
item = /obj/item/gun/syringe/rapidsyringe
cost = 8
name = "Reagent Dartgun"
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", "Virologist")

/datum/uplink_item/role_restricted/reverse_bear_trap
Expand Down

0 comments on commit 0b5cfbf

Please sign in to comment.