diff --git a/Resources/Prototypes/Actions/actions.yml b/Resources/Prototypes/Actions/actions.yml index 12374551c9..0ad1aca925 100644 --- a/Resources/Prototypes/Actions/actions.yml +++ b/Resources/Prototypes/Actions/actions.yml @@ -68,7 +68,7 @@ - type: action actionType: PAIMidi - icon: Interface/Actions/midi.png + icon: Interface/Actions/pai-midi.png name: "Play MIDI" description: "Open your portable MIDI interface to soothe your owner." filters: diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 195ab7fec6..aab82ce023 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -17,10 +17,10 @@ type: InstrumentBoundUserInterface - type: Sprite netsync: false - sprite: Objects/Devices/pda.rsi + sprite: Objects/Fun/pai.rsi layers: - - state: pda-lawyer # nobody's using this one - - state: pai_off_overlay + - state: pai-base + - state: pai-off-overlay shader: unshaded - type: Input context: "human" @@ -43,7 +43,7 @@ key: enum.PAIVisuals.Status layer: 1 states: - enum.PAIStatus.Off: pai_off_overlay - enum.PAIStatus.Searching: pda-r - enum.PAIStatus.On: pai_overlay + enum.PAIStatus.Off: pai-off-overlay + enum.PAIStatus.Searching: pai-searching-overlay + enum.PAIStatus.On: pai-on-overlay diff --git a/Resources/Textures/Interface/Actions/midi.png b/Resources/Textures/Interface/Actions/midi.png deleted file mode 100644 index 38d89b609e..0000000000 Binary files a/Resources/Textures/Interface/Actions/midi.png and /dev/null differ diff --git a/Resources/Textures/Interface/Actions/pai-midi.png b/Resources/Textures/Interface/Actions/pai-midi.png new file mode 100644 index 0000000000..d0e6e9614d Binary files /dev/null and b/Resources/Textures/Interface/Actions/pai-midi.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 0762084d11..aeb6eaad2d 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -20,12 +20,6 @@ { "name": "light_overlay" }, - { - "name": "pai_off_overlay" - }, - { - "name": "pai_overlay" - }, { "name": "pda" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pai_off_overlay.png b/Resources/Textures/Objects/Devices/pda.rsi/pai_off_overlay.png deleted file mode 100644 index 7d557d092e..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pai_off_overlay.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pai_overlay.png b/Resources/Textures/Objects/Devices/pda.rsi/pai_overlay.png deleted file mode 100644 index 92d93851cf..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pai_overlay.png and /dev/null differ diff --git a/Resources/Textures/Objects/Fun/pai.rsi/meta.json b/Resources/Textures/Objects/Fun/pai.rsi/meta.json new file mode 100644 index 0000000000..075707c6bf --- /dev/null +++ b/Resources/Textures/Objects/Fun/pai.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9ddb8cf084e292571d4e9c79745db25befbd82fe. pai-searching-overlay heavily modified.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pai-base" + }, + { + "name": "pai-off-overlay" + }, + { + "name": "pai-on-overlay", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + }, + { + "name": "pai-searching-overlay", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Fun/pai.rsi/pai-base.png b/Resources/Textures/Objects/Fun/pai.rsi/pai-base.png new file mode 100644 index 0000000000..948ac45e47 Binary files /dev/null and b/Resources/Textures/Objects/Fun/pai.rsi/pai-base.png differ diff --git a/Resources/Textures/Objects/Fun/pai.rsi/pai-off-overlay.png b/Resources/Textures/Objects/Fun/pai.rsi/pai-off-overlay.png new file mode 100644 index 0000000000..e376b25435 Binary files /dev/null and b/Resources/Textures/Objects/Fun/pai.rsi/pai-off-overlay.png differ diff --git a/Resources/Textures/Objects/Fun/pai.rsi/pai-on-overlay.png b/Resources/Textures/Objects/Fun/pai.rsi/pai-on-overlay.png new file mode 100644 index 0000000000..dd43760c15 Binary files /dev/null and b/Resources/Textures/Objects/Fun/pai.rsi/pai-on-overlay.png differ diff --git a/Resources/Textures/Objects/Fun/pai.rsi/pai-searching-overlay.png b/Resources/Textures/Objects/Fun/pai.rsi/pai-searching-overlay.png new file mode 100644 index 0000000000..94eb011c70 Binary files /dev/null and b/Resources/Textures/Objects/Fun/pai.rsi/pai-searching-overlay.png differ