Merge remote-tracking branch 'space-station-14/master'

This commit is contained in:
Ed
2024-04-13 18:59:09 +03:00
74 changed files with 1038 additions and 503 deletions

View File

@@ -4,7 +4,7 @@
"x": 32,
"y": 32
},
"copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github)",
"copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2_door state modified by Flareguy from fire_door, using sprites from /vg/station at https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e",
"license": "CC-BY-SA-3.0",
"states": [
{
@@ -398,6 +398,9 @@
{
"name": "mixed_door"
},
{
"name": "n2_door"
},
{
"name": "oldcloset"
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -0,0 +1,27 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "by Ko4erga (discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "base",
"directions": 4
},
{
"name": "empty",
"directions": 4
},
{
"name": "glow",
"directions": 4
},
{
"name": "broken",
"directions": 4
}
]
}