[MIRROR] Fixes material container flags precedence (#3029)

* Fixes material container flags precedence * Update material_container.dm
2017-09-30 14:39:57 -05:00
parent a6a4deb94c
commit aaa2a214cb
1 changed files with 4 additions and 1 deletions
@@ -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