diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index ba9ee9ec27..5be4593ab4 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -29,7 +29,9 @@ - type: alert alertType: LowPressure category: Pressure - icon: /Textures/Interface/Alerts/Pressure/lowpressure.png + icon: + sprite: /Textures/Interface/Alerts/pressure.rsi + state: lowpressure maxSeverity: 2 name: "[color=red]Low Pressure[/color]" description: "The air around you is [color=red]hazardously thin[/color]. A [color=green]space suit[/color] would protect you." @@ -37,7 +39,9 @@ - type: alert alertType: HighPressure category: Pressure - icon: /Textures/Interface/Alerts/Pressure/highpressure.png + icon: + sprite: /Textures/Interface/Alerts/pressure.rsi + state: highpressure maxSeverity: 2 name: "[color=red]High Pressure[/color]" description: "The air around you is [color=red]hazardously thick[/color]. A [color=green]pressurized suit[/color] would be enough protect you" @@ -52,7 +56,9 @@ - type: alert alertType: Cold category: Temperature - icon: /Textures/Interface/Alerts/Temperature/cold.png + icon: + sprite: /Textures/Interface/Alerts/temperature.rsi + state: cold maxSeverity: 3 name: "[color=cyan]Too Cold[/color]" description: "You're [color=cyan]freezing cold![/color] Get somewhere warmer and take off any insulating clothing like a space suit." @@ -60,7 +66,9 @@ - type: alert alertType: Hot category: Temperature - icon: /Textures/Interface/Alerts/Temperature/hot.png + icon: + sprite: /Textures/Interface/Alerts/temperature.rsi + state: hot maxSeverity: 3 name: "[color=red]Too Hot[/color]" description: "It's [color=red]too hot![/color] Flee to space or at least away from the flames. Standing on weeds will heal you." @@ -70,7 +78,7 @@ icon: /Textures/Interface/Alerts/Weightless/weightless.png name: Weightless description: > - Gravity has ceased affecting you, and you're floating around aimlessly. Find something sturdy to hold onto, or throw or shoot something in a direction opposite of you. + Gravity has ceased affecting you, and you're floating around aimlessly. Find something sturdy to hold onto, or throw or shoot something in a direction opposite of you. Mag-boots or jetpacks would help you move with more control - type: alert @@ -96,21 +104,27 @@ - type: alert alertType: HumanCrit category: Health - icon: /Textures/Interface/Alerts/Human/humancrit-0.png + icon: + sprite: /Textures/Interface/Alerts/human_health.rsi + state: health6 name: "[color=red]Critical Condition[/color]" description: "You're severely injured and unconscious." - type: alert alertType: HumanDead category: Health - icon: /Textures/Interface/Alerts/Human/humandead.png + icon: + sprite: /Textures/Interface/Alerts/human_health.rsi + state: health7 name: Dead description: You're dead, note that you can still be revived! - type: alert alertType: HumanHealth category: Health - icon: /Textures/Interface/Alerts/Human/human.png + icon: + sprite: /Textures/Interface/Alerts/human_health.rsi + state: health name: Health description: "[color=green]Green[/color] good. [color=red]Red[/color] bad." minSeverity: 0 diff --git a/Resources/Textures/Interface/Alerts/Pressure/highpressure1.png b/Resources/Textures/Interface/Alerts/Pressure/highpressure1.png deleted file mode 100644 index daebd742be..0000000000 Binary files a/Resources/Textures/Interface/Alerts/Pressure/highpressure1.png and /dev/null differ diff --git a/Resources/Textures/Interface/Alerts/Pressure/highpressure2.png b/Resources/Textures/Interface/Alerts/Pressure/highpressure2.png deleted file mode 100644 index 85f74289aa..0000000000 Binary files a/Resources/Textures/Interface/Alerts/Pressure/highpressure2.png and /dev/null differ diff --git a/Resources/Textures/Interface/Alerts/Pressure/lowpressure1.png b/Resources/Textures/Interface/Alerts/Pressure/lowpressure1.png deleted file mode 100644 index 27153cc542..0000000000 Binary files a/Resources/Textures/Interface/Alerts/Pressure/lowpressure1.png and /dev/null differ diff --git a/Resources/Textures/Interface/Alerts/Pressure/lowpressure2.png b/Resources/Textures/Interface/Alerts/Pressure/lowpressure2.png deleted file mode 100644 index d94b77ea1a..0000000000 Binary files a/Resources/Textures/Interface/Alerts/Pressure/lowpressure2.png and /dev/null differ diff --git a/Resources/Textures/Interface/Alerts/Pressure/meta.json b/Resources/Textures/Interface/Alerts/Pressure/meta.json deleted file mode 100644 index 6c4b44e058..0000000000 --- a/Resources/Textures/Interface/Alerts/Pressure/meta.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA 3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", - "states": [ - { - "name": "highpressure1", - - }, - { - "name": "highpressure2", - - }, - { - "name": "lowpressure1", - - }, - { - "name": "lowpressure2", - - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Interface/Alerts/Temperature/cold1.png b/Resources/Textures/Interface/Alerts/Temperature/cold1.png deleted file mode 100644 index a7408f8e7f..0000000000 Binary files a/Resources/Textures/Interface/Alerts/Temperature/cold1.png and /dev/null differ diff --git a/Resources/Textures/Interface/Alerts/Temperature/cold2.png b/Resources/Textures/Interface/Alerts/Temperature/cold2.png deleted file mode 100644 index e8599a3e91..0000000000 Binary files a/Resources/Textures/Interface/Alerts/Temperature/cold2.png and /dev/null differ diff --git a/Resources/Textures/Interface/Alerts/Temperature/cold3.png b/Resources/Textures/Interface/Alerts/Temperature/cold3.png deleted file mode 100644 index 4c6f07cf5a..0000000000 Binary files a/Resources/Textures/Interface/Alerts/Temperature/cold3.png and /dev/null differ diff --git a/Resources/Textures/Interface/Alerts/Temperature/hot1.png b/Resources/Textures/Interface/Alerts/Temperature/hot1.png deleted file mode 100644 index 2d3896f7b0..0000000000 Binary files a/Resources/Textures/Interface/Alerts/Temperature/hot1.png and /dev/null differ diff --git a/Resources/Textures/Interface/Alerts/Temperature/hot2.png b/Resources/Textures/Interface/Alerts/Temperature/hot2.png deleted file mode 100644 index 7408c204c8..0000000000 Binary files a/Resources/Textures/Interface/Alerts/Temperature/hot2.png and /dev/null differ diff --git a/Resources/Textures/Interface/Alerts/Temperature/hot3.png b/Resources/Textures/Interface/Alerts/Temperature/hot3.png deleted file mode 100644 index d74178208f..0000000000 Binary files a/Resources/Textures/Interface/Alerts/Temperature/hot3.png and /dev/null differ diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/health0.png b/Resources/Textures/Interface/Alerts/human_health.rsi/health0.png new file mode 100644 index 0000000000..9330c49282 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/human_health.rsi/health0.png differ diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/health1.png b/Resources/Textures/Interface/Alerts/human_health.rsi/health1.png new file mode 100644 index 0000000000..c6232e16c0 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/human_health.rsi/health1.png differ diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/health2.png b/Resources/Textures/Interface/Alerts/human_health.rsi/health2.png new file mode 100644 index 0000000000..51cf805d9a Binary files /dev/null and b/Resources/Textures/Interface/Alerts/human_health.rsi/health2.png differ diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/health3.png b/Resources/Textures/Interface/Alerts/human_health.rsi/health3.png new file mode 100644 index 0000000000..3165e8bce4 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/human_health.rsi/health3.png differ diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/health4.png b/Resources/Textures/Interface/Alerts/human_health.rsi/health4.png new file mode 100644 index 0000000000..ca08aade24 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/human_health.rsi/health4.png differ diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/health5.png b/Resources/Textures/Interface/Alerts/human_health.rsi/health5.png new file mode 100644 index 0000000000..fc96021bfe Binary files /dev/null and b/Resources/Textures/Interface/Alerts/human_health.rsi/health5.png differ diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/health6.png b/Resources/Textures/Interface/Alerts/human_health.rsi/health6.png new file mode 100644 index 0000000000..b677960687 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/human_health.rsi/health6.png differ diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/health7.png b/Resources/Textures/Interface/Alerts/human_health.rsi/health7.png new file mode 100644 index 0000000000..9fb45eca0b Binary files /dev/null and b/Resources/Textures/Interface/Alerts/human_health.rsi/health7.png differ diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/health_numb.png b/Resources/Textures/Interface/Alerts/human_health.rsi/health_numb.png new file mode 100644 index 0000000000..9dc3a511d7 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/human_health.rsi/health_numb.png differ diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/meta.json b/Resources/Textures/Interface/Alerts/human_health.rsi/meta.json new file mode 100644 index 0000000000..e34c0728f1 --- /dev/null +++ b/Resources/Textures/Interface/Alerts/human_health.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA 3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1d52615ca647d96583f5bc7a1017f3910194bed3", "states": [{"name": "health0", "directions": 1, "delays": [[1.0]]}, {"name": "health1", "directions": 1, "delays": [[1.0]]}, {"name": "health2", "directions": 1, "delays": [[1.0]]}, {"name": "health3", "directions": 1, "delays": [[1.0]]}, {"name": "health4", "directions": 1, "delays": [[1.0]]}, {"name": "health5", "directions": 1, "delays": [[0.5, 0.5]]}, {"name": "health6", "directions": 1, "delays": [[0.5, 0.5]]}, {"name": "health7", "directions": 1, "delays": [[1.0]]}, {"name": "health_numb", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Interface/Alerts/pressure.rsi/highpressure1.png b/Resources/Textures/Interface/Alerts/pressure.rsi/highpressure1.png new file mode 100644 index 0000000000..92c8aa0eb2 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/pressure.rsi/highpressure1.png differ diff --git a/Resources/Textures/Interface/Alerts/pressure.rsi/highpressure2.png b/Resources/Textures/Interface/Alerts/pressure.rsi/highpressure2.png new file mode 100644 index 0000000000..34cc305c84 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/pressure.rsi/highpressure2.png differ diff --git a/Resources/Textures/Interface/Alerts/pressure.rsi/lowpressure1.png b/Resources/Textures/Interface/Alerts/pressure.rsi/lowpressure1.png new file mode 100644 index 0000000000..6cf5f379b9 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/pressure.rsi/lowpressure1.png differ diff --git a/Resources/Textures/Interface/Alerts/pressure.rsi/lowpressure2.png b/Resources/Textures/Interface/Alerts/pressure.rsi/lowpressure2.png new file mode 100644 index 0000000000..3c266180be Binary files /dev/null and b/Resources/Textures/Interface/Alerts/pressure.rsi/lowpressure2.png differ diff --git a/Resources/Textures/Interface/Alerts/pressure.rsi/meta.json b/Resources/Textures/Interface/Alerts/pressure.rsi/meta.json new file mode 100644 index 0000000000..1690b7a19b --- /dev/null +++ b/Resources/Textures/Interface/Alerts/pressure.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA 3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "states": [{"name": "highpressure1", "directions": 1, "delays": [[1.0]]}, {"name": "highpressure2", "directions": 1, "delays": [[0.5, 0.5]]}, {"name": "lowpressure1", "directions": 1, "delays": [[1.0]]}, {"name": "lowpressure2", "directions": 1, "delays": [[0.5, 0.5]]}]} \ No newline at end of file diff --git a/Resources/Textures/Interface/Alerts/temperature.rsi/cold1.png b/Resources/Textures/Interface/Alerts/temperature.rsi/cold1.png new file mode 100644 index 0000000000..b1c09293ba Binary files /dev/null and b/Resources/Textures/Interface/Alerts/temperature.rsi/cold1.png differ diff --git a/Resources/Textures/Interface/Alerts/temperature.rsi/cold2.png b/Resources/Textures/Interface/Alerts/temperature.rsi/cold2.png new file mode 100644 index 0000000000..3ba601625a Binary files /dev/null and b/Resources/Textures/Interface/Alerts/temperature.rsi/cold2.png differ diff --git a/Resources/Textures/Interface/Alerts/temperature.rsi/cold3.png b/Resources/Textures/Interface/Alerts/temperature.rsi/cold3.png new file mode 100644 index 0000000000..b20875afff Binary files /dev/null and b/Resources/Textures/Interface/Alerts/temperature.rsi/cold3.png differ diff --git a/Resources/Textures/Interface/Alerts/temperature.rsi/hot1.png b/Resources/Textures/Interface/Alerts/temperature.rsi/hot1.png new file mode 100644 index 0000000000..ee13775054 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/temperature.rsi/hot1.png differ diff --git a/Resources/Textures/Interface/Alerts/temperature.rsi/hot2.png b/Resources/Textures/Interface/Alerts/temperature.rsi/hot2.png new file mode 100644 index 0000000000..c23d5859b4 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/temperature.rsi/hot2.png differ diff --git a/Resources/Textures/Interface/Alerts/temperature.rsi/hot3.png b/Resources/Textures/Interface/Alerts/temperature.rsi/hot3.png new file mode 100644 index 0000000000..df70e373e8 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/temperature.rsi/hot3.png differ diff --git a/Resources/Textures/Interface/Alerts/temperature.rsi/meta.json b/Resources/Textures/Interface/Alerts/temperature.rsi/meta.json new file mode 100644 index 0000000000..e1cc97be28 --- /dev/null +++ b/Resources/Textures/Interface/Alerts/temperature.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA 3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 1c7401722f397d8ac8afdd10e550c5962e0f38d4", "states": [{"name": "cold1", "directions": 1, "delays": [[1.0]]}, {"name": "cold2", "directions": 1, "delays": [[1.0]]}, {"name": "cold3", "directions": 1, "delays": [[0.3, 0.3]]}, {"name": "hot1", "directions": 1, "delays": [[1.0]]}, {"name": "hot2", "directions": 1, "delays": [[1.0]]}, {"name": "hot3", "directions": 1, "delays": [[0.3, 0.3]]}]} \ No newline at end of file