merge conflict drinks.dmi

This commit is contained in:
Dip
2020-10-29 13:50:19 -03:00
97 changed files with 327 additions and 658 deletions
+1 -1
View File
@@ -174,7 +174,7 @@
to_chat(usr, "<span class='notice'>\The [src] is full.</span>")
return FALSE
GET_COMPONENT_FROM(STR, /datum/component/storage, O.loc)
var/datum/component/storage/STR = O.loc.GetComponent(/datum/component/storage)
if(STR)
if(!STR.remove_from_storage(O,src))
return FALSE