Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2022-10-13 11:21:32 -05:00
93 changed files with 29025 additions and 28617 deletions
@@ -311,3 +311,9 @@
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
mergeable_decal = TRUE
persistent = TRUE
/obj/effect/decal/cleanable/wrapping
name = "wrapping shreds"
desc = "Torn pieces of cardboard and paper, left over from a package."
icon = 'icons/obj/objects.dmi'
icon_state = "paper_shreds"