Merge branch 'master' into plumb

This commit is contained in:
lolman360
2020-08-12 09:03:11 +10:00
committed by GitHub
113 changed files with 9045 additions and 400 deletions
@@ -389,3 +389,10 @@
..()
/datum/asset/spritesheet/mafia
name = "mafia"
/datum/asset/spritesheet/mafia/register()
InsertAll("", 'icons/obj/mafia.dmi')
..()