Skip to content

Commit

Permalink
Merge pull request #57 from Flybik/master
Browse files Browse the repository at this point in the history
Изменение статус-иконок
  • Loading branch information
Flybik authored Sep 3, 2024
2 parents b0653d0 + dbe9cf3 commit 4045f60
Show file tree
Hide file tree
Showing 97 changed files with 58 additions and 13 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/Buckle/buckled.png
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.
Binary file modified Resources/Textures/Interface/Alerts/Fire/fire.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/Handcuffed/Handcuffed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/Pull/pulled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/Pull/pulling.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/Weightless/weightless.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery-none.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/battery.rsi/battery9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed4.png
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed5.png
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed6.png
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed7.png
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed8.png
Binary file modified Resources/Textures/Interface/Alerts/bleed.rsi/bleed9.png
57 changes: 45 additions & 12 deletions Resources/Textures/Interface/Alerts/bleed.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,73 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Edited by Flareguy for Space Station 14, original sprite taken from https://github.com/tgstation/tgstation/blob/master/icons/effects/bleed.dmi",
"copyright": "Draw by Skilets: https://github.com/Skilets",
"states": [
{
"name": "bleed0"
"name": "bleed0",
"delays": [
[0.5, 0.5]
]
},
{
"name": "bleed1"
"name": "bleed1",
"delays": [
[0.5, 0.5]
]
},
{
"name": "bleed2"
"name": "bleed2",
"delays": [
[0.5, 0.5]
]
},
{
"name": "bleed3"
"name": "bleed3",
"delays": [
[0.4, 0.4]
]
},
{
"name": "bleed4"
"name": "bleed4",
"delays": [
[0.4, 0.4]
]
},
{
"name": "bleed5"
"name": "bleed5",
"delays": [
[0.4, 0.4]
]
},
{
"name": "bleed6"
"name": "bleed6",
"delays": [
[0.4, 0.4]
]
},
{
"name": "bleed7"
"name": "bleed7",
"delays": [
[0.3, 0.3]
]
},
{
"name": "bleed8"
"name": "bleed8",
"delays": [
[0.3, 0.3]
]
},
{
"name": "bleed9"
"name": "bleed9",
"delays": [
[0.3, 0.3]
]
},
{
"name": "bleed10"
"name": "bleed10",
"delays": [
[0.3, 0.3]
]
}
]
}
Binary file modified Resources/Textures/Interface/Alerts/borg_alive.rsi/health0.png
Binary file modified Resources/Textures/Interface/Alerts/borg_alive.rsi/health1.png
Binary file modified Resources/Textures/Interface/Alerts/borg_alive.rsi/health2.png
Binary file modified Resources/Textures/Interface/Alerts/borg_alive.rsi/health3.png
Binary file modified Resources/Textures/Interface/Alerts/borg_alive.rsi/health4.png
Binary file modified Resources/Textures/Interface/Alerts/borg_critical.rsi/critical.png
Binary file modified Resources/Textures/Interface/Alerts/borg_dead.rsi/dead.png
Binary file modified Resources/Textures/Interface/Alerts/breathing.rsi/too_much_co2.png
Binary file modified Resources/Textures/Interface/Alerts/breathing.rsi/too_much_oxy.png
Binary file modified Resources/Textures/Interface/Alerts/breathing.rsi/too_much_tox.png
Binary file modified Resources/Textures/Interface/Alerts/ensnared.rsi/ensnared.png
Binary file modified Resources/Textures/Interface/Alerts/human_alive.rsi/health0.png
Binary file modified Resources/Textures/Interface/Alerts/human_alive.rsi/health1.png
Binary file modified Resources/Textures/Interface/Alerts/human_alive.rsi/health2.png
Binary file modified Resources/Textures/Interface/Alerts/human_alive.rsi/health3.png
Binary file modified Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@
"name": "alive"
},
{
"name": "dead"
"name": "dead",
"delays": [
[
0.35,
0.35
]
]
},
{
"name": "health0"
Expand Down
Binary file modified Resources/Textures/Interface/Alerts/human_dead.rsi/dead.png
Binary file modified Resources/Textures/Interface/Alerts/hunger.rsi/overfed.png
Binary file modified Resources/Textures/Interface/Alerts/hunger.rsi/peckish.png
Binary file modified Resources/Textures/Interface/Alerts/hunger.rsi/starving.png
Binary file modified Resources/Textures/Interface/Alerts/internals.rsi/internal0.png
Binary file modified Resources/Textures/Interface/Alerts/internals.rsi/internal1.png
Binary file modified Resources/Textures/Interface/Alerts/internals.rsi/internal2.png
Binary file modified Resources/Textures/Interface/Alerts/mood.rsi/mood_insane.png
6 changes: 6 additions & 0 deletions Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
"states": [
{
"name": "offer_item"
"delays": [
[
0.5,
0.5
]
]
}
]
}
Binary file modified Resources/Textures/Interface/Alerts/pacified.rsi/icon.png
Binary file modified Resources/Textures/Interface/Alerts/piloting.png
Binary file modified Resources/Textures/Interface/Alerts/pressure.rsi/highpressure1.png
Binary file modified Resources/Textures/Interface/Alerts/pressure.rsi/lowpressure1.png
Binary file modified Resources/Textures/Interface/Alerts/stamina.rsi/stamina0.png
Binary file modified Resources/Textures/Interface/Alerts/stamina.rsi/stamina1.png
Binary file modified Resources/Textures/Interface/Alerts/stamina.rsi/stamina2.png
Binary file modified Resources/Textures/Interface/Alerts/stamina.rsi/stamina3.png
Binary file modified Resources/Textures/Interface/Alerts/stamina.rsi/stamina4.png
Binary file modified Resources/Textures/Interface/Alerts/stamina.rsi/stamina5.png
Binary file modified Resources/Textures/Interface/Alerts/stamina.rsi/stamina6.png
Binary file modified Resources/Textures/Interface/Alerts/temperature.rsi/cold1.png
Binary file modified Resources/Textures/Interface/Alerts/temperature.rsi/cold2.png
Binary file modified Resources/Textures/Interface/Alerts/temperature.rsi/cold3.png
Binary file modified Resources/Textures/Interface/Alerts/temperature.rsi/hot1.png
Binary file modified Resources/Textures/Interface/Alerts/temperature.rsi/hot2.png
Binary file modified Resources/Textures/Interface/Alerts/temperature.rsi/hot3.png
Binary file modified Resources/Textures/Interface/Alerts/thirst.rsi/overhydrated.png
Binary file modified Resources/Textures/Interface/Alerts/thirst.rsi/parched.png
Binary file modified Resources/Textures/Interface/Alerts/thirst.rsi/thirsty.png
Binary file modified Resources/Textures/Interface/Alerts/walking.rsi/walking0.png
Binary file modified Resources/Textures/Interface/Alerts/walking.rsi/walking1.png

0 comments on commit 4045f60

Please sign in to comment.