Merge branch 'master' into var/const-to-define

This commit is contained in:
AffectedArc07
2020-03-03 22:44:07 +00:00
101 changed files with 614 additions and 436 deletions
@@ -13,6 +13,7 @@
var/brightness = 2
/obj/item/shard/supermatter/New()
..()
src.icon_state = "supermatter" + pick("large", "medium", "small")
switch(src.icon_state)
if("supermattersmall")