Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jabak
2024-08-02 23:26:33 +03:00
104 changed files with 52486 additions and 49138 deletions

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
"size": {
"x": 32,
"y": 32
@@ -11,14 +11,15 @@
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]