Merge branch 'master' into SynthUpdateVendor

cmss13-devs · Sep 26, 2023 · 0bf2fee · 0bf2fee
2 parents e8d7d36 + 3d61f2e
commit 0bf2fee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
@@ -1052,7 +1052,10 @@
 		to_chat(usr, SPAN_WARNING("There is no container inside this pouch!"))
 		return
 
-	usr.put_in_any_hand_if_possible(inner, disable_warning = TRUE)
+	var/had_empty_hand = usr.put_in_any_hand_if_possible(inner, disable_warning = TRUE)
+	if(!had_empty_hand)
+		usr.drop_inv_item_on_ground(inner)
+
 	inner = null
 	update_icon()
 

diff --git a/html/changelogs/AutoChangeLog-pr-4491.yml b/html/changelogs/AutoChangeLog-pr-4491.yml
@@ -0,0 +1,4 @@
+author: "Casper"
+delete-after: True
+changes:
+  - bugfix: "fixed reagent canister being deleted if ejected with your hands full"