From d9a813b3de5d64a58f3ff1d1965721deafcc5484 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 20 Jan 2023 20:38:41 +0100 Subject: [PATCH] [MIRROR] Makes datum stock parts work for Stock parts Experiment purposes 2: Electric Boogaloo [MDB IGNORE] (#18738) * Makes datum stock parts work for Stock parts Experiment purposes 2: Electric Boogaloo (#72708) ## About The Pull Request Fixes #72694 #72559 changed the requirements for pinpoint machine scanning experiments to datums on accident, so to hopefully prevent further mishaps I've commented the var further. ## Why This Speaks Volumes On The State Of Experi-Sci (Or Sybil RnD) ![image](https://user-images.githubusercontent.com/75863639/212465375-256fc9be-ef1f-4619-88cb-fb372b47ddc4.png) ____ ![image](https://user-images.githubusercontent.com/75863639/212465379-dc48f1ab-6790-497b-b353-4bb8090feccb.png) ## Changelog :cl: fix: pinpoint machine scanning experiments work again (again) /:cl: * Makes datum stock parts work for Stock parts Experiment purposes 2: Electric Boogaloo * Makes datum stock parts work for Stock parts Experiment purposes 2: Electric Boogaloo (#72708) ## About The Pull Request Fixes #72694 #72559 changed the requirements for pinpoint machine scanning experiments to datums on accident, so to hopefully prevent further mishaps I've commented the var further. ## Why This Speaks Volumes On The State Of Experi-Sci (Or Sybil RnD) ![image](https://user-images.githubusercontent.com/75863639/212465375-256fc9be-ef1f-4619-88cb-fb372b47ddc4.png) ____ ![image](https://user-images.githubusercontent.com/75863639/212465379-dc48f1ab-6790-497b-b353-4bb8090feccb.png) ## Changelog :cl: fix: pinpoint machine scanning experiments work again (again) /:cl: Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com> Co-authored-by: GoldenAlpharex --- code/modules/experisci/experiment/experiments.dm | 8 ++++---- .../experisci/experiment/types/scanning_machinery.dm | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm index 843314f9ea4..f707d10efda 100644 --- a/code/modules/experisci/experiment/experiments.dm +++ b/code/modules/experisci/experiment/experiments.dm @@ -262,7 +262,7 @@ /obj/machinery/chem_heater = 3, /obj/machinery/power/emitter = 3 ) - required_stock_part = /datum/stock_part/micro_laser/high + required_stock_part = /obj/item/stock_parts/micro_laser/high /datum/experiment/scanning/points/machinery_pinpoint_scan/tier2_capacitors name = "Advanced Capacitors Benchmark" @@ -278,7 +278,7 @@ /obj/machinery/chem_dispenser/drinks = 3, /*actually having only the chem dispenser works for scanning soda/booze dispensers but im not quite sure how would i go about actually pointing that out w/o these two lines*/ /obj/machinery/chem_dispenser/drinks/beer = 3 ) - required_stock_part = /datum/stock_part/capacitor/adv + required_stock_part = /obj/item/stock_parts/capacitor/adv /datum/experiment/scanning/points/machinery_pinpoint_scan/tier2_scanmodules name = "Advanced Scanning Modules Calibration" @@ -291,7 +291,7 @@ /obj/machinery/piratepad/civilian = 2, /obj/machinery/rnd/bepis = 3 ) - required_stock_part = /datum/stock_part/scanning_module/adv + required_stock_part = /obj/item/stock_parts/scanning_module/adv /datum/experiment/scanning/points/machinery_pinpoint_scan/tier3_cells name = "Power Cells Capacity Test" @@ -319,7 +319,7 @@ /obj/machinery/chem_heater = 2, /obj/machinery/chem_mass_spec = 3 ) - required_stock_part = /datum/stock_part/micro_laser/ultra + required_stock_part = /obj/item/stock_parts/micro_laser/ultra /datum/experiment/scanning/random/mecha_damage_scan name = "Exosuit Materials 1: Stress Failure Test" diff --git a/code/modules/experisci/experiment/types/scanning_machinery.dm b/code/modules/experisci/experiment/types/scanning_machinery.dm index 141ac3e41fd..97a75a2b355 100644 --- a/code/modules/experisci/experiment/types/scanning_machinery.dm +++ b/code/modules/experisci/experiment/types/scanning_machinery.dm @@ -33,7 +33,9 @@ name = "Machinery Pinpoint Stock Parts Scanning Experiment" description = "Base experiment for scanning machinery with specific parts" exp_tag = "Scan" - ///Which stock part are we looking for in the machine + ///Which stock part are we looking for in the machine. + ///We use obj instead of datum here, as some stock parts aren't datumised, and in datumised ones + ///we can just look for the physical_object_reference to match up the requirement. var/obj/item/stock_parts/required_stock_part = /obj/item/stock_parts /datum/experiment/scanning/points/machinery_pinpoint_scan/check_progress()