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
@@ -110,7 +110,7 @@
if(istype(I, /obj/item/weapon/material/ashtray))
var/obj/item/weapon/material/ashtray/A = I
if(A.contents.len > 0)
user.visible_message("<span class='notice'>\The [user] empties \the [A.name] into [src].</span>")
user.visible_message("<b>\The [user]</b> empties \the [A] into [src].")
for(var/obj/item/O in A.contents)
O.forceMove(src)
A.update_icon()