diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs index 9d0305dbd0..2f3bf92fda 100644 --- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs +++ b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs @@ -24,12 +24,12 @@ namespace Content.Client.GameObjects.Components.MedicalScanner { switch (status) { - case Off: return "scanner_off"; - case Open: return "scanner_open"; - case Red: return "scanner_red"; - case Death: return "scanner_death"; - case Green: return "scanner_green"; - case Yellow: return "scanner_yellow"; + case Off: return "closed"; + case Open: return "open"; + case Red: return "closed"; + case Death: return "closed"; + case Green: return "occupied"; + case Yellow: return "closed"; default: throw new ArgumentOutOfRangeException(nameof(status), status, "unknown MedicalScannerStatus"); } @@ -39,12 +39,12 @@ namespace Content.Client.GameObjects.Components.MedicalScanner { switch (status) { - case Off: return "scanner_terminal_off"; - case Open: return "scanner_terminal_blue"; - case Red: return "scanner_terminal_red"; - case Death: return "scanner_terminal_dead"; - case Green: return "scanner_terminal_green"; - case Yellow: return "scanner_terminal_blue"; + case Off: return "off_unlit"; + case Open: return "idle_unlit"; + case Red: return "red_unlit"; + case Death: return "red_unlit"; + case Green: return "idle_unlit"; + case Yellow: return "maint_unlit"; default: throw new ArgumentOutOfRangeException(nameof(status), status, "unknown MedicalScannerStatus"); } diff --git a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml b/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml similarity index 95% rename from Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml rename to Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml index c340c99681..f58464d996 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml @@ -7,7 +7,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Specific/Medical/cloning.rsi + sprite: Constructible/Specific/Medical/cloning.rsi layers: - state: pod_0 map: ["enum.CloningPodVisualLayers.Machine"] diff --git a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml b/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml similarity index 87% rename from Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml rename to Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml index fce14c14e7..1c0b3988c3 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml @@ -7,11 +7,11 @@ components: - type: Sprite netsync: false - sprite: Constructible/Power/medical_scanner.rsi + sprite: Constructible/Specific/Medical/scanner.rsi layers: - - state: scanner_open + - state: open map: ["enum.MedicalScannerVisualLayers.Machine"] - - state: scanner_terminal_blue + - state: idle_unlit map: ["enum.MedicalScannerVisualLayers.Terminal"] - type: PowerReceiver - type: Anchorable @@ -22,7 +22,6 @@ anchored: true shapes: - !type:PhysShapeAabb - bounds: "-0.5,0,0.5,1" layer: - Opaque - Impassable diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/meta.json b/Resources/Textures/Constructible/Power/medical_scanner.rsi/meta.json deleted file mode 100644 index 45f3c3c55d..0000000000 --- a/Resources/Textures/Constructible/Power/medical_scanner.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 64, "y": 32}, "states": [{"name": "scanner_death", "directions": 1, "delays": [[0.3, 0.3, 0.3, 0.3]]}, {"name": "scanner_green", "directions": 1, "delays": [[0.3, 0.3, 0.3, 0.3, 0.3, 0.3]]}, {"name": "scanner_off", "directions": 1, "delays": [[1.0]]}, {"name": "scanner_open", "directions": 1, "delays": [[1.0]]}, {"name": "scanner_red", "directions": 1, "delays": [[0.3, 0.3, 0.3, 0.3, 0.3, 0.3]]}, {"name": "scanner_terminal_blue", "directions": 1, "delays": [[0.3, 0.3, 0.3, 0.3]]}, {"name": "scanner_terminal_dead", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.2]]}, {"name": "scanner_terminal_green", "directions": 1, "delays": [[0.3, 0.3, 0.3, 0.3]]}, {"name": "scanner_terminal_off", "directions": 1, "delays": [[1.0]]}, {"name": "scanner_terminal_red", "directions": 1, "delays": [[0.3, 0.3, 0.3, 0.3]]}, {"name": "scanner_yellow", "directions": 1, "delays": [[0.3, 0.3, 0.3, 0.3, 0.3, 0.3]]}]} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_death.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_death.png deleted file mode 100644 index 7abe8dde27..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_death.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_green.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_green.png deleted file mode 100644 index b413cbe1bb..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_green.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_icon.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_icon.png deleted file mode 100644 index e47411e0fd..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_icon.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_off.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_off.png deleted file mode 100644 index 1b3c66bfab..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_off.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_open.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_open.png deleted file mode 100644 index 4208d0e977..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_open.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_red.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_red.png deleted file mode 100644 index e45f895d46..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_red.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_blue.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_blue.png deleted file mode 100644 index 0f4a4b33fe..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_blue.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_dead.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_dead.png deleted file mode 100644 index a79cb10c67..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_dead.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_green.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_green.png deleted file mode 100644 index 13befd5934..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_green.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_off.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_off.png deleted file mode 100644 index 46f8d61efd..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_off.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_red.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_red.png deleted file mode 100644 index 8f02d3cdd3..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_red.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_yellow.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_yellow.png deleted file mode 100644 index fe31a166e4..0000000000 Binary files a/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_yellow.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/meta.json b/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/meta.json new file mode 100644 index 0000000000..736abaec7c --- /dev/null +++ b/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1da0b5547e02db0db48d0bc93926c26bd8888347", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pod_0", + "directions": 1 + }, + { + "name": "pod_1", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "pod_e", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "pod_g", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/pod_0.png b/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_0.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/pod_0.png rename to Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_0.png diff --git a/Resources/Textures/Objects/Specific/Medical/cloning.rsi/pod_1.png b/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/cloning.rsi/pod_1.png rename to Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_1.png diff --git a/Resources/Textures/Objects/Specific/Medical/cloning.rsi/pod_e.png b/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_e.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/cloning.rsi/pod_e.png rename to Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_e.png diff --git a/Resources/Textures/Objects/Specific/Medical/cloning.rsi/pod_g.png b/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_g.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/cloning.rsi/pod_g.png rename to Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_g.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed.png b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed.png new file mode 100644 index 0000000000..6cce367fc5 Binary files /dev/null and b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_unpowered.png b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed_unpowered.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_unpowered.png rename to Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed_unpowered.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/idle_unlit.png b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/idle_unlit.png new file mode 100644 index 0000000000..4470a4668c Binary files /dev/null and b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/idle_unlit.png differ diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/maint_unlit.png b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/maint_unlit.png new file mode 100644 index 0000000000..1726aa5d10 Binary files /dev/null and b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/maint_unlit.png differ diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/meta.json b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/meta.json new file mode 100644 index 0000000000..d54c5960af --- /dev/null +++ b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/meta.json @@ -0,0 +1,77 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1da0b5547e02db0db48d0bc93926c26bd8888347", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "open", + "directions": 1 + }, + { + "name": "closed", + "directions": 1 + }, + { + "name": "open_unpowered", + "directions": 1 + }, + { + "name": "closed_unpowered", + "directions": 1 + }, + { + "name": "occupied", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off_unlit", + "directions": 1 + }, + { + "name": "occupied_unlit", + "directions": 1 + }, + { + "name": "idle_unlit", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "maint_unlit", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "red_unlit", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_occupied.png b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_occupied.png rename to Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied_unlit.png b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied_unlit.png new file mode 100644 index 0000000000..0ff8021e00 Binary files /dev/null and b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied_unlit.png differ diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/off_unlit.png b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/off_unlit.png new file mode 100644 index 0000000000..445ddaae70 Binary files /dev/null and b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/off_unlit.png differ diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open.png b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open.png new file mode 100644 index 0000000000..c028a08d31 Binary files /dev/null and b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_open_unpowered.png b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open_unpowered.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_open_unpowered.png rename to Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open_unpowered.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/red_unlit.png b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/red_unlit.png new file mode 100644 index 0000000000..16ca86aa36 Binary files /dev/null and b/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/red_unlit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/meta.json deleted file mode 100644 index 36d0f22970..0000000000 --- a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/meta.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "version": 1, - "license": "CC BY-SA 3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "pod_0", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "scanner", - "directions": 1, - "delays": [ - [ - 0.2, - 0.2 - ] - ] - }, - { - "name": "scanner_maintenance", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "scanner_occupied", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "scanner_open", - "directions": 1, - "delays": [ - [ - 0.2, - 0.2 - ] - ] - }, - { - "name": "scanner_open_maintenance", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "scanner_open_unpowered", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "scanner_unpowered", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner.png b/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner.png deleted file mode 100644 index 01b9c37f9e..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_maintenance.png b/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_maintenance.png deleted file mode 100644 index b659cb7f35..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_maintenance.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_open.png b/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_open.png deleted file mode 100644 index 4af3b01611..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_open_maintenance.png b/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_open_maintenance.png deleted file mode 100644 index 513eb24d71..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/BodyScanner.rsi/scanner_open_maintenance.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/cloning.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/cloning.rsi/meta.json deleted file mode 100644 index ac8957b3fe..0000000000 --- a/Resources/Textures/Objects/Specific/Medical/cloning.rsi/meta.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC BY-SA 3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f", - "states": [ - { - "name": "pod_0", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "pod_1", - "directions": 1, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "pod_e", - "directions": 1, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "pod_g", - "directions": 1, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Medical/cloning.rsi/pod_0.png b/Resources/Textures/Objects/Specific/Medical/cloning.rsi/pod_0.png deleted file mode 100644 index 13d289fd6c..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/cloning.rsi/pod_0.png and /dev/null differ