Merge branch 'master' into quitclowningaround

Citadel-Station-13 · Sep 24, 2023 · 858c2fc · 858c2fc
2 parents 6b64005 + ebceb1d
commit 858c2fc
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/code/game/objects/items/stock_parts/part_replacer.dm b/code/game/objects/items/stock_parts/part_replacer.dm
@@ -31,15 +31,7 @@
 	name = "advanced rapid part exchange device"
 	desc = "A special mechanical module made to store, sort, and apply standard machine parts.  This one has a greatly upgraded storage capacity"
 	icon_state = "RPED"
-	w_class = ITEMSIZE_HUGE
-	can_hold = list(/obj/item/stock_parts)
 	storage_slots = 200
-	use_to_pickup = 1
-	allow_quick_gather = 1
-	allow_quick_empty = 1
-	collection_mode = 1
-	display_contents_with_number = 1
-	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space = 400
 	materials = list(
 		MAT_STEEL = 12000,

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -79,6 +79,7 @@
 		/obj/item/flashlight/lantern,
 		/obj/item/shovel,
 		/obj/item/pickaxe,
+		/obj/item/mining_scanner,
 		/obj/item/gps/mining,
 		/obj/item/survivalcapsule,
 		/obj/item/clothing/glasses/material,

diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm
@@ -139,7 +139,7 @@
 
 /obj/item/reagent_containers/food/drinks/cans/ramune/Initialize(mapload)
 	. = ..()
-	reagents.add_reagent("ramune", 20)
+	reagents.add_reagent("ramune", 30)
 
 /obj/item/reagent_containers/food/drinks/cans/starkist
 	name = "\improper Star-kist"

diff --git a/code/modules/research/designs/circuits/circuits.dm b/code/modules/research/designs/circuits/circuits.dm
@@ -472,6 +472,24 @@ CIRCUITS BELOW
 	req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2, TECH_ILLEGAL = 4)
 	build_path = /obj/item/circuitboard/mecha/honker/targeting
 
+/datum/design/circuit/mecha/phazon_main
+	design_name = "'Phazon' central control"
+	id = "phazon_main"
+	req_tech = list(TECH_DATA = 6, TECH_COMBAT = 4, TECH_BLUESPACE = 6, TECH_ARCANE = 2)
+	build_path = /obj/item/circuitboard/mecha/phazon/main
+
+/datum/design/circuit/mecha/phazon_peri
+	design_name = "'Phazon' peripherals control"
+	id = "phazon_peri"
+	req_tech = list(TECH_DATA = 6, TECH_COMBAT = 4, TECH_BLUESPACE = 6, TECH_ARCANE = 2)
+	build_path = /obj/item/circuitboard/mecha/phazon/peripherals
+
+/datum/design/circuit/mecha/phazon_targ
+	design_name = "'Phazon' weapon control and targeting"
+	id = "phazon_targ"
+	req_tech = list(TECH_DATA = 6, TECH_COMBAT = 4, TECH_BLUESPACE = 6, TECH_ARCANE = 2)
+	build_path = /obj/item/circuitboard/mecha/phazon/targeting
+
 /datum/design/circuit/mecha/reticent_main
 	design_name = "'Reticent' central control"
 	id = "reticent_main"

diff --git a/code/modules/research/designs/mechfab_designs.dm b/code/modules/research/designs/mechfab_designs.dm
@@ -947,7 +947,7 @@
 	id = "melectricalhigh"
 	req_tech = list(TECH_ENGINEERING = 5, TECH_POWER = 5, TECH_MATERIAL = 4)
 	materials = list(MAT_STEEL = 3000, MAT_GLASS = 4000, MAT_PLASTIC = 5000, MAT_GOLD = 5000)
-	build_path = /obj/item/mecha_parts/component/electrical
+	build_path = /obj/item/mecha_parts/component/electrical/high_current
 
 /datum/design/science/mecha_component/hull
 	design_name = "Mecha Hull"