Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Перенос спрайтов #19

Merged
merged 1 commit into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47f6d91b37609b940152de62befa931dba35adf0",
"states": [
{
"name": "full",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi and modified by Peptide90",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi and modified by Peptide90, Resprited by Mureixlol",
"states": [
{
"name": "full"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by Peptide based on wooden table",
"copyright": "Sprite by Peptide based on wooden table, Resprited by Mureixlol",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47f6d91b37609b940152de62befa931dba35adf0",
"states": [
{
"name": "full",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47f6d91b37609b940152de62befa931dba35adf0",
"states": [
{
"name": "full",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b7c1c31bf867b8548d882e49a852eb5b26d713e9",
"copyright": "Taken from TauCetiStation at https://github.com/TauCetiStation/TauCetiClassic/commit/2456d1ba6ff2a506d0a5073c882ed89b7b67695b",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47f6d91b37609b940152de62befa931dba35adf0",
"states": [
{
"name": "full",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47f6d91b37609b940152de62befa931dba35adf0",
"states": [
{
"name": "full",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi",
"states": [
{
"name": "full",
Expand Down
Original file line number Diff line number Diff line change
@@ -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 tgstation at commit https://github.com/tgstation/tgstation/commit/47f6d91b37609b940152de62befa931dba35adf0",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Structures/Furniture/chairs.rsi/comfy.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, wooden bench by Ko4erga (discord)",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/e9d1248bc9548ab18f3fcf967e0d9dfb303fe4ad/icons/obj/chairs.dmi, comfy sprite recolored by github:Morb0, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/e9d1248bc9548ab18f3fcf967e0d9dfb303fe4ad/icons/obj/chairs.dmi, wooden bench by Ko4erga (discord)",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Structures/Furniture/chairs.rsi/shuttle.png
Binary file modified Resources/Textures/Structures/Furniture/chairs.rsi/wooden.png
Binary file modified Resources/Textures/Structures/Furniture/furniture.rsi/rack.png
Binary file modified Resources/Textures/Structures/Hydroponics/overlays.rsi/alert3.png
55 changes: 20 additions & 35 deletions Resources/Textures/Structures/Hydroponics/overlays.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,32 @@
"name": "alert3",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
0.25,
0.25,
0.25,
0.25
]
]
},
{
"name": "harvest3",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
0.17,
0.17,
0.17,
0.17
]
]
},
{
"name": "lowhealth3",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
0.17,
0.17,
0.17,
0.17
]
]
},
Expand All @@ -56,27 +47,21 @@
"name": "lownutri3",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
0.25,
0.25,
0.25,
0.25
]
]
},
{
"name": "lowwater3",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
0.25,
0.25,
0.25,
0.25
]
]
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 2,
"license": "CC0-1.0",
"copyright": "Original base by deltanedas (github) for SS14. Resprited by (DISCORD)@ps3moira#9488",
"copyright": "Original base by deltanedas (github) for SS14. Resprited by (DISCORD)@ps3moira#9488. Resprited by KREKS",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png
Binary file modified Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,63 @@
]
]
},
{
"name": "inserting_hamster",
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
},
{
"name": "inserting_mothroach",
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
},
{
"name": "inserting_mouse",
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
},
{
"name": "printing",
"delays": [
Expand Down
Binary file modified Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png
Binary file modified Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png
54 changes: 45 additions & 9 deletions Resources/Textures/Structures/Machines/microwave.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,30 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14",
"copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/ed4fbf117973dafea6e654bee7efdc2316bc2d8d",
"states": [
{
"name": "mw"

},
{
"name": "mw_unlit"
},
},
{
"name": "mw0"
},
{
"name": "mw_running_unlit"
"name": "mw_running_unlit",
"delays": [
[
1.0,
1.0,
1.0,
1.0,
1.0,
1.0
]
]
},
{
"name": "mwb"
Expand All @@ -29,13 +40,38 @@
"name": "mwbloody0"
},
{
"name": "mwbloody1"
"name": "mwbloody1",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "mwbloodyo"
"name": "mwbloodyo",
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "mwo"
}
]
}
"name": "mwo",
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "mw-o"
}
]
}
Binary file modified Resources/Textures/Structures/Machines/microwave.rsi/mw.png
Binary file modified Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
Binary file modified Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
Binary file modified Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
Binary file modified Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
0.1,
0.2,
0.1,
0.2,
0.1
0.2
]
]
},
Expand Down
Binary file modified Resources/Textures/Structures/Machines/smartfridge.rsi/broken.png
Binary file modified Resources/Textures/Structures/Machines/smartfridge.rsi/off.png
Binary file modified Resources/Textures/Structures/Storage/orebox.rsi/orebox-top.png
Binary file modified Resources/Textures/Structures/Storage/orebox.rsi/orebox.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from /tg/station commit https://github.com/tgstation/tgstation/commit/af7b7043df593807f7a98b7a07880d7a977cda14 and resprited by Alekshhh, welded state drawn by Flareguy for Space Station 14",
"copyright": "Taken from /tg/station commit https://github.com/tgstation/tgstation/commit/af7b7043df593807f7a98b7a07880d7a977cda14 and slightly edited, welded state drawn by Flareguy for Space Station 14",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Structures/Storage/suit_storage.rsi/welded.png
Binary file modified Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-1.png
Binary file modified Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-2.png
Binary file modified Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-3.png
Binary file modified Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png
Binary file modified Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png
Binary file modified Resources/Textures/Structures/Storage/tanks.rsi/highfueltank.png
Loading
Loading