From 356a97cf8345b8c1ea91e77be735a03231340f09 Mon Sep 17 00:00:00 2001 From: TheObserver-sys Date: Fri, 22 Sep 2023 02:48:14 -0400 Subject: [PATCH 1/3] Is it sad I make PRs only when enough shit annoys --- .../objects/items/stock_parts/part_replacer.dm | 10 +--------- .../crates_lockers/closets/secure/cargo.dm | 1 + code/modules/food/food/cans.dm | 2 +- .../research/designs/circuits/circuits.dm | 18 ++++++++++++++++++ .../research/designs/mechfab_designs.dm | 2 +- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/stock_parts/part_replacer.dm b/code/game/objects/items/stock_parts/part_replacer.dm index 79d5e3f6bf17..d16c51021550 100644 --- a/code/game/objects/items/stock_parts/part_replacer.dm +++ b/code/game/objects/items/stock_parts/part_replacer.dm @@ -3,7 +3,7 @@ desc = "A special mechanical module made to store, sort, and apply standard machine parts." icon_state = "RPED" w_class = ITEMSIZE_HUGE - can_hold = list(/obj/item/stock_parts) + can_hold = list(/obj/item/stock_parts,/obj/item/cell/,/obj/item/reagent_containers/glass/beaker) storage_slots = 100 use_to_pickup = 1 allow_quick_gather = 1 @@ -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 index c9b9b6f22150..4a6b6f947302 100644 --- 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 index 037cdfdfb411..38b726b7213c 100644 --- 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 index ce13b233156a..7013d4d82ed3 100644 --- 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 index 02f1144cf037..1004f16256eb 100644 --- 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" From cf46433c6bcb230ab8674652e136b3a191bf67e4 Mon Sep 17 00:00:00 2001 From: TheObserver-sys Date: Fri, 22 Sep 2023 02:50:31 -0400 Subject: [PATCH 2/3] a missed comma --- .../objects/structures/crates_lockers/closets/secure/cargo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 4a6b6f947302..b3abfa415914 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -79,7 +79,7 @@ /obj/item/flashlight/lantern, /obj/item/shovel, /obj/item/pickaxe, - /obj/item/mining_scanner + /obj/item/mining_scanner, /obj/item/gps/mining, /obj/item/survivalcapsule, /obj/item/clothing/glasses/material, From decd908b86fbaafeb9021d2c055577f1f75634b7 Mon Sep 17 00:00:00 2001 From: TheObserver-sys Date: Fri, 22 Sep 2023 05:15:10 -0400 Subject: [PATCH 3/3] Removing the cell/beaker stuff for now. New PR inc --- code/game/objects/items/stock_parts/part_replacer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stock_parts/part_replacer.dm b/code/game/objects/items/stock_parts/part_replacer.dm index d16c51021550..c110c15d84cb 100644 --- a/code/game/objects/items/stock_parts/part_replacer.dm +++ b/code/game/objects/items/stock_parts/part_replacer.dm @@ -3,7 +3,7 @@ desc = "A special mechanical module made to store, sort, and apply standard machine parts." icon_state = "RPED" w_class = ITEMSIZE_HUGE - can_hold = list(/obj/item/stock_parts,/obj/item/cell/,/obj/item/reagent_containers/glass/beaker) + can_hold = list(/obj/item/stock_parts) storage_slots = 100 use_to_pickup = 1 allow_quick_gather = 1