From aaa2a214cb3b99484697772b28a7866ed4a78a2e Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Sat, 30 Sep 2017 14:39:57 -0500
Subject: [PATCH] [MIRROR] Fixes material container flags precedence (#3029)

* Fixes material container flags precedence

* Update material_container.dm
---
 code/datums/components/material_container.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index 55504d47d5..c790dcc1aa 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -52,7 +52,10 @@
 
 /datum/component/material_container/proc/OnAttackBy(obj/item/I, mob/living/user)
 	var/list/tc = allowed_typecache
-	if(user.a_intent == INTENT_HARM || (I.flags_2 & HOLOGRAM_2) || (tc && !is_type_in_typecache(I, tc)))
+	if(user.a_intent == INTENT_HARM)
+		return FALSE
+	if((I.flags_2 & (HOLOGRAM_2 | NO_MAT_REDEMPTION_2)) || (tc && !is_type_in_typecache(I, tc)))
+		to_chat(user, "<span class='warning'>[parent] won't accept [I]!</span>")
 		return FALSE
 	. = TRUE
 	last_insert_success = FALSE