Merge pull request #4561 from MistakeNot4892/devupdate

Dev update from staging
NebulaSS13 · Nov 13, 2024 · 22125c2 · 22125c2
2 parents 2f81f83 + 0fda447
commit 22125c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/code/datums/extensions/storage/subtypes_wallet.dm b/code/datums/extensions/storage/subtypes_wallet.dm
@@ -51,7 +51,7 @@
 			wallet.front_stick = null
 
 /datum/storage/wallet/handle_item_insertion(mob/user, obj/item/W, prevent_warning, skip_update, click_params)
-	. = ..(W, prevent_warning)
+	. = ..()
 	if(. && istype(holder, /obj/item/wallet))
 		var/obj/item/wallet/wallet = holder
 		if(!wallet.front_id && istype(W, /obj/item/card/id))

diff --git a/code/modules/fabrication/fabricator_intake.dm b/code/modules/fabrication/fabricator_intake.dm
@@ -139,8 +139,13 @@
 		show_intake_message(user, reagents_taken, atom_name, took_reagents = TRUE)
 		updateUsrDialog()
 		return TRUE
+
+	if(!can_ingest(O))
+		to_chat(user, SPAN_WARNING("\The [src] cannot process \the [O]."))
+		return TRUE
+
 	// Take everything if we have a recycler.
-	if(can_ingest(O) && !is_robot_module(O) && user.try_unequip(O))
+	if(!is_robot_module(O) && user.try_unequip(O))
 		var/result = max(take_materials(O, user), max(reagents_taken, take_reagents(O, user, TRUE)))
 		show_intake_message(user, result, atom_name)
 		if(result == SUBSTANCE_TAKEN_NONE)