diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 55976d69c2..f4ffd2aa16 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -21,7 +21,8 @@ list(/datum/reagent/medicine/epinephrine, /datum/reagent/medicine/morphine, /datum/reagent/medicine/salbutamol, /datum/reagent/medicine/bicaridine, /datum/reagent/medicine/kelotane), list(/datum/reagent/medicine/oculine,/datum/reagent/medicine/inacusiate), list(/datum/reagent/medicine/antitoxin, /datum/reagent/medicine/mutadone, /datum/reagent/medicine/mannitol, /datum/reagent/medicine/pen_acid), - list(/datum/reagent/medicine/omnizine) + list(/datum/reagent/medicine/omnizine), + list(/datum/reagent/medicine/neo_jelly) ) var/list/chem_buttons //Used when emagged to scramble which chem is used, eg: antitoxin -> morphine var/scrambled_chems = FALSE //Are chem buttons scrambled? used as a warning diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index ba6311a94d..f539636d5c 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -266,6 +266,19 @@ /obj/item/stock_parts/cell/bluespace/empty start_charged = FALSE +/obj/item/stock_parts/cell/vortex + name = "vortex power cell" + desc = "A rechargeable transdimensional power cell." + icon_state = "bscell" + maxcharge = 60000 + custom_materials = list(/datum/material/glass=600) + chargerate = 3000 //Recharges slowly. + self_recharge = 1 + rating = 6 + +/obj/item/stock_parts/cell/vortex/empty + start_charged = FALSE + /obj/item/stock_parts/cell/infinite name = "infinite-capacity power cell!" icon_state = "icell" diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index da33f935da..bd3e514b0d 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -78,6 +78,10 @@ /datum/reagent/toxin ) + var/list/upgrade_reagents4 = list( + /datum/reagent/toxin/slimejelly + ) + var/list/emagged_reagents = list( /datum/reagent/drug/space_drugs, /datum/reagent/toxin/plasma, @@ -101,6 +105,8 @@ upgrade_reagents2 = sortList(upgrade_reagents2, /proc/cmp_reagents_asc) if(upgrade_reagents3) upgrade_reagents3 = sortList(upgrade_reagents3, /proc/cmp_reagents_asc) + if(upgrade_reagents4) + upgrade_reagents4 = sortList(upgrade_reagents4, /proc/cmp_reagents_asc) dispensable_reagents = sortList(dispensable_reagents, /proc/cmp_reagents_asc) update_icon() @@ -400,6 +406,8 @@ dispensable_reagents |= upgrade_reagents2 if(M.rating > 3) dispensable_reagents |= upgrade_reagents3 + if(M.rating > 4) + dispensable_reagents |= upgrade_reagents4 powerefficiency = round(newpowereff, 0.01) /obj/machinery/chem_dispenser/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker) @@ -509,6 +517,11 @@ /datum/reagent/consumable/nothing, /datum/reagent/consumable/peachjuice ) + upgrade_reagents4 = list( + /datum/reagent/toxin/teapowder, + /datum/reagent/consumable/bungojuice, + /datum/reagent/consumable/caramel + ) emagged_reagents = list( /datum/reagent/toxin/mindbreaker, /datum/reagent/toxin/staminatoxin, @@ -567,6 +580,7 @@ ) upgrade_reagents2 = null upgrade_reagents3 = null + upgrade_reagents4 = null emagged_reagents = list( /datum/reagent/consumable/ethanol/alexander, /datum/reagent/consumable/clownstears, @@ -768,7 +782,9 @@ upgrade_reagents3 = list( /datum/reagent/medicine/mine_salve ) - + upgrade_reagents4 = list( + /datum/reagent/blood + ) emagged_reagents = list( /datum/reagent/drug/space_drugs, /datum/reagent/toxin/carpotoxin, diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index 3403d96049..b777f71684 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -57,6 +57,18 @@ category = list("Misc","Power Designs") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING +/datum/design/vortex_cell + name = "Vortex Power Cell" + desc = "A power cell that holds 60 MJ of energy and slowly recharge itself." + id = "vortex_cell" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/iron = 800, /datum/material/gold = 120, /datum/material/glass = 160, /datum/material/diamond = 160, /datum/material/titanium = 300, /datum/material/bluespace = 300) + construction_time=180 + build_path = /obj/item/stock_parts/cell/vortex/empty + reagents_list = list(/datum/reagent/liquid_dark_matter = 5, /datum/reagent/bluespace = 5, /datum/reagent/teslium/energized_jelly = 10) + category = list("Misc","Power Designs") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + /datum/design/inducer name = "Inducer" desc = "The NT-75 Electromagnetic Power Inducer can wirelessly induce electric charge in an object, allowing you to recharge power cells without having to remove them." diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index 7392f83975..89def0ec3d 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -67,6 +67,18 @@ lathe_time_factor = 0.2 departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE +/datum/design/giga_capacitor + name = "Giga Capacitor" + desc = "A stock part used in the construction of various devices." + id = "giga_capacitor" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/gold = 500, /datum/material/diamond = 100, /datum/material/bluespace = 300, /datum/material/plasma = 750) + build_path = /obj/item/stock_parts/capacitor/giga + reagents_list = list(/datum/reagent/teslium/energized_jelly = 5) + category = list("Stock Parts") + lathe_time_factor = 0.8 + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + //Scanning modules /datum/design/basic_scanning name = "Basic Scanning Module" @@ -112,6 +124,18 @@ lathe_time_factor = 0.2 departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE +/datum/design/unilatera_triphasic_scanning + name = "Unilatera Triphasic Scanning Module" + desc = "A stock part used in the construction of various devices." + id = "unilatera_triphasic_scanning" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 500, /datum/material/diamond = 100, /datum/material/bluespace = 300, /datum/material/plasma = 750) + build_path = /obj/item/stock_parts/scanning_module/unilatera_triphasic + reagents_list = list(/datum/reagent/teslium/energized_jelly = 5) + category = list("Stock Parts") + lathe_time_factor = 0.8 + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + //Maipulators /datum/design/micro_mani name = "Micro Manipulator" @@ -157,6 +181,18 @@ lathe_time_factor = 0.2 departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE +/datum/design/atto_mani + name = "Atto Manipulator" + desc = "A stock part used in the construction of various devices." + id = "atto_mani" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/gold = 500, /datum/material/diamond = 100, /datum/material/bluespace = 300, /datum/material/plasma = 750) + build_path = /obj/item/stock_parts/manipulator/atto + reagents_list = list(/datum/reagent/teslium/energized_jelly = 5) + category = list("Stock Parts") + lathe_time_factor = 0.8 + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + //Micro-lasers /datum/design/basic_micro_laser name = "Basic Micro-Laser" @@ -202,6 +238,19 @@ lathe_time_factor = 0.2 departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE +/datum/design/super_quadultra_micro_laser + name = "Super-Ultra Micro-Laser" + desc = "A stock part used in the construction of various devices." + id = "super_quadultra_micro_laser" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/gold = 500, /datum/material/diamond = 100, /datum/material/bluespace = 300, /datum/material/plasma = 750) + build_path = /obj/item/stock_parts/micro_laser/super_quadultra + reagents_list = list(/datum/reagent/teslium/energized_jelly = 5) + category = list("Stock Parts") + lathe_time_factor = 0.8 + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + +// Matter Bins /datum/design/basic_matter_bin name = "Basic Matter Bin" desc = "A stock part used in the construction of various devices." @@ -246,6 +295,18 @@ lathe_time_factor = 0.2 departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE +/datum/design/dark_matter_bin + name = "Dark-Matter Bin" + desc = "A stock part used in the construction of various devices." + id = "dark_matter_bin" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/gold = 500, /datum/material/diamond = 100, /datum/material/bluespace = 300, /datum/material/plasma = 750) + build_path = /obj/item/stock_parts/matter_bin/darkmatter + reagents_list = list(/datum/reagent/liquid_dark_matter = 5) + category = list("Stock Parts") + lathe_time_factor = 0.8 + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + //T-Comms devices /datum/design/subspace_ansible name = "Subspace Ansible" diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index fb29399064..d61f2a257b 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -273,6 +273,43 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi rating = 4 custom_materials = list(/datum/material/iron=80) +//Rating 5 + +/obj/item/stock_parts/capacitor/giga + name = "giga capacitor" + desc = "A capacity capacitor mixed with xenobio power storage breakthrough, used in the construction of a variety of devices." + icon_state = "giga_capacitor" + rating = 5 + custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) + +/obj/item/stock_parts/scanning_module/unilatera_triphasic + name = "unilatera triphasic scanning module" + desc = "A compact, unilatera ultra resolution triphasic scanning module made with bluespace compression and plasma phase shifting. Used in the construction of certain devices." + icon_state = "unilatera_triphasic_scan_module" + rating = 5 + custom_materials = list(/datum/material/iron=50, /datum/material/glass=20) + +/obj/item/stock_parts/manipulator/atto + name = "atto-manipulator" + desc = "A joint engineered tiny manipulator, using plasma and alien designs for the most affective manipulation. Used in the construction of certain devices." + icon_state = "atto_mani" + rating = 5 + custom_materials = list(/datum/material/iron=30) + +/obj/item/stock_parts/micro_laser/super_quadultra + name = "super-quad-ultra micro-laser" + icon_state = "super_quadultra_micro_laser" + desc = "A tiny laser used in certain devices. It's laser being the finest point and high wattage is due to the breakthroughs in xenobio and bluespace storage." + rating = 5 + custom_materials = list(/datum/material/iron=10, /datum/material/glass=20) + +/obj/item/stock_parts/matter_bin/darkmatter + name = "dark-matter bin" + desc = "A container designed to hold compressed matter awaiting reconstruction." + icon_state = "darkmatter_bin" + rating = 5 + custom_materials = list(/datum/material/iron=80) + // Subspace stock parts /obj/item/stock_parts/subspace/ansible diff --git a/code/modules/research/techweb/nodes/alien_nodes.dm b/code/modules/research/techweb/nodes/alien_nodes.dm index 567a5dbded..8733f07e4c 100644 --- a/code/modules/research/techweb/nodes/alien_nodes.dm +++ b/code/modules/research/techweb/nodes/alien_nodes.dm @@ -34,3 +34,11 @@ prereq_ids = list("alientech", "exp_tools") design_ids = list("alien_wrench", "alien_wirecutters", "alien_screwdriver", "alien_crowbar", "alien_welder", "alien_multitool") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) + +/datum/techweb_node/alien_stockparts + id = "alien_stockparts" + display_name = "Theoretical Engineering" + description = "A merging of unknown alien designs, bluespace mannagement, and xenobiology." + prereq_ids = list("alientech", "emp_super", "alien_engi", "bluespace_power") + design_ids = list("super_quadultra_micro_laser", "dark_matter_bin", "vortex_cell", "atto_mani", "unilatera_triphasic_scanning", "giga_capacitor") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi index fbc8be5474..3bd0493735 100644 Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ