diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 8b0f60ca58a..8e67114bc31 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -98,8 +98,8 @@ description: View a solar control interface. components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Interface/AdminPanel/solar.png # Corvax-Resprite + iconOn: Interface/AdminPanel/solar.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.SolarControlConsoleUiKey.Key } @@ -110,8 +110,8 @@ description: View a communications interface. components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Interface/AdminPanel/communications.png # Corvax-Resprite + iconOn: Interface/AdminPanel/communications.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.CommunicationsConsoleUiKey.Key } @@ -122,8 +122,8 @@ description: View a mass scanner interface. components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Interface/AdminPanel/radar.png # Corvax-Resprite + iconOn: Interface/AdminPanel/radar.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key } @@ -134,8 +134,8 @@ description: View a cargo ordering interface. components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Interface/AdminPanel/cargo.png # Corvax-Resprite + iconOn: Interface/AdminPanel/cargo.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.CargoConsoleUiKey.Orders } @@ -146,8 +146,8 @@ description: View a crew monitoring interface. components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Interface/AdminPanel/monitoring.png # Corvax-Resprite + iconOn: Interface/AdminPanel/monitoring.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.CrewMonitoringUIKey.Key } @@ -158,8 +158,8 @@ description: View a station records Interface components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Interface/AdminPanel/records.png # Corvax-Resprite + iconOn: Interface/AdminPanel/records.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.GeneralStationRecordConsoleKey.Key } diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png index 503d6be951b..3d605026b0b 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png index 400cc41545d..6a73fdca240 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png index 0be36bc309a..95b29936b4c 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png index 3fb9fad6d76..70648c897d1 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json index ed91c56e31f..819e5c0d2b3 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29, modified by linkblyat (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png index b4f0155515d..f5f32aa3482 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png index d61d4eeb830..22f7831b461 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png index 37a5937690b..978998fd782 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png index 06875557192..6af7dc41ff8 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png index d06bc5c0502..fdbbc317cc0 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png index eda68924f68..85226d11be0 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json index 477c5227850..caa1ec429ac 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord)", + "copyright": "Sprited by Hülle#2562 (Discord), Resprited by MureixloL", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png index aa9b9fa096d..cc1afccae54 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png index 93c823ce089..6050ab8de79 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png index 10030cdfc3d..bae326ef05a 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png index 2461338959a..c9a4e9a41cf 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png index aa67ac1a014..4c1fd1472d6 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png index 0f4e9010403..56cd95e74f1 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json index 5ce2c3cf970..8e0d473c71d 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png index 9f10db67a90..5f22d5a11dd 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png index 9112452d204..528364ad495 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png index ee34a4a9c2c..cd4dce8756f 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png index 20df264c061..6918decb91c 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png index 0f412e23383..61744104171 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png index 669c5bc3e7d..b79c807ae6a 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png index af6478d1fa7..8d3834833bf 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png index ec7d0229409..99af2a17c7b 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png index bfe41793070..dc8cdbcf31f 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png index 9c7b04a38b4..23afd82caf5 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png index d1cf3b1540d..bc9cca02f38 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png index c9e4989cd56..ed381a51f33 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png index 47613295e40..e55a5ea62e7 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png index 9fe676d2ff5..86ce445c4b0 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png index c3e3536c6ec..d5000c9d27d 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json index aa3381b0eb9..2880cc53ed6 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29, tweak by @mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png index fc977d86e7c..21003e9eefd 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png index a366d48aa5c..ab4b059df1d 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/equipped-BACKPACK.png index a15cccaf322..f927e6b97b0 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png index 35e6f81552b..311f0339138 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png index c164dba6fd1..b3665cdb86e 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png index af9d3e6b038..f594f9cc2de 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json index ed91c56e31f..2e99af940c7 100644 --- a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14, and modified for corvax by linkblyat (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png index 7fd84d54e1f..f3a42065cd8 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png index c894a9f04c3..cc616fff7ac 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png index 0b74d694c36..041b96bf0f0 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png index 22826589597..28377a52272 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json index 477c5227850..caa1ec429ac 100644 --- a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord)", + "copyright": "Sprited by Hülle#2562 (Discord), Resprited by MureixloL", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png index 1c888ace63d..fcdc61f8cf0 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png index a296739d8dd..7e5b86dd5e7 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png index 54d3af0227a..0f2a332147b 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png index 7aec3db48ed..1679e41b96f 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json index 5ce2c3cf970..8e0d473c71d 100644 --- a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png index ec4cf4ab8e6..ce67965c1eb 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json index 89236692cc9..d3f32cd8f07 100644 --- a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png index bb274bec3e3..d8e10580eca 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png index b48c8f590a1..f016402d95a 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png index e0dab47ddfd..b2c3e395c74 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png index 39db3d7260a..9619231171a 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json index ac5b5463410..745e688f84e 100644 --- a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4, Resprited by Mureixlol", "size": { "x": 32, "y": 32 @@ -24,4 +24,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/equipped-BACKPACK.png index 9ebc0235081..f4985e40cf4 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png index f62e3b3c593..f384dbde9d6 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png index 3f611d36913..97c6daa708e 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png index 54ca73feca0..b0a31671a29 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json index c166df646be..df8c42373b7 100644 --- a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/eeb99fcbde07bcf2e8bce93383744e3e142839df", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png index 709e67d3a41..6655fbb71bb 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json index 89236692cc9..d3f32cd8f07 100644 --- a/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png index 4a667e3a905..a17ceacb608 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png index 85111f98c38..c86b365acb4 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png index 7f7462feaf7..34b8a798024 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png index 3d4e3bb716d..86906792cec 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json index fce8c90ce86..4798572002c 100644 --- a/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1, tweak by @mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png index c86cf500e94..e4de4de1b20 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png index c3a5469919b..2f3eb624751 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png index 5a0a228b0d5..f060c5b7f0e 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png index 72fbcbfebe8..d1f0c2cc456 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json index ac5b5463410..745e688f84e 100644 --- a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4, Resprited by Mureixlol", "size": { "x": 32, "y": 32 @@ -24,4 +24,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/equipped-BACKPACK.png index ecdbbe04e5c..1a1b368f056 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png index c6b6edcf868..ff7fccd9ce8 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png index 77bdd89c57d..06aa5931dce 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png index 4811e50a91a..56410075947 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/meta.json index ed91c56e31f..819e5c0d2b3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29, modified by linkblyat (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png index 09f3fce48f7..3c1486b8e1f 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png index 3c3fc165461..af10af0b98d 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png index 66229364c51..55c93e70d98 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png index 51b618480d1..556ae6d3fae 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json index 477c5227850..caa1ec429ac 100644 --- a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord)", + "copyright": "Sprited by Hülle#2562 (Discord), Resprited by MureixloL", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png index 8332a0c0a99..ae70111e1e7 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png index a89cee8d796..3b0bd0547c8 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png index 7dfb99ea3e9..4ff5c554681 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png index f85e0843388..d5ff90fac6d 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png index bb2b3e163fc..c43fd0ea103 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png index fe3aaec78b7..2a5a28c1083 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json index 5ce2c3cf970..8e0d473c71d 100644 --- a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png index d9b5d894045..365e30b6864 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png index ea5838f1398..8feb895010a 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png index d5dbd754d58..7a84e0c0e31 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png index ec5b0363cba..e4b9442f026 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png index 20f7eb80d85..0ea59fc827e 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png index 02abe498251..dc781ce8173 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png index 68eaa7cf447..b8ee121cef4 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png index 717957515b8..b80cb1bfd65 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json index 53773473242..42591f4c4e8 100644 --- a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4, Resprited by Mureixlol", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png index fc4a93d812d..9ae968c9d0b 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png index 2a5ea97c42b..684aab50d73 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png index f80b1f2e6e5..8e2fc119357 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png index 450a24e818b..b6840d14b7b 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png index c24f815bc10..34e981394a8 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png index d390ee7c983..9e72773f768 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png index 2661a05b4c7..7c1da2349b1 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png index 53d96698ae4..1b1c1e0ebf5 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json index fce8c90ce86..c166df646be 100644 --- a/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png index c33aec6307a..a0c20344911 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png index 7f100adff6a..217d746bb42 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png index 2311df1b113..66dc3fb1a1a 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png index 62192054057..071bb888c7d 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json index fce8c90ce86..2880cc53ed6 100644 --- a/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29, tweak by @mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/equipped-BACKPACK.png index 220ea76ea64..c9666f474b3 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/icon.png index a77ff33ca55..e55cd46ec5f 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-left.png index 9d6050ca169..67db987c12d 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-right.png index b6d9aba43f3..a52bc6b2629 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/meta.json index f9b3615d28d..2ac6d2eccee 100644 --- a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1, Resprited by Mureixlol", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png index 44e093f26ad..7fca8dc1d3f 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json index df6ee47d086..b612633d44f 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png index 608b9ef7a0a..68f73226fdc 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json index 774e33fbe70..b612633d44f 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edited by Flareguy for Space Station 14. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png index c2160a1d86a..ce11edf2363 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json index 529b60f8387..c3a3dcd2311 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by PuroSlavKing (github) for SS14", + "copyright": "Sprited by PuroSlavKing and some resprited by SonicHDC (github) for SS14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png index 671111e4bc6..b99dad7b10f 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png index 439a4b6e529..1e23bc37364 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json index 1e84b43d94d..f13d472e818 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png index 4ee60687d09..9184e71509a 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png index 0927232ed58..17cbe45cbe6 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json index 1e84b43d94d..f13d472e818 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png index 30e1697c3ce..ee020ded8c3 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png index a01e0c6c13e..9b67d0e8814 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json index 1e84b43d94d..f13d472e818 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png index d39d3680dfa..a18ba86f4bf 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png index f1559927e0c..95c92f59c9c 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json index 1e84b43d94d..f13d472e818 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png index 0ff3f2c9893..19c0c0c357a 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png index d3be4bc4972..cce4bdcef59 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json index 5567eaaf379..f13d472e818 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png index e18fee6225e..79291740531 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png index 1087400c3ca..53a11ba7e13 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json index 1e84b43d94d..f13d472e818 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png index 5e773624bcf..e98878e7de8 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json index 3d37ed54346..81f97d57027 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png index cdb552f140e..74a3ff47c08 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json index df6ee47d086..b612633d44f 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png index 3d247f05be5..eade7edf28e 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json index df6ee47d086..b612633d44f 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png index e292512c97d..4df42d6f1d4 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png index c86c128c245..410b18ba09a 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json index 1e84b43d94d..f13d472e818 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png index cced5121647..cc301f1a04c 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png index 219918544cc..789530863d5 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json index 1e84b43d94d..f13d472e818 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png index c1010a58da6..26040fe8651 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json index 394f296153b..b612633d44f 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 @@ -13,10 +13,6 @@ { "name": "equipped-EARS", "directions": 4 - }, - { - "name": "equipped-EARS-cat", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png index 0b1f7514166..b010229b037 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json index dd2fdcc360a..a9efa2c815a 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png index f7cddb85c00..a1af823e1cd 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json index a36cd58203e..56b6260f355 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Made by Hqlle and SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES-hamster.png index 82246877e5a..ea46260e8ee 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES-hamster.png and b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES.png index c4c838f5135..dc4cba87dd2 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/icon.png index 8204d495ce7..6987bc9c028 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-left.png index 36e283a2923..9d95816d405 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-right.png index b02a6b85288..05727aa5d47 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json index 1d659eee14e..1b407313a0b 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Sprited by discord:@mishutka09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES-hamster.png index 1d7042d3df9..06c554ac088 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES-hamster.png and b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES.png index f285e3cf597..4028fc96136 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/icon.png index 67839213b72..61f0ce8a60a 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-left.png index 36e283a2923..9d95816d405 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-right.png index b02a6b85288..05727aa5d47 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json index 1d659eee14e..1b407313a0b 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Sprited by discord:@mishutka09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/equipped-EYES.png index 7181602fbe9..c8889d3bad1 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/icon.png index 17e6d890208..8b194af4861 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-left.png index a386caae792..d6e73ce20a7 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-right.png index 490d9808938..7292f4d0382 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json index 76e39a32d70..2fa67d390cb 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, Resprited by MureixloL", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES.png index 83fa02bc456..46379d49147 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/icon.png index fffba8d2865..fb3ec89b0c5 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-left.png index ebd7858dabb..d155746761f 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-right.png index 53535a1de70..ff54a736db5 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json index 541bdfbedca..cacbfbd4bc6 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3f51609e62619249b715cdf66a2aebdd955c8afc", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png index 483d40449fb..34a85632574 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png index 0911957a8d2..cd5944e3ce6 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png index ebd7858dabb..4c6abfc0fbf 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-right.png index 53535a1de70..9ea445e53de 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json index f803400908a..3b31bb60d1b 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station https://github.com/ParadiseSS13/Paradise/commit/ede55cc8f5b50abcd4f51d37779b56853a440a9a", + "copyright": "Sprited by discord:@mishutka09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/equipped-EYES.png index 56ce8dd4ad2..a0139036722 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/icon.png index 722eefb165a..ef0e2efd897 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-left.png index b0f4888e369..45efc1c1616 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-right.png index 72ac291aa99..76a8a84849b 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json index 36eed5db120..3b31bb60d1b 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and modified by лазік#7305", + "copyright": "Sprited by discord:@mishutka09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES.png index dd921481b7a..de13a55e964 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/icon.png index af3788654b9..4505c1685ca 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/inhand-left.png index 5088632f8df..075983ce4b0 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/inhand-right.png index 14f7b4547f9..ec292a19c1a 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json index 541bdfbedca..3b31bb60d1b 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Sprited by discord:@mishutka09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png index f6a9fcecd73..2f8980c56d3 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png index 62e8bb0a2f0..fddb8233db5 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png index bb46a99276d..e840de2b34f 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png index 9410b0476fb..629911c3050 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png index 7a79cc8d936..7f9afcd0db0 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json index 1d659eee14e..1b407313a0b 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Sprited by discord:@mishutka09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-hamster.png index 9fa934a7788..5914ad7a238 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-hamster.png and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png index f72e29ec428..2bed45ffd88 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/icon.png index a11166c046b..97610dca5fb 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-left.png index 9712db9d5f4..b36d5884881 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-right.png index 2a225f98bcf..ab0d39b8deb 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json index 1d659eee14e..1b407313a0b 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Sprited by discord:@mishutka09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/equipped-EYES.png index 9bef0a8c05f..1252a9d62ac 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/icon.png index 3fbc30b7e9d..10071058935 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-left.png index bf67e35d402..96487e34cc7 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-right.png index 4ede078291d..a46fda6562c 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json index 541bdfbedca..cacbfbd4bc6 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3f51609e62619249b715cdf66a2aebdd955c8afc", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png index 02ae05df0c6..f9cd7e67bfd 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/icon.png index fc8ee4f5445..80b9c8699eb 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png new file mode 100644 index 00000000000..74455e96b50 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png new file mode 100644 index 00000000000..02df73ce2ee Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json index c6895c95837..3b31bb60d1b 100644 --- a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Sprited by discord:@mishutka09", "size": { "x": 32, "y": 32 @@ -13,6 +13,14 @@ { "name": "equipped-EYES", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/equipped-EYES.png index 9128dd01f6e..19a9e002b6d 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/icon.png index 02dc6cc0679..07f8828bd14 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/inhand-left.png index ebd7858dabb..6b555b4a06a 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/inhand-right.png index 53535a1de70..75aaba77565 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json index e3bc1a2940a..3b31bb60d1b 100644 --- a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by IntegerTempest", + "copyright": "Sprited by discord:@mishutka09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/equipped-EYES.png index 84979d10972..9cdafaf91f5 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/icon.png index 900b438c7e2..b7e9aee3e3a 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/inhand-left.png index b888ce227ab..9aa710342bc 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/inhand-right.png index 0e248905fbf..a3c6323ecac 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json index f3acabcc544..3b31bb60d1b 100644 --- a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by IntegerTempest, edited by Golinth", + "copyright": "Sprited by discord:@mishutka09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png index fee14e7a8cd..747d885b15f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png index 31760fce4e8..909bac5fd53 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png index 5c130ddc0d0..be162bd0a07 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png index 1d83642a050..ac2d1f67fa8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png index 54e729e107a..bbb541a6366 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png index aeee8b15a75..80c17d64aec 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png index 7bb84291468..1f069dec797 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png index 3d3aa75958d..2728bf501bd 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png index 3a850ef0d89..f385d0187d3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png index ba88c23f723..eb5dbe122d1 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png index 316cf7a9bcc..57d5b472364 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json index 02f235207e0..ec84571e001 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png index ff4a3732bb0..14e1a8e7b4d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png index 1d3e030449a..4e2955903b3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png index 2900754a945..7c83a07d5e6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png index 5686662f411..7ba4874a8d3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png index 61e9fd17ddc..d3f7cdaf4cf 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png index 877bafcc6a5..4e48d3745ce 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png index 011962037d6..7e0ae9838ab 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png index 3a850ef0d89..57d5b472364 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json index 02f235207e0..ec84571e001 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png index 8a4c5443523..59c7868010c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png index 6d4ac236784..515cab6b2f8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png index a76b8fc02ef..10a5a6809c1 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png index bfb5f6e1fc0..f666b163edb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png index f8b08eeda03..6b1f9ab92b5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png index b1f55babdd7..a39346c8d2f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png index 2a5093d619e..8147df63ed5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png index 316cf7a9bcc..57d5b472364 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json index 02f235207e0..ec84571e001 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png index 7adb94de92e..c6d41f90fe3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png index 5693510c94e..cb68e36e285 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png index b9118b37405..e5a082c2ac3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png index daa76611f23..2890c3adac8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png index 4328ca313ab..e5a2d0db245 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png index f5bc8e9427c..87610635e87 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png index 1a3f49cc1b3..ba217e4678b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png index 3a850ef0d89..57d5b472364 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json index 02f235207e0..ec84571e001 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png index 3184781883b..68b1a44b6a7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png index 200cced5f80..73797bda24b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png index 1d47eeb0c8a..7514ad28a38 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png index bea2ece2a37..46de28ac3ab 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png index fdafcd1a54c..819e0d36b1c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png index 6ad388244c8..5407da7f802 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png index 2e9de699582..fa70a3067e2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png index e158cc68eef..1c27feec5ae 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png index da83451329b..772670446bc 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png index 176eb22cf2d..ef32c38de88 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png index be3cd97eb7e..f73f5a98fc2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png index 2e6cd06a076..1cb0ad002f8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png index 6348ab2c961..80919be0e71 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png index 6ef78080694..d99b5b4cf66 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png index 8b5eec131c2..b79b46ab702 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png index c76d801bf7b..49a78caa43e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png index 8ec84341db3..d534389208d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png index 0c9bbec52b9..5243cd4e1f2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png index 8049a11c7c3..01c63612c88 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png index a3c39c5acc1..7cdce2c2bf7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png index b6479ec04ef..91dc31d92b8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png index b521190ff10..757c2a4ce12 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png index 9f75f28c056..058dc8a0e63 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png index 4ba7fc7b745..c107e174a50 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png index f0a064cde4a..68d26272e4d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png index bed72ecb13d..75dd12fcd79 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png index 4723be70cb0..b249bec8dcc 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png index e390363d613..8dc4d36530d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon-flash.png index 5033c5a1f82..d9971a4d7a6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon.png index 0bf76e1a88c..06ce3a47b0e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json index 7f118a00371..e4a3096a67f 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json @@ -17,10 +17,6 @@ "name": "off-equipped-HELMET", "directions": 4 }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, { "name": "off-inhand-left", "directions": 4 @@ -33,10 +29,6 @@ "name": "on-equipped-HELMET", "directions": 4 }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, { "name": "on-inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET.png index 68f95ad9fda..2bbbae4bad0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET.png index 890ecd02006..164cd862b79 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..f02e33c6584 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..656bd2f3c8f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png index cee0d6f0293..78fd784c4de 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png index 7079528ae69..656bd2f3c8f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png index 6f4caecb989..f3e1d212c45 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded.png index 7fd9a0b229c..8341273a2c4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png index 98b9db46654..48160451fbe 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-flash.png index d37c1afe3e2..7be8b07a329 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-unshaded.png index 9da6cf4b4a7..b399e296669 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon.png index adfb7557f7e..d451beea472 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/light-overlay.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/light-overlay.png index ff7347fe6ee..2787963454a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/light-overlay.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/light-overlay.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon-flash.png index aadf947320b..7c29d024aff 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon.png index 3c636061bde..79acf653e40 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET.png index fb51ee1331a..96c3764d502 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET.png index 6db97b2cfc2..7826f2db68f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon-flash.png new file mode 100644 index 00000000000..3d11a7cf870 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png index 5cfffd9203b..8070f6af3ad 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json index 7e51d1622a0..d757634ed94 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json @@ -1,26 +1,45 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise SS13 at commit https://github.com/ParadiseSS13/Paradise/commit/a67c929b7394f78e7787114457ba42f4df6cc3a1. Vox state by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:IAmRasputin#5242. Vox state by Flareguy for SS14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "equipped-HELMET-vox", - "directions": 4 - }, - { - "name": "equipped-HELMET-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "equipped-HELMET-harpy", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon-flash" + }, + { + "name": "icon" + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + } + ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 00000000000..02363a7faac Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..b6d4b82b047 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 00000000000..02363a7faac Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..45353029959 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png index fe62e15b50a..3db8d6d2078 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon-flash.png new file mode 100644 index 00000000000..a4cc77a73cb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png index 1b712fe6747..868b329a67c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json index f0207bb6884..665dcac75f3 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json @@ -1,22 +1,41 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14. Vox state by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Python generated", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "equipped-HELMET-vox", - "directions": 4 - } - ] -} + "states": [ + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon-flash" + }, + { + "name": "icon" + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 00000000000..1a7ed3b8666 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..3db8d6d2078 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 00000000000..1a7ed3b8666 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..40370ab769a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png index be2593406a4..ac3cdcbc159 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png index 85281322f01..cafefc96c80 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png index f394a8ea4cb..9f4a44ae3ac 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png index 6baf685a662..9430ccbe5ef 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png index d8e40277ccf..8f1dd0e7cef 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png index 45763e5696f..8f45b56f52b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png index 55b9fa1d3e7..f0a638462eb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png index 896f1fe3754..3974995e451 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png index 865873709e8..e2ee0854b2c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png index 3b8c23b7b51..f43695d4347 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png index 95ed264c5e4..9f4e3124bc6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png index 4377435a3b5..4e50d9dee04 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon-flash.png index e351248c53d..ad1d05885b9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon.png index f5423da5d72..0d15d94b064 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET.png index 08151e7df59..00d8b8771b8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET.png index 7f0e3c5e434..b8b2dc86240 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon-flash.png index 2ecfd87ec4e..1c6db73c318 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon.png index aefc368cb3d..4c29938236f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET.png index fa8f3936225..dac7fc34587 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET.png index 531a5d5a9fa..692feb6b31d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png index 31e787f8223..5d61001fb84 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png index a134c90cca4..724f4ec9a4b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png index f6e00187238..18fd81460a9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png index 44ead9d1ae1..faf1ee14a9b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png index 551d52bf04b..e2ee0854b2c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png index 68733a17ff0..f43695d4347 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png index 370d0a28cfc..9f4e3124bc6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET.png index 2e5db5827b7..4e50d9dee04 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png index 5d5b1e76d1d..38a00798a92 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png index 5c5b4b53d6e..c401c000932 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png index 3f16f842ce9..e4b309374f2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png index f7ec9d2fadc..a88f19d222b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png index c711b3b3309..25270e2bb02 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png index ce766f6f6ee..c3af5d5b23b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png index 853f2d18685..2f0652d4ca6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png index 26398a6b41e..4361d77847c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png index 84f1b0ad31f..5dc8bf301bb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png index 3301c0a0abe..76fe02797b8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png index 2c953f28dda..c85d0436dbe 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png index b2dfdc5d086..704fbb407ce 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png index e9fb8a3e1f3..8f20cb81147 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png index e8aaf06567f..d29322a71ce 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png index 4581e3275d0..217d1f73502 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-flash.png index 6f33c4c29b3..8b7d2171c1b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png index b6e9cb615de..480617a104a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon.png index b1692715e8a..f1d9d29f16e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png index a2da1025505..699a26c7bc9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png index 6a4a0e32a49..b97674fdfbf 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png index e6aafcfcf0d..32759d3244c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png index 4fd853dd131..f7f4fc15701 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png index 8d5c3f58a53..2257c4a0778 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png index 08b6d1d87c5..972df70f3b2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png index 42926ed988c..7b2870ea45f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png index 7be67fee633..a14b45c2c6b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png index bbd6cdcfafc..8f40926b670 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png index 638b2358ff3..a7298ff039f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png index 6a1d34f452b..68ca980fb8b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png index 6d330d446d8..fbbd0610141 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png index 6d63fa871b4..58536378e6b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png index 6b2df0e84fd..580ad3e90b4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png index 37d8a092d9c..67771bb7637 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png index 44443b7755b..47a2dbd5ff9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon-flash.png index 1484052fafe..be2bab84fc2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon.png index 762300d0ddd..75e6d5c2ef3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET.png index 90346571acc..b18ae80fe4c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET.png index d0f4804b65e..29a59713de2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png index 9a6ed93c6d6..94bd456fe5b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png index e64e2148567..55de09bc70d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png index b516a3930bf..adb9ad9f42f 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png index cc35f7a123a..665f3a13fe7 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png index d94faf182d7..5cd71c5368c 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png index f7f37e478bf..2eb9c5fafeb 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/icon.png index 7c0099bc7b5..a631f41dcaf 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png index 662316ab8d4..2c24064f29a 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png index 95e97b47bc5..b31c3b5f9a1 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png index b03816eeb68..07b02e66802 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png index ee1997cc965..fd5d4035593 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png index 4c59df75503..b729198cce4 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png index 1f8ff310244..b729198cce4 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json index 8591b0feabb..a067278440e 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, recoloured by Hanzdegloker", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, resprite by @mureixlol, recoloured by Hanzdegloker", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png index c5e77b2f3cd..7614e6c6783 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png index 14f97f6a445..cd1550f1de7 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/icon.png index af32d2ccd16..227d2a5eb1d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png index 240b1bf2766..c63732d4893 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png index 83f38ce6c4a..4b2381f37f2 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json index 7d73315ad63..6799d6fd81c 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and changed by lazik", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and changed by lazik, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png index 8f503d62378..33718f8d000 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png index fc1ad2e939e..9b62444185d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png index 6f489ec36b7..f85a51143ac 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png index e15f148f013..dc91b0b2fb7 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png index 74bcd6a7230..335f74a136a 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json index ade65863af2..6f2962a0591 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png index 36056a0e4ef..5bd073560f6 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png index da90e4a62ec..fd92ccefe51 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png index 28dc2d9d1d1..8c51d5e5b2b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png index ef3574b017a..b1bf119a282 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json index ade65863af2..56b194c573d 100644 --- a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png index 831b7780eb8..afd8f2451cf 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png index bbc380f6adc..b06fa76f1b4 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png new file mode 100644 index 00000000000..14382a99bbf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png new file mode 100644 index 00000000000..99fd52658a9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json index b21b92751c8..f18f2bc3ccc 100644 --- a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json @@ -1,22 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github), edited by Emisse for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TG station at: https://github.com/tgstation/tgstation/commit/c7dde066687a52e2aad598d19ee01cc0fbaa7d43#diff-4bf8ea7edf380bc679abdb6816b5742859caa8e87532315850772b843c083a26", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, - { - "name": "equipped-HELMET", - "directions": 4 - } - ] + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png index 19048d7d1aa..51ad84708ac 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png index c025248263e..2e86e9d9b82 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png index 32a9300b282..8684787c2d2 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png index b59da29a4b6..00813d1a112 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json index ae83b3a1d48..39f538e2394 100644 --- a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "equipped-HELMET", "directions": 4 @@ -22,9 +25,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "icon" } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..f5a8cf7c054 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json index a470e009443..cec1961dce8 100644 --- a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png index 3abd49cf753..b5938fc8b42 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png index 2a1b9d77c77..c42eefbbf82 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json index a470e009443..5a576150110 100644 --- a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json index 5d633ce802e..ade65863af2 100644 --- a/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json @@ -25,10 +25,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-cat", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png index 20554f5f2a7..2085c263906 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png index 634dbe744c9..33a324b1a2e 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png index 88f5e5ef93d..c6986385b62 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png index 8c68945d834..15f87384784 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json index a470e009443..56b194c573d 100644 --- a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png index c147928c6b8..e1df83ac432 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png index 73a83917879..dc0cf72c1d2 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json index ade65863af2..39f538e2394 100644 --- a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png index 8b7692f0ff3..805cf0c124a 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png index f980e7b3ecc..81cee0edd63 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png index e441011bcf4..bbb6d4fad91 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png index d0213d0eab3..206c5d4fbad 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png index 36d4c7032f2..7a64c47de5a 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json index 9a2a8389628..557644093f2 100644 --- a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1, resprite by @mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..10f06b436de Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json index ab1f7a4abf6..c6887def720 100644 --- a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/0bb49b1a97488349ee89308ad6a0904066e1c6f3", + "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/0bb49b1a97488349ee89308ad6a0904066e1c6f3. vox states by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/meta.json index 38f626d16eb..a470e009443 100644 --- a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/meta.json @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-cat", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..9e7eca032cd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json index a470e009443..cec1961dce8 100644 --- a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png index 26d5c11eeaa..18144f0ed1b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png index 8f180c9e45a..7b80f4be1c0 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json index e099085bde1..2cae5c20ec6 100644 --- a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-HELMET-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-HELMET-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png index abc293aa93d..f60ea1cac35 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png index a1bc3ed151c..ec7ebdb0a8a 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json index 057d0b0ab24..5330004f011 100644 --- a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-HELMET-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-HELMET-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png index 620dca461b1..858fb9b8682 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png index 03983f640b9..0a9316cc1c7 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json index 057d0b0ab24..5330004f011 100644 --- a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-HELMET-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-HELMET-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png index 3abb582499f..8b1762b5722 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png index bc82fd5f9f5..cf910145af5 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png index 615a41f4910..bed091cd362 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json index b3f2f7457dc..7fa3b72f2ed 100644 --- a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png index 534f3660779..d42ab73a716 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png index 10dab5101f7..76d073d09ba 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png index 617f6b45792..4bc117678ea 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png new file mode 100644 index 00000000000..a979cc3a601 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png new file mode 100644 index 00000000000..34a1f0488be Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json index 7bd2e3e22a7..5a576150110 100644 --- a/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -13,6 +13,14 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png index 36f945fe2a6..7f19e2afbc7 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png index b86a968e89c..e5d79e13c1f 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png index 77b6ef5b3d4..02a70348731 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png index cfee6aae70e..b1f9826b902 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png index 5c7a58cf14e..f33d605675b 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png index 2206f9d17d5..a4574bd396e 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/equipped-HELMET.png index 67feca27edd..06dc565ac87 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/icon.png index d688522bc50..72c44e1a17d 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-left.png index d07ab182383..9a83298a823 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-right.png index 3592fb67f57..0d626db0a1b 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/equipped-HELMET.png index b41c00ca5fa..76721857bc3 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/icon.png index f38509cbc1c..2b5e2499329 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-left.png index f5dd6a73217..868d35219c4 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-right.png index cd8e066d37a..65a6381f0aa 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/meta.json index 6aae6f00975..8f2f13ebd71 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37 and repaletted, inhands created by Flareguy for Space Station 14", + "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/equipped-HELMET.png index 6e0ac9cfc41..30f16ada3df 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/icon.png index 377fad32bf4..2b5e2499329 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-left.png index 7b91444077a..9687a7e4ca1 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-right.png index 4982132d29f..65a6381f0aa 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/meta.json index a4a0293921c..8f2f13ebd71 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37, inhands created by Flareguy for Space Station 14", + "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/equipped-HELMET.png index a644a20e0a1..6a4039bb890 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/icon.png index e9c5c7ae71c..09ec4b5e7ae 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-left.png index b768856809d..bf602632feb 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-right.png index 2f289e525ae..f0954b39fbe 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/meta.json index a4a0293921c..8f2f13ebd71 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37, inhands created by Flareguy for Space Station 14", + "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png index 952b32f3a1a..1f6b8adceba 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png index 3264d3cde68..9f9bbec6d5d 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png index 59457ba90c2..bcc1de5ab1c 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png index a2892255be8..55eaa9ed576 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png index 9640ec825fb..cd3dc7f5575 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json index abfed0635af..d507037ebee 100644 --- a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb. Vox state by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. Vox state by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..4d8b97d11ed Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png index e6810d74524..e9c3ce54dc9 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png index 0c0dc62be7b..e3898cc4d3f 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png index 0a75a797db7..08ffe2f6de0 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png index 5c7f8b902b1..a65a7146efe 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json index bc6cc714e91..5c59779d4dc 100644 --- a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441. vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "equipped-HELMET-vulpkanin", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png index 703d927ecfe..47a6bfb145f 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png index 4fd9f44ff21..8dc79d4be66 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png index 325084b69fc..b5e41dfe7ba 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png index f8f7501afcd..bc0c6e4c958 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png index a8bbe3dfac7..a578aeefb34 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png index 6a4f85e4190..f5f0257ff70 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png index b814dfe5a57..78bbbcfd041 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png index e5b88c6c1a1..4585c268498 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png index ffcd06463c7..7b005ddacb3 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png index 1ed974c2062..e13fb420993 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png index 030107f05e3..770a9c020d1 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png index c334355ba85..27ce818b8e5 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png index 423f3fe52e6..9316e65d1c0 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png index e228a8a33aa..31bb5b7ada0 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png index 6c958708c8d..194c17066d2 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png index e0ab815b503..2932481da1a 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png index ee9a05fcdbc..0b343eae4bb 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png index 5264b993e46..24b5fe10dde 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json index 4441be48f01..e7019f46d0b 100644 --- a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by Emisse (github) for ss14, edited by Skarletto (github)", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png index 9ec0e020424..4c700f91d4b 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png index ac1fd8367e9..26421ad5a87 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json index a9b40d83e27..e7019f46d0b 100644 --- a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png index be5f9402faf..d9694e7e0f8 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png index e456036c672..13964877438 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json index a9b40d83e27..e7019f46d0b 100644 --- a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png index e5898d7f1d0..5eaf6241cf4 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png index 5ed01af8296..b756df1bc18 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json index a9b40d83e27..e7019f46d0b 100644 --- a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png index c0af293f675..507db02620b 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png index 8b044ac7be2..a2145dc6111 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json index a9b40d83e27..9bdc29e9e81 100644 --- a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "made by emisse for ss14, Resprited by MureixloL", "size": { "x": 32, "y": 32 @@ -15,4 +15,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png index 68c5c0bb230..c2258997cbd 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png index dae1c518496..d78c6b43bab 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json index a9b40d83e27..e7019f46d0b 100644 --- a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json index 5f95573206c..7db1931640d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json @@ -1,30 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json index e482264df5f..437d51cca4e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json @@ -23,4 +23,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json index f9e375d700a..d82259b9770 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json @@ -1,30 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified by Taral from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894. Vox states by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified by Taral from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894. Vox states by Flareguy for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json index a9366f0bc1d..e6b318f55f0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json index 5c326232e4f..89684b2c745 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png index 57f22a6c322..486c6767dbf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png index 5d8cfcc4940..b64e078a1cc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json index e482264df5f..ed831eb49fa 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/icon.png index 1c9e96a4f5c..a5e7e4e7cde 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json index 232bec9c0a2..d8103384068 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/icon.png index 26d8466aca2..09c122206cf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json index 232bec9c0a2..13e225f916a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/icon.png index 0359c2f8ebd..f588fa2efbc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json index e482264df5f..437d51cca4e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json @@ -23,4 +23,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/icon.png index 1547127402c..b305bae7277 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json index e482264df5f..437d51cca4e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json @@ -23,4 +23,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/meta.json index 97c559cbdc1..bdf69368849 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/meta.json @@ -23,4 +23,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png index 45ba5b9a32f..594637a033e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png index fde6c90e2ca..46aae7f85e8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json index c429d1116cf..686c1b1e540 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb. Vox state by Flareguy for Space Station 14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. Vox state by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png index 0063e8cda06..9ee816f6245 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png index a92566d3087..ae2cdb35a38 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json index 434b53f4728..686c1b1e540 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for Space Station 14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. Vox state by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png index 59d6ea3b487..fb4087b662b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png index 23bb26f648e..f2b15dd82f3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json index 9b89dd2d076..c1129ed4377 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png index c2d3934cbb4..adfdc99fbee 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png index 3e9c24edaf7..cd1bcd2e14e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png index e5e277dbccb..03622842881 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png index 0e0e6230acf..65eb36b9b47 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json index ca1146d007e..9aa97735040 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand by github:Morb0, reptilian made by kuro(388673708753027083). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png index 5ffa5786187..0867d9794a5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png index cfdd1918256..c439c7ab23c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png index 6e98089bd4a..51abed13259 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png index 470def2a417..0aaa3645255 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json index 232bec9c0a2..37431831fa7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand by github:Morb0, reptilian made by kuro(388673708753027083). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png index acb3d355f2d..fdc219ce202 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png index 71a603615bc..1b9e8be4211 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png index 6920ec8f749..6011316bd2c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png index e3d2c93b6c4..f5743b6a55b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json index ca1146d007e..9aa97735040 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand by github:Morb0, reptilian made by kuro(388673708753027083). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png index a7d80f02b41..c9481ce8c32 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png index 4b16a3255c3..8e9483e783d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png index dced6667b00..b702994435c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png index b69b0bbd205..33d4b9a5994 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json index ca1146d007e..9aa97735040 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand by github:Morb0, reptilian made by kuro(388673708753027083). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png index a779b3812df..67a4f30ea5d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png index eea15cfb0a9..5522eb9de44 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png index 36bd1257f2e..d1164c39ab7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png index 89de6e8fc6f..22bf56e0b78 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json index ca1146d007e..e34d18efef3 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand by github:Morb0, reptilian made by kuro(388673708753027083). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. inhands by Flareguy, modified from bio_suit in vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/30f9caeb59b0dd9da1dbcd4c69307ae182033a74", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png index e1e81a8409d..6fae8df90d8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png index 52bc430c98c..ad0a604d211 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png index c91403c1231..b6815a0e790 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png index b2a41d23cc1..644533b0098 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json index ca1146d007e..9aa97735040 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand by github:Morb0, reptilian made by kuro(388673708753027083). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png index df85eb0944e..a084bd3d4c6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon.png index 381fdb8955a..56d81ce3e07 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png index 9e96b9e48aa..acaa1611de4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png index 69ab367846d..33fbeaa3d90 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-left.png index 48eae2b05b1..93874d96036 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-right.png index 582296eb74c..8ae91d40c3c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json index 13bf8611379..cb67ae6b851 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord) for Space Station 14", + "copyright": "Sprited by Hülle#2562 (Discord) for Space Station 14, Resprited by MureixloL", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png index 24481b1f748..a53a7049f1f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png index ed3481d3d2f..67749bd79d8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png index 9f79738900c..6ae85c89b5a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png index b1315700d18..c9dfddebd9a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json index 18a65e16d71..470778d93af 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png index 31e6f31708e..e89ec20485b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png index 987679cecb9..c45743726c6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png index 20ac8b6d189..3b4410b9a5f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png index aa0228cf311..52b9733ec13 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png index 4d6c9347906..83e924a710d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json index fa20ea7d596..3a16a25da70 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png index fa32996aa89..a6546c46557 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png index 636a1cb9088..87658bf58d3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png index 8109f04f48a..aa1ed9795b2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png index 612ddf1b54b..d8d511a1064 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png index 489f958b9e9..3c79e71b80d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png index 54bd14c8aac..4d242231b34 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json index c2b48b1d762..acc5b104736 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, reptilian made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -46,4 +46,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png index ce7c029026c..2ecf1e68e01 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png index 86c2a978ec2..ab0dc88ef30 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png index 6d96d0a0379..7d73e554619 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png index 1e12cf6ba6d..564a71592d2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png index 3250e534f7a..4e3cc765027 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png index 6d8083c9450..5f98915603e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png index 57d36185047..5874b7c2e19 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png index 5f3b6bdd5dc..c20728e8b29 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json index c2b48b1d762..b9d629b8574 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand updated by github:Morb0, reptilian made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -46,4 +46,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png index f83538ee601..bcf14c7791d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png index d06ce6124fb..6c0cb71f9de 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png index 58b84263ac0..eaef9455081 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png index b81779a5fc4..ef6945707c1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png index cec0cbda47f..98f94fc9a40 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png index 49a486ef944..178aae3e797 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png index 31025b7ddad..4e22376f6f0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png index 01e8e0fbc11..0d30f6df1d9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json index c2b48b1d762..dc94cabfc02 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand recolored by github:Morb0, reptilian made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -46,4 +46,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png index 547839061b6..b9da47830b3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png index a1b3376682e..cc7fa6b486a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png index 31025b7ddad..9aeb2c66bc2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png index 01e8e0fbc11..2fa58045802 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png index fa9a53d3735..03a4e52f7b9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png index 229cc8f9642..6f4213e888c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png index 5c87c278b87..340c19e79ad 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json index c2b48b1d762..8fee7c4da58 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped and icon remade by \u0440\u045c\u0459\u2020\u0440\u045c\u0459\u0409\u0440\u045c\u0459\u203a\u0440\u045c\u0459\u045c\u0440\u045c\u0459\u0409\u0440\u045c\u0459\u0452\u0440\u045c\u0459\u2022\u0440\u045c\u0459\u040b\u0440\u045c\u0459\u040e#0912, reptilian made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -46,4 +46,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png index 9cba3e8ef3f..1824ac30a7f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png index 270abf067e5..d676a5df2bd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png index c78886effea..cdd4222d4a7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png index 02ce32c8624..b81190c3a09 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png index 83d3f527c8c..d14c033652d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png index 99937faf28e..b0295d7b3f9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json index 02abb078069..c1ec11c5d03 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e; resrite by DreamlyJack, Fix sprites by DreamlyJack", "size": { "x": 32, "y": 32 @@ -38,4 +38,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png index f6c705937e4..eeb27d9ce91 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png index 83d3f527c8c..d14c033652d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png index 99937faf28e..b0295d7b3f9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png index 89369f8794c..f99be74a5a9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING.png index 1b2c62a529b..f3693458763 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon-open.png index ee28dc51c42..fd73bb00197 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon.png index 570c4ec1b49..5ee31c39711 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/inhand-left.png index 5dc3a92fdcd..424ce7087fa 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/inhand-right.png index c28ef522612..0caa83e3970 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json index c2b48b1d762..ca31e15b670 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, Resprite by DreamlyJack, Fix sprites by DreamlyJack", "size": { "x": 32, "y": 32 @@ -46,4 +46,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png index 973451e5f5b..d4813efe64e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING.png index 03f66e91d86..f26b18d6b42 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-left.png index 5dc3a92fdcd..424ce7087fa 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-right.png index c28ef522612..0caa83e3970 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png index 134e2856bdd..c61ea628d36 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon-open.png index 6b5a60bbe18..75ec5344018 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon.png index 9830020e334..0897cf74967 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png index 0a5ccbabcd2..36e5d67001a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png index ea28f8cf3e2..28f96f29515 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json index 46a5d33e019..57b8f1dc059 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at pull request https://github.com/space-wizards/space-station-14/pull/10758,", + "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at pull request https://github.com/space-wizards/space-station-14/pull/10758, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png index 6b669142222..ff2feceec6c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png index f71113eb24d..62df9c6904a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png index cbd68e913bf..f331c1788a6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png index ed02ccf8024..09ba6cf8ae9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon-open.png index 38dff182515..838a8c94321 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon.png index c4cc759c34d..e70d5bd2d42 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png index 59b2c93e608..0a2543edeec 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png index b3b9ada646c..5ebc12a7922 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json index dd16b8c78e5..379944af891 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at commit https://github.com/space-wizards/space-station-14/pull/10758", + "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at commit https://github.com/space-wizards/space-station-14/pull/10758, resprite by DreamlyJack, Fix sprites by DreamlyJack", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png index bd35aecb083..62569276f38 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png index 4683ab9d081..0a2543edeec 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png index 389d9294228..5ebc12a7922 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png index e432bb2d017..38b48d0a2d4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png index ff140671f3b..b4e66f21814 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png index 2ccbba517ec..8d67598b6b8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json index c2b48b1d762..2fe36ca30e4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped and icon remade by \u0440\u045c\u0459\u2020\u0440\u045c\u0459\u0409\u0440\u045c\u0459\u203a\u0440\u045c\u0459\u045c\u0440\u045c\u0459\u0409\u0440\u045c\u0459\u0452\u0440\u045c\u0459\u2022\u0440\u045c\u0459\u040b\u0440\u045c\u0459\u040e#0912, reptilian made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -46,4 +46,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png index 2363b4118d0..ca6d049a1fd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png index a56db4fd532..56983936f41 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png index b62a0318da7..8760a37e84d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png index b226550a5d1..5f18b94c806 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png index 51b08d95681..b4cd26fd59d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png index 464ee509bc3..9d7d68d0ab9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json index 232bec9c0a2..cb3d6dfd905 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png index 9c188ab7291..1c0a679e9ec 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png index 85e6c096e3e..b7f7f307e1f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png index 60bc426d8bb..6e20fcd5ffc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png index 8b4abf2e18d..612296ba7c6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png index eb6d63a7553..cda3535ed11 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png index 432e48be40f..e14d077eb4b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png index f8f5c1d402c..d6d36cc7c31 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png index 3ff74175cdf..e92fd8d8331 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png index 6e1f10cfdea..c4fd38e53e9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png index bd3c592a1ff..ce1a6809ee2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png index 77994efec81..deda1dc8cc1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png index f3aeb98d697..a2281127fa6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png index 471347b1ff7..b31411383b8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png index fbd5291cf76..c28f18c7734 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png index a835bd27a0b..b25da10d604 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png index f89f3ddea44..51bb5aeba04 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png index 83cd6ef9028..626856fd5e4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png index 442c1230a52..42e5d0e5e19 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png index 31fc1a5227d..bff0ef69d9e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png index 05c21acd9b9..c6c6532bbca 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png index a6f1904a2c8..ed8f796b772 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png index 87c3f8595a9..f7da65b9680 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json index e3d8adebbe1..53365fabe73 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json @@ -1,34 +1,34 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/97ec5ed1a0fc8263df5df5a5afbb653d4684992e & icon made by github:Morb0, reptilian made by kuro(388673708753027083). Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png index 62ff24def93..1bba483dea0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png index 2fa0358ff63..728b4e9ee60 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png index 7ac2fbde5e3..7ad59e98dfe 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png index 77e0426ef48..6e2018cbc23 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png index 0545ffa683b..1c5a054bbae 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png index a0d0dd7125e..60c4c9631ef 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING.png index c7ed8fa9ff5..3979563a420 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/icon.png index 8d7c6be6a65..b87ea614d84 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-left.png index 9071444e119..23efda34287 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-right.png index 715c65f4b6e..e6d48fc2983 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING.png index 2873bc483d5..1f52d8b5d2c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/icon.png index a72a1da8eaa..34e8eb96406 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png index 17925efbf43..003645bb30a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png index 1c3177b459f..79faa4c5319 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png index ab9ffc9a9a3..0c126c88192 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png index 560fb552f9c..7a40cb38d88 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png index 6513ccf2738..8b00ab058db 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png index 6bcee818b2b..e58ff1f270b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png index 32dbb4bcbd5..ade4a82935f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png index 690d4cef200..aef371c7d4c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING.png index a7fa5600f5c..df8d93fe6f8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png index 9312de4a0cc..af4fcd6fe26 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING.png index d85158a7f59..a3d49b3a243 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png index f014aca7cbb..cf02755bc65 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png index 9a49a516b52..c511f315701 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png index 128c6375560..cb03c690626 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png index 6b99071d3d5..fbc53c9c2c1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png index b56335aef57..0ccb463801c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING.png index 486b50e13c4..02ccb9def10 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/icon.png index 70a02579158..245a533c78a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING.png index 3d91e4ba118..f962f659fba 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/icon.png index e44b9e4863d..57db507a3d0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-left.png index 08f1ed177f0..84f9b645e08 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-right.png index 9ddd8a6ecd4..904cb795985 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png index 24837f4d9aa..9f18305453e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png index 31f9e2f0e94..3adc8e7cf5e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png index 02bb28f88c6..cac61451dd6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png index 14e31e35ffd..7b2c993890a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING.png index 9da142bcba2..e162324eca7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/icon.png index 5b6631d7836..7fdf08e87d6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png index 3465700d9b4..b88bdcbd04c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png index 8081c5962db..c872887cc36 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING.png index 6daf184ffd0..03052595f60 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png index d81d730fb49..a5cda9101bb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png index a1ecf105b29..45dfbaf6f37 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png index 4f04fd6bf45..8a87bee67f9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png index 391c62adad5..1924c3a3fd5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png index 2093000d233..e43e20cd9f3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png index 5532ef90e61..f8052710838 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png index 340f4d1a674..392f98177a2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png index ec979f4b511..b80e00ffeff 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png index e5d891560ce..1619a08e9e7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING.png index ad53d336836..6e7481438bc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/icon.png index afcfd3527c5..edf2a5fc5c7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png index 09402a1cb76..7f16c61a2a5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png index d8ace82fae1..d94dd3bc294 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png index 2102993402e..268fde26b14 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png index e4113194a3e..29b67726d88 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png index ecf87e190af..b7b52f0c416 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png index 7a423e798df..871fcbd074a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png index 2102993402e..a27d75760ad 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png index e4113194a3e..11f4011e6ee 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png index 8a88030e8e1..24970c7ac6b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png index 28c21b611b0..0ba07b9c382 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png index 0f415d109b9..3ffcc52ad0c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png index 75076efb127..a5ae29e3665 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png index 2fc4a8bc9d0..1ae4bd3036f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png index 8f2ed21fe50..ef1d5c5721b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png index 6fdf0f3318a..b3240d55147 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png index 0e6f5a83c86..4fc74ac8c52 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING.png index 24be13e43ea..852ee41ee95 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/icon.png index 4d552add4c1..356fc50bfb2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING.png index bfa5e02c5ec..9e0c70f8ca3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/icon.png index 3f867edd709..044301f8924 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-left.png index a12a5e9854d..4fceca8ddf3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-right.png index 2fdd95a63f5..9cb39f954a1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png index 64b3aa3c5c9..18c9d17ca2d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png index 693d215ff32..39c84373a37 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png index 0c7f537a424..5fb79730ee4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png index 23152285cb1..7592e9e2994 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png index 28f0ec6bd1c..97f06bdea26 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png index aa750ee200a..ad843169539 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png index 526891c8230..30468f6ee31 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png index 50872d177ea..96272297f22 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png index c125b0affd8..13c3b241faf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png index 5bb527e1b02..0a73d163213 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png index 132d9aabf0d..8c3605f8b54 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png index e3b31316cce..ddebc2e4c39 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png index 4d432569767..d91d2192feb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png index 2e86e344383..085b66f5010 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png index e0de8c7ec98..fa5e1f94200 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png index 457d2f0aa73..30dd5afe3f3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png index 46c4bf259c7..26ec896bf6e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png index 17e322a6956..9474a313756 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png index 57fe7a1def9..36396bc3f0d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING.png index 0ac62cbf2fa..dfee2f68827 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/icon.png index 78a44d8bc14..5a55affff81 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png index f1892bc740a..c1bef370422 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/icon.png index d0c43471e9b..ea0e69d4f42 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json index f2f80aaa03f..269e7ea5a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png index ced9838dd7d..0822145e3a5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png index d0de463ca27..506ef8e9ffc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json index 19f610cdfe9..269e7ea5a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png index 0b3086ac587..687810dc881 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png index dd14ac0a8a8..407dabf42b2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json index a4806cc1cba..3c81e9f96c2 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, edited by Skarletto (github). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and repaletted to match with the default state", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and repaletted to match with the default state", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png index a4751765d54..e9a5f8b6bc5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/icon.png index 6224f8b1f3d..55994e86a31 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json index f2f80aaa03f..269e7ea5a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png index 7a7061d42e8..111d332535d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png index a867bb2a97c..7a8f610acaf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json index f2f80aaa03f..269e7ea5a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png index afd123b81e5..0f8b26f5395 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png index 2993e8f19be..077ec0bdd35 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json index 146bd662b49..5f802d30832 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png index 111444a42c3..7b0ddc07f12 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png index 65b29650ec1..d4b8ec88cb1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json index 146bd662b49..5f802d30832 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png index cbc9deecfd6..b4cd6820608 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png index 22c04eddbf3..097ee689d4b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json index 146bd662b49..5f802d30832 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png index d28cc36bceb..dac05117e26 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png index 438bbcadbb9..d5dc668092b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json index f2f80aaa03f..269e7ea5a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png index 1ddb9611690..1e1303e45dd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png index dc1dce02ce0..3a49301ecaa 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json index 146bd662b49..5f802d30832 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png index 46872867933..73967afb0ad 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png index bfeebc5ab8e..367eb564d1c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json index 146bd662b49..5f802d30832 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png index 22b8a7a1c19..8e39e4df883 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png index b4b72c17840..855b6bb3e42 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json index 146bd662b49..ed831eb49fa 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png index e7b6ea0e77a..c5ea3fd2395 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png index 3d19bd85b7a..96b3281455f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json index f2f80aaa03f..269e7ea5a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png index 2efa802498b..788bce0c831 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png index 5ee73fd113e..cc65b63316b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json index 146bd662b49..5f802d30832 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png index 9f624b8c61e..1fa168b3cf3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png index d4a0c976c8f..a4a352d0985 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json index f2f80aaa03f..269e7ea5a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png index 74bb92031c5..3062975c599 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png index c3e059dfd12..0d3a0e680a6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png index 27db7d78b07..8e864953568 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png index 855b726b359..ffa0818f5b1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json index 1c427d3df9f..2d4f5082169 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, Resprited by github:DreamlyJack(624946166152298517). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png index c9166a8add4..10b9f3bdc25 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png index d1ac8ea82a9..bd412069181 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json index f2f80aaa03f..269e7ea5a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png index 231dd31f012..6b4f55fedbe 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png index cf00747dce5..1a8a4cc50bd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json index f2f80aaa03f..269e7ea5a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png index ef618ecc1d6..56cc3829232 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png index 12537c8d097..0c906ae2374 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json index 146bd662b49..5f802d30832 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png index 2a803b480a3..354bd77b7b4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png index 92f99ea46d6..062378ba5c0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json index 146bd662b49..5f802d30832 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png index f7ddec5305b..0ac466ee2c0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png index 5ecc8c108f7..7cef5a44903 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json index 146bd662b49..5f802d30832 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png index f4511975320..61bf1b5b0f3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png index 075acb7eabc..f155f597ce5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json index f2f80aaa03f..269e7ea5a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png index 9d201dc1ecc..6a6e97b9b38 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png index 00b5a10f039..deef07ea16e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json index f2f80aaa03f..cb3d6dfd905 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png index 3c5303d52c7..cb1eedcf871 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png index bb8bb2820bd..a3bdca4be74 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json index 146bd662b49..5f802d30832 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png index baeeca8781a..4283f3ffeb9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png index 854ea543e96..b4e958b0b7c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png index 464c4bfc5e3..83e5da1b6bb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png index d537128b824..a59a5246357 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json index ade0905fb8b..fc2108e65db 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 / https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, recolored by Github user Dutch-VanDerLinde.", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, resprite by mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..f6e8747d4a7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png index 28cf03f49cc..890563ab432 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png index eaf984f4378..b12879adfd9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json index c9f0d90ea13..1ffb8fc6bd5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd and modified by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png index 6a867d0ffd0..205ff59c34a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png index 88e3456ff15..5632c57eb31 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png index 0a44f2f3e98..5f31602b187 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png index 815b2a813c5..c5df8b73fbc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json index 1be161f5fb0..8ef8c7b5236 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey made by brainfood1183 (github) for ss14", + "copyright": "https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png index 081fd4fc043..ab93302717e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png index d8b61ee3e06..4c6ff3d1445 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png index 580490e1d9f..c473f19e70a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png index 19404ed83c1..3b5560521e7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json index e159206ad48..36ba443fb53 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14 | Resprited by Hülle#2562 (Discord), monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from Skyrat-tg https://github.com/Skyrat-SS13/Skyrat-tg/blob/735606d73c5262dcce6a5d9b9cfc797eb5a64946/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png index f6b6d7ab040..8651ad10e70 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png index 8a65d6675e0..50641b757b6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png index b95ae73479c..46bc66d25f4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png index b43fd233e81..db345a7434e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json index 781a55f15bd..4983d761653 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, edited by emisse for ss14, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png index dbdb51cef9b..032be6c35fc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png index 67fd943b4c2..2575dc3ac1c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png index 9641f214a53..45020687309 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png index 0b3d0087478..f6bcc2b1437 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json index 6eb08f0f320..0b57c04149c 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png index a8c6d46508d..a9427d23b73 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png index 664c857ae43..f66fb63ea46 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png index 7300529db96..67ff16712b8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png index 72d82e79376..251c32a11e6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/meta.json index 12bdb72c4a0..a4f81a395bf 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, Resprited by MureixloL", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png index 3263c54ec99..0b9a452a711 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png index 5f662e0280b..38f77ef6fab 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png index 4cb7704e2c9..cacc5915118 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png index 93477d07f5c..f5bb87d2946 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png index 06c845ef84e..9d22222bb04 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png index bdbd3ea4881..4600638d9f3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png index 7822bf686cf..08bc5114d53 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json index 425a857f025..dd13ffd1b7b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by KingFroozy (github) for space station 14", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by KingFroozy (github) for space station 14, resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png index 600f014582e..f973da56293 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png index a72665e9930..0102558ed45 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json index 36ab573091a..4ab97e3ef8b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png index 37435795c5e..8fd7b18c8fc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png index 6969d40be71..3cd2bace431 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json index 36ab573091a..1dd4e0e0100 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png index 5608a2451c9..f36a0ad7812 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png index c5d3ad90e05..3fb69dcac15 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png index 955ee298f60..31d07ff06f4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png index 029688868db..944f6fec68c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png index a2581dab5e3..a64fb9b3919 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png index b4d2825f0da..0c9280bedff 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png index b5702f2d315..ecb6c89e68a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png index 921ca6fbe48..dcb4fb8f583 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png index ed69a457387..e9182e0b529 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json index a81e5b94776..de9ec78a62e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by Hanzdegloekr (github) for space station 14", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by Hanzdegloekr (github) for space station 14, resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png index 567a06b8d3f..0b17ad30671 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png index 0d8ec239482..330e9e437ee 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png index aed8b4f025e..aa9b5112d94 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png index fd6f60eabb4..5e1581b51ab 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json index 36ab573091a..e685fe5a8a8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png index 6e576b6e40d..73905b44c99 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png index 737576e1563..fc02b31eb99 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png index 15c30a04914..d5ca96c85f6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png index 53512e6969e..0fcbfbaf67a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json index bbcef071e2e..e685fe5a8a8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png index 0fe314e7781..3426f0eb924 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png index 76ea48170d4..6190e526fdd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json index 36ab573091a..1dd4e0e0100 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING-monkey.png index 49b52d58593..be6b1c9297c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png index b464902a9ec..8e177170996 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png index 0ee22bf147f..0ec620df97a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png index cfb2a8ff2bb..46beecc032e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png index 7071a1d5128..50324f3fded 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json index bbcef071e2e..92c141c8064 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14, Resprited by Mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png index cf547d1ce9a..3359a44239e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png index 69b9a2ff976..d9e02bac63e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png index 0eff0ab3faa..08d6150503d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png index 31ba54e8af7..fcaffe8630f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png index da24e1e5f5d..132998eb218 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png index b8b3c25e76f..78678f30b50 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png index 682bc0ea02d..6bd1fb7d5a3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png index 2e4a7103ae4..6162151b80f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png index 8d34f3244eb..6bbce7a0aab 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json index 36ab573091a..daf51b253f0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, monkey made by brainfood1183 (github) for ss14, edited by Deenkaide (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png index f27e553b991..d76f9614fea 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png index 9f82ea76731..129a24cbd14 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png index f38f8dd3a77..31e526f0970 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png index a377a731b13..52022a8dde7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png index 56b96469654..8c772eee012 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png index 2400ac8d752..41a97c9d3fe 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png index 9feaebdb55a..dffffbc9889 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png index 6b8fccf1f47..aa45782ecdb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json index 0a48ac3e373..3f17e46010a 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47718914e47c6fbf23d6dc97f073a9daa11b23cb and modified by potato1234x (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png index 3128383e68a..ba9ea65cec9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png index 5afae7d932c..715401b683e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png index e6532029e45..074f5eb50cc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png index ae1f8542922..f86b2ad0e64 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png index 59518c35c36..dccaf261df1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png index fa96803d56c..770188d6f1f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json index 36ab573091a..47966793b35 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, Resprited by github:DreamlyJack(624946166152298517)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png index e38db3e03dc..05de5d50b13 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png index 26bcd5c0757..5c91d2e37e6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json index 94d2cd0d9de..1dd4e0e0100 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png index b582d02aa8e..a13937f7643 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png index 3440af11d7a..7f61c958c15 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png index 8eed62b0f76..41252784be2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png index bd94c01bba0..bb27ba0b70e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png index d91c9c28e78..12acf1e8290 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png index d85c9f7b60e..fdd132d8052 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/meta.json index 12bdb72c4a0..a4f81a395bf 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, Resprited by MureixloL", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/equipped-INNERCLOTHING.png index 1b58594e9e2..38b69284a76 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/icon.png index 7868175f99e..77c2728c233 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-left.png index ee12b32d15c..cbb47c4bc4c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-right.png index f927e8a343b..b007804fc7a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json index cb8a2af0875..6b0da573ee1 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Derived from beestation qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14", + "copyright": "Derived from beestation qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14, Resprited by MureixloL, edited by Deenkaide (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/equipped-INNERCLOTHING-monkey.png index b1b0ca09716..70f85c55404 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/equipped-INNERCLOTHING.png index 3671a3b548a..05e3b5408b4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/icon.png index 77e75f8fb9f..46eb55c8de8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png index 9f940e51ff5..22a92a8b932 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png index 169bf43315c..5f936e68a64 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json index bbcef071e2e..66f144a6b3f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14, resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png index 2278c797023..af5abf6f0bb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png index a7f82133677..861539fab81 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png index 0dceab67590..bacc6c39de6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png index c512a197cef..d107c18c8da 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json index 16b45eec87d..bb0a29fbfcd 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5da269bf8615c7d645ab85556a0a658c20baa74, monkey derivative made by brainfood1183 (github)", + "copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github)", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png index a55307841a5..46841906996 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png index cf454bc23a5..9a860aeda10 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-left.png index a6f9089cadc..2f1666048ff 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-right.png index a4c036a4577..8540677f193 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json index bbcef071e2e..080788ccf98 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png index 8781d46b5f8..3b8dc119043 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png index accf74dc8f6..8f89295199f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png index 77471c7dc44..49f0cf11bda 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png index b2a0093c517..a9b652bf0a2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png index 3fc106cf45d..30c9a42f81c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png index 9875eee60e7..777b44893b0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png index c37ef04570c..7bb070857d3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png index 2536ec824c3..172fbdda6a3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png index 07d0b38025f..7e5897e662b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png index 2541991f9a4..db387dfe419 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png index a238a7d7be8..d8194eaab57 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json index 9b15553cde9..c8cd53cefed 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit of hazard from tgstation at commit https://github.com/tgstation/tgstation/pull/67000, by Nairod (github) for ss14", + "copyright": "Edit of hazard from tgstation at commit https://github.com/tgstation/tgstation/pull/67000, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png index 2f8c480cb5a..1e6eb63de40 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png index 8d2ae436492..6b303ff3069 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png index b08cd213dee..50dbb8f376f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png index d90b6f3c45f..d331c0b8e58 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png index 356e2a5ec28..e1fb6de9ec6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json index 7f498ead9b8..d6abb0ec89e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of secskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7779930358ba4776575975690d2c952f0d05c6cc", + "copyright": "Edit by Nairodian (github) of secskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7779930358ba4776575975690d2c952f0d05c6cc, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png index 830f482ab86..57486af7c2e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png index c92abfde99c..3ff0643c8bc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png index 65ef81a2529..4015f8a5f06 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png index 4381a0172be..3671b2a450f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png index 3855dc44e1b..b0b494d5f5e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json index 5b8e4130385..da2b6066cbf 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of paramedic_skirt from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236.", + "copyright": "Edit by Nairodian (github) of paramedic_skirt from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png index b317451d8ff..afe9c8e187e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png index 0d1e3b13bfa..763776e4afe 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png index 8bbaf401e9e..8bfc4cf7b0e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png index 197f1a6af51..5c985b11edd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png index edd1c6fdbb0..06595802ae7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json index c2d804360bd..259724c9003 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edited by Nairodian (github) from the formal scientist jumpsuit by Flareguy for Space Station 14.", + "copyright": "Edited by Nairodian (github) from the formal scientist jumpsuit by Flareguy, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING-monkey.png index 0dbaa2e513d..23e89143dbc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png index 361a1d1e046..fb496caefb5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png index a93fd858b6b..60f99acdb8b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png index 1bb069da772..00810b8b8ba 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png index e8cfe71e97f..d157d36e8d9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json index bbcef071e2e..92c141c8064 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14, Resprited by Mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png index 56e7e3567a3..3cbdadb672d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png index 77db2ff0284..75e2558dd48 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png index e74a13048fa..3fad51040a0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png index 61b1d0694ac..8c3a66b401a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-monkey.png index 0c918856626..4fd9e0a298a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png index def12bafc6f..82418208272 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png index 209d9a8ab39..2929d360927 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png index 9cfedb2728f..5f31602b187 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png index e5035e20ded..c5df8b73fbc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png index 160d5a94ab2..512f10ad5bb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png index c0a4aa3346e..02baf32b46a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png index fbb4b5e7a42..c473f19e70a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png index 35244353f1a..3b5560521e7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png index f7bd08b91d7..5f3df23fd12 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png index fbd1b6aea5b..210107b305f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png index 127e4ded44a..c0ef848e60e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png index f0dad45c99a..c591079d53f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png index 1d8ab34a208..e8d24fd2676 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png index 368d24a3331..0134f44da2f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png index 5ad7eb1c1be..efa8c60bd55 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png index 0d6dc2631b9..e0c9f86274a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png index 1bccf1eb46c..aebf621ff9c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png index e0b994af897..56f5030f2a9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png index 12e582665b7..5a4dfcc3a91 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png index 2c4d0d5d46b..63217101367 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png index fede092c27e..d09381cc976 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png index 190f71c4a50..644c00b78d4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png index 9885a2bd4a6..f14bbccd629 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png index e0881f66bba..15e8e1f912c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png index e9165f29cc2..4dfc92de50b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png index e2c37a0c2ca..fcbdc143b1d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png index 7c9e3cfc923..2546610a85a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png index 171598455fc..751e8ca0202 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png index 50def373e33..47d5fc42962 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png index bdbd3ea4881..ae0e994aaa5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png index 7822bf686cf..7097222fa13 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png index ad203eb9b33..fe77eb77ef5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png index 79e67276608..c509859469e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png index 3c407d9f125..dd26125b97b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-monkey.png index c1aa7a75924..348f64c2946 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png index aef08cee2cd..be50ecee1e8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png index 9fcf7ace5a2..11cf6c6f98e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png index 7423a21e658..fdb9558af68 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png index 01d31abcc81..da40d32ba00 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-monkey.png index 26af4f6afb8..cd0c5c8e798 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png index de50443a1b1..f5f86400759 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png index cb5599f81c0..1f93c8160f0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-monkey.png index 411661e87da..86336106db7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png index d2d87bb1b2c..097f3a4be89 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png index 98cc641cd5c..f83d6a7246e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png index 3fe3856e331..05d7d6f4fe8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-monkey.png index fc94b595b80..f3799a3754a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png index 23e1e2bfb83..45024ef6d42 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png index 9381096adca..9ba01fecafe 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png index 2cc39c88940..e06598e0225 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png index 8e1557db217..d32e5e69f15 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png index 334ef02242d..dea29a8fc80 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png index ad7541ea1d4..ab3ef6dffdc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png index c0133d22a20..188333b9324 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-monkey.png index c40a7f3bf35..f52412e54e2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png index db9842a95e8..a16eaacb452 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png index c08f4aa765d..0825f3ab225 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png index aed8b4f025e..7df372e3c8a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png index fd6f60eabb4..5e1581b51ab 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png index 59791ed5fad..383232e5a19 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png index d83f6a8b21c..11efa63d450 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png index dfe4f4f8b35..bc8588057a9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png index 15c30a04914..d5ca96c85f6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png index 53512e6969e..0fcbfbaf67a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-monkey.png index a7424bcb4d6..bc138205b5e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png index f3b13e1ec25..b71c63fd6e3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png index 51f8d000f64..3c6420e675e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png index 1f0689cf058..abc09c9ecd2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png index 1432e6bea18..2b14937536c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png index 7e275f29e9c..cc0780e81a5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png index 3e0dfb1b0f3..a4bce0105e1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png index eb6a7d90cd5..1bd77b0727b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png index 34610a06fd7..37272192069 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png index 882d9f813a2..f606f8c8a87 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png index 34d28c744aa..efa1a341039 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png index 88240bf0c11..03484bee5ef 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png index b1ba7c72894..c4ee3900d7c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png index 8e67a880df8..3101e4f3663 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png index 7b4f7f7a476..391ecd77352 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png index 8cbca5d1d43..dce81c0c7bf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png index 0f20b7f88a1..6e207b7ce38 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png index 3a8e6e6d6f4..12049e92617 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png index 4646a0948dc..f2883132823 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png index e6accaed554..1408e381382 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png index e75e0297eb3..16d731380bf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png index d8c6fa6239f..ea08a9adf02 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png index 6a58be3f406..8f6c37acea8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png index f01dd8232e5..def7e063bcc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png index a73a7cd4660..5359f363caf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..cda54e513fe Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING.png index 80a966b0ce7..9386d46ebd7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/icon.png index 38eb1021c4a..f5113e34080 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-left.png index 7850e6a6763..1f6c279dae6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-right.png index 8cbbfad26bc..d24e67b4440 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json index d54e5e2985e..8462b89af7b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-monkey.png index 8867a95aea0..e1a4bd41051 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png index 04e4612cfcb..e3413c3e861 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png index 83fa7d679bf..e255080f43a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png index cfb2a8ff2bb..301465e828c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png index 7071a1d5128..c414199341d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png index a35da374d4e..13433a573cc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png index 4471de10bc2..9384964fd0f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png index 8f213061c2b..75c281d2924 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png index f7ccaf7d97e..aad5a6bba9e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-monkey.png index 8bc241ecaa3..3986d7b82e0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png index 0de6ae14017..b4b44dbb17a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png index 9b7cc65ebe3..3c26ce500d8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png index 46c5d6229b0..ec0d7ec1ca9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png index 8db1985cb82..3628f39100f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-monkey.png index 8cc377d268a..f26ae173d6b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png index 0f906e2c719..edd54686413 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png index 79f247bf015..d9f0585ffa4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png index 75be7de7beb..dc9d095a3d5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png index bb96e022b1c..1dd8ea8d7c3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-monkey.png index 44f6f4f1134..2094c441e6c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png index 1b49813ca2b..7ed6e452029 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png index 4bb5883cf13..b31f72b0d37 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png index 2499e796774..709af38d6a8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png index f31cab9aebe..0b036a90116 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-monkey.png index 8210e841104..29f255cef0b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png index 807f99fc7df..4482c7ecc3c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png index f65a93f00dd..72cd698b807 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png index fa049e89a59..834be00c19a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png index 80984c51c12..0c1fab7c7bc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png index 94007963536..d806293ab2e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png index 0d26aebd26b..f19b069d96f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png index d034a9fbb8d..b9b7f804a02 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png index 6dde5c525b3..f5759701b4e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png index 2e4a7103ae4..8057d345ce8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png index 8d34f3244eb..e8b3d206596 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png index 98f4d7093c3..6c5aa4a64bc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png index 6c0ef8efe37..f4f23bf01c4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png index 8863e61992b..72988492b25 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png index 547aab783b1..438da17f585 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png index c9cb8ac6227..56496560636 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png index c947c630e71..b2d7256ef08 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png index bf66e84ec64..98e905c94c4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png index 5393fcdf4bd..b95c9d63995 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png index 379ca3bce8d..dc9f300245a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png index 70f76a475b3..b6ea0e536eb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-monkey.png index ad9d4cf8b8b..517e523f1ea 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png index d87ca22a54a..f2ac23c9486 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png index 26920f2469a..662450d980d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png index 436ebe0bdb4..b803ac61001 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png index 3c6f4de6e59..0cb59c1979b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png index 59518c35c36..9808c1255d4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png index fa96803d56c..37b205768e0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-monkey.png index e7acf1f3cae..8f7f1d7ac9b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png index 23329b72452..79fb85a229a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png index c69974d2e79..9a646591dae 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png index 4896ed18ac4..b52064a8e20 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png index 60005dc4d1c..cc7abcf4004 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png index 9c8f0d020df..87282ec8420 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png index be42d7ae7ee..447174a09eb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png index 24dfb6da1f7..558124e55c0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png index 38b78db1e16..e1db9b0bda2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png index 412c768774a..a017df53e3f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png index e648d2e6c5b..5f8f62440c4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png index 42ea220dbad..0ac333ae6c4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png index 6f2f21e14b5..9d3ca48f209 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png index ef474f95ad4..c6e604ffea3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png index 79468f3b600..e3ee0522a10 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png index dca763bcea0..81c2e530360 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png index 33fafb9ea98..ec9299f9f35 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png index d5f51513709..7b21801944a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png index 2b83e342169..c7acb2b4a05 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png index e6d91f6afba..31a1a06958d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png index 98d51e2638b..b4bd66596a3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png index da4d765219e..a273dbd60cc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-left.png index b3928a4e7a0..40d6847d741 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-right.png index 1db2ee53596..31a304e6be6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png index 3fa68c11d46..b3f3835b0f9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png index 63325952266..7b609f9818b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png index e5c39a74eb8..0a880a7b8c0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png index 014ac5f9ec6..3bf938273c6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/equipped-INNERCLOTHING.png index ca28756915b..040cb229f13 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/icon.png index bd7bf4f6789..2aebd2b120d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-left.png index 090ddae8dc8..1f2455a0859 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-right.png index 4443d9f5d08..3edc488d693 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png index e89ff84ba52..e17d3ba1a89 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png index ed407d3fcc9..231336f54cf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png index 88f006a5550..14aba724961 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png index f7ab944b202..76a00c17713 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-monkey.png index 6ca05b54f8a..e3165ae3874 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING.png index 10d438e86ae..e0b825013db 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png index 511d13dbaa3..17227c0b3b8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png index 9f940e51ff5..e8a676d7afa 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png index 169bf43315c..7e13ba4345e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png index 963a2f9cfac..f4f4ab93ca6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png index fcab14dc208..ab39a7e17e4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png index 0dceab67590..d0bd2174369 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png index c512a197cef..a20d35709d5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png index 31b0d774d35..2968cdf7820 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png index f7ff607b25d..d6345eff175 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png index d456f94f0f8..63a5ea08c30 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png index 24602b7b37c..9654f94a8dc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-monkey.png index 99678ec7dee..215a7020d9b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png index 04e9223e76e..8d625f7d009 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png index e21589c6dd2..5d69bc0ab7d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-left.png index a6f9089cadc..d4c4b224fba 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-right.png index a4c036a4577..bc3dfb1b494 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING.png index 4e7a06dfc24..6b633369196 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/icon.png index cd88fbd01d6..6666a6f143d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/inhand-left.png index 43931e7d3dc..7afe8d956bc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/inhand-right.png index f3d0f6d70b5..03ae68e725a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png index f17cb0661b2..5b0e222fb35 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png index 2fb771d84c3..a1c64aa4c62 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png index a3186ba4c1a..8728919a7e7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png index b5676f523eb..913d3bf76ed 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png index 9265834ae3e..813e0aa040c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png index fac0c0156dd..cbd34f89ac0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png index 51510a908f5..473145cf071 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png index 7113bbf3ec0..d2bf1add194 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png index 5b19cb2dc7f..b3139003b02 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png index fba921db3ae..27505e30808 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png index 2541991f9a4..b0fc8982f64 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png index a238a7d7be8..cd00bfd1a66 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png index 37bfef9fbd7..ceb7ef07d0a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png index 463828936cf..02386668b44 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png index 5f1d7e7506a..4aa45edab3c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png index d90b6f3c45f..d75e52eda9d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png index 356e2a5ec28..c96f2f1007d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png index 1c5fc823ebd..75e83bb3fac 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png index 3e68439c786..512cacf5f38 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png index 7a4e5b493fd..6ce569e9ee0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png index 4381a0172be..e00bcbbd507 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png index 3855dc44e1b..5a38a8333dd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png index 9a1392a5b5a..872add5ae2a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png index a70cd6f5bce..857c3c6f706 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png index b8425e6ff6e..e49f7c1cc34 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png index 197f1a6af51..2b5f21e6e6c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png index edd1c6fdbb0..921304fe757 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING-monkey.png index e8d03f1fd32..c6eba7571ba 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png index 3898432b87c..648b3c1a691 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png index 8e647ef78fe..8f8111aadf8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png index 1bb069da772..5b2a90226dd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png index e8cfe71e97f..b18e7d4d8e3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png index 562402ee893..7e81fa87f4e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png index a912ead1775..1a3744b01a5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png index 331203e531f..2ea7068b003 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png differ diff --git a/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_eject.png b/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_eject.png index 79babfb9319..afd2e57745c 100644 Binary files a/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_eject.png and b/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_eject.png differ diff --git a/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_ivanov_cooldown.png b/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_ivanov_cooldown.png index 70704d56da1..61c68e273e1 100644 Binary files a/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_ivanov_cooldown.png and b/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_ivanov_cooldown.png differ diff --git a/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_savannah_cooldown.png b/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_savannah_cooldown.png index 67aaad7f6cf..39647df3540 100644 Binary files a/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_savannah_cooldown.png and b/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_savannah_cooldown.png differ diff --git a/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_view_stats.png b/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_view_stats.png index 81b51a9d525..14b611123d2 100644 Binary files a/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_view_stats.png and b/Resources/Textures/Interface/Actions/actions_mecha.rsi/mech_view_stats.png differ diff --git a/Resources/Textures/Interface/Actions/actions_mecha.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_mecha.rsi/meta.json index ea7bf434e9a..16d91f5c63b 100644 --- a/Resources/Textures/Interface/Actions/actions_mecha.rsi/meta.json +++ b/Resources/Textures/Interface/Actions/actions_mecha.rsi/meta.json @@ -1,5 +1,5 @@ { - "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, mech_eject, mech_ivanov_cooldown, mech_savannah_cooldown, mech_view_stats localized by discord:kuro_0001 (388673708753027083)", "license" : "CC-BY-SA-3.0", "version": 1, "size": { @@ -109,4 +109,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/attack.png b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/attack.png index 35f663c66ee..34fb1bc4b2f 100644 Binary files a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/attack.png and b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/attack.png differ diff --git a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/attackOff.png b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/attackOff.png index 7a190584e5a..61617c682fd 100644 Binary files a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/attackOff.png and b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/attackOff.png differ diff --git a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/follow.png b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/follow.png index dd669304ac0..d751a2446ed 100644 Binary files a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/follow.png and b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/follow.png differ diff --git a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/followOff.png b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/followOff.png index a0491c5a0e8..d5057d2bb83 100644 Binary files a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/followOff.png and b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/followOff.png differ diff --git a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/loose.png b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/loose.png index bfbc45daed7..fb7bf997e68 100644 Binary files a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/loose.png and b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/loose.png differ diff --git a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/looseOff.png b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/looseOff.png index 60db395e545..a362a35ddb8 100644 Binary files a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/looseOff.png and b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/looseOff.png differ diff --git a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/meta.json index c9b6bfe9da1..62c8977309b 100644 --- a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/meta.json +++ b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github). ratKingArmy and ratKingDomain taken from https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8", + "copyright": "Created by EmoGarbage404 (github). ratKingArmy and ratKingDomain taken from https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8. stay, stayOff, follow, followOff, loose, looseOff, attack, attackOff localized by discord: jerryimmouse(848188612293951506)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/stay.png b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/stay.png index b92a7f3acce..fd66274916f 100644 Binary files a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/stay.png and b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/stay.png differ diff --git a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/stayOff.png b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/stayOff.png index aa739f71d77..673464c05dd 100644 Binary files a/Resources/Textures/Interface/Actions/actions_rat_king.rsi/stayOff.png and b/Resources/Textures/Interface/Actions/actions_rat_king.rsi/stayOff.png differ diff --git a/Resources/Textures/Interface/Actions/disarm.png b/Resources/Textures/Interface/Actions/disarm.png index cfda495f74e..386139f2629 100644 Binary files a/Resources/Textures/Interface/Actions/disarm.png and b/Resources/Textures/Interface/Actions/disarm.png differ diff --git a/Resources/Textures/Interface/Actions/disarmOff.png b/Resources/Textures/Interface/Actions/disarmOff.png index 57414f6f74d..4efd92db951 100644 Binary files a/Resources/Textures/Interface/Actions/disarmOff.png and b/Resources/Textures/Interface/Actions/disarmOff.png differ diff --git a/Resources/Textures/Interface/Actions/harm.png b/Resources/Textures/Interface/Actions/harm.png index e4cd2fb8340..7f6c45a751b 100644 Binary files a/Resources/Textures/Interface/Actions/harm.png and b/Resources/Textures/Interface/Actions/harm.png differ diff --git a/Resources/Textures/Interface/Actions/harmOff.png b/Resources/Textures/Interface/Actions/harmOff.png index e68c585073f..b7505afbede 100644 Binary files a/Resources/Textures/Interface/Actions/harmOff.png and b/Resources/Textures/Interface/Actions/harmOff.png differ diff --git a/Resources/Textures/Interface/AdminPanel/attributions.yml b/Resources/Textures/Interface/AdminPanel/attributions.yml new file mode 100644 index 00000000000..7a8bc75ed3f --- /dev/null +++ b/Resources/Textures/Interface/AdminPanel/attributions.yml @@ -0,0 +1,29 @@ +- files: ["cargo.png"] + license: "CC-BY-3.0" + copyright: "Created by Kuro & kxv" + source: "https://github.com/space-syndicate/space-station-14/blob/ea370babf8c7ff34ea65cd4277ca50e3e9a021bc/Resources/Textures/Corvax/Interface/AdminActions/cargo.png" + +- files: ["communication.png"] + license: "CC-BY-3.0" + copyright: "Created by Kuro & kxv" + source: "https://github.com/space-syndicate/space-station-14/blob/ea370babf8c7ff34ea65cd4277ca50e3e9a021bc/Resources/Textures/Corvax/Interface/AdminActions/communications.png" + +- files: ["monitoring.png"] + license: "CC-BY-3.0" + copyright: "Created by Kuro & kxv" + source: "https://github.com/space-syndicate/space-station-14/blob/ea370babf8c7ff34ea65cd4277ca50e3e9a021bc/Resources/Textures/Corvax/Interface/AdminActions/monitoring.png" + +- files: ["radar.png"] + license: "CC-BY-3.0" + copyright: "Created by Kuro & kxv" + source: "https://github.com/space-syndicate/space-station-14/blob/ea370babf8c7ff34ea65cd4277ca50e3e9a021bc/Resources/Textures/Corvax/Interface/AdminActions/radar.png" + +- files: ["solar.png"] + license: "CC-BY-3.0" + copyright: "Created by Kuro & kxv" + source: "https://github.com/space-syndicate/space-station-14/blob/ea370babf8c7ff34ea65cd4277ca50e3e9a021bc/Resources/Textures/Corvax/Interface/AdminActions/solar.png" + +- files: ["records.png"] + license: "CC-BY-3.0" + copyright: "Created by Kuro & kxv" + source: "https://github.com/space-syndicate/space-station-14/blob/ea370babf8c7ff34ea65cd4277ca50e3e9a021bc/Resources/Textures/Corvax/Interface/AdminActions/records.png" \ No newline at end of file diff --git a/Resources/Textures/Interface/AdminPanel/cargo.png b/Resources/Textures/Interface/AdminPanel/cargo.png new file mode 100644 index 00000000000..a094c0d5153 Binary files /dev/null and b/Resources/Textures/Interface/AdminPanel/cargo.png differ diff --git a/Resources/Textures/Interface/AdminPanel/communications.png b/Resources/Textures/Interface/AdminPanel/communications.png new file mode 100644 index 00000000000..ab3253f56d1 Binary files /dev/null and b/Resources/Textures/Interface/AdminPanel/communications.png differ diff --git a/Resources/Textures/Interface/AdminPanel/monitoring.png b/Resources/Textures/Interface/AdminPanel/monitoring.png new file mode 100644 index 00000000000..2d9b550d146 Binary files /dev/null and b/Resources/Textures/Interface/AdminPanel/monitoring.png differ diff --git a/Resources/Textures/Interface/AdminPanel/radar.png b/Resources/Textures/Interface/AdminPanel/radar.png new file mode 100644 index 00000000000..255cf7f77e8 Binary files /dev/null and b/Resources/Textures/Interface/AdminPanel/radar.png differ diff --git a/Resources/Textures/Interface/AdminPanel/records.png b/Resources/Textures/Interface/AdminPanel/records.png new file mode 100644 index 00000000000..6119a9c77c6 Binary files /dev/null and b/Resources/Textures/Interface/AdminPanel/records.png differ diff --git a/Resources/Textures/Interface/AdminPanel/solar.png b/Resources/Textures/Interface/AdminPanel/solar.png new file mode 100644 index 00000000000..17e42d2a4f2 Binary files /dev/null and b/Resources/Textures/Interface/AdminPanel/solar.png differ diff --git a/Resources/Textures/Interface/Alerts/Buckle/buckled.png b/Resources/Textures/Interface/Alerts/Buckle/buckled.png index 7a656da45d0..ec01ea32c76 100644 Binary files a/Resources/Textures/Interface/Alerts/Buckle/buckled.png and b/Resources/Textures/Interface/Alerts/Buckle/buckled.png differ diff --git a/Resources/Textures/Interface/Alerts/Handcuffed/Handcuffed.png b/Resources/Textures/Interface/Alerts/Handcuffed/Handcuffed.png index 3536af53b2f..6f6659dabfb 100644 Binary files a/Resources/Textures/Interface/Alerts/Handcuffed/Handcuffed.png and b/Resources/Textures/Interface/Alerts/Handcuffed/Handcuffed.png differ diff --git a/Resources/Textures/Interface/Alerts/Pull/pulled.png b/Resources/Textures/Interface/Alerts/Pull/pulled.png index 9c148fe4595..fc583e803e0 100644 Binary files a/Resources/Textures/Interface/Alerts/Pull/pulled.png and b/Resources/Textures/Interface/Alerts/Pull/pulled.png differ diff --git a/Resources/Textures/Interface/Alerts/Pull/pulling.png b/Resources/Textures/Interface/Alerts/Pull/pulling.png index d57f12cd63a..5411155173a 100644 Binary files a/Resources/Textures/Interface/Alerts/Pull/pulling.png and b/Resources/Textures/Interface/Alerts/Pull/pulling.png differ diff --git a/Resources/Textures/Interface/Alerts/breathing.rsi/meta.json b/Resources/Textures/Interface/Alerts/breathing.rsi/meta.json index a40047dcd8e..e8da58e191e 100644 --- a/Resources/Textures/Interface/Alerts/breathing.rsi/meta.json +++ b/Resources/Textures/Interface/Alerts/breathing.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/blob/2f18e6232ce5897554351194082469a043c5ab06/icons/hud/screen_alert.dmi", "states": [{"name": "not_enough_co2", "delays": [[0.5, 0.5]]}, {"name": "not_enough_nitro", "delays": [[0.5, 0.5]]}, {"name": "not_enough_oxy", "delays": [[0.5, 0.5]]}, {"name": "not_enough_tox", "delays": [[0.5, 0.5]]}, {"name": "too_much_co2", "delays": [[0.5, 0.5]]}, {"name": "too_much_nitro", "delays": [[0.5, 0.5]]}, {"name": "too_much_oxy", "delays": [[0.5, 0.5]]}, {"name": "too_much_tox", "delays": [[0.5, 0.5]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/blob/2f18e6232ce5897554351194082469a043c5ab06/icons/hud/screen_alert.dmi, not_enough_tox, too_much_tox localized by discord:kuro_0001 (388673708753027083)", "states": [{"name": "not_enough_co2", "delays": [[0.5, 0.5]]}, {"name": "not_enough_nitro", "delays": [[0.5, 0.5]]}, {"name": "not_enough_oxy", "delays": [[0.5, 0.5]]}, {"name": "not_enough_tox", "delays": [[0.5, 0.5]]}, {"name": "too_much_co2", "delays": [[0.5, 0.5]]}, {"name": "too_much_nitro", "delays": [[0.5, 0.5]]}, {"name": "too_much_oxy", "delays": [[0.5, 0.5]]}, {"name": "too_much_tox", "delays": [[0.5, 0.5]]}]} diff --git a/Resources/Textures/Interface/Alerts/breathing.rsi/not_enough_tox.png b/Resources/Textures/Interface/Alerts/breathing.rsi/not_enough_tox.png index f5a8ef2a681..36702903a95 100644 Binary files a/Resources/Textures/Interface/Alerts/breathing.rsi/not_enough_tox.png and b/Resources/Textures/Interface/Alerts/breathing.rsi/not_enough_tox.png differ diff --git a/Resources/Textures/Interface/Alerts/breathing.rsi/too_much_tox.png b/Resources/Textures/Interface/Alerts/breathing.rsi/too_much_tox.png index 08773270d6a..97ed824800d 100644 Binary files a/Resources/Textures/Interface/Alerts/breathing.rsi/too_much_tox.png and b/Resources/Textures/Interface/Alerts/breathing.rsi/too_much_tox.png differ diff --git a/Resources/Textures/Interface/Alerts/ensnared.rsi/ensnared.png b/Resources/Textures/Interface/Alerts/ensnared.rsi/ensnared.png index 166d05221eb..c52744c318d 100644 Binary files a/Resources/Textures/Interface/Alerts/ensnared.rsi/ensnared.png and b/Resources/Textures/Interface/Alerts/ensnared.rsi/ensnared.png differ diff --git a/Resources/Textures/Interface/Alerts/ensnared.rsi/meta.json b/Resources/Textures/Interface/Alerts/ensnared.rsi/meta.json index 5e9747ee71d..5172dec1a15 100644 --- a/Resources/Textures/Interface/Alerts/ensnared.rsi/meta.json +++ b/Resources/Textures/Interface/Alerts/ensnared.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Ensnared alert created by Hyenh. Bear Trap sprite taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13/commit/3cfea7eb92246d311de8b531347795bc76d6dab6", + "copyright": "Ensnared alert created by Hyenh. Bear Trap sprite taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13/commit/3cfea7eb92246d311de8b531347795bc76d6dab6, ensnared localized by discord:kuro_0001 (388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Interface/Alerts/human_alive.rsi/health0.png b/Resources/Textures/Interface/Alerts/human_alive.rsi/health0.png index 6c9b54e52e2..6c57c88d6c1 100644 Binary files a/Resources/Textures/Interface/Alerts/human_alive.rsi/health0.png and b/Resources/Textures/Interface/Alerts/human_alive.rsi/health0.png differ diff --git a/Resources/Textures/Interface/Alerts/human_alive.rsi/health1.png b/Resources/Textures/Interface/Alerts/human_alive.rsi/health1.png index 186d07386ec..4fc1fe857d7 100644 Binary files a/Resources/Textures/Interface/Alerts/human_alive.rsi/health1.png and b/Resources/Textures/Interface/Alerts/human_alive.rsi/health1.png differ diff --git a/Resources/Textures/Interface/Alerts/human_alive.rsi/health2.png b/Resources/Textures/Interface/Alerts/human_alive.rsi/health2.png index 6463eb386fa..40e53249a9d 100644 Binary files a/Resources/Textures/Interface/Alerts/human_alive.rsi/health2.png and b/Resources/Textures/Interface/Alerts/human_alive.rsi/health2.png differ diff --git a/Resources/Textures/Interface/Alerts/human_alive.rsi/health3.png b/Resources/Textures/Interface/Alerts/human_alive.rsi/health3.png index d7b8d559ef3..3474867dc0a 100644 Binary files a/Resources/Textures/Interface/Alerts/human_alive.rsi/health3.png and b/Resources/Textures/Interface/Alerts/human_alive.rsi/health3.png differ diff --git a/Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png b/Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png index fea96e5604d..3e630a779c6 100644 Binary files a/Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png and b/Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png differ diff --git a/Resources/Textures/Interface/Alerts/human_alive.rsi/meta.json b/Resources/Textures/Interface/Alerts/human_alive.rsi/meta.json index 6b548a029bc..b1db844f8ca 100644 --- a/Resources/Textures/Interface/Alerts/human_alive.rsi/meta.json +++ b/Resources/Textures/Interface/Alerts/human_alive.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commits/50689f89a40e5e7a2732a0c5fb38c787b69f7d28/icons/hud/screen_gen.dmi, health4 modified by Errant", + "copyright": "https://github.com/tgstation/tgstation/commits/50689f89a40e5e7a2732a0c5fb38c787b69f7d28/icons/hud/screen_gen.dmi and translated by KREKS, health4 modified by Errant", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/alive.png b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/alive.png index 69351e41b8c..75e90ad2d14 100644 Binary files a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/alive.png and b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/alive.png differ diff --git a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/critical.png b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/critical.png index f2a58e1ffe2..9cbbfefa85c 100644 Binary files a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/critical.png and b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/critical.png differ diff --git a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/dead.png b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/dead.png index c3dfe488d6c..dc08ced1ab6 100644 Binary files a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/dead.png and b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/dead.png differ diff --git a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health0.png b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health0.png index 755c74eba57..bf60f4add49 100644 Binary files a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health0.png and b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health0.png differ diff --git a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health1.png b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health1.png index 41ff5b21a1f..b98089673de 100644 Binary files a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health1.png and b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health1.png differ diff --git a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health2.png b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health2.png index cfe54411275..52a561f13e8 100644 Binary files a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health2.png and b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health2.png differ diff --git a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health3.png b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health3.png index b82f46e453c..3567da37200 100644 Binary files a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health3.png and b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health3.png differ diff --git a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health4.png b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health4.png index d371bb2a14b..816d700147b 100644 Binary files a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health4.png and b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/health4.png differ diff --git a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/meta.json b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/meta.json index e95420f02c3..a476669456b 100644 --- a/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/meta.json +++ b/Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by chromiumboy, derived from https://github.com/tgstation/tgstation/commits/50689f89a40e5e7a2732a0c5fb38c787b69f7d28/icons/hud/screen_gen.dmi, ", + "copyright": "Created by chromiumboy, derived from https://github.com/tgstation/tgstation/commits/50689f89a40e5e7a2732a0c5fb38c787b69f7d28/icons/hud/screen_gen.dmi, resprited by github:lapatison", "size": { "x": 24, "y": 8 diff --git a/Resources/Textures/Interface/Alerts/human_critical.rsi/critical.png b/Resources/Textures/Interface/Alerts/human_critical.rsi/critical.png index 9ef1894cf52..f50fce01f93 100644 Binary files a/Resources/Textures/Interface/Alerts/human_critical.rsi/critical.png and b/Resources/Textures/Interface/Alerts/human_critical.rsi/critical.png differ diff --git a/Resources/Textures/Interface/Alerts/human_dead.rsi/dead.png b/Resources/Textures/Interface/Alerts/human_dead.rsi/dead.png index 4604cf7bd0b..1596000a7b3 100644 Binary files a/Resources/Textures/Interface/Alerts/human_dead.rsi/dead.png and b/Resources/Textures/Interface/Alerts/human_dead.rsi/dead.png differ diff --git a/Resources/Textures/Interface/Alerts/internals.rsi/internal0.png b/Resources/Textures/Interface/Alerts/internals.rsi/internal0.png index 95c4644ec06..c2e664a01c4 100644 Binary files a/Resources/Textures/Interface/Alerts/internals.rsi/internal0.png and b/Resources/Textures/Interface/Alerts/internals.rsi/internal0.png differ diff --git a/Resources/Textures/Interface/Alerts/internals.rsi/internal1.png b/Resources/Textures/Interface/Alerts/internals.rsi/internal1.png index 7ee4c9de7c8..5d313796318 100644 Binary files a/Resources/Textures/Interface/Alerts/internals.rsi/internal1.png and b/Resources/Textures/Interface/Alerts/internals.rsi/internal1.png differ diff --git a/Resources/Textures/Interface/Alerts/internals.rsi/internal2.png b/Resources/Textures/Interface/Alerts/internals.rsi/internal2.png index 401c72e3c07..87ee8555659 100644 Binary files a/Resources/Textures/Interface/Alerts/internals.rsi/internal2.png and b/Resources/Textures/Interface/Alerts/internals.rsi/internal2.png differ diff --git a/Resources/Textures/Interface/Alerts/internals.rsi/meta.json b/Resources/Textures/Interface/Alerts/internals.rsi/meta.json index 9ce9b2330d0..c507bc972e8 100644 --- a/Resources/Textures/Interface/Alerts/internals.rsi/meta.json +++ b/Resources/Textures/Interface/Alerts/internals.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/c7e930edde846fa51812ff8aed66fa97821ac000/icons/hud/screen_gen.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/c7e930edde846fa51812ff8aed66fa97821ac000/icons/hud/screen_gen.dmi, internal0, internal1, internal2 localized by discord:kuro_0001 (388673708753027083)", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "name": "internal2" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon.png index ea7735183ef..c6070d8e3ef 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon_open.png index 04cfae2fc3c..b632b398ef0 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json index 681df632623..6390f20a71a 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon", @@ -32,4 +32,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/icon.png index dbf320f5b58..d0d607dd991 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/icon_open.png index 0d837ff0122..108388bb3dd 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json index 1bebea0aa9c..79515e63a29 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/icon.png index 02428e87a04..6714a3e24a4 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/icon_open.png index 4823e3c0510..5ec1628bb7f 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json index 1bebea0aa9c..faafeeec343 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png index e9e2aea7168..952f6d632cc 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png index 44688ef3e92..0f6a115bc41 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json index 1bebea0aa9c..79515e63a29 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon.png index a9c14d6e75b..227f78e10e5 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon_open.png index de9a1e6eb7b..30badf51dcb 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json index 1bebea0aa9c..faafeeec343 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon.png index 6b247b3fc7d..8c286856bc4 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon_open.png new file mode 100644 index 00000000000..576162576bd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-left.png new file mode 100644 index 00000000000..1e9f4ce4c04 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-right.png new file mode 100644 index 00000000000..af6cea1382e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/meta.json index db0ac608ed0..384967e3e29 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/meta.json @@ -1 +1,25 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/icon.png index 2b54ae98519..d31a83adb27 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/icon_open.png index 65ba7adef83..43577a8e598 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-left.png new file mode 100644 index 00000000000..b98efff8b94 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-right.png new file mode 100644 index 00000000000..721f77149da Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/meta.json index 1b1b3aa259a..e7865d2b1ca 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/meta.json @@ -5,13 +5,21 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" }, { "name": "icon_open" - } + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/icon.png index 18fee5f8b4b..347968b6ec3 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/icon_open.png index 030172d4a72..6e8930cb0cd 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json index 1bebea0aa9c..79515e63a29 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png index 01abf17a363..7f37864ba60 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png new file mode 100644 index 00000000000..72485a8e566 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json index db0ac608ed0..9e1d9a9075d 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json @@ -1 +1,17 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/icon.png index c132823e07c..8c286856bc4 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/icon_open.png index 15682cef73c..576162576bd 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-left.png index 69b23480056..1e9f4ce4c04 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-right.png index 71a60e7b0c9..af6cea1382e 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json index 1bebea0aa9c..79515e63a29 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon.png index c089ba47cd8..eacb4fe24fd 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon_open.png index 6451930614a..a7c67ec0632 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json index d269458e27a..79515e63a29 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon.png index 67a9c1ff3eb..d6b24026385 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon_open.png index b43bfa79948..a03f7a1f613 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png index 59e3843dc2d..982aa89a3cf 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png index 39481d24ee5..d1d3b9caa43 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json index 7ded114b0f0..5bfe7546500 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by Potato1234x (github) for SS14", + "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon.png index 5e9c87f4c17..866b8033b96 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon_open.png index df8cfabd497..55231f79469 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json index 68b9e804a56..5bfe7546500 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi (EDITED BY Plasmaguy#6148 [Discord, liable to change] / jrjr3000 [Steam])", + "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon.png index 12e05e98d79..3643b793a0c 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon_open.png index a30e5dc6b4d..8ae4a9ad148 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json index d269458e27a..79515e63a29 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/icon.png index 7bf8647a6da..5c2f7baea89 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/icon_open.png index 684abe7f5bb..ff079ff4a9f 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json index 1bebea0aa9c..79515e63a29 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/icon.png index 42e0336cb2a..d9e84d33198 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/icon_open.png index f156eab7544..29949ee2c25 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/meta.json index 1bebea0aa9c..79515e63a29 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/icon.png index b9ed8858d86..284cb263d71 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/icon_open.png index 6a35004e25b..fbaec3f6397 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/meta.json index 1bebea0aa9c..faafeeec343 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/icon.png index ebff716fd04..2df8188281b 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/icon_open.png index b0fd12a7e70..bef98481d5b 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/meta.json index 1bebea0aa9c..79515e63a29 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/icon.png index 2a526b4f992..730bb1cdfd4 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/icon_open.png index e031d59363f..8cf79a69a87 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/meta.json index d2cf48f2862..f350004da8d 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-poppy.png b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-poppy.png new file mode 100644 index 00000000000..e9b8cc143d9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-poppy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel.png b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel.png new file mode 100644 index 00000000000..1f36b3b186b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json new file mode 100644 index 00000000000..fcd9dc077d6 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Bagel and BagelPoppy were created by DrEnzyme", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bagel" + }, + { + "name": "bagel-poppy" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json index f42362b2545..cb676a06ef7 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, Spicy Rock Pizza modified from margherita pizza by mkanke", "size": { "x": 32, "y": 32 @@ -137,6 +137,12 @@ { "name": "box-inhand-left", "directions": 4 + }, + { + "name": "uranium-pizza" + }, + { + "name": "uranium-slice" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png new file mode 100644 index 00000000000..6fdb66c2dca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png new file mode 100644 index 00000000000..de619c3a137 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png index 86be79038b7..dd9a1e80bcb 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json index 1e5782a7fbe..88b482b469f 100644 --- a/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json @@ -49,4 +49,4 @@ "name": "orange" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-rope.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-rope.png new file mode 100644 index 00000000000..864df464ccb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-rope.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index 6633b0b0bd6..b4317b0c76f 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -52,6 +52,9 @@ { "name": "dough-pie" }, + { + "name": "dough-rope" + }, { "name": "dough-flat" }, diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json index 6f699103840..4ff3230cae7 100644 --- a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide, cnds-trash based on boritos-trash and syndicakes modified by potato1234x", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide, cnds-trash based on boritos-trash and syndicakes modified by potato1234x, ramen from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "ramen" + }, { "name": "boritos" }, diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/ramen.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/ramen.png new file mode 100644 index 00000000000..595eb11f7f5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/ramen.png differ diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/equipped-BELT.png index 1c69c8195b2..7bec4e65c16 100644 Binary files a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/icon.png b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/icon.png index be4ee00c36b..876d793beb8 100644 Binary files a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/icon.png and b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/inhand-left.png index c7c78e8a2df..08bf8dcd4f5 100644 Binary files a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/inhand-right.png index da85765a9e6..4ce4de875a9 100644 Binary files a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json index 8d6202dde40..8ec571a40b5 100644 --- a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Homegrown by @ninruB#7795, inhand sprites by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe, inhand sprites by лазік#7305", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png index dcb06d09ca6..f7ac7ba3d01 100644 Binary files a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png and b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png differ diff --git a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png index da63d127c4a..d0a7cc017c8 100644 Binary files a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png and b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png differ diff --git a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png index 1f5b6d4c259..4558eb12e11 100644 Binary files a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png and b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png differ diff --git a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png index 7edcc12a1fd..1514a714017 100644 Binary files a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png and b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png differ diff --git a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png index ecdde4162aa..bedbc0950cb 100644 Binary files a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png and b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png differ diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png index eade164c957..bfa4211a79c 100644 Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json index d4cab89f8ef..79fd4fcc060 100644 --- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, storage and red-storage by Flareguy", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1, storage and red-storage by SonicHDC", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png index 7479cee98ee..52e4fbfc264 100644 Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png differ diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png index 1d88fecb2b0..2dd8c4bd1a1 100644 Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png differ diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/storage.png b/Resources/Textures/Objects/Tools/crowbar.rsi/storage.png index 444ec90e9a9..d20769b55bc 100644 Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/storage.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/storage.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png index 6fb3b4ab8e6..c99774bfad1 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png and b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png index c51ae6332b2..d27dee1427d 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png and b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png index 2350f111f10..aeffd17fcf3 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png index 27646ca2148..8a1b51a61e5 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/meta.json b/Resources/Textures/Objects/Tools/drill.rsi/meta.json index 90af7840e15..4bcf0563213 100644 --- a/Resources/Textures/Objects/Tools/drill.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/drill.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189 by KingFroozy (Github)", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json index 7ea0019902d..edae9c38c41 100644 --- a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Frontier Station, Tem Armoff", + "copyright": "Taken from Frontier Station, created by Tem Armoff https://github.com/new-frontiers-14/frontier-station-14/pull/484/files", "states": [ { "name": "scanner", diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png index 8f0a816c3f9..d97b1d9764e 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png index 22750af0532..0b0c85a8196 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png index 42695acd7c2..32dd8ae6521 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png index 8877f81e188..ccfecf3dbd1 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json index 0d2bf3b7ef6..8ea14f80160 100644 --- a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified from tgstation at commit https://github.com/tgstation/tgstation/commit/f07f847706d85b7cfa4b398e5175732212b69a63 by KingFroozy (Github), inhand for syn made by icekot8", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-left.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-left.png index ac011a58f85..0ca1160a8e7 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-left.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-right.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-right.png index d4c1c58997b..1a7f9d180a3 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-right.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png index 973b1428b80..40749be79c1 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png index ed36af3d67b..5b77cad939e 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png index edfa1bb29f5..1f8bae5d226 100644 Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png and b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/icon.png b/Resources/Textures/Objects/Tools/multitool.rsi/icon.png index edfa1bb29f5..bbb1c6bd8f2 100644 Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/icon.png and b/Resources/Textures/Objects/Tools/multitool.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json index bf4315734b7..a6c48311a17 100644 --- a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94f27c7b25bbde39c1412e24fb32bf6470fcc394", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 @@ -11,13 +11,35 @@ "name": "icon" }, { - "name": "green-unlit" + "name": "green-unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] }, { - "name": "yellow-unlit" + "name": "yellow-unlit", + "delays": [ + [ + 0.2, + 0.2 + ] + ] }, { - "name": "red-unlit" + "name": "red-unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png index 9e12b5bc0b4..820a8423072 100644 Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png and b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png index dc51aad56c1..1faa1c537dd 100644 Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png and b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png differ diff --git a/Resources/Textures/Objects/Tools/network_configurator.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/network_configurator.rsi/equipped-BELT.png index ba6c98f4159..51c8bd32f8c 100644 Binary files a/Resources/Textures/Objects/Tools/network_configurator.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Tools/network_configurator.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/network_configurator.rsi/icon.png b/Resources/Textures/Objects/Tools/network_configurator.rsi/icon.png index 94fd032f31d..4539e5ee43e 100644 Binary files a/Resources/Textures/Objects/Tools/network_configurator.rsi/icon.png and b/Resources/Textures/Objects/Tools/network_configurator.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/network_configurator.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/network_configurator.rsi/inhand-left.png index a138b4fde04..74f172496c4 100644 Binary files a/Resources/Textures/Objects/Tools/network_configurator.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/network_configurator.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/network_configurator.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/network_configurator.rsi/inhand-right.png index 1ed797542a3..1ee9d743dfe 100644 Binary files a/Resources/Textures/Objects/Tools/network_configurator.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/network_configurator.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/network_configurator.rsi/meta.json b/Resources/Textures/Objects/Tools/network_configurator.rsi/meta.json index a2063473de3..5dc52f87614 100644 --- a/Resources/Textures/Objects/Tools/network_configurator.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/network_configurator.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by 20kdc (github) for ss14", + "copyright": "Made by 20kdc (github) for ss14, Resprite by github: Mureixlol", "size": { "x": 32, "y": 32 @@ -42,6 +42,14 @@ 0.1, 0.1, 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, 0.1 ] ] diff --git a/Resources/Textures/Objects/Tools/network_configurator.rsi/mode-link.png b/Resources/Textures/Objects/Tools/network_configurator.rsi/mode-link.png index 924fef84717..90c307dd085 100644 Binary files a/Resources/Textures/Objects/Tools/network_configurator.rsi/mode-link.png and b/Resources/Textures/Objects/Tools/network_configurator.rsi/mode-link.png differ diff --git a/Resources/Textures/Objects/Tools/network_configurator.rsi/mode-list.png b/Resources/Textures/Objects/Tools/network_configurator.rsi/mode-list.png index b886a7104a9..3b883be4a92 100644 Binary files a/Resources/Textures/Objects/Tools/network_configurator.rsi/mode-list.png and b/Resources/Textures/Objects/Tools/network_configurator.rsi/mode-list.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/icon.png b/Resources/Textures/Objects/Tools/rcd.rsi/icon.png index 6b6b779827d..3913af25188 100644 Binary files a/Resources/Textures/Objects/Tools/rcd.rsi/icon.png and b/Resources/Textures/Objects/Tools/rcd.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png index b305882226f..7a07062f1cf 100644 Binary files a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png index a9cca584d2d..d93bb310eec 100644 Binary files a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/meta.json b/Resources/Textures/Objects/Tools/rcd.rsi/meta.json index d9dde9dcfa3..3e45b5ba1b0 100644 --- a/Resources/Textures/Objects/Tools/rcd.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/rcd.rsi/meta.json @@ -46,4 +46,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json index 17ec25991ac..ec6d67d8e36 100644 --- a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png index 2bede8bc3b0..57c62e2b95c 100644 Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png differ diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png index 565ebc24f66..6f2d047a2c6 100644 Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png differ diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png index 9d0d820ddaa..48d491dae1c 100644 Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png differ diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json index 056ba0a8563..a6892218291 100644 --- a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json @@ -1,5 +1,5 @@ { - "copyright" : "Taken from https://github.com/tgstation/tgstation at commit a21274e56ae84b2c96e8b6beeca805df3d5402e8.", + "copyright" : "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3866dabea8ba6c31115e661b852601cc099e0136", "license" : "CC-BY-SA-3.0", "size" : { "x" : 32, diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png index 462e22932c2..3b9c84af853 100644 Binary files a/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png and b/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png differ diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json b/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json index e79ca362989..20a8f7e7e5b 100644 --- a/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json @@ -1,10 +1,10 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "/tg/station, 'icons/obj/device.dmi' commit 2b8b045d, redrawn by Ubaser.", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 }, "states": [ - { "name": "tray-on" , "delays": [[0.1, 1.0]]}, + { "name": "tray-on" , "delays": [[0.2, 0.2]]}, { "name": "tray-off" } ] } diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png index 9ca7ff2ca4c..eb108219afc 100644 Binary files a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png and b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png differ diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png index 5c4ba77cfed..5ec22e6031f 100644 Binary files a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png and b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/icon.png b/Resources/Textures/Objects/Tools/welder.rsi/icon.png index a023a035ad4..dbb9e252b37 100644 Binary files a/Resources/Textures/Objects/Tools/welder.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json index 5f876da9ae0..bb756b463c5 100644 --- a/Resources/Textures/Objects/Tools/welder.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png index 20aa48abf68..ec90a5518bc 100644 Binary files a/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png index 446d4b21bf7..bfb59ab5dd0 100644 Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json index 75650c19288..bb756b463c5 100644 --- a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json @@ -1,22 +1,14 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] + "name": "icon" }, { "name": "welder_flame", diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png index 1efc7aaa60d..0b9c8ff0000 100644 Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png index 5c6c99c5d93..353825f0c80 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json index ab4744aaa63..bb756b463c5 100644 --- a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png index 7814b748519..2efcd6a8ee6 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png index c187486f2bc..e01273389d3 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json index ab4744aaa63..bb756b463c5 100644 --- a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png index d8ba3f28bdc..562edf0254f 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_mini.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_mini.rsi/icon.png index 87e78827927..f400317c0a2 100644 Binary files a/Resources/Textures/Objects/Tools/welder_mini.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_mini.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder_mini.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_mini.rsi/meta.json index 5f876da9ae0..bb756b463c5 100644 --- a/Resources/Textures/Objects/Tools/welder_mini.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_mini.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder_mini.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_mini.rsi/welder_flame.png index f080d7bcaad..d508efe9b07 100644 Binary files a/Resources/Textures/Objects/Tools/welder_mini.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_mini.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png index f331df4390e..47d9fa26d92 100644 Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png index a68f4c12577..b6589228ef4 100644 Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png index 3f79cb157ca..d3caeea2ca3 100644 Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json index cd294908267..88669b83867 100644 --- a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json @@ -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/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/icon.png b/Resources/Textures/Objects/Tools/wrench.rsi/icon.png index e28c32319ce..b5e37414cd3 100644 Binary files a/Resources/Textures/Objects/Tools/wrench.rsi/icon.png and b/Resources/Textures/Objects/Tools/wrench.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json index a2c8f06819b..ff330f3aaa4 100644 --- a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json @@ -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/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, storage by EmoGarbage404 (github)", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1, storage by SonicHDC (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/storage.png b/Resources/Textures/Objects/Tools/wrench.rsi/storage.png index 54d1d9b28e9..d95f1782cba 100644 Binary files a/Resources/Textures/Objects/Tools/wrench.rsi/storage.png and b/Resources/Textures/Objects/Tools/wrench.rsi/storage.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner-blue.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner-blue.png index 724dd1ea240..7a1e37693e1 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner-blue.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner-blue.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner-green.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner-green.png index a0c89e4bfc3..a06a48885bf 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner-green.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner-green.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner-red.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner-red.png index 82af96018cc..50e9b054af8 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner-red.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner-red.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner-yellow.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner-yellow.png index 0069be618d8..5c582fe7550 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner-yellow.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner-yellow.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner.png index 8db1e80fdd1..8daa67ae23e 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png index 899c8d6e4cb..ff808bbc8bb 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png index e45b9e35303..da76b044c1e 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png index c2dc11d21bf..5bbd100773c 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png index 1da59b8a315..8ae607cdcd4 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png index cfd18620e04..42114c515b2 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_syndicate.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_syndicate.png index 6b39694e7a7..c8424057d02 100644 Binary files a/Resources/Textures/Structures/Decoration/banner.rsi/banner_syndicate.png and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_syndicate.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/meta.json b/Resources/Textures/Structures/Decoration/banner.rsi/meta.json index 10bef7b97e4..69066fc8031 100644 --- a/Resources/Textures/Structures/Decoration/banner.rsi/meta.json +++ b/Resources/Textures/Structures/Decoration/banner.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485 | Taken from Paradise Station", + "copyright": "https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485 | banner_syndicate sprited by mureixlol (Discord)| color banners repsrited by lzk228", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png index 3d018bfbbb4..890af5aa888 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed.png index 959b58471af..db3cc54a45b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing.png index a2b6ac7e3ad..7aabf34fc70 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json index 12fec14c770..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open.png index 61f9bb5c082..cdf2505753c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening.png index d0f17a5e61f..b414e948000 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png index 33f6de75d76..6443e909ccc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png index 904395ea40c..6f34cf3d006 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png index 95c4cf190b9..0120be8d060 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png index 862c9940fcf..deaaa0e7214 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png index 753e1e8a9ec..70aa03ef8cd 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png index bf8945b1f20..eed46ce68cf 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png index 9aaf1f688f8..1d497f6d1c8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png index e171ad6aead..ca43da28bd3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png index d0175d0f861..2c8ec407cec 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png index bdd0150cf12..a45a6d8d43a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png index 7db8f8b6e85..a29314d66fd 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..cc49407c5f4 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/bolted_unlit.png index 6857f2a2415..c6b550c603d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed.png index 8c3d2ae66c8..9272e95ef77 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png index c78d01c42d0..4ca8c59ec1d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closing.png index ba55d1eefb9..0186cbf7669 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closing_unlit.png index 2a71f76d5d0..09946a77e6e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/deny_unlit.png index 7c56263f839..6486ac5ca83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..e5dfd04206c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/emergency_unlit.png index 817f2fb3f95..ede345c70df 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json index 6180afd17da..56b5ec97ad8 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/58e5354cdbc304847c9ef20963320d21f418b58e and edited by Nairod(github) for SS14", + "copyright": "Made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/open.png index 4c684bdca10..7a002ba0b3f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/open_unlit.png new file mode 100644 index 00000000000..4c03a217b74 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/opening.png index d99926d11e4..55d53890d35 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/opening_unlit.png index 84933bd5ed9..d50675650ce 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closed.png new file mode 100644 index 00000000000..7244b37f5c7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closing.png index db7be0bc4a0..193665a93b5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_open.png index 24eb2aedc22..49e318c243c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_opening.png index fc90acd637a..a0f494310cf 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks.png index dd67e88a315..0666b28799a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_broken.png index fb5d774588a..ad6e6cbae40 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_damaged.png index f16a028dee5..695b8f38751 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_open.png index 630eabb976e..fb8ba8d034c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/welded.png index a0040dfdc73..f8369a1fcad 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json index f686706dd30..e4f4bf6326e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -61,8 +67,8 @@ { "name": "open", "delays": [ - [ - 1 + [ + 1 ] ] }, @@ -105,6 +111,9 @@ ] ] }, + { + "name": "panel_closed" + }, { "name": "panel_open", "delays": [ @@ -162,6 +171,9 @@ 0.4 ] ] + }, + { + "name": "emergency_open_unlit" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png index 211a5ec6b25..75bd7235b0c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png index 36df88f44c5..1d848e4854f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png index 5ec7f63312d..cc3266212f7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png index c771279653b..1ea14b70d67 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png index f8dfecba631..7fd272dd1e9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png index c8eb941bd9f..76ce3eee3ce 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png index efddf7ff2e7..5024a18f9b4 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png index fe9268a1deb..b4b7119676b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png index 09fec38bfa3..95e4de0af48 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png index d5db1fa7de1..b4e532fa3cc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png index 85715a9ca06..f235c2cd6dc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..8adf26a9b1b Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png index c1984c4f00d..8adf26a9b1b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png index 2d854b6b48b..1eb40152d0a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png index 79125cbe2e9..7eb921a4509 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png index 54938d9b3b6..79a84cfe822 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png index 351a0f35280..6eb13de6540 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny_unlit.png index 0eaf4064c7c..68e9f7343a4 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..5df5341c86d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png index 817f2fb3f95..5df5341c86d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json index 603c7588fd7..4351a68937a 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,22 +13,28 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ [ - 0.2, - 0.2, 0.1, 0.1, 0.1, - 0.3 + 0.1, + 0.1, + 0.1 ] ] }, @@ -36,7 +42,12 @@ "name": "closing_unlit", "delays": [ [ - 0.6 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -44,6 +55,8 @@ "name": "deny_unlit", "delays": [ [ + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -57,12 +70,12 @@ "name": "opening", "delays": [ [ - 0.2, - 0.2, 0.1, 0.1, 0.1, - 0.3 + 0.1, + 0.1, + 0.1 ] ] }, @@ -70,20 +83,28 @@ "name": "opening_unlit", "delays": [ [ - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, + { + "name": "panel_closed" + }, { "name": "panel_closing", "delays": [ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -96,10 +117,10 @@ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -125,7 +146,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -138,7 +160,7 @@ 0.1, 0.1, 0.1, - 1.7 + 0.1 ] ] }, @@ -162,10 +184,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png index 1868e6ccac1..dfb2434e85b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open_unlit.png new file mode 100644 index 00000000000..7eb921a4509 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png index ec42792e4b2..2a76140ef02 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png index 351a0f35280..a70d9f4b30d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png index 86838a60001..01a853b2e90 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png index 33ef420933b..75a82a33320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png index bf857f1c122..117d9082257 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png index 834fc745198..d948d20b1ac 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png index 2dba3923698..ec63892c092 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png index 2dba3923698..41bac6ff98c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png index e5d876f7ed0..ff2f5dda80d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png index a0b9e23d406..cbdbe4e3a44 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png index 602b83df5b0..da0a8e63f8c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png index 6718ae08e97..92c13304a4f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png index a2b151c1408..93ae9afd31f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png index 5c87415ec1a..fb740ee62a0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json index 505b597a613..d4e1f7e92f7 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", + "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185", "size": { "x": 32, "y": 32 @@ -23,12 +23,18 @@ "name": "closing", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -71,16 +77,25 @@ { "name": "open" }, + { + "name": "open_unlit" + }, { "name": "opening", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png index 6fcb5b059bd..3f19497d1c7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open_unlit.png new file mode 100644 index 00000000000..6f91287ccdb Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png index 113ddab7b76..9af41abffa8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png index 26d9dc17c25..ef9d1f81308 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..14908c7728b Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png index d5243ea8576..c8dc4abdeca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png index 64d41f1dbab..32810ee2ea3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png index f48efb153a5..7a6a2132917 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png index b835f51158d..602b8571d7c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png index a3a6eb30a5e..d5b149f75e7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..e821f26d53a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json index 9bb7e9bb728..e0ec34938b7 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -19,6 +19,9 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, @@ -112,6 +115,9 @@ { "name": "open" }, + { + "name": "open_unlit" + }, { "name": "panel_open" }, @@ -202,7 +208,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -215,8 +222,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -240,10 +246,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png index de9c757173a..cc521adb838 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png index 6d3267c174e..5ff38ebb130 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png index 594f26a4505..9e622d79b8d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png index b4ca46e4255..88f6d44467b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png index 7fe48cc120a..4c59d3a28cc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png index 2603c4a7205..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png index e76a54328af..f28c439e9b0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png index fb5d774588a..3385880ae8b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png index f16a028dee5..4265ee1e56b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png index 630eabb976e..d04ec15555a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png index 3f3f14b0781..062db252998 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png index 3e2f7aff449..9faa6567fe1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed.png index b4468aef4ef..a7edd06ad69 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing.png index 1ae0abf4c60..e2458dd3bcc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open.png index 086bedbc60b..0511acc6b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening.png index 296144e3872..f0a7de8d159 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png index 50662eb45c0..53efb2a5d5f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png index 821f747fb2f..fc6a8c621dc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png index 64683f81db8..54fa4b2d6ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png index acb44760025..4c0bef0b3f6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png index 1c15ed06bcb..5f04fd76208 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..d3a7169b08e Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png index cd5c6b4700c..c5419eb75a9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..f4b61b56fa0 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json index f710aeb1adc..2699685fc29 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -61,12 +67,7 @@ ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -111,12 +112,10 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_open" + }, + { + "name": "panel_closed" }, { "name": "panel_opening", @@ -196,6 +195,9 @@ 0.4 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/open_unlit.png new file mode 100644 index 00000000000..53aae2f4d19 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_closed.png new file mode 100644 index 00000000000..7244b37f5c7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png index f7d8aaf354c..53db57ff623 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png index 82a36b65b93..c5ff9a5b93f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png index ff5532f584c..9643cfb2eea 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png index 8940b5a510c..c1de0fd0171 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png index 3254710d818..72979dce850 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png index a59a9fcebb1..0131731bdb4 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png index 789b3537c07..d93cc4df06a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png index 90e3917603d..ddeb014809e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png index 93c4460f1b8..2e67e55a8b6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png index 0a6a79329ec..82a7adeae38 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json index ded8386db5c..126434bce54 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -97,6 +103,9 @@ ] ] }, + { + "name": "panel_closed" + }, { "name": "panel_closing", "delays": [ @@ -141,6 +150,9 @@ 0.4 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json index 1081b1b57d2..de199dcf3d6 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json @@ -19,6 +19,18 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "panel_closed" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png index 891e7fd9ee4..77b917578c5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..cc49407c5f4 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/bolted_unlit.png index 6857f2a2415..c6b550c603d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png index 75cfc05d025..09f222d3081 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png index c78d01c42d0..4ca8c59ec1d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png index b6a10c1cfbc..002320c6fd7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing_unlit.png index 2a71f76d5d0..09946a77e6e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/deny_unlit.png index 7c56263f839..6486ac5ca83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..e5dfd04206c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/emergency_unlit.png index 817f2fb3f95..ede345c70df 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json index 6b8b84fc124..56b5ec97ad8 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24; Edited by Doru991", + "copyright": "Made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png index 5620a500fc8..0a90e6df4d1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open_unlit.png new file mode 100644 index 00000000000..4c03a217b74 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png index 283ac808a28..373da014194 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening_unlit.png index 84933bd5ed9..d50675650ce 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closed.png new file mode 100644 index 00000000000..7244b37f5c7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closing.png index db7be0bc4a0..193665a93b5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_open.png index 24eb2aedc22..49e318c243c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_opening.png index fc90acd637a..a0f494310cf 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks.png index dd67e88a315..0666b28799a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_broken.png index fb5d774588a..ad6e6cbae40 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_damaged.png index f16a028dee5..695b8f38751 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_open.png index 630eabb976e..fb8ba8d034c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/welded.png index a0040dfdc73..f8369a1fcad 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png index f162a3d7078..591ddf47e1c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed.png index 35b896703cb..76930618cef 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing.png index 1a98e1e5d65..acb9b01a768 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open.png index f334c224c98..8cb2e42e100 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening.png index 8707d23a761..efd8577e6ba 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png index 0c50656f6b0..32d1246788e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png index 97e3a30040a..ed9c957c197 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png index 0a679afb71b..2ed07f2b1ec 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json index 12fec14c770..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png index 61f9bb5c082..106db14faea 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png index bd7937096e2..c82ac46c59a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png index 0281682b363..c756f0e6734 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png index d61b8f17f06..a3533494d9c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png index 247612bd7e3..a8d31f11d32 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png index 862c9940fcf..e2f571df417 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png index cded9299ebd..3068911894f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png index 8aac380b7b6..f622d538e8d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png index 01ddc9fef05..11374042f91 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png index 9e9e14d1bd5..1427304bce6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png index d0175d0f861..7d53fa5dfcc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png index 94b0291a5bb..f3c1116c1d3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/assembly.png index 814d8379085..8734d9ac0f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..cc49407c5f4 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/bolted_unlit.png index 6857f2a2415..c6b550c603d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed.png index 814d8379085..c65f6458e8e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png index c78d01c42d0..4ca8c59ec1d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closing.png index ebfb093c0c6..51d3ebfd15a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closing_unlit.png index 2a71f76d5d0..09946a77e6e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/deny_unlit.png index 7c56263f839..6486ac5ca83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..e5dfd04206c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/emergency_unlit.png index 817f2fb3f95..ede345c70df 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json index 6180afd17da..56b5ec97ad8 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/58e5354cdbc304847c9ef20963320d21f418b58e and edited by Nairod(github) for SS14", + "copyright": "Made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/open.png index 4c684bdca10..71e883f7ec0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/open_unlit.png new file mode 100644 index 00000000000..4c03a217b74 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/opening.png index 3168c455839..a45a7dddd69 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/opening_unlit.png index 84933bd5ed9..d50675650ce 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closed.png new file mode 100644 index 00000000000..7244b37f5c7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closing.png index db7be0bc4a0..193665a93b5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_open.png index 24eb2aedc22..49e318c243c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_opening.png index fc90acd637a..a0f494310cf 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks.png index dd67e88a315..0666b28799a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_broken.png index fb5d774588a..ad6e6cbae40 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_damaged.png index f16a028dee5..695b8f38751 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_open.png index 630eabb976e..fb8ba8d034c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/welded.png index a0040dfdc73..f8369a1fcad 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json index f686706dd30..f7bec18e87f 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json @@ -8,17 +8,23 @@ }, "states": [ { - "name": "assembly" - }, - { - "name": "bolted_unlit" - }, + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -61,8 +67,8 @@ { "name": "open", "delays": [ - [ - 1 + [ + 1 ] ] }, @@ -105,6 +111,9 @@ ] ] }, + { + "name": "panel_closed" + }, { "name": "panel_open", "delays": [ @@ -162,6 +171,9 @@ 0.4 ] ] + }, + { + "name": "emergency_open_unlit" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png index fa6f3e59cf6..1bc0d5f24b1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png index 96349c2a296..5ac29f9e693 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png index 2a861fa8a4f..e7e8ef883ff 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png index c771279653b..84f8aa0008d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png index edcf9d92cc5..4ac41438aa8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png index a7e102b37e7..2d880858cd7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png index b409f80c52f..f1c1d7387da 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png index c27f6aad6f2..2b14e9a44e3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png index 09fec38bfa3..01d84b9034f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png index 47dee90e591..91e647a0987 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png index 62b788cbc74..d637a36427a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..8adf26a9b1b Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png index c1984c4f00d..8adf26a9b1b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png index 6699ff81548..972a78e44db 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png index 79125cbe2e9..7eb921a4509 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png index f8d6f1e29e3..7c143b4b4be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png index 351a0f35280..6eb13de6540 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png index 0eaf4064c7c..68e9f7343a4 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..5df5341c86d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_unlit.png index a40cee44beb..5df5341c86d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json index 603c7588fd7..4351a68937a 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,22 +13,28 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ [ - 0.2, - 0.2, 0.1, 0.1, 0.1, - 0.3 + 0.1, + 0.1, + 0.1 ] ] }, @@ -36,7 +42,12 @@ "name": "closing_unlit", "delays": [ [ - 0.6 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -44,6 +55,8 @@ "name": "deny_unlit", "delays": [ [ + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -57,12 +70,12 @@ "name": "opening", "delays": [ [ - 0.2, - 0.2, 0.1, 0.1, 0.1, - 0.3 + 0.1, + 0.1, + 0.1 ] ] }, @@ -70,20 +83,28 @@ "name": "opening_unlit", "delays": [ [ - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, + { + "name": "panel_closed" + }, { "name": "panel_closing", "delays": [ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -96,10 +117,10 @@ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -125,7 +146,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -138,7 +160,7 @@ 0.1, 0.1, 0.1, - 1.7 + 0.1 ] ] }, @@ -162,10 +184,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png index 1868e6ccac1..dfb2434e85b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open_unlit.png new file mode 100644 index 00000000000..7eb921a4509 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png index be4300f51cd..51611137a29 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png index 351a0f35280..a70d9f4b30d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png index 86838a60001..01a853b2e90 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png index 33ef420933b..75a82a33320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png index bf857f1c122..117d9082257 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png index 834fc745198..d948d20b1ac 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png index 2dba3923698..ec63892c092 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png index 2dba3923698..41bac6ff98c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png index e5d876f7ed0..ff2f5dda80d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png index a0b9e23d406..cbdbe4e3a44 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png index ade0a87386c..eb7f7999521 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png index 8c90b693a4c..fbd603be3ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png index 4347bf8afe7..24f74258530 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png index 225d45a82a5..2eaff3bcae3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png index 458698515f1..eb7f7999521 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png index 67f782bd89c..45623c1fc56 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png index 5421154834a..eff24a12fb1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png index 6252d37d1ed..a250675f19f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png index 12ccff5cb0f..6a2950255ec 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json index 7c1ec64f624..b4a3c6faa4c 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", + "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185. frame3.png, frame4.png by github:Morb0", "size": { "x": 32, "y": 32 @@ -23,12 +23,18 @@ "name": "closing", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -87,12 +93,18 @@ "name": "opening", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png index a89b493a8b2..3f19497d1c7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png index 79a05996ad2..6de08c6f063 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png index 4c85a632c51..9050e190d73 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png index 10168bf7621..3b35b128053 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png index 8c1c28521d2..292e14e1c39 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png index 2523b36382a..f076d443d2c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png index 00f2c629b9c..4610236cb47 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/assembly.png index 5afd95efb8c..8be45cc28b3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..dd7fd8611c2 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png index 57f172d54fe..dd7fd8611c2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed.png index 346fea6cdf2..014a8ef5914 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png index fdf7952dd87..e22ca14a512 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing.png index 94b84d364be..79471688264 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png index a2f351482b5..494b077eacd 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png index ba26f190cb1..08766d78fb7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..40640f1471d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png index 6a122fbcfd0..40640f1471d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json index 5b0c9b55a7c..3a05e97088d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d", + "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d Resprite by KREKS", "size": { "x": 32, "y": 32 @@ -13,22 +13,28 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -38,10 +44,10 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -72,10 +72,10 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -85,10 +85,10 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -98,20 +98,15 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -119,13 +114,17 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -149,9 +148,7 @@ 0.1, 0.1, 0.1, - 0.1, - 0.1, - 0.1 + 1.7 ] ] }, @@ -164,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -189,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open.png index d0c95a2a032..3deddde5ce0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open_unlit.png new file mode 100644 index 00000000000..e22ca14a512 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening.png index 14462814684..3b2996697bf 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png index 051f78f757d..69cfdd3e236 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_closing.png index c53b5a692ba..2a2f6ec6c2c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_open.png index bd90e262c86..91bf5cbb54a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_opening.png index 02b488b9c92..558aa246e6d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks.png index dd67e88a315..fb676e71001 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_broken.png index c41fa18ca1a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_open.png index 40d559f7a33..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/welded.png index f19a0b8caf2..b2d2f7ce373 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/assembly.png index 503e7ecdf24..2b9d0367994 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..dd7fd8611c2 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png index 57f172d54fe..dd7fd8611c2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed.png index 23f456b33e1..c8f1d2eb509 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png index fdf7952dd87..e22ca14a512 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing.png index 41258937399..fef64a8f6d4 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png index a2f351482b5..494b077eacd 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png index ba26f190cb1..08766d78fb7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..40640f1471d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png index 6a122fbcfd0..40640f1471d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json index 5b0c9b55a7c..69388008d5f 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d", + "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d, Resprite by KREKS", "size": { "x": 32, "y": 32 @@ -13,22 +13,28 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -38,10 +44,10 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -72,10 +72,10 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -85,10 +85,10 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -98,20 +98,15 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -119,13 +114,17 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -149,9 +148,7 @@ 0.1, 0.1, 0.1, - 0.1, - 0.1, - 0.1 + 1.7 ] ] }, @@ -164,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -189,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open.png index 90f190f0446..d039e1f31e8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open_unlit.png new file mode 100644 index 00000000000..e22ca14a512 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening.png index f77d4f6d2d8..8d133eb6d15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png index 051f78f757d..69cfdd3e236 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_closing.png index c53b5a692ba..2a2f6ec6c2c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_open.png index bd90e262c86..91bf5cbb54a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_opening.png index 02b488b9c92..558aa246e6d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks.png index dd67e88a315..fb676e71001 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks_open.png index 40d559f7a33..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/welded.png index f19a0b8caf2..b2d2f7ce373 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png index 8382b0bb1fd..d38df6a7ca1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png index 9035162d43b..695665daf76 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png index d207ec7d21e..a972453b51a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png index 086bedbc60b..a5cf18c0d04 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png index d6d578a3bec..844ac516843 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png index 0f82d603ae4..c58e4b8a343 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png index b228a1487c9..9e4031f7560 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png index a124e930d29..d5f733039c4 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png index acb44760025..f4b43692857 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png index 2f25dfe043d..8b084151528 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..d3a7169b08e Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png index cd5c6b4700c..c5419eb75a9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..f4b61b56fa0 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json index f710aeb1adc..0ab5a7ab6b9 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json @@ -1,201 +1,203 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken at https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "assembly" - }, - { - "name": "bolted_unlit" - }, - { - "name": "closed" - }, - { - "name": "closed_unlit" - }, - { - "name": "closing", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.05, - 0.05, - 0.1 - ] - ] - }, - { - "name": "closing_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.05, - 0.05, - 0.1 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken at https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "open_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.05, + 0.05, + 0.1 + ] ] - ] - }, - { - "name": "deny_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.05, + 0.05, + 0.1 + ] ] - ] - }, - { - "name": "open", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "opening", - "delays": [ - [ - 0.1, - 0.05, - 0.05, - 0.1, - 0.1, - 0.1, - 0.1 + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] ] - ] - }, - { - "name": "opening_unlit", - "delays": [ - [ - 0.1, - 0.05, - 0.05, - 0.1, - 0.1, - 0.1, - 0.1 + }, + { + "name": "open" + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.05, + 0.05, + 0.1, + 0.1, + 0.1, + 0.1 + ] ] - ] - }, - { - "name": "panel_closing", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.05, - 0.05, - 0.1 + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.05, + 0.05, + 0.1, + 0.1, + 0.1, + 0.1 + ] ] - ] - }, - { - "name": "panel_open", - "delays": [ - [ - 1 + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.05, + 0.05, + 0.1 + ] ] - ] - }, - { - "name": "panel_opening", - "delays": [ - [ - 0.1, - 0.05, - 0.05, - 0.1, - 0.1, - 0.1, - 0.1 + }, + { + "name": "panel_open" + }, + { + "name": "panel_closed" + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.05, + 0.05, + 0.1, + 0.1, + 0.1, + 0.1 + ] ] - ] - }, - { - "name": "sparks", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] ] - ] - }, - { - "name": "sparks_broken", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] ] - ] - }, - { - "name": "sparks_damaged", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 1.7 + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] ] - ] - }, - { - "name": "sparks_open", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] ] - ] - }, - { - "name": "welded" - }, - { - "name": "emergency_unlit", - "delays": [ - [ - 0.4, - 0.4 + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] ] - ] - } - ] -} + }, + { + "name": "emergency_open_unlit" + } + ] + } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/open_unlit.png new file mode 100644 index 00000000000..53aae2f4d19 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closed.png new file mode 100644 index 00000000000..7244b37f5c7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png index 0224acaae56..20ee581b931 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png index 814fba34228..00a265b53a9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png index 891dda16cee..47d2d10cf7e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png index 8940b5a510c..efc1e67b8af 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png index eeab16dca76..fc9ac0ff0d5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png index 02eaa98e7d5..2a28c2629d6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png index 4cfd894f740..8d3c703650c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png index 56ac2b4eada..228a900172f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png index 93c4460f1b8..bd20910d0dc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png index a9f90c4553d..27b573e8e98 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json index 72a5cbe0d12..c1da03d63c3 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -97,6 +103,9 @@ ] ] }, + { + "name": "panel_closed" + }, { "name": "panel_closing", "delays": [ @@ -141,6 +150,9 @@ 0.4 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json index 712b0ea1fc2..9fc4f6342aa 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json @@ -19,6 +19,18 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "panel_closed" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png index 2a4287034ab..c0b7ffa3029 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..cc49407c5f4 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/bolted_unlit.png index 6857f2a2415..c6b550c603d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png index bc5174213ca..a00bd64698e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png index c78d01c42d0..4ca8c59ec1d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png index 5311eca0452..f3b542e4a51 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing_unlit.png index 2a71f76d5d0..09946a77e6e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/deny_unlit.png index 7c56263f839..6486ac5ca83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..e5dfd04206c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/emergency_unlit.png index 817f2fb3f95..ede345c70df 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json index b343ae11dbf..56b5ec97ad8 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24; Edited by @MaloTV on GitHub", + "copyright": "Made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png index 1c064b99d48..b88bd9bedf8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open_unlit.png new file mode 100644 index 00000000000..4c03a217b74 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png index cc155dc10bf..708de1d80a5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening_unlit.png index 84933bd5ed9..d50675650ce 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closed.png new file mode 100644 index 00000000000..7244b37f5c7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closing.png index db7be0bc4a0..193665a93b5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_open.png index 24eb2aedc22..49e318c243c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_opening.png index fc90acd637a..a0f494310cf 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks.png index dd67e88a315..0666b28799a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_broken.png index fb5d774588a..ad6e6cbae40 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_damaged.png index f16a028dee5..695b8f38751 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_open.png index 630eabb976e..fb8ba8d034c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/welded.png index a0040dfdc73..f8369a1fcad 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png index 867e15f07c8..30a0cb64283 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png index 9c33e5217d0..0d9721c6816 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png index 42838cc43d8..74e883e324a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json index 588d48b46e4..885d0ea166d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open.png index f334c224c98..3940e829007 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png index c68f20d4368..da44eb779b5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png index 8f42abb5324..54106fd0e05 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png index 847bfd4024e..f9dd25a9735 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png index ef026cecb50..cb5e6ae3e52 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png index 585557b6b6d..fb5afb1e935 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png index 44876121116..6566fdf9a41 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png index e1baf64ff7f..a39a09e7119 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png index 21284ae6117..3e4266bdf31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png index 539c5523d7b..920fc4b3271 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json index bbf21830078..4351a68937a 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tg station at commit https://github.com/tgstation/tgstation/commit/6f450d93a6bfcc94e9c43ef7938e85bda49f7b6f", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", "size": { "x": 32, "y": 32 @@ -13,24 +13,28 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -40,12 +44,10 @@ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -53,6 +55,8 @@ "name": "deny_unlit", "delays": [ [ + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -68,12 +72,10 @@ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -83,25 +85,26 @@ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, + { + "name": "panel_closed" + }, { "name": "panel_closing", "delays": [ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -114,10 +117,10 @@ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -143,7 +146,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -156,8 +160,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -181,10 +184,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open.png index f691a36f780..8513d10e011 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open_unlit.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png index 1e69cc0a909..9b44053cc52 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png index eef8d9c12e7..0d96c805f13 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closing.png index db7be0bc4a0..ad5f96fb3b1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_opening.png index fc90acd637a..de975a1a4d3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png index 465d1a32145..45d4999d3b1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_broken.png index e1ff1cbde2b..0be2bb456f7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_damaged.png index c45136360ea..9721b330499 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_open.png index fc1ad6e5e5e..4ccda2b946e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/welded.png index b220fab8091..1429284418d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png b/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png index 1a84e526a4a..8d9ace436a5 100644 Binary files a/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png and b/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png index 0f60f5243cc..8d01b1faa8f 100644 Binary files a/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png and b/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png index 9dd42badabf..113a88c5912 100644 Binary files a/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png and b/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json b/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json index c1f0d5e09ec..80f11fe51a8 100644 --- a/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14 & edited by github:Morb0", "size": { "x": 32, "y": 32 @@ -24,12 +24,12 @@ "directions": 1, "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] }, @@ -47,12 +47,12 @@ "directions": 1, "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] } diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/open.png b/Resources/Textures/Structures/Doors/secret_door.rsi/open.png index 5f78166d8cf..d60bce98f92 100644 Binary files a/Resources/Textures/Structures/Doors/secret_door.rsi/open.png and b/Resources/Textures/Structures/Doors/secret_door.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png b/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png index 127a10b53db..85d7ece777f 100644 Binary files a/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png and b/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o0.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o0.png index 5eefb01db6a..8d071f31732 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o0.png and b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o0.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o1.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o1.png index 1902bbd8b96..2facc28f45d 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o1.png and b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o1.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o2.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o2.png index 57a1eaa3abf..27758b37d56 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o2.png and b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o2.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o3.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o3.png index 3522af81e5c..089ae6c6e28 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o3.png and b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o3.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-tank.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-tank.png index 4d5049f7b4e..d98a511f658 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-tank.png and b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-tank.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png index 134c51bccb0..1e931adf522 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png and b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png index e40e276e040..e6ce118ed6d 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png and b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png index a3cac04acb3..4211045faf6 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png and b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png index b9a49e1ec98..81d1fc32119 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png and b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png index 896c844149d..31b29a33eaa 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png and b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json index 1da3a0a7336..369ac7589d9 100644 --- a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/commit/cbe076402ed43b1cd861295bbcb95608c453de7a. Edited by chromiumboy", + "copyright": "Taken from TauCetiStation at https://github.com/TauCetiStation/TauCetiClassic/commit/ed880fc5f1c41623906f39bf8b74e3db9911cc56. Edited by github:Morb0", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/icon.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/icon.png index c47df306f34..25fbaee4026 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/icon.png and b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/meta.json index a0ff9e5c78b..b1775c37586 100644 --- a/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da354ba4e28fcaf73002d25cab0da4815808be60", + "copyright": "Taken from TauCetiStation at https://github.com/TauCetiStation/TauCetiClassic/commit/ed880fc5f1c41623906f39bf8b74e3db9911cc56", "size": { "x": 32, "y": 32 @@ -17,7 +17,19 @@ "name": "a3" }, { - "name": "on" + "name": "on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] }, { "name": "p1" diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/on.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/on.png index 9b69664237d..4285c7f3255 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/on.png and b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/on.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/field.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/field.png index bbd284cfcb8..e0baea3aaef 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/field.png and b/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/field.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/meta.json index c77a50c4f40..07b9d98b21c 100644 --- a/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da354ba4e28fcaf73002d25cab0da4815808be60", + "copyright": "Taken from TauCetiStation at https://github.com/TauCetiStation/TauCetiClassic/commit/ed880fc5f1c41623906f39bf8b74e3db9911cc56", "size": { "x": 32, "y": 32 @@ -11,78 +11,38 @@ "name": "field", "directions": 4, "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] ] } ] diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json index 265b9125e95..30995cf9a87 100644 --- a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json @@ -1 +1,39 @@ -{"version":1,"size":{"x":32,"y":32},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/obj/singularity.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_1","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]} +{ + "version": 1, + "copyright": "Taken from TauCetiStation at https://github.com/TauCetiStation/TauCetiClassic/commit/ed880fc5f1c41623906f39bf8b74e3db9911cc56", + "license": "CC-BY-SA-3.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "singularity_1", + "directions": 1, + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/singularity_1.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/singularity_1.png index 4a862b604d0..e603e5dd366 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/singularity_1.png and b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/singularity_1.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json index 44c79e79646..e3e92d7946e 100644 --- a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json @@ -1 +1,39 @@ -{"version":1,"size":{"x":96,"y":96},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/96x96.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_2","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]} +{ + "version": 1, + "copyright": "Taken from TauCetiStation at https://github.com/TauCetiStation/TauCetiClassic/commit/39bf2edc0b9aab3db8f4b088cab38e492e439f61", + "license": "CC-BY-SA-3.0", + "size": { + "x": 96, + "y": 96 + }, + "states": [ + { + "name": "singularity_2", + "directions": 1, + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/singularity_2.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/singularity_2.png index b4e91a1136a..201b7a8f25c 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/singularity_2.png and b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/singularity_2.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json index 2d500fd12f3..a03ca5e2d34 100644 --- a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json @@ -1 +1,39 @@ -{"version":1,"size":{"x":160,"y":160},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/160x160.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_3","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]} +{ + "version": 1, + "copyright": "Taken from TauCetiStation at https://github.com/TauCetiStation/TauCetiClassic/commit/39bf2edc0b9aab3db8f4b088cab38e492e439f61", + "license": "CC-BY-SA-3.0", + "size": { + "x": 160, + "y": 160 + }, + "states": [ + { + "name": "singularity_3", + "directions": 1, + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/singularity_3.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/singularity_3.png index 3f334e0ab2c..b43084e2f62 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/singularity_3.png and b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/singularity_3.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json index 1313bc34c55..e7a35adad60 100644 --- a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json @@ -1 +1,39 @@ -{"version":1,"size":{"x":224,"y":224},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/224x224.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_4","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]} +{ + "version": 1, + "copyright": "Taken from TauCetiStation at https://github.com/TauCetiStation/TauCetiClassic/commit/39bf2edc0b9aab3db8f4b088cab38e492e439f61", + "license": "CC-BY-SA-3.0", + "size": { + "x": 224, + "y": 224 + }, + "states": [ + { + "name": "singularity_4", + "directions": 1, + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/singularity_4.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/singularity_4.png index 5c8107ef23a..c1e8e241018 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/singularity_4.png and b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/singularity_4.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json index ac26dee9eff..2b9fe4f46ec 100644 --- a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json @@ -1 +1,39 @@ -{"version":1,"size":{"x":288,"y":288},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/288x288.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_5","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]} +{ + "version": 1, + "copyright": "Taken from TauCetiStation at https://github.com/TauCetiStation/TauCetiClassic/commit/39bf2edc0b9aab3db8f4b088cab38e492e439f61", + "license": "CC-BY-SA-3.0", + "size": { + "x": 288, + "y": 288 + }, + "states": [ + { + "name": "singularity_5", + "directions": 1, + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/singularity_5.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/singularity_5.png index 03c49487ee9..8abceb7fbba 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/singularity_5.png and b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/singularity_5.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json index 6f2a6d5cca8..fdd8b3e41e3 100644 --- a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json @@ -1 +1,39 @@ -{"version":1,"size":{"x":352,"y":352},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/352x352.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_6","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]} +{ + "version": 1, + "copyright": "Created by github:UDaV73rus", + "license": "CC-BY-SA-3.0", + "size": { + "x": 352, + "y": 352 + }, + "states": [ + { + "name": "singularity_6", + "directions": 1, + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/singularity_6.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/singularity_6.png index 3f187d4354b..95d6ebc2bf3 100644 Binary files a/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/singularity_6.png and b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/singularity_6.png differ diff --git a/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/meta.json index df1f633a18e..defc1ef4227 100644 --- a/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By Peptide90 for SS14", + "copyright": "By Peptide90 for SS14, Resprited by MureixloL", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/on.png b/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/on.png index 35a8f891edd..109de8a5d46 100644 Binary files a/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/on.png and b/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/on.png differ diff --git a/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/panel.png b/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/panel.png index 92e55910a37..e05d50114d8 100644 Binary files a/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/panel.png and b/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/static.png b/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/static.png index fa674a8960b..b03eaf4e1ef 100644 Binary files a/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/static.png and b/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/static.png differ diff --git a/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/warning.png b/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/warning.png index 613769121cc..33eddc7285d 100644 Binary files a/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/warning.png and b/Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/warning.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png index 02e8764173f..0a2e1ae76b9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png index 9d10428af8d..1565cdc86d7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png index 160db7c5cbb..7e14e2c2b39 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png index 0f8f9478bd8..5ead53beb0e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png index e1258d83dc3..edffdfe50c2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json index 4b8aa5fa2f0..07444979e60 100644 --- a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/birdcage.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/birdcage.png index 85ef67dd58e..17a42d8e90a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/birdcage.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/birdcage.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/combocafe.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/combocafe.png index 97980b7a62c..1a7b01bd6d5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/combocafe.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/combocafe.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/corvax_alcoholic.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/corvax_alcoholic.png new file mode 100644 index 00000000000..7ad385b8fa9 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/corvax_alcoholic.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/emergencyrumparty.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/emergencyrumparty.png index 11c57c63cf4..a4e6ac0a2cd 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/emergencyrumparty.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/emergencyrumparty.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/empbarsign.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/empbarsign.png index 6d9893b43f1..137c893bee5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/empbarsign.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/empbarsign.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/emprah.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/emprah.png index 8db33a7e687..d693504685a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/emprah.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/emprah.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/enginechange.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/enginechange.png index 0e13399999a..fc7a7583366 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/enginechange.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/enginechange.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/goose.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/goose.png index b5f8594b126..21f0b21896b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/goose.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/goose.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/maidcafe.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maidcafe.png index 9c3a3a431c0..84e359c1fa0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/maidcafe.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maidcafe.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltesefalcon.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltesefalcon.png index a71587ec229..90226fe3868 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltesefalcon.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltesefalcon.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json index 3fdd9fe8943..0b4f519fea5 100644 --- a/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json @@ -7,9 +7,8 @@ "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/commit/1fbb5e417d0200fe60c6b628656a371093d2d715", "copyright": "https://github.com/tgstation/tgstation/commit/68aade356cf53032f206cb5a887581ac7d166cae", + "copyright": "corvax_alcoholic made by discord:DenLemp#2965", "copyright": "https://github.com/space-wizards/space-station-14/commit/b301d3ac26cb2301048eda4535667c28e2283d41 - Made by ProPandaBear for SS14", - "copyright": "nfmaltroach by MoffNyan (GitHub) for tgstation, nflittletreats, nfneonflamingos (w/ edits by Whatstone), nftherune taken from tgstation at https://github.com/tgstation/tgstation/commit/430896b5cf6b786d1e70e7d73c0faccf4f3ca355", - "copyright": "nfwhiskeyechoes by cerebralerror (Discord)", "states": [ { "name": "combocafe", @@ -504,10 +503,10 @@ "delays": [ [ 0.2, - 0.3, 0.2, 0.2, - 0.3, + 0.2, + 0.2, 0.2 ] ] @@ -516,17 +515,17 @@ "name": "nfmaltroach", "delays": [ [ - 0.25, - 0.25, - 0.25, - 0.25, - 0.25, - 0.25, - 0.25, - 0.25, - 0.25, - 0.25, - 0.25 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] }, @@ -589,6 +588,24 @@ ] ] }, + { + "name": "corvax_alcoholic", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, { "name": "nfwhiskeyechoes", "delays": [ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png index ede821777a0..e3c37c8d5d8 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/robustacafe.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/robustacafe.png index 2e140b29538..8f37a9142a8 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/robustacafe.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/robustacafe.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/spacebucks.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/spacebucks.png index 9818fb892c4..80abffa1f2f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/spacebucks.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/spacebucks.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/the_lightbulb.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/the_lightbulb.png index d6e43b6088f..b2452a60990 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/the_lightbulb.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/the_lightbulb.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thealenath.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thealenath.png index 1238a7bc11e..96a4acf4464 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thealenath.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thealenath.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thecoderbus.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thecoderbus.png index 7a0bfb16f66..fde1cdf135c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thecoderbus.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thecoderbus.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thedrunkcarp.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thedrunkcarp.png index 3e087b0ebd9..440f4d305a2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thedrunkcarp.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thedrunkcarp.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/theharmbaton.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/theharmbaton.png index f17adacedd4..2f4a57dfc7f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/theharmbaton.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/theharmbaton.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/theouterspess.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/theouterspess.png index 470ab4b3df8..08c4328abd6 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/theouterspess.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/theouterspess.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesingulo.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesingulo.png index dcdc72b30b4..498fd00a08e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesingulo.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesingulo.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesun.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesun.png index 38519a7e236..4166265b751 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesun.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesun.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thewiggleroom.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thewiggleroom.png index e11c4642587..33c9dd3d2d6 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/thewiggleroom.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thewiggleroom.png differ diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/zocalo.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/zocalo.png index 9117a76366b..d6085e7384c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/barsign.rsi/zocalo.png and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/zocalo.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera.png index 19481d55a0d..f3054b57ed3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_assembly.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_assembly.png index 44d8460f5fc..404e4dad197 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_assembly.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_assembly.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_emp.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_emp.png index 6a7c1a24c51..59c7f453ebc 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_emp.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_emp.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_in_use.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_in_use.png index 42a6a6e098e..3ed85a4a6b2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_in_use.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_in_use.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_off.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_off.png index 7fa16ed3fdd..487a2602aa5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_off.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_off.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/cameracase.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/cameracase.png index ac3f200d1fe..f93042f15f2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/cameracase.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/cameracase.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/camera.rsi/meta.json index b8cedc6db63..95d2b24378e 100644 --- a/Resources/Textures/Structures/Wallmounts/camera.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/camera.rsi/meta.json @@ -1,73 +1,490 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/f878e95210d81e1328b023feb96ec0d0b6113d8c", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "camera", + "directions": 8, + "delays": [ + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25, + 0.25 + ] + ] }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi", - "states": [ - { - "name": "camera", - "directions": 1, - "delays": [ - [ 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3 ] - ] - }, - { - "name": "camera_assembly", - "directions": 1 - }, - { - "name": "camera_emp", - "directions": 1, - "delays": [ - [ 0.2, 0.2, 0.1, 0.1 ] - ] - }, - { - "name": "camera_in_use", - "directions": 1, - "delays": [ - [ 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3 ] - ] - }, - { - "name": "camera_off", - "directions": 1 - }, - { - "name": "cameracase", - "directions": 1 - }, - { - "name": "xraycamera", - "directions": 1, - "delays": [ - [ 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3 ] - ] - }, - { - "name": "xraycamera_assembly", - "directions": 1 - }, - { - "name": "xraycamera_emp", - "directions": 1, - "delays": [ - [ 0.2, 0.2, 0.1, 0.1 ] - ] - }, - { - "name": "xraycamera_in_use", - "directions": 1, - "delays": [ - [ 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3 ] - ] - }, - { - "name": "xraycamera_off", - "directions": 1 - } - ] -} \ No newline at end of file + { + "name": "camera_in_use", + "directions": 8, + "delays": [ + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ] + ] + }, + { + "name": "camera_off", + "directions": 8 + }, + { + "name": "camera_emp", + "directions": 8, + "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 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 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": "camera_assembly", + "directions": 8 + }, + { + "name": "xraycamera", + "directions": 8, + "delays": [ + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ] + ] + }, + { + "name": "xraycamera_emp", + "directions": 8, + "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 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 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": "xraycamera_off", + "directions": 8 + }, + { + "name": "xraycamera_assembly", + "directions": 8 + }, + { + "name": "cameracase" + }, + { + "name": "xraycamera_in_use", + "directions": 8, + "delays": [ + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ], + [ + 0.25, + 0.25, + 0.6, + 0.25, + 0.25, + 0.25, + 0.6, + 0.25 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera.png index 31d9892d9f6..b543be5d7b3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_assembly.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_assembly.png index d2f690d3c11..5dfddb08f7d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_assembly.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_assembly.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_emp.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_emp.png index af6f3e2ceca..434dbd575b6 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_emp.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_emp.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_in_use.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_in_use.png index 96dc134c7f2..dadc30eba7c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_in_use.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_in_use.png differ diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_off.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_off.png index 9b8a1aed798..487a2602aa5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_off.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_off.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png index 787af3f5387..7ddea57eded 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png index 0566c70e35c..fb01e708619 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png index cfd5d5fffa0..21fc9a1bad5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json index f5a9d7b89c2..d4440c99a04 100644 --- a/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi", + "copyright": "Taken from https://github.com/Skyrat-SS13/Skyrat-tg/blob/6e7197f550aac62a165c0a8c6b0835de19342623/modular_skyrat/modules/aesthetics/intercom/icons/intercom.dmi & build state from DenLemp#2965", "states": [ { "name": "base", diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png index 3bfeb8df584..68f4cd1240b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png index eb09c52fc3a..ea319b11876 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png index 7b0bb630722..9c4c3f199e6 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index 34d277c984a..be1bd23b5ea 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_", + "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_. poster1_legit, poster3_contraband, poster3_legit, poster4_contraband, poster4_legit, poster5_contraband, poster5_legit, poster6_contraband, poster6_legit, poster7_contraband, poster7_legit, poster8_contraband, poster8_legit, poster9_contraband, poster9_legit, poster10_legit, poster11_legit, poster12_legit, poster13_legit, poster14_contraband, poster15_legit, poster16_contraband, poster16_legit, poster17_legit, poster19_legit, poster20_contraband, poster20_legit, poster21_contraband, poster21_legit, poster22_contraband, poster22_legit, poster23_contraband, poster23_legit, poster24_legit, poster25_contraband, poster26_legit, poster28_legit, poster29_contraband, poster29_legit, poster30_contraband, poster31_contraband, poster31_legit, poster32_contraband, poster32_legit, poster33_contraband, poster33_legit, poster34_legit, poster35_contraband, poster36_legit, poster37_legit, poster39_legit, poster43_contraband, poster44_contraband, poster46_contraband, poster48_contraband, poster50_legit, poster51_legit, poster53_contraband, poster55_contraband, poster56_contraband, poster59_contraband, poster60_contraband, poster63_contraband edited and localised by github:lapatison", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster10_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster10_legit.png index 9e3d23053af..5ca7df24ba6 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster10_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster10_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster11_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster11_legit.png index 3fa6b1f6568..ad019b14f5c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster11_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster11_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster12_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster12_legit.png index f49b85c5118..5bdcde588b5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster12_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster12_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster13_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster13_legit.png index 59c9f17da41..1e4dceb214c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster13_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster13_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster14_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster14_contraband.png index eb2a81884e2..0e100410e33 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster14_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster14_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster15_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster15_legit.png index 07f728814fd..14448299fdf 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster15_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster15_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster16_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster16_contraband.png index a211a38009e..acd22c24f2e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster16_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster16_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster16_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster16_legit.png index 4051fb0bb1d..03c324dfd77 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster16_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster16_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster17_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster17_legit.png index 44d17b61a64..5384c2d9526 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster17_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster17_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster19_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster19_legit.png index 12b423165cf..853d0a95bfe 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster19_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster19_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster1_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster1_legit.png index 63f701d118b..300c965cd56 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster1_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster1_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster20_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster20_contraband.png index 7c401a056c0..f740d7df8d5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster20_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster20_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster20_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster20_legit.png index 6c1091c2291..b3753a8d30b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster20_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster20_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster21_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster21_contraband.png index 70813909c97..14ddcbc42b7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster21_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster21_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster21_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster21_legit.png index f5edd0e736e..9b78428b90e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster21_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster21_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster22_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster22_contraband.png index b21524753c6..0be1fdc3b42 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster22_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster22_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster22_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster22_legit.png index 1a968bdf409..c67ffd844ab 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster22_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster22_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster23_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster23_contraband.png index 815dd36dbb1..4aa29054991 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster23_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster23_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster23_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster23_legit.png index 4e1b818657f..48fcb20b4ec 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster23_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster23_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster24_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster24_legit.png index 13b95788c6d..056577bff43 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster24_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster24_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster25_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster25_contraband.png index e51a7e63f97..fc94f57716b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster25_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster25_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster26_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster26_legit.png index 3e34a1af538..8135544caa3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster26_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster26_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster28_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster28_legit.png index 3484b9f57a4..f8543ac1b1d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster28_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster28_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_contraband.png index 1dbcdd99335..f173d1a825e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png index 539f08d86c6..dfaf745e7a3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster30_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster30_contraband.png index a7081806beb..a045eee9127 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster30_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster30_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster31_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster31_legit.png index b58c4800089..6ff8ddd44b9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster31_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster31_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster32_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster32_contraband.png index 5c854e07c42..1bb2e825511 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster32_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster32_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster32_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster32_legit.png index 53c705cdb23..a56d03a2da9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster32_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster32_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster33_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster33_contraband.png index e5939facde7..a4273588202 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster33_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster33_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster33_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster33_legit.png index a9c1f6a81c9..1e9f7bdfc6d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster33_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster33_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster34_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster34_legit.png index cde20046afe..b297e33aae9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster34_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster34_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster35_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster35_contraband.png index 5c78a517e30..e6671748e29 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster35_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster35_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster36_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster36_legit.png index cc21a3f6d57..e6b0ac39ee1 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster36_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster36_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster37_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster37_legit.png index 647163aa6b9..69079d91b0e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster37_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster37_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster39_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster39_legit.png index 570d9347c6e..099fe2317c4 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster39_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster39_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster3_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster3_contraband.png index 25da210526c..b8dc36d231c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster3_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster3_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster3_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster3_legit.png index c6bdeb1b207..22b5f5d6c6f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster3_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster3_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster43_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster43_contraband.png index d39f20d01a9..a3ba5f30c0b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster43_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster43_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster44_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster44_contraband.png index 77cccc69e11..5a62887440f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster44_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster44_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster46_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster46_contraband.png index b4dc771bad2..3e4a18b7b93 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster46_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster46_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster48_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster48_contraband.png index 74ac1292cea..2a7fc896279 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster48_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster48_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png index 62ea801136d..29a89d6b32c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_legit.png index 308b1c57456..2348db51b1b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster50_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster50_legit.png index 902ca4ff1fe..664db7f79f8 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster50_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster50_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster51_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster51_legit.png index 2c37cc4415b..74332078af9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster51_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster51_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_contraband.png index 3000e77cd01..39080260292 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster55_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster55_contraband.png index 4fb41108e78..06cf9cbe9ca 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster55_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster55_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster56_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster56_contraband.png index 3fc4e859f82..a323e64a7be 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster56_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster56_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster59_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster59_contraband.png index 307ca195dcb..07bb2451843 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster59_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster59_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster5_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster5_contraband.png index 7e477479e3d..c0241d89ff0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster5_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster5_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster5_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster5_legit.png index aca3d3fb77b..1b5991b683a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster5_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster5_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster60_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster60_contraband.png index e597b62d6a3..a66ffd62427 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster60_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster60_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster63_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster63_contraband.png index 3ecb203059e..3e22f902756 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster63_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster63_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster6_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster6_contraband.png index 9fec6ecc395..0bb9b273104 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster6_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster6_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster6_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster6_legit.png index 9a494a13dbe..c1a537eef5d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster6_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster6_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster7_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster7_contraband.png index a9f4dcdf871..ee69511c80e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster7_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster7_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster7_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster7_legit.png index 5b9b0bf236a..2c8df96cc12 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster7_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster7_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster8_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster8_contraband.png index 4c43c6fdbff..461492670ed 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster8_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster8_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster8_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster8_legit.png index 8a4ea70ea58..2de38afb00c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster8_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster8_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster9_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster9_contraband.png index fca47bb9aa0..c0a9a298640 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster9_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster9_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster9_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster9_legit.png index 6699b59a1d9..5ef0254c235 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster9_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster9_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png index 6cee540a6b2..e532ec039e8 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png new file mode 100644 index 00000000000..91256aa1df7 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png index e5b69da718e..6b7361f21c2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png index 9f36d43776f..7cb18443529 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png index 671e57aa5cf..3f237ec0466 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png index 0dfa8a04f5c..9d57ebe7e9a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png index 9441b328278..ae31db348b2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_air.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_air.png index 51cd12d4b76..119fce5fa5a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_air.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_air.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_plasma.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_plasma.png index 8d47135dee1..e39c0165542 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_plasma.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_plasma.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_waste.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_waste.png index 6649918af01..c136c9e8776 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_waste.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_waste.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png index e5fb2ab766e..8fdc8016af3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png index d196072a32b..b01a82717f7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png index ae86efe4965..9c2f15e0483 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png index e34d8cf8f25..838ffa7b24b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png new file mode 100644 index 00000000000..53cdbbb5c90 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png index bf0176ea97e..0366a82ffa6 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png index df7ee4cf112..4b07e410e29 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png index 635f00ec536..a862131d76c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png index 71739f2d4a8..f8b42e9e6a3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png index d1c1ac91845..4e40f4ec728 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png index f9864f7d44c..d55a64cf6cd 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png index ecbc9370c18..da9434fcfbb 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png index d66b76011f2..f98c0a440b2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png index c3d20f31b87..0823ef39432 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png index fbb8c50593e..85944bf91df 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png new file mode 100644 index 00000000000..3a0fc6d7168 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png new file mode 100644 index 00000000000..03a801e4838 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png index 28975a1b12b..7dd47ae3b4f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bar.png index ad9cd3bbd54..a4477ab5484 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bar.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bar.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png index 7f3e3d70c50..2806586167a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png index 34f12710aec..d1ece9751a7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png index 1c1d333e8d5..30ad17577c0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png index b6119064afe..2d1c1e77404 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png index dc342dce676..8efae593570 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png index 3ee8b449d36..e5ae5d54eb1 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png index 56ea5fbadd2..6e33d4dab33 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png index 7807607b0fd..e33a4a07e1b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_exam.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_exam.png index dc1eb795e80..dc6a923c77c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_exam.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_exam.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_food.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_food.png index f2f0212b4c2..da9fee707e2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_food.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_food.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png index d4095e9a276..729922e5e0d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hop.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hop.png index 6272e3fd71a..9eeb785b871 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hop.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hop.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png index c81effa2266..f4714c4691b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_icu.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_icu.png index d4d2e4cd576..34777178555 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_icu.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_icu.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_janitor.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_janitor.png index cc50450fb99..5ce9ab5ffe0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_janitor.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_janitor.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_library.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_library.png index bd4c2fae277..b56cf322915 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_library.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_library.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png index b6b2899dcd6..188b8ec617f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png index 3f0d3dbf425..cb1080b9950 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png index 731a2011401..7669ab537f1 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png index d025350b9a3..9f4229c13d0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png index 9af0616816c..83d9c5dfc11 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png index 0f4df4caa50..ac68a451a90 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png index af31c3057d8..eab7edab109 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png index 1716f825bbd..8d59357a358 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png index 46f7585812b..ea6eb45a38f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png new file mode 100644 index 00000000000..af0d276d5c0 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png new file mode 100644 index 00000000000..538374ce404 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png new file mode 100644 index 00000000000..cba0ec5955a Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png index 2d12b080fc7..5a70940bd90 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png index 2c4f14d7077..629680bfea8 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png index 2db7d426456..3e5d2db3c32 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png index afe1ce59865..fb0d64a14bd 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png index 21eb2e86136..811d40aa898 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png new file mode 100644 index 00000000000..f23fa7960de Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png index b20654fcd64..1adf448814d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png index 40d3e546ec4..a638d33026a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png index ccb0e83784e..0242b5249fb 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png index 653caf39075..e5c0b186b4c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png index 789a53802c7..8fb54313d69 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png new file mode 100644 index 00000000000..322d62d8d2e Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png index 251e0ebd7b7..400e73df422 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png index de6e16d4a60..2eef281d8c9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png index f397ffe996e..ffb43a9ae5f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png new file mode 100644 index 00000000000..af933d5b9e3 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png index c9c6e1362a7..e57571f6821 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json index 97be2aaa0d0..632aba1b123 100644 --- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json @@ -5,1490 +5,538 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, except numerical signs which were created by discord: brainfood#7460, states: 'survival' and 'ntmining' from https://github.com/tgstation/tgstation/commit/f743754ec3ef446c8172388431effa73aeddb7ff#diff-b429dd7fccbca60d740d4887c1077a178abf1efffe57e7ae2a0b607c8a9e2202, 'janitor' edited by forgotmyotheraccount on github, 'arcade', 'barbershop', 'direction_exam', 'direction_icu', 'laundromat', 'news', 'reception', and 'salvage' made by rosieposieeee (github)", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github). 'court', 'janitor', 'law' & 'psychology' changed for corvax by netwy (discord, 583844759429316618) and updated by github:lapatison;", "states": [ { - "name": "ai", - "delays": [ - [ - 1 - ] - ] + "name": "ai" }, { - "name": "anomaly", - "delays": [ - [ - 1 - ] - ] + "name": "ai_upload" + }, + { + "name": "vault" + }, + { + "name": "xenoarch" + }, + { + "name": "anomaly" }, { "name": "anomaly2" }, { - "name": "arcade", - "delays": [ - [ - 1 - ] - ] + "name": "arcade" + }, + { + "name": "armory" }, { - "name": "armory", - "delays": [ - [ - 1 - ] - ] + "name": "barbershop" }, { - "name": "barbershop", - "delays": [ - [ - 1 - ] - ] + "name": "ass" }, { - "name": "ass", - "delays": [ - [ - 1 - ] - ] + "name": "atmominsky" }, { - "name": "atmos", - "delays": [ - [ - 1 - ] - ] + "name": "atmos" }, { - "name": "atmos_air", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_air" }, { - "name": "atmos_co2", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_co2" }, { - "name": "atmos_n2", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_n2" }, { - "name": "atmos_n2o", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_n2o" }, { - "name": "atmos_o2", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_o2" }, { - "name": "atmos_plasma", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_plasma" }, { - "name": "atmos_tritium", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_tritium" }, { - "name": "atmos_waste", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_waste" }, { - "name": "atmosplaque", - "delays": [ - [ - 1 - ] - ] + "name": "atmosplaque" }, { - "name": "zumosplaque", - "delays": [ - [ - 1 - ] - ] + "name": "zumosplaque" }, { - "name": "bar", - "delays": [ - [ - 1 - ] - ] + "name": "bar" }, { - "name": "biblio", - "delays": [ - [ - 1 - ] - ] + "name": "biblio" }, { - "name": "bio", - "delays": [ - [ - 1 - ] - ] + "name": "bio" }, { - "name": "biohazard", - "delays": [ - [ - 1 - ] - ] + "name": "biohazard" }, { - "name": "bridge", - "delays": [ - [ - 1 - ] - ] + "name": "bridge" }, { - "name": "canisters", - "delays": [ - [ - 1 - ] - ] + "name": "canisters" }, { - "name": "cargo", - "delays": [ - [ - 1 - ] - ] + "name": "cargo" }, { - "name": "cargo_dock", - "delays": [ - [ - 1 - ] - ] + "name": "cargo_dock" }, { - "name": "chapel", - "delays": [ - [ - 1 - ] - ] + "name": "chapel" }, { - "name": "chem", - "delays": [ - [ - 1 - ] - ] + "name": "chem" }, { - "name": "chemistry1", - "delays": [ - [ - 1 - ] - ] + "name": "chemistry1" }, { - "name": "chemistry2", - "delays": [ - [ - 1 - ] - ] + "name": "chemistry2" }, { - "name": "commander", - "delays": [ - [ - 1 - ] - ] + "name": "commander" }, { - "name": "conference_room", - "delays": [ - [ - 1 - ] - ] + "name": "conference_room" }, { - "name": "corrosives", - "delays": [ - [ - 1 - ] - ] + "name": "corrosives" }, { - "name": "court", - "delays": [ - [ - 1 - ] - ] + "name": "court" }, { - "name": "cryogenics", - "delays": [ - [ - 1 - ] - ] + "name": "cryogenics" }, { - "name": "danger", - "delays": [ - [ - 1 - ] - ] + "name": "danger" }, { - "name": "deathsposal", - "delays": [ - [ - 1 - ] - ] + "name": "deathsposal" }, { "name": "direction_bar", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_exam", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_icu", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_janitor", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_food", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_hop", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_library", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_chemistry", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_eng", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_evac", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_supply", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_bridge", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_med", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_sci", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_sec", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_brig", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_chapel", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_hydro", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_dorms", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_cryo", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_gravity", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_salvage", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_solar", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_wash", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "dock", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "doors", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "drones", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "electrical", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "eng", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "engine", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "eva", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "examroom", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "explosives", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "fire", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "flammable", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "cloning", - "delays": [ - [ - 1 - ] - ] + "directions": 4 + }, + { + "name": "dock" + }, + { + "name": "doors" + }, + { + "name": "mats" + }, + { + "name": "electrical" + }, + { + "name": "eng" + }, + { + "name": "engine" + }, + { + "name": "eva" + }, + { + "name": "examroom" + }, + { + "name": "explosives" + }, + { + "name": "fire" + }, + { + "name": "flammable" + }, + { + "name": "cloning" + }, + { + "name": "gravi" + }, + { + "name": "hydro" }, { - "name": "gravi", - "delays": [ - [ - 1 - ] - ] + "name": "hydro1" }, { - "name": "hydro1", - "delays": [ - [ - 1 - ] - ] + "name": "hydro2" }, { - "name": "hydro2", - "delays": [ - [ - 1 - ] - ] + "name": "hydro3" }, { - "name": "hydro3", - "delays": [ - [ - 1 - ] - ] + "name": "interrogation" }, { - "name": "interrogation", - "delays": [ - [ - 1 - ] - ] + "name": "janitor" }, { - "name": "janitor", - "delays": [ - [ - 1 - ] - ] + "name": "laser" }, { - "name": "laser", - "delays": [ - [ - 1 - ] - ] + "name": "laundromat" }, { - "name": "laundromat", - "delays": [ - [ - 1 - ] - ] + "name": "law" }, { - "name": "law", - "delays": [ - [ - 1 - ] - ] + "name": "magnetics" }, { - "name": "magnetics", - "delays": [ - [ - 1 - ] - ] + "name": "mail" }, { - "name": "mail", - "delays": [ - [ - 1 - ] - ] + "name": "medbay" }, { - "name": "medbay", - "delays": [ - [ - 1 - ] - ] + "name": "memetic" }, { - "name": "memetic", - "delays": [ - [ - 1 - ] - ] + "name": "miner_dock" }, { - "name": "miner_dock", - "delays": [ - [ - 1 - ] - ] + "name": "monkey_painting" }, { - "name": "monkey_painting", - "delays": [ - [ - 1 - ] - ] + "name": "morgue" }, { - "name": "morgue", - "delays": [ - [ - 1 - ] - ] + "name": "news" }, { - "name": "news", - "delays": [ - [ - 1 - ] - ] + "name": "kitchen" }, { - "name": "nosmoking", - "delays": [ - [ - 1 - ] - ] + "name": "drama1" }, { - "name": "nosmoking2", - "delays": [ - [ - 1 - ] - ] + "name": "drama2" }, { - "name": "surgery", - "delays": [ - [ - 1 - ] - ] + "name": "drama3" }, { - "name": "optical", - "delays": [ - [ - 1 - ] - ] + "name": "drones" }, { - "name": "oxidants", - "delays": [ - [ - 1 - ] - ] + "name": "restroom" }, { - "name": "pods", - "delays": [ - [ - 1 - ] - ] + "name": "nosmoking" }, { - "name": "prison", - "delays": [ - [ - 1 - ] - ] + "name": "nosmoking2" }, { - "name": "psychology", - "delays": [ - [ - 1 - ] - ] + "name": "surgery" }, { - "name": "radiation", - "delays": [ - [ - 1 - ] - ] + "name": "optical" }, { - "name": "reception", - "delays": [ - [ - 1 - ] - ] + "name": "oxidants" }, { - "name": "rnd", - "delays": [ - [ - 1 - ] - ] + "name": "pods" }, { - "name": "robo", - "delays": [ - [ - 1 - ] - ] + "name": "prison" }, { - "name": "salvage", - "delays": [ - [ - 1 - ] - ] + "name": "psychology" }, { - "name": "sci", - "delays": [ - [ - 1 - ] - ] + "name": "radiation" }, { - "name": "science1", - "delays": [ - [ - 1 - ] - ] + "name": "reception" }, { - "name": "science2", - "delays": [ - [ - 1 - ] - ] + "name": "rnd" }, { - "name": "secure", - "delays": [ - [ - 1 - ] - ] + "name": "robo" }, { - "name": "securearea", - "delays": [ - [ - 1 - ] - ] + "name": "salvage" }, { - "name": "shield", - "delays": [ - [ - 1 - ] - ] + "name": "sci" }, { - "name": "shock", - "delays": [ - [ - 1 - ] - ] + "name": "science1" }, { - "name": "something-old1", - "delays": [ - [ - 1 - ] - ] + "name": "science2" }, { - "name": "something-old2", - "delays": [ - [ - 1 - ] - ] + "name": "secure" }, { - "name": "space", - "delays": [ - [ - 1 - ] - ] + "name": "securearea" }, { - "name": "telecoms", - "delays": [ - [ - 1 - ] - ] + "name": "cans" }, { - "name": "toxins2", - "delays": [ - [ - 1 - ] - ] + "name": "shock" }, { - "name": "toxins", - "delays": [ - [ - 1 - ] - ] + "name": "something-old1" }, { - "name": "virology", - "delays": [ - [ - 1 - ] - ] + "name": "something-old2" }, { - "name": "xenobio", - "delays": [ - [ - 1 - ] - ] + "name": "space" }, { - "name": "xenobio2", - "delays": [ - [ - 1 - ] - ] + "name": "telecoms" }, { - "name": "xenolab", - "delays": [ - [ - 1 - ] - ] + "name": "toxins" }, { - "name": "zomlab", - "delays": [ - [ - 1 - ] - ] + "name": "toxins2" }, { - "name": "small_secure_red", - "delays": [ - [ - 1 - ] - ] + "name": "virology" }, { - "name": "small_secure", - "delays": [ - [ - 1 - ] - ] + "name": "xenobio" }, { - "name": "medium_secure_red", - "delays": [ - [ - 1 - ] - ] + "name": "xenobio2" }, { - "name": "medium_blank", - "delays": [ - [ - 1 - ] - ] + "name": "xenolab" }, { - "name": "medium_magnetics", - "delays": [ - [ - 1 - ] - ] + "name": "zomlab" }, { - "name": "medium_danger", - "delays": [ - [ - 1 - ] - ] + "name": "small_secure_red" }, { - "name": "medium_explosives", - "delays": [ - [ - 1 - ] - ] + "name": "small_secure" }, { - "name": "medium_cryogenics", - "delays": [ - [ - 1 - ] - ] + "name": "medium_secure_red" }, { - "name": "medium_electrical", - "delays": [ - [ - 1 - ] - ] + "name": "medium_blank" }, { - "name": "medium_biohazard", - "delays": [ - [ - 1 - ] - ] + "name": "medium_magnetics" }, { - "name": "medium_radiation", - "delays": [ - [ - 1 - ] - ] + "name": "medium_danger" }, { - "name": "medium_flammable", - "delays": [ - [ - 1 - ] - ] + "name": "medium_explosives" }, { - "name": "medium_laser", - "delays": [ - [ - 1 - ] - ] + "name": "medium_cryogenics" }, { - "name": "medium_secure", - "delays": [ - [ - 1 - ] - ] + "name": "medium_electrical" }, { - "name": "goldenplaque", - "delays": [ - [ - 1 - ] - ] + "name": "medium_biohazard" }, { - "name": "kiddieplaque", - "delays": [ - [ - 1 - ] - ] + "name": "medium_radiation" }, { - "name": "security", - "delays": [ - [ - 1 - ] - ] + "name": "medium_flammable" }, { - "name": "nanotrasen_sign1", - "delays": [ - [ - 1 - ] - ] + "name": "medium_laser" }, { - "name": "nanotrasen_sign2", - "delays": [ - [ - 1 - ] - ] + "name": "medium_secure" }, { - "name": "nanotrasen_sign3", - "delays": [ - [ - 1 - ] - ] + "name": "goldenplaque" }, { - "name": "nanotrasen_sign4", - "delays": [ - [ - 1 - ] - ] + "name": "kiddieplaque" }, { - "name": "nanotrasen_sign5", - "delays": [ - [ - 1 - ] - ] + "name": "security" }, { - "name": "atmominsky", - "delays": [ - [ - 1 - ] - ] - }, + "name": "data" + }, { - "name": "one", - "delays": [ - [ - 1 - ] - ] - }, + "name": "cryo" + }, { - "name": "two", - "delays": [ - [ - 1 - ] - ] - }, + "name": "nanotrasen_sign1" + }, { - "name": "three", - "delays": [ - [ - 1 - ] - ] - }, + "name": "nanotrasen_sign2" + }, { - "name": "four", - "delays": [ - [ - 1 - ] - ] - }, + "name": "nanotrasen_sign3" + }, { - "name": "five", - "delays": [ - [ - 1 - ] - ] - }, + "name": "nanotrasen_sign4" + }, { - "name": "six", - "delays": [ - [ - 1 - ] - ] - }, + "name": "nanotrasen_sign5" + }, { - "name": "seven", - "delays": [ - [ - 1 - ] - ] - }, + "name": "one" + }, { - "name": "eight", - "delays": [ - [ - 1 - ] - ] - }, + "name": "two" + }, { - "name": "nine", - "delays": [ - [ - 1 - ] - ] - }, + "name": "three" + }, { - "name": "zero", - "delays": [ - [ - 1 - ] - ] - }, + "name": "four" + }, { - "name": "survival", - "delays": [ - [ - 1 - ] - ] - }, + "name": "five" + }, + { + "name": "six" + }, + { + "name": "seven" + }, + { + "name": "shield" + }, + { + "name": "eight" + }, + { + "name": "nine" + }, + { + "name": "zero" + }, + { + "name": "survival" + }, { - "name": "ntmining", - "delays": [ - [ - 1 - ] - ] + "name": "ntmining" } ] } diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png index 1dc0e7d1a96..95729938071 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png index 575d943c769..40b73c7c2d2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking2.png index 4a18326d740..3cd02fde6d7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking2.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/pods.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/pods.png index 70d0e6512a4..7f5125119af 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/pods.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/pods.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png index a6fe5ca1f39..cea5bba81a9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png index 9b0761c1bb4..93908500a50 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png index b16670d5b5f..3f3e6dfa490 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png new file mode 100644 index 00000000000..f5903a7d155 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png index 875b57204b3..3dc284f4794 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png index 5b3bb6e83db..82519ba966b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png index 8c51238f897..20b0eb577de 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png index 7c67901ec43..2fef91a82c6 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png index 7722ef83031..fb34663e73f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png index 7e27efa2b32..a8f40331cb6 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png index 214650d6db4..69f7dd2bef3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png index 254ada76fd4..f24ba5c1b33 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png index e1e721de4aa..5896206cafe 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png index 6c28bfde003..cf11ed6155f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png new file mode 100644 index 00000000000..33572ca25b5 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png index b83297d037c..232d9a74b55 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png new file mode 100644 index 00000000000..a4b26daa993 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png index 0d9336c01a1..0c60737ffe4 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png index 3e8515dda03..08b9baa79cb 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png index 09d54e603dc..a81784d30b5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png differ diff --git a/Resources/Textures/Structures/Walls/brick.rsi/brick0.png b/Resources/Textures/Structures/Walls/brick.rsi/brick0.png index f35146394a8..3d251ac56ea 100644 Binary files a/Resources/Textures/Structures/Walls/brick.rsi/brick0.png and b/Resources/Textures/Structures/Walls/brick.rsi/brick0.png differ diff --git a/Resources/Textures/Structures/Walls/brick.rsi/brick1.png b/Resources/Textures/Structures/Walls/brick.rsi/brick1.png index e6733218f6b..f57cc34d160 100644 Binary files a/Resources/Textures/Structures/Walls/brick.rsi/brick1.png and b/Resources/Textures/Structures/Walls/brick.rsi/brick1.png differ diff --git a/Resources/Textures/Structures/Walls/brick.rsi/brick2.png b/Resources/Textures/Structures/Walls/brick.rsi/brick2.png index f35146394a8..5e6787a9132 100644 Binary files a/Resources/Textures/Structures/Walls/brick.rsi/brick2.png and b/Resources/Textures/Structures/Walls/brick.rsi/brick2.png differ diff --git a/Resources/Textures/Structures/Walls/brick.rsi/brick3.png b/Resources/Textures/Structures/Walls/brick.rsi/brick3.png index e6733218f6b..21db58f6a2e 100644 Binary files a/Resources/Textures/Structures/Walls/brick.rsi/brick3.png and b/Resources/Textures/Structures/Walls/brick.rsi/brick3.png differ diff --git a/Resources/Textures/Structures/Walls/brick.rsi/brick4.png b/Resources/Textures/Structures/Walls/brick.rsi/brick4.png index 893c538db9e..2e9e2706c59 100644 Binary files a/Resources/Textures/Structures/Walls/brick.rsi/brick4.png and b/Resources/Textures/Structures/Walls/brick.rsi/brick4.png differ diff --git a/Resources/Textures/Structures/Walls/brick.rsi/brick5.png b/Resources/Textures/Structures/Walls/brick.rsi/brick5.png index a53325619a5..49cb479602f 100644 Binary files a/Resources/Textures/Structures/Walls/brick.rsi/brick5.png and b/Resources/Textures/Structures/Walls/brick.rsi/brick5.png differ diff --git a/Resources/Textures/Structures/Walls/brick.rsi/brick6.png b/Resources/Textures/Structures/Walls/brick.rsi/brick6.png index 893c538db9e..6a8c0602b3b 100644 Binary files a/Resources/Textures/Structures/Walls/brick.rsi/brick6.png and b/Resources/Textures/Structures/Walls/brick.rsi/brick6.png differ diff --git a/Resources/Textures/Structures/Walls/brick.rsi/brick7.png b/Resources/Textures/Structures/Walls/brick.rsi/brick7.png index a53325619a5..f727145772f 100644 Binary files a/Resources/Textures/Structures/Walls/brick.rsi/brick7.png and b/Resources/Textures/Structures/Walls/brick.rsi/brick7.png differ diff --git a/Resources/Textures/Structures/Walls/brick.rsi/full.png b/Resources/Textures/Structures/Walls/brick.rsi/full.png index 02d5ea0bed3..a13d8df6c51 100644 Binary files a/Resources/Textures/Structures/Walls/brick.rsi/full.png and b/Resources/Textures/Structures/Walls/brick.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/brick.rsi/meta.json b/Resources/Textures/Structures/Walls/brick.rsi/meta.json index dfaa01c49e3..72680e82607 100644 --- a/Resources/Textures/Structures/Walls/brick.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/brick.rsi/meta.json @@ -1 +1,46 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "brick0", "directions": 4}, {"name": "brick1", "directions": 4}, {"name": "brick2", "directions": 4}, {"name": "brick3", "directions": 4}, {"name": "brick4", "directions": 4}, {"name": "brick5", "directions": 4}, {"name": "brick6", "directions": 4}, {"name": "brick7", "directions": 4}, {"name": "full"}]} \ No newline at end of file +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "By ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "brick0", + "directions": 4 + }, + { + "name": "brick1", + "directions": 4 + }, + { + "name": "brick2", + "directions": 4 + }, + { + "name": "brick3", + "directions": 4 + }, + { + "name": "brick4", + "directions": 4 + }, + { + "name": "brick5", + "directions": 4 + }, + { + "name": "brick6", + "directions": 4 + }, + { + "name": "brick7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Walls/plastitanium.rsi/full.png b/Resources/Textures/Structures/Walls/plastitanium.rsi/full.png index 68b7d4c1e34..ae2a8ba557b 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium.rsi/full.png and b/Resources/Textures/Structures/Walls/plastitanium.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/plastitanium.rsi/meta.json b/Resources/Textures/Structures/Walls/plastitanium.rsi/meta.json index f63a77531f7..3bb3437d70e 100644 --- a/Resources/Textures/Structures/Walls/plastitanium.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/plastitanium.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/tree/dfb73d28e68aa56c34c7c539448f713b78b6d4d5 and modified.", + "copyright": "Made by KREKS", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium0.png b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium0.png index e9b3d6668b4..f3833a8dc65 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium0.png and b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium0.png differ diff --git a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium1.png b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium1.png index 4ab357d0d47..ec709eb9ff4 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium1.png and b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium1.png differ diff --git a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium2.png b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium2.png index e9b3d6668b4..f3833a8dc65 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium2.png and b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium2.png differ diff --git a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium3.png b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium3.png index 4ab357d0d47..ec709eb9ff4 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium3.png and b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium3.png differ diff --git a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium4.png b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium4.png index 81a59c50739..0d5fe4595ab 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium4.png and b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium4.png differ diff --git a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium5.png b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium5.png index 6911553ebf2..b867e137578 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium5.png and b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium5.png differ diff --git a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium6.png b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium6.png index 81a59c50739..0d5fe4595ab 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium6.png and b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium6.png differ diff --git a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium7.png b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium7.png index 478c0d558d7..f45bc62dc9f 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium7.png and b/Resources/Textures/Structures/Walls/plastitanium.rsi/plastitanium7.png differ diff --git a/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/meta.json b/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/meta.json index 3b450829a50..2b153780686 100644 --- a/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from: https://github.com/tgstation/tgstation/commit/847e50af31a6c2b797c0de213e725f24b6175e17#diff-d887f4300e059d5fba9576e24bf1e6268a2fd25791f3d13f2636402492f6d917", + "copyright": "Made by KREKS", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/state0.png index 5e930b56751..63136532922 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/state1.png index 6aab4050c01..d1a577155b2 100644 Binary files a/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Walls/plastitanium_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png index 10fb9cd49d6..d025471ffb4 100644 Binary files a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png index 814483e1a6e..a1645c80f30 100644 Binary files a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Walls/riveted.rsi/full.png b/Resources/Textures/Structures/Walls/riveted.rsi/full.png index e8b5a056a5f..4f4aff43016 100644 Binary files a/Resources/Textures/Structures/Walls/riveted.rsi/full.png and b/Resources/Textures/Structures/Walls/riveted.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/riveted.rsi/meta.json b/Resources/Textures/Structures/Walls/riveted.rsi/meta.json index c2d0e291637..96a71f7edad 100644 --- a/Resources/Textures/Structures/Walls/riveted.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/riveted.rsi/meta.json @@ -1 +1,46 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full"}, {"name": "riveted0", "directions": 4}, {"name": "riveted1", "directions": 4}, {"name": "riveted2", "directions": 4}, {"name": "riveted3", "directions": 4}, {"name": "riveted4", "directions": 4}, {"name": "riveted5", "directions": 4}, {"name": "riveted6", "directions": 4}, {"name": "riveted7", "directions": 4}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi modified by ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "riveted0", + "directions": 4 + }, + { + "name": "riveted1", + "directions": 4 + }, + { + "name": "riveted2", + "directions": 4 + }, + { + "name": "riveted3", + "directions": 4 + }, + { + "name": "riveted4", + "directions": 4 + }, + { + "name": "riveted5", + "directions": 4 + }, + { + "name": "riveted6", + "directions": 4 + }, + { + "name": "riveted7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Walls/riveted.rsi/riveted0.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted0.png index 03d03fb7a7a..520d5d4721d 100644 Binary files a/Resources/Textures/Structures/Walls/riveted.rsi/riveted0.png and b/Resources/Textures/Structures/Walls/riveted.rsi/riveted0.png differ diff --git a/Resources/Textures/Structures/Walls/riveted.rsi/riveted1.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted1.png index 8a3db62a52d..631e52b3d2e 100644 Binary files a/Resources/Textures/Structures/Walls/riveted.rsi/riveted1.png and b/Resources/Textures/Structures/Walls/riveted.rsi/riveted1.png differ diff --git a/Resources/Textures/Structures/Walls/riveted.rsi/riveted2.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted2.png index 03d03fb7a7a..27515d71c18 100644 Binary files a/Resources/Textures/Structures/Walls/riveted.rsi/riveted2.png and b/Resources/Textures/Structures/Walls/riveted.rsi/riveted2.png differ diff --git a/Resources/Textures/Structures/Walls/riveted.rsi/riveted3.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted3.png index 8a3db62a52d..9faf3cda5b2 100644 Binary files a/Resources/Textures/Structures/Walls/riveted.rsi/riveted3.png and b/Resources/Textures/Structures/Walls/riveted.rsi/riveted3.png differ diff --git a/Resources/Textures/Structures/Walls/riveted.rsi/riveted4.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted4.png index 6823f9a1dbe..bbe2edabc71 100644 Binary files a/Resources/Textures/Structures/Walls/riveted.rsi/riveted4.png and b/Resources/Textures/Structures/Walls/riveted.rsi/riveted4.png differ diff --git a/Resources/Textures/Structures/Walls/riveted.rsi/riveted5.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted5.png index c3495ae1fcf..7a68150597e 100644 Binary files a/Resources/Textures/Structures/Walls/riveted.rsi/riveted5.png and b/Resources/Textures/Structures/Walls/riveted.rsi/riveted5.png differ diff --git a/Resources/Textures/Structures/Walls/riveted.rsi/riveted6.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted6.png index 6823f9a1dbe..b1aa3d52010 100644 Binary files a/Resources/Textures/Structures/Walls/riveted.rsi/riveted6.png and b/Resources/Textures/Structures/Walls/riveted.rsi/riveted6.png differ diff --git a/Resources/Textures/Structures/Walls/riveted.rsi/riveted7.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted7.png index c3495ae1fcf..b254383129c 100644 Binary files a/Resources/Textures/Structures/Walls/riveted.rsi/riveted7.png and b/Resources/Textures/Structures/Walls/riveted.rsi/riveted7.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/full.png b/Resources/Textures/Structures/Walls/solid.rsi/full.png index b4e991e3457..3d1679310bd 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/full.png and b/Resources/Textures/Structures/Walls/solid.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/meta.json b/Resources/Textures/Structures/Walls/solid.rsi/meta.json index 246ebe31b94..97aa2602e43 100644 --- a/Resources/Textures/Structures/Walls/solid.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/solid.rsi/meta.json @@ -1,7 +1,7 @@ { - "version": 1, + "version": 2, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from https://github.com/TauCetiStation/TauCetiClassic/commit/e02e5c2e8d458d9aeeb6828cfe8bc55d72d3ad01 and recolored to old style by Morb0", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png index 1e2da3352b7..3dc9a2310b4 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png index 501e4b2ab40..5f65427cf1c 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png index 23367ae824a..4f178aa2e67 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png index 2b48ffb696b..2060ce315e1 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png index 515b40760d8..8ae77b429a7 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png index bbff6b65840..dbf578816fb 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png index f6b33bcb189..626cad1048c 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png index a7800d9dcc3..f016fad5d00 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png index f6b33bcb189..626cad1048c 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png index a7800d9dcc3..f016fad5d00 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png index 9e8e9dd40ad..83ff49764c9 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png index 3c0b42ddbf7..c2eb8972374 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png index 9e8e9dd40ad..83ff49764c9 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png index b4bc95f4f0d..c13a1892753 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png index 1e2da3352b7..d3138510c1e 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png and b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png index 3849504b6ff..ab0578cdd9f 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png index 9ac2271692b..4272df31ae2 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png index 3849504b6ff..ab0578cdd9f 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid2.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png index 9ac2271692b..4272df31ae2 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png index a5a6dd28566..0f7af30a6a8 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid4.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png index 3c0b42ddbf7..1e3b2833024 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png index a5a6dd28566..0f7af30a6a8 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid6.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png index b4bc95f4f0d..f566d05be5d 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png differ diff --git a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/meta.json b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/meta.json index e27c76563c3..7b53f8ddb6b 100644 --- a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by PuroSlavKing (Github) for Space Station 14", + "copyright": "Sprited by PuroSlavKing (Github) for Space Station 14, Resprited by SonicHDC (GitHub)", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png index 5976a6c5c8c..0c7f30398aa 100644 Binary files a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png index 81e51b9ac63..ba2747c67c8 100644 Binary files a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png index bac03f82f18..2064032be5f 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png index 3af17740393..3d1cc13cb43 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png index 57f9a29657b..cda2ddff303 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png index 122fb413982..190c78067e0 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png index 2e7be27dd05..11675d819ef 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png index 48a07386adb..88330fff5cc 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png index 0969ca3ecd7..7a5e6fbb5c9 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png index 89314482b3a..90ee4f11d60 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png index 79fb38bd6ac..ec5243a722f 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png index 89314482b3a..90ee4f11d60 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png index 79fb38bd6ac..ec5243a722f 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png index 3fd3d1f3a26..19e0375dff9 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png index a9d7e717378..0f4ae0ac44e 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png index 3fd3d1f3a26..19e0375dff9 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png index 970ef1f1f5d..b3eaa7dc37b 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png index 02a1c5c63bb..015b1aa6713 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png index b6720ad5a32..73bf2e7723f 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png index 9d1da43e6f0..d3c02dfafab 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png index b6720ad5a32..73bf2e7723f 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png index 9d1da43e6f0..14b1978a673 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png index f31f3a6bc98..f46ed703f0c 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png index 7c18f9c11a7..b1bf8aac0be 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png index 8737894cbf0..da9667cc5b1 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png index 15f74bcaeed..cdec0de262d 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png b/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png index 4f9bf4c955d..a98794a7922 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/meta.json b/Resources/Textures/Structures/Windows/directional.rsi/meta.json index 5a01452c005..7fbbd82344a 100644 --- a/Resources/Textures/Structures/Windows/directional.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/directional.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "tgstation at ff1c30ac123dd28c6b5fee11e7f03654f5daa731, plasma windows from paradise at 44c12c6d9d0e42a9d3a582dff7e9a8d72b6ea68a, uranium windows made via edit by SphiraI(github), clockwork windows from https://github.com/tgstation/tgstation/blob/21b42d49ecf2b87f665b5f122368f6a247676721/icons/obj/smooth_structures/structure_variations.dmi", + "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/639e77f6e957bce88d9734b4b97b249738af42b1, uranium windows made via edit by SphiraI(github), clockwork windows from https://github.com/tgstation/tgstation/blob/21b42d49ecf2b87f665b5f122368f6a247676721/icons/obj/smooth_structures/structure_variations.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png b/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png index c1269b424e0..63bdf7e4224 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png b/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png index b1d1f4fef52..bc97d3350a8 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png b/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png index 865f079317c..bedb3ce7b24 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png b/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png index 4f9bf4c955d..a98794a7922 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/uranium_reinforced_window.png b/Resources/Textures/Structures/Windows/directional.rsi/uranium_reinforced_window.png index 2e5990bd0c6..f9bc93a3db4 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/uranium_reinforced_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/uranium_reinforced_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/uranium_window.png b/Resources/Textures/Structures/Windows/directional.rsi/uranium_window.png index 8a4661a5f20..150498600af 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/uranium_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/uranium_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/window.png b/Resources/Textures/Structures/Windows/directional.rsi/window.png index a510742c941..8c02d087386 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/window.png and b/Resources/Textures/Structures/Windows/directional.rsi/window.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json index 453a3797223..18e43517f8f 100644 --- a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by SonicHDC (github)", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png index 84f71e4833a..019f60ce928 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png index 3655b4b9d15..f4e27f64dd8 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png index 41d24e9d2c4..acc54ea583f 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json index 888b3527fb6..c66b84cb600 100644 --- a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png index a4adc74bb5e..fbdbb1288cc 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png index b0289b7d65a..e215884b7ff 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png index a4adc74bb5e..fbdbb1288cc 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png index b0289b7d65a..e215884b7ff 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png index 06f42755835..8ab206fb06a 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png index b6847b92373..053da345f9c 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png index 06f42755835..8ab206fb06a 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png index 897abc2b8e4..b1177ddbe86 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json index 453a3797223..18e43517f8f 100644 --- a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by SonicHDC (github)", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png index 3e5ebf50361..4c9b0e31975 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png index 7bd92db59f7..e48936b4f93 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png index a1c5c2115fc..06c35bd1299 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json index e716cdf4ed6..df88aef3fce 100644 --- a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png index 89446260094..bb83192d6ae 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png index b4ba2ac0075..40b0bc87680 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png index 89446260094..bb83192d6ae 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png index 7f987f7a8ef..40b0bc87680 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png index c9bd9b86994..761a5aa83d5 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png index f16d149ec46..e081e62a384 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png index c9bd9b86994..761a5aa83d5 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png index 4ad14d62d1d..b1177ddbe86 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json index 453a3797223..18e43517f8f 100644 --- a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by SonicHDC (github)", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png index fa6f83797c1..1c5730a810b 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png index c40b161092b..4f4bf895d17 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png index a1c44f239f0..6dbad5a7948 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json index 84639dad70e..739d63b2474 100644 --- a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json @@ -1,46 +1,46 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full" - }, - { - "name": "ruwindow0", - "directions": 4 - }, - { - "name": "ruwindow1", - "directions": 4 - }, - { - "name": "ruwindow2", - "directions": 4 - }, - { - "name": "ruwindow3", - "directions": 4 - }, - { - "name": "ruwindow4", - "directions": 4 - }, - { - "name": "ruwindow5", - "directions": 4 - }, - { - "name": "ruwindow6", - "directions": 4 - }, - { - "name": "ruwindow7", - "directions": 4 - } - ] -} + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "ruwindow0", + "directions": 4 + }, + { + "name": "ruwindow1", + "directions": 4 + }, + { + "name": "ruwindow2", + "directions": 4 + }, + { + "name": "ruwindow3", + "directions": 4 + }, + { + "name": "ruwindow4", + "directions": 4 + }, + { + "name": "ruwindow5", + "directions": 4 + }, + { + "name": "ruwindow6", + "directions": 4 + }, + { + "name": "ruwindow7", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png index ee388930016..9d18a3dd3f8 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png index cb46c4deda8..ce76439fd4f 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png index ee388930016..9d18a3dd3f8 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png index 7977b29f0cc..ce76439fd4f 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png index a50fafe0ed2..664958ccbee 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png index 3fe3f626e79..13724e4d57d 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png index a50fafe0ed2..664958ccbee 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png index 6edfddd38d6..2f28ae5d71d 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png index 73b05e9b2a0..421ba606867 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json index 90c736a41cc..70ee3344d38 100644 --- a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png index f339bedb11d..37a04f75997 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png index defff91bc01..2923d2406b6 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png index f339bedb11d..37a04f75997 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png index defff91bc01..2923d2406b6 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png index 0324c05f17d..7b647acd3cb 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png index 6770b1a2357..385f7239ab3 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png index 0324c05f17d..7b647acd3cb 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png index 0e02c2e8de0..aa5530009e1 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json index 453a3797223..18e43517f8f 100644 --- a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by SonicHDC (github)", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png index cd8aca55797..57d3ee5cb28 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png index 4130608cea1..f4f7f9075bc 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png index 371b38edb20..cda10181af6 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json index cdbfb466b44..2568a4a0b39 100644 --- a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png index 5539fa6154e..52a70b6bd71 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png index a7a0cad53af..676d2a73104 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png index 5539fa6154e..52a70b6bd71 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png index a7a0cad53af..676d2a73104 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png index ea4706b1911..1926b1e2a14 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png index b26c7be0b2d..6470bfaf52f 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png index ea4706b1911..1926b1e2a14 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png index a422e8c1526..a51fbde4d58 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png index 5695bc0c26c..80e4bf82685 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json index e4e4f5004e3..099201b4184 100644 --- a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json @@ -1,46 +1,46 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full" - }, - { - "name": "uwindow0", - "directions": 4 - }, - { - "name": "uwindow1", - "directions": 4 - }, - { - "name": "uwindow2", - "directions": 4 - }, - { - "name": "uwindow3", - "directions": 4 - }, - { - "name": "uwindow4", - "directions": 4 - }, - { - "name": "uwindow5", - "directions": 4 - }, - { - "name": "uwindow6", - "directions": 4 - }, - { - "name": "uwindow7", - "directions": 4 - } - ] -} + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "uwindow0", + "directions": 4 + }, + { + "name": "uwindow1", + "directions": 4 + }, + { + "name": "uwindow2", + "directions": 4 + }, + { + "name": "uwindow3", + "directions": 4 + }, + { + "name": "uwindow4", + "directions": 4 + }, + { + "name": "uwindow5", + "directions": 4 + }, + { + "name": "uwindow6", + "directions": 4 + }, + { + "name": "uwindow7", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png index 31bfc29cf0a..5d0bbe60ba9 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png index e395832e8e3..50b755fa38f 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png index 31bfc29cf0a..5d0bbe60ba9 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png index e395832e8e3..50b755fa38f 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png index 4097d024fc2..675e5a4be9d 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png index 5245aa4de55..00213ab1593 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png index 4097d024fc2..675e5a4be9d 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png index f2aec98846c..2f28ae5d71d 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json index 453a3797223..18e43517f8f 100644 --- a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by SonicHDC (github)", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png index dc5081de2ed..40270c1b212 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png index 772c39f6419..2745243cdc2 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/full.png b/Resources/Textures/Structures/Windows/window.rsi/full.png index 897534dd8f6..0053676b295 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/full.png and b/Resources/Textures/Structures/Windows/window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/meta.json b/Resources/Textures/Structures/Windows/window.rsi/meta.json index 9f6536937a3..5323637737f 100644 --- a/Resources/Textures/Structures/Windows/window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/window.rsi/window0.png b/Resources/Textures/Structures/Windows/window.rsi/window0.png index 95094714d3b..ed03f201ada 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window0.png and b/Resources/Textures/Structures/Windows/window.rsi/window0.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window1.png b/Resources/Textures/Structures/Windows/window.rsi/window1.png index 98f6b07bcb1..98deb967bb7 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window1.png and b/Resources/Textures/Structures/Windows/window.rsi/window1.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window2.png b/Resources/Textures/Structures/Windows/window.rsi/window2.png index 95094714d3b..ed03f201ada 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window2.png and b/Resources/Textures/Structures/Windows/window.rsi/window2.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window3.png b/Resources/Textures/Structures/Windows/window.rsi/window3.png index 98f6b07bcb1..98deb967bb7 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window3.png and b/Resources/Textures/Structures/Windows/window.rsi/window3.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window4.png b/Resources/Textures/Structures/Windows/window.rsi/window4.png index 30629fcac2a..f660c605a02 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window4.png and b/Resources/Textures/Structures/Windows/window.rsi/window4.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window5.png b/Resources/Textures/Structures/Windows/window.rsi/window5.png index df4ef650886..7906d5b9176 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window5.png and b/Resources/Textures/Structures/Windows/window.rsi/window5.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window6.png b/Resources/Textures/Structures/Windows/window.rsi/window6.png index 30629fcac2a..f660c605a02 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window6.png and b/Resources/Textures/Structures/Windows/window.rsi/window6.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window7.png b/Resources/Textures/Structures/Windows/window.rsi/window7.png index 0e02c2e8de0..aa5530009e1 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window7.png and b/Resources/Textures/Structures/Windows/window.rsi/window7.png differ diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json index 453a3797223..18e43517f8f 100644 --- a/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by SonicHDC (github)", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png index 39ffd5be1fd..524b6288fc1 100644 Binary files a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png index bb5136c8b00..fce99628597 100644 Binary files a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/equipped-BACKPACK.png index 5b125432cd6..99e00783401 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/equipped-BACKPACK.png and b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/icon.png index fd5283dfaba..b0d77e93823 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-left.png index 5c3fde14e26..1c2194bc703 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-right.png index 17a7c48d83c..a4788d30921 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/meta.json index f81a72aeecd..a278322727a 100644 --- a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/equipped-BACKPACK.png index 261efce2c83..d6250ad40ce 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/equipped-BACKPACK.png and b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/icon.png index f90dd461d8a..cf296189e32 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-left.png index 72dc1e371ed..9859baa46a3 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-right.png index 7374fbcf046..d19dc70cfa1 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/meta.json index f81a72aeecd..a278322727a 100644 --- a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/equipped-BACKPACK.png index fbfe6c1b36b..6c3eac2d12b 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/equipped-BACKPACK.png and b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/icon.png index 70917a1c3a5..9e4de9ee7fd 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-left.png index 132671671b2..2b40c6b957e 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-right.png index fe67b92522b..202272254c3 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/meta.json index f81a72aeecd..a278322727a 100644 --- a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/equipped-BACKPACK.png index 576f46263e9..b229a2834d6 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/equipped-BACKPACK.png and b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/icon.png index 5a0de63268e..ed18e7c78b5 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-left.png index d5917a9f42d..7c7ebc49ac6 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-right.png index 6f6d9193d4d..d0ae11d0024 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/meta.json index f81a72aeecd..a278322727a 100644 --- a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/equipped-BACKPACK.png index b30d1cbcff4..41974b84f91 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/equipped-BACKPACK.png and b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/icon.png index d7fa017df53..756f8fa94a1 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-left.png index 3b4e9844296..eecfd553192 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-right.png index 3b9471ef1bc..0200f4277b6 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/meta.json index f81a72aeecd..a278322727a 100644 --- a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/equipped-BACKPACK.png index 7d3614dea0f..41974b84f91 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/equipped-BACKPACK.png and b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/icon.png index c163e1b5733..76d139d0532 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-left.png index bf658d69a6e..ccb77d36e74 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-right.png index 6593e4c8c95..7085bfccf00 100644 Binary files a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/meta.json index f81a72aeecd..a278322727a 100644 --- a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/icon_alt.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/icon_alt.png index fc2711ef7dc..35a85639a96 100644 Binary files a/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/icon_alt.png and b/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/icon_alt.png differ diff --git a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi/icon.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi/icon.png index 48101b4ae30..77a0990dc10 100644 Binary files a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi/icon_alt.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi/icon_alt.png index 48101b4ae30..77a0990dc10 100644 Binary files a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi/icon_alt.png and b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi/icon_alt.png differ diff --git a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi/icon.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi/icon.png index 200e483f3b3..31008320c1f 100644 Binary files a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi/icon_alt.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi/icon_alt.png index 200e483f3b3..31008320c1f 100644 Binary files a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi/icon_alt.png and b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi/icon_alt.png differ diff --git a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_green.rsi/icon.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_green.rsi/icon.png index ce2d4617ac2..1c2e583ef5f 100644 Binary files a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_green.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_green.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_green.rsi/icon_alt.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_green.rsi/icon_alt.png index c9a60c28a84..1c2e583ef5f 100644 Binary files a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_green.rsi/icon_alt.png and b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_green.rsi/icon_alt.png differ diff --git a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_brown.rsi/icon_alt.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_brown.rsi/icon_alt.png index 218f216cdf8..1d72ee348b2 100644 Binary files a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_brown.rsi/icon_alt.png and b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_brown.rsi/icon_alt.png differ diff --git a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_cb.rsi/icon_alt.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_cb.rsi/icon_alt.png index 50dbb2e80cb..e7052960226 100644 Binary files a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_cb.rsi/icon_alt.png and b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_cb.rsi/icon_alt.png differ diff --git a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_green.rsi/icon_alt.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_green.rsi/icon_alt.png index 2898f2e65b4..980a5b4ebaf 100644 Binary files a/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_green.rsi/icon_alt.png and b/Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_green.rsi/icon_alt.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon-flash.png index 3f3663431c7..45f8aa7805c 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon-flash.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon-flash.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon.png index e9154375e3b..7ab6c31aa90 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json index 04dcf4b3c0b..3db02c84bfb 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json @@ -1,6 +1,7 @@ { + "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 @@ -52,6 +53,5 @@ "name": "on-inhand-right", "directions": 4 } - ], - "version": 1 + ] } diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-reptilian.png index bd1b0d972ca..97721c13bc1 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-reptilian.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET.png index 038e6660b68..bc6ffc925a4 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-reptilian.png index 85bc0f0b0e3..baf0446a81d 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-reptilian.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET.png index 401abcc15b7..af3bd3ac743 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon-flash.png index d81a8d2d5c7..2db91a16318 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon-flash.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon-flash.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon.png index 49e45c268df..e57dd93d6b2 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json index 15cd65040c2..9d1aa0b603b 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14.", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-reptilian.png index 7be262f1ec4..0243ba24323 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-reptilian.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET.png index 7de9521ab79..28c4ec62e21 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-reptilian.png index fec2019f87a..cad3724cfe2 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-reptilian.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET.png index 6c1c3f32e89..81faa90bb90 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon-flash.png index 0f24fad835f..36cdfaf6b24 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon-flash.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon-flash.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon.png index 9cb5ce425a0..d13f305ee1e 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json index 15cd65040c2..9d1aa0b603b 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14.", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-reptilian.png index 38af6472ec5..010dc8c0580 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-reptilian.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET.png index 9018b93907e..9a3e6f0f51d 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-reptilian.png index dcbd8b7c5c0..0c04c096306 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-reptilian.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET.png index 6f19d1c50de..101a5b01bdd 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon-flash.png index 58e30fab96e..ab6d1e75780 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon-flash.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon-flash.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon.png index 0921fc0f7ab..3650b196826 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json index b37a49af42b..a5ea038d562 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json @@ -1,6 +1,6 @@ { "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by Bing Guss for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-reptilian.png index 1dcc905a2da..c7d00c8341f 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-reptilian.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET.png index 7128251c669..5bf5707820f 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-reptilian.png index 7fdfdc6f1e6..76af831f4b4 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-reptilian.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET.png index 96d8e7b816d..e743288f949 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon-flash.png index f87f30b0c36..274cf7d193e 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon-flash.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon-flash.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon.png index db598bdc767..e9154375e3b 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/meta.json index 04dcf4b3c0b..a5ea038d562 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/meta.json @@ -1,6 +1,6 @@ { "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-reptilian.png index 95a00cce95c..f95a7a4b06f 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-reptilian.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET.png index a49dd305a8f..d222101bdc9 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-reptilian.png index 6da17cc34f4..8b48b73281c 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-reptilian.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET.png index 25bda6dba0f..809d483c9ba 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/equipped-HELMET.png index 45fe8ebfb9c..77a1118c16b 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/icon.png index ea668eaa950..3cc126427ed 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/inhand-left.png index 9ab550f31c9..baaa054aca2 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/inhand-right.png index c421e06ccd7..da3367620de 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/meta.json index 1b74f944ba6..825a345e85a 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/equipped-HELMET-cat.png b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/equipped-HELMET-cat.png index e50ad3009d8..94559228e74 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/equipped-HELMET-cat.png and b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/equipped-HELMET-cat.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/equipped-HELMET.png index 5b8a70738b9..9aead721020 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/equipped-HELMET.png and b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/icon.png index c73b98c799e..f301f800254 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/inhand-left.png index 0ead31206c8..ac663f568ed 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/inhand-right.png index 9b86ba7607c..da10fdc4b5c 100644 Binary files a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/meta.json index 27c0aab342e..53b16cc6389 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/equipped-MASK-reptilian.png b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/equipped-MASK-reptilian.png index f6ad21358bd..0f405dc77fa 100644 Binary files a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/equipped-MASK.png b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/equipped-MASK.png index df6a91a56a4..23cfb764ee8 100644 Binary files a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/equipped-MASK.png and b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/icon.png b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/icon.png index 1941725c3f1..96eee2c0e6c 100644 Binary files a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/inhand-left.png index f5a24c368a7..2ebdde38874 100644 Binary files a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/inhand-right.png index c453e9bb1f6..f03fece22f1 100644 Binary files a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/meta.json b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/meta.json index c2488114521..21474a699b6 100644 --- a/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Mask/nfsd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by Ghost Prince for use on Frontier Server.", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/equipped-MASK-reptilian.png b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/equipped-MASK-reptilian.png index e51f3d9cf12..e247cda9058 100644 Binary files a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/equipped-MASK.png b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/equipped-MASK.png index e106cba9034..d01f93e0999 100644 Binary files a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/equipped-MASK.png and b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/icon.png b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/icon.png index be1ba76fef9..17a2c64165b 100644 Binary files a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/inhand-left.png index b0142a31c46..0040b916062 100644 Binary files a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/inhand-right.png index 7cfc304d887..d57972669b9 100644 Binary files a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/meta.json b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/meta.json index df185a40388..0fb9ed3ba5b 100644 --- a/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Mask/nfsd_sheriff.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by Ghost Prince for use on Frontier Server.", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/equipped-NECK.png index 65eb456a79f..f3ed876267d 100644 Binary files a/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/equipped-NECK.png and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/icon.png index 4209b8eafc7..db3b0f22838 100644 Binary files a/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/meta.json index f53534a4d0e..6c6779cc314 100644 --- a/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/equipped-NECK.png index 38a31f6d2be..ad74501c220 100644 Binary files a/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/equipped-NECK.png and b/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/icon.png index d66d334fede..31c94c11a36 100644 Binary files a/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/meta.json index 5aaf4f934c0..f26e748b84b 100644 --- a/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/equipped-OUTERCLOTHING.png index 56530c2e5fa..d775626ee0b 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/icon.png index d4ed4b45248..b6e9d11099f 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/inhand-left.png index 801596f6265..b9943a5ad24 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/inhand-right.png index 196a8c3f221..3fc20fb0776 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/meta.json index 42bd4dc842d..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/equipped-OUTERCLOTHING.png index ec1bca9212d..afb70371f82 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/icon.png index 59012730a14..4397d61308b 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/inhand-left.png index ad0197116cb..629b5a20a4f 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/inhand-right.png index ac2f3823b47..1fff1227654 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/meta.json index 42bd4dc842d..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/equipped-OUTERCLOTHING.png index 767f16fcfb2..6f76dc7f31c 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/icon.png index 0764baa9ae2..e73b629d494 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/inhand-left.png index 73f86eb8efe..e10d0b30008 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/inhand-right.png index afc36177071..349bce6fd54 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/meta.json index 42bd4dc842d..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/equipped-OUTERCLOTHING.png index b5a3f6295f4..7db08439cbb 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/icon.png index 236027ad54a..5b9c9b72690 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-left.png index 9f26408d9ea..5a383a13740 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-right.png index dd19c6f92d4..a680f5d48f6 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/meta.json index e541c9afe9d..877d9d1bf2a 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14.", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/equipped-OUTERCLOTHING.png index b5a3f6295f4..63fe5e025af 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/icon.png index 236027ad54a..59246b769cf 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-left.png index 9f26408d9ea..69d6a18e559 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-right.png index dd19c6f92d4..30a8a3e3cb4 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/meta.json index e541c9afe9d..877d9d1bf2a 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14.", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/equipped-OUTERCLOTHING.png index ce1a18c940a..76ff21a79e7 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/icon.png index bc6f890ba0e..e6020eab272 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-left.png index 6a3d25f79f7..aa729d90c21 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-right.png index 8184691feba..adbe7ec1daf 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/meta.json index 79fa7147485..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by Bing Guss for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/equipped-OUTERCLOTHING.png index ee9b5600d80..3184997a1e0 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/icon.png index f7ab342e660..1f916335130 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/inhand-left.png index 157b2d5c2e1..eef00636e4e 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/inhand-right.png index 733bbe396de..6d4591fb575 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/meta.json index 42bd4dc842d..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/equipped-OUTERCLOTHING.png index e332096f672..d1e51c06280 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/icon.png index 7deaccfdab6..18003282990 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/inhand-left.png index 43b868eed99..d5374ed818e 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/inhand-right.png index dff14c1e8fd..6886c44d118 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/meta.json index 42bd4dc842d..3cd62b4485f 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite creayed by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/equipped-OUTERCLOTHING.png index 0fd3aae83d0..35e6405176b 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/icon.png index 40c17020f85..4397d61308b 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/inhand-left.png index bfc1e8317ee..629b5a20a4f 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/inhand-right.png index e245faaf9c9..1fff1227654 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/meta.json index 42bd4dc842d..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/equipped-OUTERCLOTHING.png index 8a2023facfc..3b0bcff9b1e 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/icon.png index 59fa9150d74..98f2f98afbb 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/equipped-OUTERCLOTHING.png index 12f25de8d6f..e5f8fbeb84d 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/icon.png index 40d7500b5a5..1b6dfe9f9d4 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/inhand-left.png index a7f981ef6d3..9a34aee19a5 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/inhand-right.png index 3318ef90ff2..a138b3d14ea 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/meta.json index 42bd4dc842d..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/equipped-OUTERCLOTHING.png index 5f41d0b65ab..0e8058480f5 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/icon.png index 21fedcd8c72..7118f3938cf 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/inhand-left.png index 864390518cc..7028a1d8860 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/inhand-right.png index 5a7b99956db..a4989aeef93 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/meta.json index 42bd4dc842d..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/equipped-OUTERCLOTHING.png index 1d864b19bd2..115100c756a 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/icon.png index d90dd8899b2..0ea9f6e35e7 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/inhand-left.png index 50757bfde15..e4cc7d1bcee 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/inhand-right.png index 8b1669c88e6..35da843bfe1 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/meta.json index 42bd4dc842d..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/equipped-OUTERCLOTHING.png index 043df38fef3..523eb72d1b5 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/icon.png index 6d5f1a0041c..61a550f004b 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/inhand-left.png index 614564265ad..d6c695fd7b7 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/inhand-right.png index 1e0766b0475..a773b67ee74 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/meta.json index 42bd4dc842d..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/equipped-OUTERCLOTHING.png index ec0295c1796..885949510ce 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/icon.png index e74f8341f9f..a07f18ae224 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/icon.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/inhand-left.png index 681f77c57f0..ef558f7179c 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/inhand-right.png index f7e33c16ba9..96c84316f80 100644 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/meta.json index 42bd4dc842d..50dc61fc3f2 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/equipped-FEET-reptilian.png new file mode 100644 index 00000000000..1ab779df215 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/icon.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/icon.png index 387778231f7..fc82528621b 100644 Binary files a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/inhand-left.png index 2d34917e4a1..d1176139c0f 100644 Binary files a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/inhand-right.png index c66a43fbfbe..2ebad810d41 100644 Binary files a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/meta.json index 5699ee0b102..9ac3564f550 100644 --- a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/equipped-FEET-reptilian.png new file mode 100644 index 00000000000..25f88b4b82a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/equipped-FEET.png index 5a571c97a11..a9224b03413 100644 Binary files a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/equipped-FEET.png and b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/meta.json index 5699ee0b102..9ac3564f550 100644 --- a/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/equipped-INNERCLOTHING.png index ee9c883f892..6a406308b24 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/icon.png index cfa08dc0cc5..79b188d9b4c 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/inhand-left.png index e01024da6b3..09e5d3257b3 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/inhand-right.png index 0500f422467..35a1b3b985a 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/meta.json index 152713ab03f..d2f9e059cb7 100644 --- a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/equipped-INNERCLOTHING.png index 15ec406184e..673cb6f5cfb 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/icon.png index 702b0effb04..79b188d9b4c 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/inhand-left.png index 82cdc5e184e..09e5d3257b3 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/inhand-right.png index a07dedea88b..fca5c8aad6c 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/meta.json index 152713ab03f..d2f9e059cb7 100644 --- a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 00000000000..e88aa5bd0a2 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/equipped-INNERCLOTHING.png index 3210958abc6..9b2095f1288 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/icon.png index 2e3e5f4f5b6..0ca70eba398 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/inhand-left.png index 7dcc30c6a73..09e5d3257b3 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/inhand-right.png index ff21e16e9aa..35a1b3b985a 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/meta.json index 152713ab03f..0f8bc78e24f 100644 --- a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 00000000000..9ea5cf4abe6 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/equipped-INNERCLOTHING.png index aa257c32c7f..e5614acd39a 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/icon.png index daa6c33f3b8..0ca70eba398 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/inhand-left.png index 400eb94a5a1..09e5d3257b3 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/inhand-right.png index 2f75884dfcf..fca5c8aad6c 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/meta.json index 152713ab03f..0f8bc78e24f 100644 --- a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 00000000000..509bac24c1c Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/equipped-INNERCLOTHING.png index 1ef3b55ad27..7d858f39d7a 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/icon.png index d8b8c0428f4..cb6828db514 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/inhand-left.png index cc0dffd221e..168bd863908 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/inhand-right.png index fe705d16a26..106d13a9d28 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/meta.json index 152713ab03f..0f8bc78e24f 100644 --- a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 00000000000..2fa67b578f2 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/equipped-INNERCLOTHING.png index 1849488018a..d3f31f91819 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/icon.png index 8f796f5988b..8fb1be72110 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/inhand-left.png index 848458364b1..068f5f739df 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/inhand-right.png index d14240ab2d9..1ac14c77547 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/meta.json index 152713ab03f..0f8bc78e24f 100644 --- a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 00000000000..f7b422e54d9 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/equipped-INNERCLOTHING.png index b5970468376..a04363c9e96 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/icon.png index a587ebaf4e4..fef009312a8 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/inhand-left.png index 01bbb965c57..0280c15d8a4 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/inhand-right.png index eaa3f2e0edd..8b10d15e43c 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/meta.json index 152713ab03f..0f8bc78e24f 100644 --- a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 00000000000..2653ce2eb5a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/equipped-INNERCLOTHING.png index db21effa6f9..70f95787dfd 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/icon.png index 00b0ce29b60..141cba57b4b 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/icon.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/inhand-left.png index 8c5d95b0d04..6bc557692df 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/inhand-left.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/inhand-right.png index 257110241bc..82cfc38f6d5 100644 Binary files a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/inhand-right.png and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/meta.json index 152713ab03f..0f8bc78e24f 100644 --- a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", + "copyright": "Resprite created by kbas5", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/assembly.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/assembly.png index d85cc044921..f3cc7a62c65 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/assembly.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/assembly.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/bolted_open_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/bolted_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/bolted_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closed.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closed.png index 966d1eb577b..89c17e1a01f 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closed.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closed_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closed_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closed_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closing.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closing.png index 0471f8e8ba8..4c34ded1e8e 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closing.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closing_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closing_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/closing_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/deny_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/deny_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/deny_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/emergency_open_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/emergency_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/emergency_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/meta.json b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/meta.json index d1d16acd678..0475b8542e1 100644 --- a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/meta.json +++ b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified security door from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Resprite created by karmen4ik", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/open.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/open.png index 14d1474557d..777fd1503a4 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/open.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/open.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/open_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/open_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/opening.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/opening.png index 85f0b19deae..1005d204c0b 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/opening.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/opening.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/opening_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/opening_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/opening_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_closed.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_closed.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_closing.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_closing.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_closing.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_open.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_open.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_open.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_opening.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_opening.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/panel_opening.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_broken.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_broken.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_broken.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_damaged.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_damaged.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_open.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_open.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/sparks_open.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/welded.png b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/welded.png and b/Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/assembly.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/assembly.png index 8e1bd91a5e9..4bf17e7f262 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/assembly.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/assembly.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/bolted_open_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/bolted_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/bolted_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closed.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closed.png index fb47980a0e8..534b5d4e155 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closed.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closed_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closed_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closed_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closing.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closing.png index 5b1e088d57c..893b4009279 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closing.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closing_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closing_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/closing_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/deny_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/deny_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/deny_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/emergency_open_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/emergency_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/emergency_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/meta.json b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/meta.json index d1d16acd678..0475b8542e1 100644 --- a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/meta.json +++ b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified security door from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Resprite created by karmen4ik", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/open.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/open.png index 14d1474557d..d0f724f4080 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/open.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/open.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/open_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/open_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/opening.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/opening.png index 93229625df0..c4e669286d8 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/opening.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/opening.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/opening_unlit.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/opening_unlit.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/opening_unlit.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_closed.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_closed.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_closing.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_closing.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_closing.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_open.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_open.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_open.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_opening.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_opening.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/panel_opening.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_broken.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_broken.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_broken.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_damaged.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_damaged.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_open.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_open.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/sparks_open.png differ diff --git a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/welded.png b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/welded.png and b/Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/assembly.png index d85cc044921..f3cc7a62c65 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/assembly.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/assembly.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/bolted_open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/bolted_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/bolted_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closed.png index 966d1eb577b..89c17e1a01f 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closed.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closed_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closed_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closed_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closing.png index 0471f8e8ba8..4c34ded1e8e 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closing.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closing_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closing_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/closing_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/deny_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/deny_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/deny_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/emergency_open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/emergency_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/emergency_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/meta.json index d1d16acd678..0475b8542e1 100644 --- a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified security door from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Resprite created by karmen4ik", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/open.png index 14d1474557d..777fd1503a4 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/opening.png index 85f0b19deae..1005d204c0b 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/opening.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/opening_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/opening_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/opening_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_closed.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_closed.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_closing.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_opening.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_opening.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/panel_opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_broken.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_broken.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_broken.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_damaged.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_damaged.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/sparks_open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/welded.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/welded.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/assembly.png index d8ad6dcd30d..ebc98b5a073 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/assembly.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/assembly.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed.png index 6411512fa90..365bf9dc5e2 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing.png index ba70dac7d35..b1847611757 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/deny_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/deny_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/deny_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/meta.json index 8df66c72cab..6567819d73c 100644 --- a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified NFSD door by GhostPrince for use on Frontier Station ", + "copyright": "Resprite created by lugzag", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open.png index 61e42e5452c..622f7732517 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening.png index 5b6c14e5641..8511998034f 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closed.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closed.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closing.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_opening.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_opening.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_broken.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_broken.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_broken.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_damaged.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_damaged.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/welded.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/welded.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/assembly.png index 8e1bd91a5e9..4bf17e7f262 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/assembly.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/assembly.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/bolted_open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/bolted_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/bolted_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closed.png index fb47980a0e8..534b5d4e155 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closed.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closed_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closed_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closed_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closing.png index 5b1e088d57c..893b4009279 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closing.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closing_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closing_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/closing_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/deny_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/deny_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/deny_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/emergency_open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/emergency_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/emergency_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/meta.json index d1d16acd678..0475b8542e1 100644 --- a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified security door from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Resprite created by karmen4ik", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/open.png index 14d1474557d..d0f724f4080 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/opening.png index 93229625df0..c4e669286d8 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/opening.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/opening_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/opening_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/opening_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_closed.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_closed.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_closing.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_opening.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_opening.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/panel_opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_broken.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_broken.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_broken.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_damaged.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_damaged.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/sparks_open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/welded.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/welded.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/assembly.png index 18ba80b1529..3b1e18f4371 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/assembly.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/assembly.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/bolted_open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/bolted_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/bolted_unlit.png index 6857f2a2415..9a57e2c1b2f 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/bolted_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed.png index fc358822488..431f9fb0f4e 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed_unlit.png index c78d01c42d0..a1168e19653 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing.png index 84591675ed0..ba767d954d1 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing_unlit.png index 2a71f76d5d0..4c6edcfdbe6 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/deny_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/deny_unlit.png index 7c56263f839..741589c6961 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/deny_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/deny_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/emergency_open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/emergency_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/emergency_unlit.png index 817f2fb3f95..36daac76c4a 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/emergency_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/meta.json index 3f90a9a832f..6567819d73c 100644 --- a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by Ghost Prince for use on Frontier Server.", + "license": "CC-BY-SA-3.0", + "copyright": "Resprite created by lugzag", "size": { "x": 32, "y": 32 @@ -13,12 +13,18 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -53,18 +59,12 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] }, { - "name": "open", - "delays": [ - [ - 1 - ] - ] + "name": "open" }, { "name": "opening", @@ -106,12 +106,7 @@ ] }, { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] + "name": "panel_closed" }, { "name": "panel_opening", @@ -126,6 +121,10 @@ ] ] }, + + { + "name": "panel_open" + }, { "name": "sparks", "delays": [ @@ -148,7 +147,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -161,8 +161,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -186,10 +185,13 @@ "name": "emergency_unlit", "delays": [ [ - 0.4, - 0.4 + 1.2, + 1.2 ] ] + }, + { + "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/open.png index 61e42e5452c..e8827590155 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/open_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/open_unlit.png new file mode 100644 index 00000000000..810a46ad208 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/open_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/opening.png index 011a73047b2..287e8a44fba 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/opening.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/opening_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/opening_unlit.png index 84933bd5ed9..787e869bda6 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/opening_unlit.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/opening_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_closed.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_closed.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_closing.png index db7be0bc4a0..140be67d320 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_closing.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_open.png index 24eb2aedc22..c41e1484ee8 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_opening.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_opening.png index fc90acd637a..c25bc776c68 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_opening.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks.png index dd67e88a315..186d38f0d1f 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_broken.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_broken.png index fb5d774588a..4b58c64673e 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_broken.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_broken.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_damaged.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_damaged.png index f16a028dee5..9b919ed4042 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_damaged.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_open.png index 630eabb976e..deabe407f15 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_open.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/welded.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/welded.png index a0040dfdc73..85f179f2e08 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/welded.png and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png index c5e502d1f9d..08f61f2f04a 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closing.png index c96b6ab401b..bea597613dd 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closing.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png index 71f56ae15b1..1e3e39767b0 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png index 8d14635c6de..cb05befd9a5 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png index a32da6cdb7c..d2060753ada 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png index 680aee0efdd..046daa84422 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png index 916e062da27..bcf9399c710 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/open.png index bd6c53c076a..b7b21093a84 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/open.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/opening.png index 10f1d3103fc..fcf278cf36a 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/opening.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/assembly.png index a4835963628..82791a74709 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/assembly.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/assembly.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closed.png index 12b9ac2d1d5..9f2c197bb1c 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closed.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closing.png index 65089f40cb0..b42d143d0b0 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closing.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/open.png index 5652978135c..6e32360cfbe 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/open.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png index 29f1e96e76f..6d496ad787d 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png index 0c3c643ed22..c7e2f862afc 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closing.png index 5638d3aabb1..f48093d24ae 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closing.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png index 4c56ed292e6..dac0e212d41 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png index 9bb4c9e4512..1b63d2d6c01 100644 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png and b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_nfsd.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_nfsd.png index 93e6e2ecd6b..a93bd2fcafc 100644 Binary files a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_nfsd.png and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_nfsd.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_shop.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_shop.png index af74c9105c1..b20d772c7ac 100644 Binary files a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_shop.png and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_shop.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_sr.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_sr.png index 3229ead1a7a..f948051c1fe 100644 Binary files a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_sr.png and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_sr.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_vend.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_vend.png index f4608cf8ae9..3589d31158b 100644 Binary files a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_vend.png and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_vend.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json index 1ebdf71f61d..b3a5d992f11 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station, cb1/cb2/cb3/cb4/nfsd/shop/vend - Created by GentleButter for Frontier Station", + "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station, resprite in Russian - @linkblyat", "states": [ { "name": "direction_sr", diff --git a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow0.png b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow0.png index 541597a47f8..1704c25c218 100644 Binary files a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow0.png and b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow0.png differ diff --git a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow1.png b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow1.png index 3c501429065..3c2aad6b261 100644 Binary files a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow1.png and b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow1.png differ diff --git a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow2.png b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow2.png index 541597a47f8..1704c25c218 100644 Binary files a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow2.png and b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow2.png differ diff --git a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow3.png b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow3.png index 3c501429065..3c2aad6b261 100644 Binary files a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow3.png and b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow3.png differ diff --git a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow4.png b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow4.png index efa2ba3d7a4..dda14b70141 100644 Binary files a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow4.png and b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow4.png differ diff --git a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow5.png b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow5.png index 55cc68210b3..a4a28e41bf9 100644 Binary files a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow5.png and b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow5.png differ diff --git a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow6.png b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow6.png index efa2ba3d7a4..dda14b70141 100644 Binary files a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow6.png and b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow6.png differ diff --git a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow7.png b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow7.png index 0a18b6bd32d..cc1f21f692a 100644 Binary files a/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow7.png and b/Resources/Textures/_NF/Structures/Windows/plastitanium_window.rsi/ptwindow7.png differ