Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Farewell Syringe Guns #17466

Merged
merged 5 commits into from
Jan 13, 2023
Merged

Farewell Syringe Guns #17466

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
053fb8b
death
TheRyeGuyWhoWillNowDie Jan 12, 2023
38427d8
lol
TheRyeGuyWhoWillNowDie Jan 12, 2023
308e774
Update medical.dm
TheRyeGuyWhoWillNowDie Jan 12, 2023
d7abaa4
Update code/modules/research/techweb/all_nodes.dm
TheRyeGuyWhoWillNowDie Jan 12, 2023
88c7b3b
lol
TheRyeGuyWhoWillNowDie Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
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: 0 additions & 3 deletions code/modules/projectiles/guns/misc/syringe_gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@
/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
View file
Open in desktop
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's been designed to be unable to fit into a syringe gun. It can hold up to 15 units."
desc = "A diamond-tipped syringe that can safely inject its contents into those wearing bulky clothing. It can hold up to 15 units."
proj_piercing = 1
/obj/item/reagent_containers/syringe/crude
name = "crude syringe"
Expand Down
12 changes: 6 additions & 6 deletions code/modules/research/designs/weapon_designs.dm
View file
Open in desktop
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/rapidsyringe
name = "Rapid Syringe Gun"
desc = "A gun that fires many syringes."
id = "rapidsyringe"
/datum/design/syringegun
name = "Syringe Gun"
desc = "A gun that fires syringes."
id = "syringegun"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000)
build_path = /obj/item/gun/syringe/rapidsyringe
build_path = /obj/item/gun/syringe
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_ARMORY //uwu
departmental_flags = DEPARTMENTAL_FLAG_ARMORY | DEPARTMENTAL_FLAG_MEDICAL //uwu

/datum/design/temp_gun
name = "Temperature Gun"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/techweb/all_nodes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@
id = "medical_weapons"
display_name = "Medical Weaponry"
description = "Weapons using medical technology."
prereq_ids = list("adv_biotech", "adv_weaponry")
prereq_ids = list("adv_biotech", "adv_weaponry","syndicate_basic")
design_ids = list("rapidsyringe", "dartsyringe")
TheRyeGuyWhoWillNowDie marked this conversation as resolved.
Show resolved Hide resolved
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)

Expand Down
8 changes: 4 additions & 4 deletions code/modules/uplink/uplink_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
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 = "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
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
restricted_roles = list("Chemist", "Chief Medical Officer", "Virologist")

/datum/uplink_item/role_restricted/reverse_bear_trap
Expand Down