Merge remote-tracking branch 'upstream/master' into ups

2024-09-29 13:08:38 +03:00
parent b4f67b1963 f051d0087c
commit b09f28657f
128 changed files with 1836 additions and 824 deletions
--- a/Resources/Textures/White/Structures/Furniture/Tables/wood.rsi/meta.json
+++ b/Resources/Textures/White/Structures/Furniture/Tables/wood.rsi/meta.json
@@ -1,7 +1,7 @@
 {
  "version": 1,
  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/a138859aec54b20dac65eb76e94e9db1b2202f55 and modified by Swept",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/a138859aec54b20dac65eb76e94e9db1b2202f55 and modified by Swept and 6elblu_0331",
  "size": {
    "x": 32,
    "y": 32
--- a/Resources/Textures/White/Structures/Furniture/Tables/wood.rsi/state_5.png
+++ b/Resources/Textures/White/Structures/Furniture/Tables/wood.rsi/state_5.png