From d473b271cb3a3d086c7f1cb8b1374d6ec305460d Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 10 Mar 2021 15:06:39 -0600 Subject: [PATCH 1/4] uh oh! it's another stupid fucking hatter pr! --- code/game/objects/items/storage/firstaid.dm | 2 +- .../research/designs/medical_designs.dm | 32 +++++++++++++++++-- .../modules/research/techweb/_techweb_node.dm | 3 +- .../research/techweb/nodes/bluespace_nodes.dm | 12 +++++-- .../research/techweb/nodes/misc_nodes.dm | 8 ----- 5 files changed, 43 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 480e1966e9..2035b67b5e 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -469,7 +469,7 @@ //hijacking the minature first aids for hypospray boxes. <3 /obj/item/storage/hypospraykit name = "hypospray kit" - desc = "It's a kit containing a hypospray and specific treatment chemical-filled vials." + desc = "It's a kit designed for containing a hypospray and specific treatment chemical-filled vials." icon_state = "firstaid-mini" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 9879171e71..91b3198bfb 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -62,6 +62,24 @@ build_path = /obj/item/reagent_containers/glass/beaker/meta category = list("Medical Designs") +/datum/design/bs_hypovial_small + name = "Bluespace Hypovial" + id = "bs_hypovial" + build_type = PROTOLATHE + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + materials = list(/datum/material/iron = 1500, /datum/material/plasma = 1000, /datum/material/diamond = 100, /datum/material/bluespace = 100) + build_path = /obj/item/reagent_containers/glass/bottle/vial/small/bluespace + category = list("Medical Designs") + +/datum/design/bs_hypovial_large + name = "Bluespace Large Hypovial" + id = "bs_large_hypovial" + build_type = PROTOLATHE + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + materials = list(/datum/material/iron = 3000, /datum/material/plasma = 2500, /datum/material/diamond = 200, /datum/material/bluespace = 250) + build_path = /obj/item/reagent_containers/glass/bottle/vial/large/bluespace + category = list("Medical Designs") + /datum/design/bluespacesyringe name = "Bluespace Syringe" desc = "An advanced syringe that can hold 60 units of chemicals" @@ -94,7 +112,7 @@ /datum/design/medicinalsmartdart name = "Medicinal Smartdart" - desc = "A non-harmful dart that can administer medication from a range. Once it hits a patient using it's smart nanofilter technology only medicines contained within the dart are administered to the patient. Additonally, due to capillary action, injection of chemicals past the overdose limit is prevented." + desc = "A non-harmful dart that can administer medication from a range. Once it hits a patient using its smart nanofilter technology, only medicines contained within the dart are administered to the patient. Additonally, due to capillary action, injection of chemicals past the overdose limit is prevented." id = "medicinalsmartdart" build_type = PROTOLATHE materials = list(/datum/material/glass = 100, /datum/material/plastic = 100, /datum/material/iron = 100) @@ -192,6 +210,16 @@ category = list("Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE +/datum/design/hypospraykit + name = "Empty Hypospray Kit" + desc = "A plastic medical kit for storing hyposprays and hypospray accessories." + id = "hypokit" + build_type = PROTOLATHE + materials = list(/datum/material/plastic = 5000) + build_path = /obj/item/storage/hypospraykit // let's not summon new hyposprays thanks + category = list("Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + /datum/design/blood_bag name = "Empty Blood Bag" desc = "A small sterilized plastic bag for blood." @@ -203,7 +231,7 @@ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL /datum/design/bsblood_bag - name = "Blue Space Empty Blood Bag" + name = "Empty Bluespace Blood Bag" desc = "A large sterilized plastic bag for blood." id = "bsblood_bag" build_path = /obj/item/reagent_containers/blood/bluespace diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm index 40cc322eed..c7c2e7ef10 100644 --- a/code/modules/research/techweb/_techweb_node.dm +++ b/code/modules/research/techweb/_techweb_node.dm @@ -104,5 +104,6 @@ // 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", "experimentor", "rdconsole", "bepis", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab", "paystand", - "space_heater", "beaker", "large_beaker", "bucket", "xlarge_beaker", "sec_shellclip", "sec_beanbag", "sec_rshot", "sec_bshot", "sec_slug", "sec_islug", "sec_dart", "sec_38", "sec_38lethal", + "space_heater", "beaker", "large_beaker", "xlarge_beaker", "bucket", "hypovial", "large_hypovial", + "sec_shellclip", "sec_beanbag", "sec_rshot", "sec_bshot", "sec_slug", "sec_islug", "sec_dart", "sec_38", "sec_38lethal", "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass") diff --git a/code/modules/research/techweb/nodes/bluespace_nodes.dm b/code/modules/research/techweb/nodes/bluespace_nodes.dm index ae9fdd6485..b3367681b0 100644 --- a/code/modules/research/techweb/nodes/bluespace_nodes.dm +++ b/code/modules/research/techweb/nodes/bluespace_nodes.dm @@ -13,7 +13,7 @@ display_name = "Applied Bluespace Research" description = "Using bluespace to make things faster and better." prereq_ids = list("bluespace_basic", "engineering") - design_ids = list("bs_rped","biobag_holding","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "phasic_scanning", "bluespacesmartdart", "xenobio_slimebasic", "bluespace_tray", "bluespace_carrier") + design_ids = list("bs_rped","biobag_holding","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "bs_hypovial", "bs_large_hypovial", "phasic_scanning", "bluespacesmartdart", "xenobio_slimebasic", "bluespace_tray", "bluespace_carrier") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) /datum/techweb_node/adv_bluespace @@ -24,6 +24,14 @@ design_ids = list("bluespace_matter_bin", "femto_mani", "triphasic_scanning", "bluespace_crystal", "xenobio_slimeadv") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000) +/datum/techweb_node/emp_super + id = "emp_super" + display_name = "Quantum Electromagnetic Technology" + description = "Even better electromagnetic technology." + prereq_ids = list("emp_adv", "adv_bluespace") // why should the rest of T4 be locked but not this node? grmblgrmbl + design_ids = list("quadultra_micro_laser") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000) + /datum/techweb_node/bluespace_power id = "bluespace_power" display_name = "Bluespace Power Technology" @@ -37,7 +45,7 @@ display_name = "Bluespace Pockets" description = "Studies into the mysterious alternate dimension known as bluespace and how to place items in the threads of reality." prereq_ids = list("adv_power", "adv_bluespace", "adv_biotech", "adv_plasma") - design_ids = list( "bluespacebodybag","bag_holding", "bluespace_pod", "borg_upgrade_trashofholding", "blutrash", "satchel_holding", "bsblood_bag", "duffelbag_holding") + design_ids = list("bluespacebodybag","bag_holding", "bluespace_pod", "borg_upgrade_trashofholding", "blutrash", "satchel_holding", "bsblood_bag", "duffelbag_holding") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5500) /datum/techweb_node/bluespace_portal diff --git a/code/modules/research/techweb/nodes/misc_nodes.dm b/code/modules/research/techweb/nodes/misc_nodes.dm index 94a19924b8..2e5fdca6bf 100644 --- a/code/modules/research/techweb/nodes/misc_nodes.dm +++ b/code/modules/research/techweb/nodes/misc_nodes.dm @@ -49,14 +49,6 @@ design_ids = list("ultra_micro_laser") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000) -/datum/techweb_node/emp_super - id = "emp_super" - display_name = "Quantum Electromagnetic Technology" //bs - description = "Even better electromagnetic technology." - prereq_ids = list("emp_adv") - design_ids = list("quadultra_micro_laser") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000) - /////////////////////////Clown tech///////////////////////// /datum/techweb_node/clown id = "clown" From 8bebe5a649676db1174ac59f2f525928f7a04428 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 10 Mar 2021 16:17:24 -0600 Subject: [PATCH 2/4] adds hypokit --- code/modules/research/techweb/nodes/biotech_nodes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/techweb/nodes/biotech_nodes.dm b/code/modules/research/techweb/nodes/biotech_nodes.dm index 3c89f0bbab..d4f0a4b913 100644 --- a/code/modules/research/techweb/nodes/biotech_nodes.dm +++ b/code/modules/research/techweb/nodes/biotech_nodes.dm @@ -5,7 +5,7 @@ display_name = "Biological Technology" description = "What makes us tick." //the MC, silly! prereq_ids = list("base") - design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv", "medspray","genescanner","chem_pack", "portable_chem_mixer") + design_ids = list("medicalkit", "hypokit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv", "medspray","genescanner","chem_pack", "portable_chem_mixer") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) /datum/techweb_node/adv_biotech From d3a6c9b20a81cc33c5f42b8d0084d270f50e981c Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Thu, 11 Mar 2021 23:38:49 -0600 Subject: [PATCH 3/4] removes bshv --- code/modules/research/techweb/nodes/bluespace_nodes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/techweb/nodes/bluespace_nodes.dm b/code/modules/research/techweb/nodes/bluespace_nodes.dm index b3367681b0..459a4d6616 100644 --- a/code/modules/research/techweb/nodes/bluespace_nodes.dm +++ b/code/modules/research/techweb/nodes/bluespace_nodes.dm @@ -13,7 +13,7 @@ display_name = "Applied Bluespace Research" description = "Using bluespace to make things faster and better." prereq_ids = list("bluespace_basic", "engineering") - design_ids = list("bs_rped","biobag_holding","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "bs_hypovial", "bs_large_hypovial", "phasic_scanning", "bluespacesmartdart", "xenobio_slimebasic", "bluespace_tray", "bluespace_carrier") + design_ids = list("bs_rped","biobag_holding","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "phasic_scanning", "bluespacesmartdart", "xenobio_slimebasic", "bluespace_tray", "bluespace_carrier") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) /datum/techweb_node/adv_bluespace From 97e0e012655c52f99aa8031b1a908d35c3a8ec72 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 17 Mar 2021 03:25:06 -0500 Subject: [PATCH 4/4] ok --- .../research/designs/medical_designs.dm | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 91b3198bfb..c387064f2a 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -62,24 +62,6 @@ build_path = /obj/item/reagent_containers/glass/beaker/meta category = list("Medical Designs") -/datum/design/bs_hypovial_small - name = "Bluespace Hypovial" - id = "bs_hypovial" - build_type = PROTOLATHE - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL - materials = list(/datum/material/iron = 1500, /datum/material/plasma = 1000, /datum/material/diamond = 100, /datum/material/bluespace = 100) - build_path = /obj/item/reagent_containers/glass/bottle/vial/small/bluespace - category = list("Medical Designs") - -/datum/design/bs_hypovial_large - name = "Bluespace Large Hypovial" - id = "bs_large_hypovial" - build_type = PROTOLATHE - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL - materials = list(/datum/material/iron = 3000, /datum/material/plasma = 2500, /datum/material/diamond = 200, /datum/material/bluespace = 250) - build_path = /obj/item/reagent_containers/glass/bottle/vial/large/bluespace - category = list("Medical Designs") - /datum/design/bluespacesyringe name = "Bluespace Syringe" desc = "An advanced syringe that can hold 60 units of chemicals"