Merge remote-tracking branch 'upstream/master' into TGUI-3.0

This commit is contained in:
Artur
2020-05-30 18:52:02 +03:00
361 changed files with 10271 additions and 3115 deletions
+3
View File
@@ -302,3 +302,6 @@
/obj/item/paper/crumpled/bloody
icon_state = "scrap_bloodied"
/obj/item/paper/crumpled/muddy
icon_state = "scrap_mud"