Merge pull request #4538 from Citadel-Station-13/upstream-merge-33820

[MIRROR] Material containers only insert on help intent
This commit is contained in:
deathride58
2017-12-28 02:52:45 +00:00
committed by GitHub

View File

@@ -51,7 +51,7 @@
/datum/component/material_container/proc/OnAttackBy(obj/item/I, mob/living/user)
var/list/tc = allowed_typecache
if(user.a_intent == INTENT_HARM)
if(user.a_intent != INTENT_HELP)
return
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>")