From 5189da62567fbe19fbfc6ae74015a0c48eb3e8c9 Mon Sep 17 00:00:00 2001 From: endipe <170849376+endipe@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:42:53 +0300 Subject: [PATCH] bugfix: floral somatoray disassembly technology & safe mode chem master (#5815) * fix 1 * fix 2 --- code/modules/projectiles/guns/energy/special.dm | 2 +- code/modules/reagents/chemistry/machinery/chem_master.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index e7fe89ab662..e0dd750ad4a 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -62,7 +62,7 @@ item_state = "gun" fire_sound = 'sound/effects/stealthoff.ogg' materials = list(MAT_GOLD = 2000, MAT_BLUESPACE = 1500, MAT_DIAMOND = 800, MAT_URANIUM = 500, MAT_GLASS = 500) - origin_tech = "materials=5;biotech=6;powerstorage=6;enginerring=5" + origin_tech = "materials=5;biotech=6;powerstorage=6;engineering=5" ammo_type = list(/obj/item/ammo_casing/energy/flora/alpha, /obj/item/ammo_casing/energy/flora/beta, /obj/item/ammo_casing/energy/flora/gamma) modifystate = TRUE ammo_x_offset = 1 diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 9885b9e69e9..3348df63932 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -601,8 +601,8 @@ P.name = "[medicine_name][name_suffix]" P.pixel_x = rand(-7, 7) // Random position P.pixel_y = rand(-7, 7) - reagents.trans_to(P, amount_per_item) configure_item(data, reagents, P) + reagents.trans_to(P, amount_per_item) // Load the items into the bottle if there's one loaded if(istype(S) && S.can_be_inserted(P, TRUE)) @@ -644,7 +644,7 @@ chemicals_is_safe = SafetyCheck(R) data["chemicals_is_safe"] = chemicals_is_safe - if(chemicals_is_safe && data["count"] == 1) + if(chemicals_is_safe) P.instant_application = TRUE /datum/chemical_production_mode/bottles