Merge remote-tracking branch 'citadel/master' into tgsync

This commit is contained in:
silicons
2021-01-09 14:56:32 -08:00
39 changed files with 211 additions and 65 deletions
@@ -271,7 +271,7 @@
icon = 'icons/effects/atmospherics.dmi'
gender = NEUTER
mergeable_decal = TRUE
persistent = TRUE
persistent = FALSE
/obj/effect/decal/cleanable/glitter/pink
name = "pink glitter"