Merge branch 'HaloSpaceStation:alpha' into alpha

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"

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"

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"

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")

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

code/modules/halo/research/designs/computers/drive_portable.dm

@@ -4,17 +4,15 @@
 	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
 	name = "advanced data crystal"
 	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

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

code/modules/halo/research/designs/computers/processor.dm

@@ -4,22 +4,22 @@
 	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
 
 /datum/research_design/processor_photonic
 	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

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

code/modules/halo/research/designs/glasses_huds.dm

@@ -3,25 +3,23 @@
 	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
 
 /datum/research_design/nvg
 	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
 
 /datum/research_design/thermals
 	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

code/modules/halo/research/designs/grenade.dm

@@ -4,21 +4,21 @@
 	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
 	name = "Anti-Photon Grenade"
 	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

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,16 +34,14 @@
 	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
 
 /datum/research_design/implant_explosive
 	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