diff --git a/baystation12.dme b/baystation12.dme index 58b2899c5b96e..0c2e13805a8a3 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1648,6 +1648,7 @@ #include "code\modules\halo\covenant\supply\coveva.dm" #include "code\modules\halo\covenant\supply\covexplosives.dm" #include "code\modules\halo\covenant\supply\covfood.dm" +#include "code\modules\halo\covenant\supply\covholyweapons.dm" #include "code\modules\halo\covenant\supply\covmedical.dm" #include "code\modules\halo\covenant\supply\covmisc.dm" #include "code\modules\halo\covenant\supply\covNPCs.dm" diff --git a/code/modules/halo/covenant/supply/covholyweapons.dm b/code/modules/halo/covenant/supply/covholyweapons.dm new file mode 100644 index 0000000000000..ddeba16b4e8ec --- /dev/null +++ b/code/modules/halo/covenant/supply/covholyweapons.dm @@ -0,0 +1,57 @@ +/decl/hierarchy/supply_pack/covenant_holy_weapons + name = "Covenant Holy Weapons" + faction_lock = "Covenant" + containertype = /obj/structure/closet/crate/covenant + +/* FIREARMS */ + +/decl/hierarchy/supply_pack/covenant_holy_weapons/boltshot + name = "Holy Boltshot" + contains = list(/obj/item/weapon/gun/projectile/boltshot = 1, + /obj/item/ammo_magazine/boltshot = 3, + /obj/item/ammo_magazine/boltshot_sg = 3) + cost = 500 + containername = "\improper Holy Boltshot crate" + +/decl/hierarchy/supply_pack/covenant_holy_weapons/suppressor + name = "Blessed Suppressor" + contains = list(/obj/item/weapon/gun/projectile/suppressor = 1, + /obj/item/ammo_magazine/suppressor = 3) + cost = 700 + containername = "\improper Blessed Suppressor crate" + +/decl/hierarchy/supply_pack/covenant_holy_weapons/binaryrifle + name = "Sanctified Binary Rifle" + contains = list(/obj/item/weapon/gun/projectile/binary_rifle = 1, + /obj/item/ammo_magazine/binaryrifle = 3) + cost = 800 + containername = "\improper Sanctified Binary Rifle crate" + +/* EXPLOSIVES */ + +/decl/hierarchy/supply_pack/covenant_holy_weapons/splintergrenade + name = "Holy Hand Grenades" + contains = list(/obj/item/weapon/grenade/splinter = 8) + cost = 300 + containername = "\improper Holy Hand Grenade crate" + +/* AMMO */ + +/decl/hierarchy/supply_pack/covenant_holy_weapons/boltshotammo + name = "Holy Boltshot Ammo" + contains = list(/obj/item/ammo_magazine/boltshot = 3, + /obj/item/ammo_magazine/boltshot_sg = 3) + cost = 75 + containername = "\improper Holy Boltshot Ammo crate" + +/decl/hierarchy/supply_pack/covenant_holy_weapons/suppressorammo + name = "Blessed Suppressor Ammo" + contains = list(/obj/item/ammo_magazine/suppressor = 3) + cost = 50 + containername = "\improper Blessed Suppressor Ammo crate" + +/decl/hierarchy/supply_pack/covenant_holy_weapons/binaryrifleammo + name = "Sanctified Binary Rifle Ammo" + contains = list(/obj/item/ammo_magazine/binaryrifle = 3) + cost = 200 + containername = "\improper Sanctified Binary Rifle Ammo crate" \ No newline at end of file diff --git a/code/modules/halo/research/designs/ai.dm b/code/modules/halo/research/designs/ai.dm index 784373d83283d..a8bc186556d08 100644 --- a/code/modules/halo/research/designs/ai.dm +++ b/code/modules/halo/research/designs/ai.dm @@ -1,26 +1,25 @@ /datum/research_design/paicard name = "'pAI', personal artificial intelligence device" - required_materials = list("glass" = 50, DEFAULT_WALL_MATERIAL = 50) + required_materials = list("glass" = 5, "steel" = 5) build_type = PROTOLATHE product_type = /obj/item/device/paicard - required_reagents = list(/datum/reagent/mercury = 10, /datum/reagent/acid = 15) /datum/research_design/dumb_ai name = "Dumb AI Chip" product_type = /obj/item/dumb_ai_chip build_type = PROTOLATHE - required_materials = list("plasteel" = 10, "glass" = 20, "gold" = 5, "silver" = 5) - required_reagents = list(/datum/reagent/mercury = 10, /datum/reagent/nitric_acid = 15) - complexity = 20 + required_materials = list("steel" = 10, "glass" = 5, "gold" = 5) + required_reagents = list(/datum/reagent/mercury = 10) + complexity = 15 /datum/research_design/intelicard name = "intelicard" product_type = /obj/item/weapon/aicard build_type = PROTOLATHE - required_materials = list("plasteel" = 20, "glass" = 50, "gold" = 10, "diamond" = 1) + required_materials = list("steel" = 10, "glass" = 5, "gold" = 5) required_reagents = list(/datum/reagent/mercury = 10, /datum/reagent/acid/hydrochloric = 15) - complexity = 50 + complexity = 30 /* /datum/research_design/ai_core name = "Smart AI Core" diff --git a/code/modules/halo/research/designs/circuits.dm b/code/modules/halo/research/designs/circuits.dm index e1610b2efca7e..ef15e3b736206 100644 --- a/code/modules/halo/research/designs/circuits.dm +++ b/code/modules/halo/research/designs/circuits.dm @@ -4,7 +4,7 @@ complexity = 8 category_type = /datum/research_design/circuit required_materials = list("steel" = 1, "glass" = 1) - required_reagents = list(/datum/reagent/acid = 20) + required_reagents = list(/datum/reagent/acid = 5) /datum/research_design/circuit/recharger name = T_BOARD("energy weapon recharging station") diff --git a/code/modules/halo/research/designs/computers/drive.dm b/code/modules/halo/research/designs/computers/drive.dm index 9c4895fb59874..c33d663226636 100644 --- a/code/modules/halo/research/designs/computers/drive.dm +++ b/code/modules/halo/research/designs/computers/drive.dm @@ -3,18 +3,16 @@ name = "basic hard drive" product_type = /obj/item/weapon/computer_hardware/hard_drive build_type = IMPRINTER - required_materials = list("steel" = 1, "glass" = 1, "plastic" = 10) - required_objs = list(/obj/item/crystal) - required_reagents = list(/datum/reagent/acid = 20) + required_materials = list("steel" = 1, "glass" = 1, "plastic" = 5) + required_reagents = list(/datum/reagent/acid = 10) complexity = 5 /datum/research_design/drive_advanced name = "advanced hard drive" product_type = /obj/item/weapon/computer_hardware/hard_drive/advanced build_type = IMPRINTER - required_materials = list("plasteel" = 1, "rglass" = 1, "plastic" = 10) - required_objs = list(/obj/item/crystal) - required_reagents = list(/datum/reagent/acid/hydrochloric = 20) + required_materials = list("plasteel" = 1, "rglass" = 1, "plastic" = 5) + required_reagents = list(/datum/reagent/acid/hydrochloric = 10) complexity = 15 /datum/research_design/drive_super @@ -23,7 +21,7 @@ build_type = IMPRINTER required_materials = list("osmium-carbide plasteel" = 1, "phglass" = 1, "plastic" = 10) required_objs = list(/obj/item/crystal) - required_reagents = list(/datum/reagent/nitric_acid = 20) + required_reagents = list(/datum/reagent/nitric_acid = 10) complexity = 25 /datum/research_design/drive_cluster diff --git a/code/modules/halo/research/designs/computers/drive_portable.dm b/code/modules/halo/research/designs/computers/drive_portable.dm index 34231f526c3d5..0538240ef772b 100644 --- a/code/modules/halo/research/designs/computers/drive_portable.dm +++ b/code/modules/halo/research/designs/computers/drive_portable.dm @@ -4,8 +4,7 @@ product_type = /obj/item/weapon/computer_hardware/hard_drive/portable build_type = IMPRINTER required_materials = list("steel" = 1, "glass" = 1, "plastic" = 5) - required_objs = list(/obj/item/crystal) - required_reagents = list(/datum/reagent/acid = 20) + required_reagents = list(/datum/reagent/acid = 10) complexity = 5 /datum/research_design/portable_drive_advanced @@ -13,8 +12,7 @@ product_type = /obj/item/weapon/computer_hardware/hard_drive/portable/advanced build_type = IMPRINTER required_materials = list("plasteel" = 1, "rglass" = 1, "plastic" = 5) - required_objs = list(/obj/item/crystal) - required_reagents = list(/datum/reagent/acid/hydrochloric = 20) + required_reagents = list(/datum/reagent/acid/hydrochloric = 10) complexity = 15 /datum/research_design/portable_drive_super @@ -23,5 +21,5 @@ build_type = IMPRINTER required_materials = list("osmium-carbide plasteel" = 1, "phglass" = 1, "plastic" = 5) required_objs = list(/obj/item/crystal) - required_reagents = list(/datum/reagent/nitric_acid = 20) + required_reagents = list(/datum/reagent/nitric_acid = 10) complexity = 25 diff --git a/code/modules/halo/research/designs/computers/drive_tablet.dm b/code/modules/halo/research/designs/computers/drive_tablet.dm index 247ef7c56304a..c2a4251abbe62 100644 --- a/code/modules/halo/research/designs/computers/drive_tablet.dm +++ b/code/modules/halo/research/designs/computers/drive_tablet.dm @@ -3,16 +3,15 @@ name = "micro hard drive" product_type = /obj/item/weapon/computer_hardware/hard_drive/micro build_type = IMPRINTER - required_materials = list("plasteel" = 1, "rglass" = 1, "plastic" = 10) - required_objs = list(/obj/item/crystal) - required_reagents = list(/datum/reagent/acid/hydrochloric = 20) + required_materials = list("plasteel" = 1, "rglass" = 1, "plastic" = 5) + required_reagents = list(/datum/reagent/acid/hydrochloric = 10) complexity = 15 /datum/research_design/drive_small name = "small hard drive" product_type = /obj/item/weapon/computer_hardware/hard_drive/small build_type = IMPRINTER - required_materials = list("osmium-carbide plasteel" = 1, "phglass" = 1, "plastic" = 10) + required_materials = list("osmium-carbide plasteel" = 1, "phglass" = 1, "plastic" = 5) required_objs = list(/obj/item/crystal) - required_reagents = list(/datum/reagent/nitric_acid = 20) + required_reagents = list(/datum/reagent/nitric_acid = 10) complexity = 25 diff --git a/code/modules/halo/research/designs/computers/processor.dm b/code/modules/halo/research/designs/computers/processor.dm index 2b731d0491f6e..03e34f530097e 100644 --- a/code/modules/halo/research/designs/computers/processor.dm +++ b/code/modules/halo/research/designs/computers/processor.dm @@ -4,14 +4,14 @@ product_type = /obj/item/weapon/computer_hardware/processor_unit build_type = IMPRINTER required_materials = list("steel" = 1, "glass" = 1) - required_reagents = list(/datum/reagent/acid = 20) + required_reagents = list(/datum/reagent/acid = 10) complexity = 5 /datum/research_design/processor_quantum name = "quantum processor" product_type = /obj/item/weapon/computer_hardware/processor_unit/quantum build_type = IMPRINTER - required_materials = list("steel" = 1, "glass" = 1) + required_materials = list("steel" = 2, "glass" = 2) required_reagents = list(/datum/reagent/acid = 20) complexity = 15 @@ -19,7 +19,7 @@ name = "photonic processor" product_type = /obj/item/weapon/computer_hardware/processor_unit/photonic build_type = IMPRINTER - required_materials = list("steel" = 1, "glass" = 1) + required_materials = list("steel" = 5, "glass" = 5) required_reagents = list(/datum/reagent/acid = 20) required_objs = list(/obj/item/crystal/pink) complexity = 25 diff --git a/code/modules/halo/research/designs/computers/processor_tablet.dm b/code/modules/halo/research/designs/computers/processor_tablet.dm index 0bd71e3e64152..6c36b66fac80f 100644 --- a/code/modules/halo/research/designs/computers/processor_tablet.dm +++ b/code/modules/halo/research/designs/computers/processor_tablet.dm @@ -4,22 +4,22 @@ product_type = /obj/item/weapon/computer_hardware/processor_unit/small build_type = IMPRINTER required_materials = list("steel" = 1, "glass" = 1) - required_reagents = list(/datum/reagent/acid = 20) + required_reagents = list(/datum/reagent/acid = 10) complexity = 10 /datum/research_design/processor_quantum_small name = "quantum microprocessor" product_type = /obj/item/weapon/computer_hardware/processor_unit/quantum/small build_type = IMPRINTER - required_materials = list("steel" = 1, "glass" = 1) - required_reagents = list(/datum/reagent/acid = 20) + required_materials = list("steel" = 3, "glass" = 3) + required_reagents = list(/datum/reagent/acid = 10) complexity = 20 /datum/research_design/processor_photonic_small name = "photonic microprocessor" product_type = /obj/item/weapon/computer_hardware/processor_unit/photonic/small build_type = IMPRINTER - required_materials = list("steel" = 1, "glass" = 1) + required_materials = list("steel" = 5, "glass" = 5) required_reagents = list(/datum/reagent/acid = 20) required_objs = list(/obj/item/crystal/pink) complexity = 30 diff --git a/code/modules/halo/research/designs/glasses_huds.dm b/code/modules/halo/research/designs/glasses_huds.dm index de4d5cc5e2f88..b758375fd7ccb 100644 --- a/code/modules/halo/research/designs/glasses_huds.dm +++ b/code/modules/halo/research/designs/glasses_huds.dm @@ -3,8 +3,7 @@ name = "Optical meson scanner" desc = "Using the meson-scanning technology those glasses allow you to see through walls, floor or anything else." build_type = PROTOLATHE - required_materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, "silver" = 10) - required_objs = list(/obj/item/crystal/orange) + required_materials = list("steel" = 10, "glass" = 10, "silver" = 10) product_type = /obj/item/clothing/glasses/meson complexity = 15 @@ -12,8 +11,7 @@ name = "Night vision goggles" desc = "See in low light conditions." build_type = PROTOLATHE - required_materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, "silver" = 10) - required_objs = list(/obj/item/crystal/orange) + required_materials = list("steel" = 10, "glass" = 10, "silver" = 10) product_type = /obj/item/clothing/glasses/night complexity = 15 @@ -21,7 +19,7 @@ name = "Optical meson scanner" desc = "Display heat signatures of living organisms through walls." build_type = PROTOLATHE - required_materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, "silver" = 10) + required_materials = list("steel" = 15, "glass" = 10, "gold" = 10) required_objs = list(/obj/item/crystal/orange) product_type = /obj/item/clothing/glasses/thermal complexity = 15 @@ -30,7 +28,7 @@ name = "Optical material scanner" desc = "Observe small items around you through walls." build_type = PROTOLATHE - required_materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, "silver" = 10) + required_materials = list("steel" = 15, "glass" = 15, "gold" = 20) required_objs = list(/obj/item/crystal/orange) product_type = /obj/item/clothing/glasses/material complexity = 15 diff --git a/code/modules/halo/research/designs/grenade.dm b/code/modules/halo/research/designs/grenade.dm index 1f768d6ae4627..2c3f32ddc9371 100644 --- a/code/modules/halo/research/designs/grenade.dm +++ b/code/modules/halo/research/designs/grenade.dm @@ -4,7 +4,7 @@ product_type = /obj/item/weapon/grenade/empgrenade build_type = PROTOLATHE required_materials = list("steel" = 10) - required_reagents = list(/datum/reagent/uranium = 20, /datum/reagent/silver = 20) + required_reagents = list(/datum/reagent/uranium = 10, /datum/reagent/silver = 10) complexity = 8 /datum/research_design/anti_photon_grenade @@ -12,13 +12,13 @@ product_type = /obj/item/weapon/grenade/anti_photon build_type = PROTOLATHE required_materials = list("steel" = 10) - required_reagents = list(/datum/reagent/mercury = 20, /datum/reagent/phosphorus = 20) + required_reagents = list(/datum/reagent/mercury = 5, /datum/reagent/phosphorus = 5) complexity = 8 /datum/research_design/high_yield_frag name = "High Yield Fragmentation Grenade" product_type = /obj/item/weapon/grenade/frag/high_yield build_type = PROTOLATHE - required_materials = list("plasteel" = 20) - required_reagents = list(/datum/reagent/copper = 20) + required_materials = list("plasteel" = 5) + required_reagents = list(/datum/reagent/phosphorus = 10) complexity = 5 diff --git a/code/modules/halo/research/designs/implants.dm b/code/modules/halo/research/designs/implants.dm index 72fcd2b46c47b..e11f64fc58e80 100644 --- a/code/modules/halo/research/designs/implants.dm +++ b/code/modules/halo/research/designs/implants.dm @@ -7,7 +7,7 @@ name = "Implanter device" desc = "A tool for inserting different kinds of implants into a person." product_type = /obj/item/weapon/implanter - required_materials = list("plasteel" = 5, "steel" = 10, "glass" = 5) + required_materials = list("steel" = 10, "glass" = 5) build_type = PROTOLATHE complexity = 4 @@ -18,8 +18,7 @@ /datum/research_design/implant_chem name = "Chemical implant" product_type = /obj/item/weapon/implant/chem - required_materials = list("osmium-carbide plasteel" = 1, "glass" = 5, "plastic" = 5, "gold" = 1) - required_objs = list(/obj/item/weapon/reagent_containers/syringe = "empty syringe") + required_materials = list("plasteel" = 1, "glass" = 5, "plastic" = 5, "gold" = 1) build_type = PROTOLATHE complexity = 15 @@ -35,7 +34,6 @@ product_type = /obj/item/weapon/implant/adrenalin required_materials = list("osmium-carbide plasteel" = 1, "glass" = 5, "plastic" = 5, "gold" = 1) required_reagents = list(/datum/reagent/adrenaline = 10) - required_objs = list(/obj/item/weapon/reagent_containers/syringe = "empty syringe") build_type = PROTOLATHE complexity = 15 @@ -43,8 +41,7 @@ name = "Explosive implant" product_type = /obj/item/weapon/implant/explosive required_materials = list("osmium-carbide plasteel" = 1, "glass" = 5, "plastic" = 5, "gold" = 1) - required_reagents = list(/datum/reagent/nitroglycerin = 10, /datum/reagent/toxin/plasticide = 10) - required_objs = list(/obj/item/device/assembly/igniter) + required_reagents = list(/datum/reagent/nitroglycerin = 5, /datum/reagent/toxin/plasticide = 5) build_type = PROTOLATHE complexity = 15 @@ -55,8 +52,7 @@ /datum/research_design/implant_sangheili name = "Sangheili language implant" product_type = /obj/item/weapon/implantcase/language_sangheili - required_materials = list("osmium-carbide plasteel" = 1, "glass" = 5, "plastic" = 5, "gold" = 1) - required_objs = list(/obj/item/dumb_ai_chip = "dumb AI chip") + required_materials = list("plasteel" = 1, "glass" = 5, "plastic" = 5, "gold" = 1) build_type = PROTOLATHE complexity = 20 @@ -87,8 +83,7 @@ name = "English language implant" name = "Allows the recipient to understand English, but not speak it." product_type = /obj/item/weapon/implantcase/language_english - required_materials = list("osmium-carbide plasteel" = 1, "glass" = 5, "plastic" = 5, "gold" = 1) - required_objs = list(/obj/item/dumb_ai_chip = "dumb AI chip") + required_materials = list("plasteel" = 1, "glass" = 5, "plastic" = 5, "gold" = 1) build_type = PROTOLATHE complexity = 20 diff --git a/code/modules/halo/research/designs/stock_parts.dm b/code/modules/halo/research/designs/stock_parts.dm index 419c055deefa7..fee224103af00 100644 --- a/code/modules/halo/research/designs/stock_parts.dm +++ b/code/modules/halo/research/designs/stock_parts.dm @@ -6,22 +6,20 @@ /datum/research_design/basic_capacitor name = "basic capacitor" build_type = PROTOLATHE - required_materials = list("steel" = 40, "glass" = 10) - required_reagents = list(/datum/reagent/lithium = 10) + required_materials = list("steel" = 5) product_type = /obj/item/weapon/stock_parts/capacitor /datum/research_design/adv_capacitor name = "advanced capacitor" build_type = PROTOLATHE - required_materials = list("steel" = 40, "plasteel" = 10, "glass" = 5, "phglass" = 5) - required_reagents = list(/datum/reagent/lithium = 10, /datum/reagent/toxin/phoron = 10) + required_materials = list("steel" = 5, "glass" = 5) product_type = /obj/item/weapon/stock_parts/capacitor/adv /datum/research_design/super_capacitor name = "super capacitor" build_type = PROTOLATHE - required_materials = list("steel" = 40, "plasteel" = 10, "mhydrogen" = 10, "phglass" = 10, "kemocite" = 5) - required_reagents = list(/datum/reagent/lithium = 10, /datum/reagent/toxin/phoron = 10) + required_materials = list("steel" = 10, "glass" = 5) + required_reagents = list(/datum/reagent/lithium = 10) product_type = /obj/item/weapon/stock_parts/capacitor/super @@ -31,19 +29,19 @@ /datum/research_design/micro_mani name = "micro manipulator" build_type = PROTOLATHE - required_materials = list("steel" = 30) + required_materials = list("steel" = 5) product_type = /obj/item/weapon/stock_parts/manipulator /datum/research_design/nano_mani name = "nano manipulator" build_type = PROTOLATHE - required_materials = list("steel" = 20, "plasteel" = 10, "diamond" = 1) + required_materials = list("steel" = 5, "plasteel" = 5) product_type = /obj/item/weapon/stock_parts/manipulator/nano /datum/research_design/pico_mani name = "pico manipulator" build_type = PROTOLATHE - required_materials = list("steel" = 10, "plasteel" = 10, "diamond" = 1, "platinum" = 10) + required_materials = list("steel" = 10, "diamond" = 5) product_type = /obj/item/weapon/stock_parts/manipulator/pico @@ -53,21 +51,19 @@ /datum/research_design/basic_matter_bin name = "basic matter bin" build_type = PROTOLATHE - required_materials = list("steel" = 40) - required_reagents = list(/datum/reagent/mercury = 10) + required_materials = list("steel" = 5) product_type = /obj/item/weapon/stock_parts/matter_bin /datum/research_design/adv_matter_bin name = "advanced matter bin" build_type = PROTOLATHE - required_materials = list("plasteel" = 40, "mhydrogen" = 10) - required_reagents = list(/datum/reagent/mercury = 10) + required_materials = list("plasteel" = 5, "steel" = 5) product_type = /obj/item/weapon/stock_parts/matter_bin/adv /datum/research_design/super_matter_bin name = "super matter bin" build_type = PROTOLATHE - required_materials = list("osmium-carbide plasteel" = 30, "mhydrogen" = 10, "duridium" = 10) + required_materials = list("plasteel" = 5, "steel" = 10) required_reagents = list(/datum/reagent/mercury = 10) product_type = /obj/item/weapon/stock_parts/matter_bin/super @@ -78,23 +74,20 @@ /datum/research_design/basic_micro_laser name = "basic micro laser" build_type = PROTOLATHE - required_materials = list("steel" = 10, "phglass" = 10) - required_reagents = list(/datum/reagent/silicate = 10) - required_objs = list(/obj/item/crystal/pink) + required_materials = list("steel" = 5, "glass" = 5) product_type = /obj/item/weapon/stock_parts/micro_laser /datum/research_design/high_micro_laser name = "high micro laser" build_type = PROTOLATHE - required_materials = list("plasteel" = 10, "phglass" = 20) + required_materials = list("steel" = 5, "glass" = 5) required_reagents = list(/datum/reagent/silicate = 10) - required_objs = list(/obj/item/crystal/pink) product_type = /obj/item/weapon/stock_parts/micro_laser/high /datum/research_design/ultra_micro_laser name = "ultra micro laser" build_type = PROTOLATHE - required_materials = list("osmium-carbide plasteel" = 10, "phglass" = 20, "duridium" = 10) + required_materials = list("steel" = 10, "glass" = 5) required_reagents = list(/datum/reagent/silicate = 10) required_objs = list(/obj/item/crystal/pink) product_type = /obj/item/weapon/stock_parts/micro_laser/ultra @@ -106,23 +99,20 @@ /datum/research_design/basic_sensor name = "basic sensor" build_type = PROTOLATHE - required_materials = list("steel" = 50, "glass" = 10) - required_reagents = list(/datum/reagent/radium = 10) - required_objs = list(/obj/item/crystal/orange) + required_materials = list("steel" = 5, "glass" = 5) product_type = /obj/item/weapon/stock_parts/scanning_module /datum/research_design/adv_sensor name = "advanced sensor" build_type = PROTOLATHE - required_materials = list("steel" = 40, "plasteel" = 10, "glass" = 5, "rglass" = 5) + required_materials = list("steel" = 5, "glass" = 5) required_reagents = list(/datum/reagent/radium = 10) - required_objs = list(/obj/item/crystal/orange) product_type = /obj/item/weapon/stock_parts/scanning_module/adv /datum/research_design/phasic_sensor name = "phasic sensor" build_type = PROTOLATHE - required_materials = list("steel" = 30, "osmium-carbide plasteel" = 10, "rglass" = 5, "phglass" = 5) + required_materials = list("steel" = 10, "glass" = 5) required_reagents = list(/datum/reagent/radium = 10) required_objs = list(/obj/item/crystal/orange) product_type = /obj/item/weapon/stock_parts/scanning_module/phasic diff --git a/code/modules/halo/research/designs/weapons.dm b/code/modules/halo/research/designs/weapons.dm index 0040451a31db3..b76c96ac2d18d 100644 --- a/code/modules/halo/research/designs/weapons.dm +++ b/code/modules/halo/research/designs/weapons.dm @@ -4,9 +4,9 @@ product_type = /obj/item/weapon/gun/energy/spartanlaser build_type = PROTOLATHE required_materials = list("osmium-carbide plasteel" = 60) - required_reagents = list(/datum/reagent/mercury = 60, /datum/reagent/radium = 60) + required_reagents = list(/datum/reagent/mercury = 30, /datum/reagent/radium = 30) required_objs = list(/obj/item/crystal/pink) - complexity = 100 + complexity = 60 /datum/research_design/railgun name = "Asymmetric Recoilless Carbine-920" @@ -14,4 +14,4 @@ build_type = PROTOLATHE required_materials = list("osmium-carbide plasteel" = 40) required_reagents = list(/datum/reagent/mercury = 40, /datum/reagent/radium = 40) - complexity = 75 + complexity = 60 diff --git a/code/modules/halo/research/designs/weapons_plasma.dm b/code/modules/halo/research/designs/weapons_plasma.dm index 3dcb08033a1d5..244da91c7577e 100644 --- a/code/modules/halo/research/designs/weapons_plasma.dm +++ b/code/modules/halo/research/designs/weapons_plasma.dm @@ -3,30 +3,30 @@ name = "MA5P Infantry Combat Weapons System/Plasma Assault Rifle" product_type = /obj/item/weapon/gun/energy/unsc_plasma build_type = PROTOLATHE - required_materials = list("osmium-carbide plasteel" = 30, "nanolaminate" = 10) + required_materials = list("osmium-carbide plasteel" = 20, "nanolaminate" = 5) required_reagents = list(/datum/reagent/silicon = 30, /datum/reagent/aluminum = 30) - complexity = 75 + complexity = 60 /datum/research_design/plasma_rifle_mag name = "MA5P Light Plasma Magazine" product_type = /obj/item/unsc_plasma_cell/light_rounds build_type = PROTOLATHE - required_materials = list("osmium-carbide plasteel" = 10, "nanolaminate" = 5) - required_reagents = list(/datum/reagent/silicon = 10, /datum/reagent/tungsten = 10) - complexity = 50 + required_materials = list("osmium-carbide plasteel" = 5, "nanolaminate" = 1) + required_reagents = list(/datum/reagent/tungsten = 10) + complexity = 15 /datum/research_design/plasma_marksman name = "M414 Designated Marksman Rifle (plasma variant)" product_type = /obj/item/weapon/gun/energy/unsc_plasma/marksman build_type = PROTOLATHE - required_materials = list("osmium-carbide plasteel" = 30, "nanolaminate" = 10) + required_materials = list("osmium-carbide plasteel" = 20, "nanolaminate" = 5) required_reagents = list(/datum/reagent/silicon = 30, /datum/reagent/aluminum = 30) - complexity = 75 + complexity = 60 /datum/research_design/plasma_marksman_mag name = "M414 DMR Heavy Plasma Magazine" product_type = /obj/item/unsc_plasma_cell/heavy_rounds build_type = PROTOLATHE - required_materials = list("osmium-carbide plasteel" = 10, "nanolaminate" = 5) - required_reagents = list(/datum/reagent/silicon = 10, /datum/reagent/tungsten = 10) - complexity = 50 + required_materials = list("osmium-carbide plasteel" = 5, "nanolaminate" = 1) + required_reagents = list(/datum/reagent/tungsten = 10) + complexity = 15 diff --git a/code/modules/halo/research/techprint/types/ablative.dm b/code/modules/halo/research/techprint/types/ablative.dm index 0c76208195026..79449964e38cb 100644 --- a/code/modules/halo/research/techprint/types/ablative.dm +++ b/code/modules/halo/research/techprint/types/ablative.dm @@ -4,7 +4,7 @@ desc = "A reflective plastalloy that better disperses energy." required_materials = list("glass" = 10, "plastic" = 10, "steel" = 10, "plasteel" = 10) required_reagents = list(/datum/reagent/lithium = 50) - ticks_max = 75 + ticks_max = 60 tech_req_all = list(/datum/techprint/energy_two) /datum/techprint/human_shield_ablative @@ -13,7 +13,7 @@ design_unlocks = list(/datum/research_design/shield_ablative) required_reagents = list(/datum/reagent/tungsten = 20) required_materials = list("glass" = 20, "plastic" = 20, "steel" = 20) - ticks_max = 225 + ticks_max = 150 tech_req_all = list(/datum/techprint/ablative) /datum/techprint/ablative_patch @@ -23,4 +23,4 @@ required_materials = list("rglass" = 10) required_reagents = list(/datum/reagent/lithium = 10) tech_req_all = list(/datum/techprint/ablative, /datum/techprint/compression_two) - ticks_max = 250 + ticks_max = 180 diff --git a/code/modules/halo/research/techprint/types/ai.dm b/code/modules/halo/research/techprint/types/ai.dm index eb9f746318b9b..a0e57fbbf788b 100644 --- a/code/modules/halo/research/techprint/types/ai.dm +++ b/code/modules/halo/research/techprint/types/ai.dm @@ -5,8 +5,8 @@ design_unlocks = list(/datum/research_design/dumb_ai) tech_req_all = list(/datum/techprint/processing, /datum/techprint/data) required_materials = list("plasteel" = 10, "gold" = 5) - required_reagents = list(/datum/reagent/acid = 15) - ticks_max = 180 + required_reagents = list(/datum/reagent/acid/hydrochloric = 10) + ticks_max = 60 /datum/techprint/personal_ai name = "Companion AI" @@ -14,17 +14,17 @@ design_unlocks = list(/datum/research_design/paicard) tech_req_all = list(/datum/techprint/processing, /datum/techprint/data) required_materials = list("plasteel" = 10, "gold" = 5) - required_reagents = list(/datum/reagent/acid = 15) - ticks_max = 200 + required_reagents = list(/datum/reagent/acid/hydrochloric = 10) + ticks_max = 60 /datum/techprint/intelicard name = "AI Intelicard" desc = "Highly advanced device capable of storing smart AI." design_unlocks = list(/datum/research_design/intelicard) tech_req_all = list(/datum/techprint/processing_two, /datum/techprint/data_two) - required_materials = list("plasteel" = 20, "gold" = 10, "diamond" = 1) - required_reagents = list(/datum/reagent/acid/hydrochloric = 15) - ticks_max = 220 + required_materials = list("plasteel" = 10, "gold" = 5) + required_reagents = list(/datum/reagent/acid/hydrochloric = 10) + ticks_max = 60 /* /datum/techprint/ai_core name = "AI Core" diff --git a/code/modules/halo/research/techprint/types/armour_upgrades.dm b/code/modules/halo/research/techprint/types/armour_upgrades.dm index ad7a2f07cbfe8..508e8e8acf823 100644 --- a/code/modules/halo/research/techprint/types/armour_upgrades.dm +++ b/code/modules/halo/research/techprint/types/armour_upgrades.dm @@ -5,6 +5,7 @@ design_unlocks = list(/datum/research_design/armour_fibre) required_materials = list("plasteel" = 10) tech_req_all = list(/datum/techprint/compression) + ticks_max = 60 /datum/techprint/diamond_patch name = "Diamond Weave Patch" @@ -12,6 +13,7 @@ design_unlocks = list(/datum/research_design/armour_diamond) required_materials = list("diamond" = 1) tech_req_all = list(/datum/techprint/compression_two) + ticks_max = 60 /datum/techprint/nanolam_patch name = "Armour Nanolaminate Patch" @@ -19,4 +21,4 @@ design_unlocks = list(/datum/research_design/armour_nanolaminate) required_materials = list("nanolaminate" = 5) tech_req_all = list(/datum/techprint/nanolaminate, /datum/techprint/compression_three) - ticks_max = 250 + ticks_max = 60 diff --git a/code/modules/halo/research/techprint/types/computer/computer_processing.dm b/code/modules/halo/research/techprint/types/computer/computer_processing.dm index 8b9e6558bbe40..5f92d920948f6 100644 --- a/code/modules/halo/research/techprint/types/computer/computer_processing.dm +++ b/code/modules/halo/research/techprint/types/computer/computer_processing.dm @@ -4,7 +4,7 @@ desc = "Algorithms for sorting, analysing and processing vast amounts of data." required_materials = list("gold" = 1) required_reagents = list(/datum/reagent/silicate = 10, /datum/reagent/copper = 5, /datum/reagent/acid = 5) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(/datum/research_design/processor) /datum/techprint/processing_two @@ -13,7 +13,7 @@ tech_req_all = list(/datum/techprint/processing) required_materials = list("gold" = 3) required_reagents = list(/datum/reagent/silicate = 20, /datum/reagent/copper = 10, /datum/reagent/acid = 10) - ticks_max = 120 + ticks_max = 60 design_unlocks = list(/datum/research_design/processor_quantum) /datum/techprint/processing_three @@ -23,5 +23,5 @@ required_materials = list("gold" = 5, "osmium" = 5) required_reagents = list(/datum/reagent/silicate = 30, /datum/reagent/copper = 15, /datum/reagent/acid = 10) required_objs = list(/obj/item/crystal/pink) - ticks_max = 300 + ticks_max = 150 design_unlocks = list(/datum/research_design/processor_photonic) diff --git a/code/modules/halo/research/techprint/types/computer/data_storage.dm b/code/modules/halo/research/techprint/types/computer/data_storage.dm index 0042c91477428..8f881908fbfd1 100644 --- a/code/modules/halo/research/techprint/types/computer/data_storage.dm +++ b/code/modules/halo/research/techprint/types/computer/data_storage.dm @@ -4,26 +4,25 @@ desc = "Improved compression algorithms and storage mediums." required_materials = list("gold" = 10) required_reagents = list(/datum/reagent/silicate = 10, /datum/reagent/copper = 5, /datum/reagent/acid = 5) - required_objs = list(/obj/item/crystal) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(/datum/research_design/drive) /datum/techprint/data_two name = "Data Storage II" desc = "Improved compression algorithms and storage mediums." tech_req_all = list(/datum/techprint/data) - required_materials = list("gold" = 20) + required_materials = list("gold" = 15) required_reagents = list(/datum/reagent/silicate = 20, /datum/reagent/copper = 10, /datum/reagent/acid = 10) required_objs = list(/obj/item/crystal) - ticks_max = 120 + ticks_max = 60 design_unlocks = list(/datum/research_design/drive_advanced, /datum/research_design/portable_drive_advanced) /datum/techprint/data_three name = "Data Storage III" desc = "Improved compression algorithms and storage mediums." tech_req_all = list(/datum/techprint/data_two) - required_materials = list("gold" = 30, "osmium" = 5) + required_materials = list("gold" = 20, "osmium" = 5) required_reagents = list(/datum/reagent/silicate = 30, /datum/reagent/copper = 15, /datum/reagent/acid = 10) required_objs = list(/obj/item/crystal) - ticks_max = 300 + ticks_max = 150 design_unlocks = list(/datum/research_design/drive_super, /datum/research_design/portable_drive_super) diff --git a/code/modules/halo/research/techprint/types/computer_hardware.dm b/code/modules/halo/research/techprint/types/computer_hardware.dm index 1c189c9e758d1..cc56d3e2c85a0 100644 --- a/code/modules/halo/research/techprint/types/computer_hardware.dm +++ b/code/modules/halo/research/techprint/types/computer_hardware.dm @@ -10,7 +10,7 @@ desc = "Central component of a tablet computer." required_materials = list("gold" = 5) required_reagents = list(/datum/reagent/silicate = 5, /datum/reagent/copper = 5, /datum/reagent/acid = 5) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(/datum/research_design/processor_small) tech_req_all = list(/datum/techprint/miniaturisation, /datum/techprint/processing) @@ -28,7 +28,7 @@ desc = "Central component of a tablet computer." required_materials = list("gold" = 5, "platinum" = 5, "osmium" = 5) required_reagents = list(/datum/reagent/silicate = 15, /datum/reagent/copper = 5, /datum/reagent/acid/polyacid = 5) - ticks_max = 60 + ticks_max = 90 design_unlocks = list(/datum/research_design/processor_photonic_small) tech_req_all = list(/datum/techprint/miniaturisation_three, /datum/techprint/processing_three) @@ -41,7 +41,7 @@ desc = "Efficient storage for a tablet computer." required_materials = list("plasteel" = 1, "rglass" = 1, "plastic" = 10) required_reagents = list(/datum/reagent/acid/hydrochloric = 20) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(/datum/research_design/drive_micro) tech_req_all = list(/datum/techprint/miniaturisation, /datum/techprint/data) @@ -63,7 +63,7 @@ desc = "Small crystal with imprinted photonic circuits that can be used to store data. Its capacity is 16 GQ." required_materials = list("steel" = 1, "glass" = 1, "plastic" = 5) required_reagents = list(/datum/reagent/acid = 20) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(/datum/research_design/portable_drive) tech_req_all = list(/datum/techprint/miniaturisation, /datum/techprint/data) @@ -72,7 +72,7 @@ desc = "Small crystal with imprinted high-density photonic circuits that can be used to store data. Its capacity is 64 GQ." required_materials = list("plasteel" = 1, "rglass" = 1, "plastic" = 5) required_reagents = list(/datum/reagent/acid/hydrochloric = 20) - ticks_max = 120 + ticks_max = 60 design_unlocks = list(/datum/research_design/portable_drive_advanced) tech_req_all = list(/datum/techprint/miniaturisation_two, /datum/techprint/data_two) @@ -81,7 +81,7 @@ desc = "Small crystal with imprinted ultra-density photonic circuits that can be used to store data. Its capacity is 256 GQ." required_materials = list("osmium-carbide plasteel" = 1, "phglass" = 1, "plastic" = 5) required_reagents = list(/datum/reagent/nitric_acid = 20) - ticks_max = 200 + ticks_max = 90 design_unlocks = list(/datum/research_design/portable_drive_super) tech_req_all = list(/datum/techprint/miniaturisation_three, /datum/techprint/data_three) @@ -94,6 +94,6 @@ desc = "Possible thanks to breakthroughs in plasma engineering." required_materials = list("duridium" = 1, "rphglass" = 1, "plastic" = 10) required_reagents = list(/datum/reagent/acid/polyacid = 20) - ticks_max = 200 + ticks_max = 120 design_unlocks = list(/datum/research_design/drive_cluster) tech_req_all = list(/datum/techprint/data_three, /datum/techprint/plasma_storage) diff --git a/code/modules/halo/research/techprint/types/core/biology.dm b/code/modules/halo/research/techprint/types/core/biology.dm index 70075e78b2921..c5883cfac790f 100644 --- a/code/modules/halo/research/techprint/types/core/biology.dm +++ b/code/modules/halo/research/techprint/types/core/biology.dm @@ -5,7 +5,7 @@ required_materials = list("uranium" = 1) required_objs = list(/obj/item/weapon/ore/corundum) required_reagents = list(/datum/reagent/phosphorus = 5, /datum/reagent/ethanol = 5, /datum/reagent/potassium = 5) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(/datum/research_design/implant_adrenaline) tech_req_one = list(\ /datum/techprint/autopsy/human,\ @@ -21,7 +21,7 @@ required_materials = list("uranium" = 3) required_objs = list(/obj/item/weapon/ore/corundum) required_reagents = list(/datum/reagent/phosphorus = 10, /datum/reagent/ethanol = 10, /datum/reagent/potassium = 10) - ticks_max = 120 + ticks_max = 60 design_unlocks = list(/datum/research_design/implant_chem) tech_req_one = list(\ /datum/techprint/autopsy/sangheili,\ @@ -34,7 +34,7 @@ required_materials = list("uranium" = 5) required_objs = list(/obj/item/weapon/ore/corundum) required_reagents = list(/datum/reagent/phosphorus = 20, /datum/reagent/ethanol = 20, /datum/reagent/potassium = 20) - ticks_max = 300 + ticks_max = 150 tech_req_all = list(\ /datum/techprint/autopsy/sangheili,\ /datum/techprint/autopsy/jiralhanae) diff --git a/code/modules/halo/research/techprint/types/core/energy_storage.dm b/code/modules/halo/research/techprint/types/core/energy_storage.dm index 476b4f5e46048..8e005c67e0257 100644 --- a/code/modules/halo/research/techprint/types/core/energy_storage.dm +++ b/code/modules/halo/research/techprint/types/core/energy_storage.dm @@ -4,7 +4,7 @@ desc = "Store and discharge larger amounts of energy." required_materials = list("glass" = 10) required_reagents = list(/datum/reagent/toxin/phoron = 10, /datum/reagent/radium = 10) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(/datum/research_design/basic_capacitor) /datum/techprint/energy_two @@ -13,7 +13,7 @@ tech_req_all = list(/datum/techprint/energy) required_materials = list("glass" = 20, "phoron" = 5) required_reagents = list(/datum/reagent/toxin/phoron = 20, /datum/reagent/radium = 20) - ticks_max = 120 + ticks_max = 60 design_unlocks = list(/datum/research_design/adv_capacitor) /datum/techprint/energy_three @@ -22,5 +22,5 @@ tech_req_all = list(/datum/techprint/energy_two) required_materials = list("glass" = 30, "phoron" = 10, "kemocite" = 5) required_reagents = list(/datum/reagent/toxin/phoron = 30, /datum/reagent/radium = 30) - ticks_max = 300 + ticks_max = 150 design_unlocks = list(/datum/research_design/super_capacitor) diff --git a/code/modules/halo/research/techprint/types/core/lasers.dm b/code/modules/halo/research/techprint/types/core/lasers.dm index bf8fe78837336..eae0097057042 100644 --- a/code/modules/halo/research/techprint/types/core/lasers.dm +++ b/code/modules/halo/research/techprint/types/core/lasers.dm @@ -4,8 +4,7 @@ desc = "The technology to channel high power laser beams." required_materials = list("glass" = 20) required_reagents = list(/datum/reagent/phosphorus = 10, /datum/reagent/silicate = 10) - required_objs = list(/obj/item/crystal/pink) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(/datum/research_design/basic_micro_laser) /datum/techprint/lasers_two @@ -15,7 +14,7 @@ required_materials = list("glass" = 10, "phglass" = 10, "diamond" = 1) required_reagents = list(/datum/reagent/phosphorus = 20, /datum/reagent/silicate = 20) required_objs = list(/obj/item/crystal/pink) - ticks_max = 120 + ticks_max = 60 design_unlocks = list(/datum/research_design/high_micro_laser) /datum/techprint/lasers_three @@ -25,5 +24,5 @@ required_materials = list("phglass" = 20, "diamond" = 3) required_reagents = list(/datum/reagent/phosphorus = 30, /datum/reagent/silicate = 30) required_objs = list(/obj/item/crystal/pink) - ticks_max = 300 + ticks_max = 150 design_unlocks = list(/datum/research_design/ultra_micro_laser) diff --git a/code/modules/halo/research/techprint/types/core/matter_compression.dm b/code/modules/halo/research/techprint/types/core/matter_compression.dm index 2e9fcc4f1b67e..fa37bdb0ed8cf 100644 --- a/code/modules/halo/research/techprint/types/core/matter_compression.dm +++ b/code/modules/halo/research/techprint/types/core/matter_compression.dm @@ -4,7 +4,7 @@ desc = "Storing matter more compactly and efficiently." required_materials = list("plasteel" = 10) required_reagents = list(/datum/reagent/carbon = 10, /datum/reagent/acid/hydrochloric = 10) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(\ /datum/research_design/basic_matter_bin,\ /datum/research_design/adv_drill,\ @@ -16,7 +16,7 @@ tech_req_all = list(/datum/techprint/compression) required_materials = list("plasteel" = 20) required_reagents = list(/datum/reagent/carbon = 20, /datum/reagent/acid/hydrochloric = 20) - ticks_max = 120 + ticks_max = 60 design_unlocks = list(\ /datum/research_design/adv_matter_bin,\ /datum/research_design/diamonddrill,\ @@ -26,9 +26,9 @@ name = "Matter Compression III" desc = "Storing matter more compactly and efficiently." tech_req_all = list(/datum/techprint/compression_two) - required_materials = list("plasteel" = 30, "osmium-carbide plasteel" = 5) + required_materials = list("plasteel" = 30) required_reagents = list(/datum/reagent/carbon = 30, /datum/reagent/acid/hydrochloric = 30) - ticks_max = 300 + ticks_max = 150 design_unlocks = list(\ /datum/research_design/super_matter_bin,\ /datum/research_design/jackhammer,\ diff --git a/code/modules/halo/research/techprint/types/core/miniaturisation.dm b/code/modules/halo/research/techprint/types/core/miniaturisation.dm index 35169332f60ec..1549830087c85 100644 --- a/code/modules/halo/research/techprint/types/core/miniaturisation.dm +++ b/code/modules/halo/research/techprint/types/core/miniaturisation.dm @@ -4,7 +4,7 @@ desc = "Interacting with matter on an increasingly small scale." required_materials = list("steel" = 10) required_reagents = list(/datum/reagent/iron = 10, /datum/reagent/acid/hydrochloric = 10) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(/datum/research_design/micro_mani) /datum/techprint/miniaturisation_two @@ -13,7 +13,7 @@ tech_req_all = list(/datum/techprint/miniaturisation) required_materials = list("steel" = 20) required_reagents = list(/datum/reagent/iron = 20, /datum/reagent/acid/hydrochloric = 20) - ticks_max = 120 + ticks_max = 60 design_unlocks = list(/datum/research_design/nano_mani) /datum/techprint/miniaturisation_three @@ -22,5 +22,5 @@ tech_req_all = list(/datum/techprint/miniaturisation_two) required_materials = list("steel" = 30, "plasteel" = 5) required_reagents = list(/datum/reagent/iron = 30, /datum/reagent/acid/hydrochloric = 30) - ticks_max = 300 + ticks_max = 150 design_unlocks = list(/datum/research_design/pico_mani) diff --git a/code/modules/halo/research/techprint/types/core/sensors.dm b/code/modules/halo/research/techprint/types/core/sensors.dm index 0f2519799853c..17748a295958b 100644 --- a/code/modules/halo/research/techprint/types/core/sensors.dm +++ b/code/modules/halo/research/techprint/types/core/sensors.dm @@ -4,8 +4,7 @@ desc = "Detection of exotic energy and matter." required_materials = list("silver" = 5) required_reagents = list(/datum/reagent/tungsten = 10, /datum/reagent/sodium = 10) - required_objs = list(/obj/item/crystal/orange) - ticks_max = 60 + ticks_max = 30 design_unlocks = list(/datum/research_design/basic_sensor, /datum/research_design/nvg, /datum/research_design/oms) /datum/techprint/sensors_two @@ -15,15 +14,15 @@ required_materials = list("silver" = 10) required_reagents = list(/datum/reagent/tungsten = 20, /datum/reagent/sodium = 20) required_objs = list(/obj/item/crystal/orange) - ticks_max = 120 + ticks_max = 60 design_unlocks = list(/datum/research_design/adv_sensor, /datum/research_design/mesons, /datum/research_design/anti_photon_grenade) /datum/techprint/sensors_three name = "Sensors III" desc = "Detection of exotic energy and matter." tech_req_all = list(/datum/techprint/sensors_two) - required_materials = list("silver" = 15, "platinum" = 5) + required_materials = list("silver" = 10, "platinum" = 5) required_reagents = list(/datum/reagent/tungsten = 30, /datum/reagent/sodium = 30) required_objs = list(/obj/item/crystal/orange) - ticks_max = 300 + ticks_max = 150 design_unlocks = list(/datum/research_design/phasic_sensor, /datum/research_design/thermals) diff --git a/code/modules/halo/research/techprint/types/electromagnetism.dm b/code/modules/halo/research/techprint/types/electromagnetism.dm index df6d45a059bb3..385c891e56b0d 100644 --- a/code/modules/halo/research/techprint/types/electromagnetism.dm +++ b/code/modules/halo/research/techprint/types/electromagnetism.dm @@ -3,6 +3,6 @@ name = "Electro-magnetic Fields" desc = "Manipulate, generate and shape electromagnetic fields." required_reagents = list(/datum/reagent/silver = 20) - ticks_max = 75 + ticks_max = 60 tech_req_all = list(/datum/techprint/energy) design_unlocks = list(/datum/research_design/emp_grenade) diff --git a/code/modules/halo/research/techprint/types/languages.dm b/code/modules/halo/research/techprint/types/languages.dm index 6c72672ac2e2f..5597e85678930 100644 --- a/code/modules/halo/research/techprint/types/languages.dm +++ b/code/modules/halo/research/techprint/types/languages.dm @@ -3,7 +3,7 @@ name = "Sangheili autotranslators" desc = "Enough of the language to understand it, but not speak it." design_unlocks = list(/datum/research_design/implant_sangheili) - ticks_max = 120 + ticks_max = 60 tech_req_all = list(\ /datum/techprint/autopsy/sangheili,\ /datum/techprint/biology_two) @@ -15,4 +15,4 @@ tech_req_all = list(\ /datum/techprint/sangheili_translators,\ /datum/techprint/biology_three) - ticks_max = 120 + ticks_max = 90 diff --git a/code/modules/halo/research/techprint/types/plasma.dm b/code/modules/halo/research/techprint/types/plasma.dm index 4cc0c0bcfc79c..286b32258bc10 100644 --- a/code/modules/halo/research/techprint/types/plasma.dm +++ b/code/modules/halo/research/techprint/types/plasma.dm @@ -2,7 +2,7 @@ /datum/techprint/plasmadet name = "Plasma Detonation" desc = "Controlled explosive release of high pressure superheated plasma." - ticks_max = 55 + ticks_max = 60 required_objs = list(/obj/item/plasma_core = "plasma core") tech_req_one = list(\ /datum/techprint/plasmanade,\ @@ -12,11 +12,11 @@ name = "Plasma Generation" desc = "Generation methods to consistently produce superheated plasma." design_unlocks = list(/datum/research_design/plasma_charger) - required_reagents = list(/datum/reagent/toxin/phoron = 100) + required_reagents = list(/datum/reagent/toxin/phoron = 30) required_objs = list(/obj/item/plasma_core = "plasma core") tech_req_one = list(/datum/techprint/plasmarifle, /datum/techprint/plasmapistol) tech_req_all = list(/datum/techprint/plasmanade) - ticks_max = 100 + ticks_max = 90 /datum/techprint/plasma_storage name = "Plasma Storage" @@ -25,7 +25,7 @@ tech_req_one = list(/datum/techprint/plasmarifle, /datum/techprint/plasmapistol) tech_req_all = list(/datum/techprint/energy_three) required_objs = list(/obj/item/plasma_core = "plasma core") - ticks_max = 100 + ticks_max = 90 /datum/techprint/plasma_channeling name = "Plasma Channelling" @@ -33,4 +33,4 @@ tech_req_one = list(/datum/techprint/plasmarifle, /datum/techprint/plasmapistol) required_objs = list(/obj/item/plasma_core = "plasma core") design_unlocks = list(/datum/research_design/plasmacutter) - ticks_max = 100 + ticks_max = 90 diff --git a/code/modules/halo/research/techprint/types/shields.dm b/code/modules/halo/research/techprint/types/shields.dm index b22623a3bec2c..da9790b56551c 100644 --- a/code/modules/halo/research/techprint/types/shields.dm +++ b/code/modules/halo/research/techprint/types/shields.dm @@ -11,7 +11,7 @@ /datum/techprint/tvoan_gauntlet,\ /datum/techprint/shield_barricade) tech_req_all = list(/datum/techprint/energy_two) - ticks_max = 120 + ticks_max = 90 /* /datum/techprint/bubble_shield name = "Bubble Shield" @@ -30,4 +30,4 @@ tech_req_all = list(\ /datum/techprint/energy_shielding_one,\ /datum/techprint/human_shield_ablative) - ticks_max = 275 + ticks_max = 250 diff --git a/code/modules/halo/research/techprint/types/weapons.dm b/code/modules/halo/research/techprint/types/weapons.dm index 35838330781cd..76a9c7e08a07c 100644 --- a/code/modules/halo/research/techprint/types/weapons.dm +++ b/code/modules/halo/research/techprint/types/weapons.dm @@ -3,8 +3,7 @@ name = "MA5P Plasma ICWS" desc = "The next generation iteration of the Infantry Combat Weapon System firing superheated plasma." design_unlocks = list(/datum/research_design/plasma_rifle, /datum/research_design/plasma_rifle_mag) - required_reagents = list(/datum/reagent/toxin/phoron = 10) - ticks_max = 135 + ticks_max = 90 tech_req_all = list(\ /datum/techprint/plasma_generation,\ /datum/techprint/plasma_storage,\ @@ -14,8 +13,7 @@ name = "M414 Plasma DMR" desc = "The next generation iteration of the Designated Marksman Rifle firing superheated plasma." design_unlocks = list(/datum/research_design/plasma_marksman, /datum/research_design/plasma_marksman_mag) - required_reagents = list(/datum/reagent/toxin/phoron = 10) - ticks_max = 135 + ticks_max = 90 tech_req_all = list(\ /datum/techprint/plasma_generation,\ /datum/techprint/plasma_storage,\ @@ -26,11 +24,11 @@ desc = "Designed to penetrate armour with projectiles transmitted using magnetic accelerator technology." tech_req_all = list(/datum/techprint/lasers_two, /datum/techprint/electromagnetism) design_unlocks = list(/datum/research_design/railgun) - ticks_max = 200 + ticks_max = 180 /datum/techprint/splaser name = "M6 Grindell/Galilean Nonlinear Rifle" desc = "One of the most devastating anti-tank weapons in the UNSC arsenal." tech_req_all = list(/datum/techprint/lasers_three) design_unlocks = list(/datum/research_design/splaser) - ticks_max = 300 + ticks_max = 250 diff --git a/html/changelog.html b/html/changelog.html index 4721475644b18..edd1c04f9092c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,14 @@ -->
+

12 May 2023

+

Aroliacue updated:

+ +

07 May 2023

Antonio72 updated: