diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index fce21914902..9f0148e8fe1 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -14,7 +14,7 @@ create_reagents(bucketsize) janitorial_supplies |= src -/obj/structure/mobbucket/Destroy() +/obj/structure/mopbucket/Destroy() janitorial_supplies -= src return ..() diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index ee5a0bb2cf9..03bb2cfeb17 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -473,9 +473,9 @@ if(O.unacidable) return if((istype(O, /obj/item) || istype(O, /obj/effect/plant)) && (volume > meltdose)) - var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc) + var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(get_turf(O)) I.desc = "Looks like this was \an [O] some time ago." - for(var/mob/M in viewers(5, O)) + for(var/mob/M in viewers(get_turf(O), 5)) to_chat(M, "\The [O] melts.") qdel(O) remove_self(meltdose) // 10 units of acid will not melt EVERYTHING on the tile diff --git a/code/modules/reagents/dispenser/dispenser2.dm b/code/modules/reagents/dispenser/dispenser2.dm index f887e556782..1ac02bb39be 100644 --- a/code/modules/reagents/dispenser/dispenser2.dm +++ b/code/modules/reagents/dispenser/dispenser2.dm @@ -117,6 +117,8 @@ /obj/machinery/chemical_dispenser/ui_interact(mob/user, ui_key = "main",var/datum/nanoui/ui = null, var/force_open = 1) // this is the data which will be sent to the ui + if(container && !container.reagents) //sanity check in case you destroyed the container... such as if you dispensed acid into an acidable bucket. + container = null var/data[0] data["amount"] = amount data["isBeakerLoaded"] = container ? 1 : 0 diff --git a/html/changelogs/FirinMaLazors-visiblebucketmelting.yml b/html/changelogs/FirinMaLazors-visiblebucketmelting.yml new file mode 100644 index 00000000000..ebd0f7775bf --- /dev/null +++ b/html/changelogs/FirinMaLazors-visiblebucketmelting.yml @@ -0,0 +1,8 @@ +author: FirinMaLazors + +delete-after: True + +changes: + - bugfix: "Fixes aciding an item so that the moltem item spawns on the turf instead of the loc, and the 'The x melts.' message is broadcasted from the turf. In case we melt a bucket inside of a chemistry dispenser." + - bugfix: "Adds a sanity check to the nanoui of the chemical dispenser to delete the container var if it's... been deleted... so that we don't try read from a null reagents datum and crash the chemical dispenser for a few minutes." + - bugfix: "Fixes a typo in the mop bucket code - mobbuckets are, unfortunately, not real. Yet." \ No newline at end of file