diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index 5bbac2b6fa..492910282f 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -90,7 +90,7 @@ - type: alert id: Fire - icons: [ /Textures/_CP14/Interface/Alerts/vanilla/Fire/fire.png ] + icons: [ /Textures/Interface/Alerts/Fire/fire.png ] clickEvent: !type:ResistFireAlertEvent name: alerts-on-fire-name description: alerts-on-fire-desc @@ -100,11 +100,11 @@ id: Cold category: Temperature icons: - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi + - sprite: /Textures/Interface/Alerts/temperature.rsi state: cold1 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi + - sprite: /Textures/Interface/Alerts/temperature.rsi state: cold2 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi + - sprite: /Textures/Interface/Alerts/temperature.rsi state: cold3 maxSeverity: 3 name: alerts-too-cold-name @@ -114,11 +114,11 @@ id: Hot category: Temperature icons: - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi + - sprite: /Textures/Interface/Alerts/temperature.rsi state: hot1 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi + - sprite: /Textures/Interface/Alerts/temperature.rsi state: hot2 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi + - sprite: /Textures/Interface/Alerts/temperature.rsi state: hot3 maxSeverity: 3 name: alerts-too-hot-name @@ -203,15 +203,15 @@ category: Health icons: - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi - state: health9 + state: health9 - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi state: health8 - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi state: health7 - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi - state: health6 + state: health6 - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi - state: health5 + state: health5 - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi state: health4 - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi @@ -343,19 +343,19 @@ id: Stamina category: Stamina icons: - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi + - sprite: /Textures/_CP14/Interface/Alerts/stamina.rsi state: stamina0 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi + - sprite: /Textures/_CP14/Interface/Alerts/stamina.rsi state: stamina1 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi + - sprite: /Textures/_CP14/Interface/Alerts/stamina.rsi state: stamina2 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi + - sprite: /Textures/_CP14/Interface/Alerts/stamina.rsi state: stamina3 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi + - sprite: /Textures/_CP14/Interface/Alerts/stamina.rsi state: stamina4 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi + - sprite: /Textures/_CP14/Interface/Alerts/stamina.rsi state: stamina5 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi + - sprite: /Textures/_CP14/Interface/Alerts/stamina.rsi state: stamina6 name: alerts-stamina-name description: alerts-stamina-desc @@ -426,27 +426,27 @@ - type: alert id: Bleed icons: - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed0 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed1 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed2 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed3 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed4 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed5 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed6 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed7 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed8 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed9 - - sprite: /Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi + - sprite: /Textures/Interface/Alerts/bleed.rsi state: bleed10 name: alerts-bleed-name description: alerts-bleed-desc diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json b/Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json rename to Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/meta.json diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina0.png b/Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina0.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina0.png rename to Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina0.png diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina1.png b/Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina1.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina1.png rename to Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina1.png diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina2.png b/Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina2.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina2.png rename to Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina2.png diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina3.png b/Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina3.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina3.png rename to Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina3.png diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina4.png b/Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina4.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina4.png rename to Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina4.png diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina5.png b/Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina5.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina5.png rename to Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina5.png diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina6.png b/Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina6.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina6.png rename to Resources/Textures/_CP14/Interface/Alerts/stamina.rsi/stamina6.png diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/Fire/fire.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/Fire/fire.png deleted file mode 100644 index 9dda5ac333..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/Fire/fire.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed0.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed0.png deleted file mode 100644 index b9c7db4cd4..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed1.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed1.png deleted file mode 100644 index 22b5b521cc..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed10.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed10.png deleted file mode 100644 index da0b99d23b..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed10.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed2.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed2.png deleted file mode 100644 index c186e2a027..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed3.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed3.png deleted file mode 100644 index c2bf6f7296..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed4.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed4.png deleted file mode 100644 index 68a22b4040..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed5.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed5.png deleted file mode 100644 index edca645dec..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed6.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed6.png deleted file mode 100644 index 6914beae71..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed7.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed7.png deleted file mode 100644 index 018006db63..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed8.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed8.png deleted file mode 100644 index e2f4d93573..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed8.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed9.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed9.png deleted file mode 100644 index f592de1471..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/bleed9.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/meta.json b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/meta.json deleted file mode 100644 index b2412dd47f..0000000000 --- a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/meta.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "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", - "states": [ - { - "name": "bleed0" - }, - { - "name": "bleed1" - }, - { - "name": "bleed2" - }, - { - "name": "bleed3" - }, - { - "name": "bleed4" - }, - { - "name": "bleed5" - }, - { - "name": "bleed6" - }, - { - "name": "bleed7" - }, - { - "name": "bleed8" - }, - { - "name": "bleed9" - }, - { - "name": "bleed10" - } - ] -} diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold1.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold1.png deleted file mode 100644 index 3079764cfc..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold2.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold2.png deleted file mode 100644 index 67bf794cd9..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold3.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold3.png deleted file mode 100644 index d61aeb6dd9..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot1.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot1.png deleted file mode 100644 index b88bf875d3..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot2.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot2.png deleted file mode 100644 index 410ca2dfc1..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot3.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot3.png deleted file mode 100644 index 45478ed2f3..0000000000 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/meta.json b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/meta.json deleted file mode 100644 index 6ecfe4d763..0000000000 --- a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"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