Merge branch 'master' into Arokha/matdefs

This commit is contained in:
Aronai Sieyes
2021-07-07 14:29:30 -04:00
committed by GitHub
283 changed files with 4118 additions and 1405 deletions
+1 -1
View File
@@ -383,7 +383,7 @@
var/obj/item/stack/material/S = W
if(!(S.material.name in stored_material))
to_chat(user, "<span class='warning'>\the [src] doesn't accept [S.material]!</span>")
to_chat(user, "<span class='warning'>\The [src] doesn't accept [S.material]!</span>")
return
var/amnt = S.perunit