From 7aef5a3f6d41cf0e99702dd52d8864ec35ccce28 Mon Sep 17 00:00:00 2001
From: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com>
Date: Sat, 20 May 2023 16:21:10 +0100
Subject: [PATCH] Ejecting beakers from a grinder as a mob without hands no
 longer deletes the beaker (#16373)

* cyborgs dont eat beakers

* updates cl

* rename cl
---
 code/modules/reagents/Chemistry-Machinery.dm |  2 +-
 html/changelogs/llywelwyn-beakerfix.yml      | 41 ++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/llywelwyn-beakerfix.yml

diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 774f920e460..04c028da068 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -486,7 +486,7 @@
 		if(!H.put_in_active_hand(beaker))
 			beaker.forceMove(get_turf(src))
 	else
-		forceMove(get_turf(src))
+		beaker.forceMove(get_turf(src))
 	beaker = null
 	update_icon()
 
diff --git a/html/changelogs/llywelwyn-beakerfix.yml b/html/changelogs/llywelwyn-beakerfix.yml
new file mode 100644
index 00000000000..ca731340bbf
--- /dev/null
+++ b/html/changelogs/llywelwyn-beakerfix.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Llywelwyn
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Beakers are no longer destroyed when ejected from a grinder by a cyborg."