Skip to content

Commit

Permalink
bugfix: floral somatoray disassembly technology & safe mode chem mast…
Browse files Browse the repository at this point in the history
…er (#5815)

* fix 1

* fix 2
  • Loading branch information
endipe authored Aug 30, 2024
1 parent ee58233 commit 5189da6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/energy/special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/reagents/chemistry/machinery/chem_master.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5189da6

Please sign in to comment.