From 3cbaf80e38f053f12ae2afc7876f85741962acb6 Mon Sep 17 00:00:00 2001 From: crazybrain23 <44417085+crazybrain23@users.noreply.github.com> Date: Thu, 3 Aug 2023 21:48:40 +0100 Subject: [PATCH] Syndicate pAI for Nukies (#18625) * prototype * Textures * fix * spawn * Implement requested changes --------- Co-authored-by: fedKotikeD <123323327+fedKotikeD@users.noreply.github.com> --- Resources/Maps/nukieplanet.yml | 2 +- .../Prototypes/Entities/Objects/Fun/pai.yml | 25 ++++++++++++++++++ .../Textures/Objects/Fun/pai.rsi/meta.json | 23 +++++++++++++++- .../Fun/pai.rsi/syndicate-pai-off-overlay.png | Bin 0 -> 227 bytes .../Fun/pai.rsi/syndicate-pai-on-overlay.png | Bin 0 -> 413 bytes .../syndicate-pai-searching-overlay.png | Bin 0 -> 447 bytes 6 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/pai.rsi/syndicate-pai-off-overlay.png create mode 100644 Resources/Textures/Objects/Fun/pai.rsi/syndicate-pai-on-overlay.png create mode 100644 Resources/Textures/Objects/Fun/pai.rsi/syndicate-pai-searching-overlay.png diff --git a/Resources/Maps/nukieplanet.yml b/Resources/Maps/nukieplanet.yml index abf67d3973..305ab14ed6 100644 --- a/Resources/Maps/nukieplanet.yml +++ b/Resources/Maps/nukieplanet.yml @@ -11228,7 +11228,7 @@ entities: - pos: 24.5,-16.5 parent: 104 type: Transform -- proto: PersonalAI +- proto: SyndicatePersonalAI entities: - uid: 160 components: diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 29d25a621e..b1082a2793 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -57,3 +57,28 @@ Off: { state: pai-off-overlay } Searching: { state: pai-searching-overlay } On: { state: pai-on-overlay } + +- type: entity + parent: PersonalAI + id: SyndicatePersonalAI + name: Syndicate ai device + description: Your electronic pal made by the Syndicate! + components: + - type: Sprite + netsync: false + sprite: Objects/Fun/pai.rsi + layers: + - state: pai-base + - state: syndicate-pai-off-overlay + shader: unshaded + - type: ActiveRadio + channels: + - Syndicate + - type: Appearance + - type: GenericVisualizer + visuals: + enum.PAIVisuals.Status: + screen: + Off: { state: syndicate-pai-off-overlay } + Searching: { state: syndicate-pai-searching-overlay } + On: { state: syndicate-pai-on-overlay } diff --git a/Resources/Textures/Objects/Fun/pai.rsi/meta.json b/Resources/Textures/Objects/Fun/pai.rsi/meta.json index 075707c6bf..a24a709a63 100644 --- a/Resources/Textures/Objects/Fun/pai.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/pai.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/9ddb8cf084e292571d4e9c79745db25befbd82fe. pai-searching-overlay heavily modified.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9ddb8cf084e292571d4e9c79745db25befbd82fe. pai-searching-overlay heavily modified. Syndicate variants by fedKotikeD", "size": { "x": 32, "y": 32 @@ -30,6 +30,27 @@ 0.8 ] ] + }, + { + "name": "syndicate-pai-off-overlay" + }, + { + "name": "syndicate-pai-on-overlay", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + }, + { + "name": "syndicate-pai-searching-overlay", + "delays": [ + [ + 0.8, + 0.8 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Fun/pai.rsi/syndicate-pai-off-overlay.png b/Resources/Textures/Objects/Fun/pai.rsi/syndicate-pai-off-overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..58e7c1817a2a653e9b52450ed9529b4508999f44 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ37#&FArYL(bMli<8BA!%RM2I= zY5S_-qJRW1qnOa?TfNTyR27yb#lR=cHtDnm{ Hr-UW|-_b_Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/pai.rsi/syndicate-pai-on-overlay.png b/Resources/Textures/Objects/Fun/pai.rsi/syndicate-pai-on-overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..43aa812a4f029beac7fdc7734c406176ae5c92a2 GIT binary patch literal 413 zcmV;O0b>4%P)Nkl|HJL>#Sie}+0Fk@qC1>O%mg3Lj}*gfui{M}v^ zUqb-Eb^~xaIuPfJ2NTW>y`N8QJzoIB&8^xV{OaH4{L@*hQCx+k3c!H>RDdeJUIDl~ zR(z@e8s}C3#>a|J6%dZmN7zgOLZX}-o&j9@g#tJXis!m5fQJw^I&|E~{YFYKT!OW! z0CebvFGOxZ9RUP@`VauwzfizxP0@T$#ql#DOGiLt5D^lI(;V^izOn#10x|#~+@d~1 z0W@C$#F+dlDoWftC6BLDK%NVZPmi~fU$CnGH)sU#sw>;W6i{}3`Rq&qJV#}Fm;%bK zFQ1($faj=ek2h5yO=U+95bpp001jnXNoGw=04e|g00;m8000000Mb*F00000NkvXX Hu0mjfjDD+? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/pai.rsi/syndicate-pai-searching-overlay.png b/Resources/Textures/Objects/Fun/pai.rsi/syndicate-pai-searching-overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..5d2dc53b0ef43552f85cc940bd817131a9d2fad1 GIT binary patch literal 447 zcmV;w0YLtVP)qot^>k$4zPAMncbPO zWu@7enJM`yyZejsm4K4%kKU^TssjpVp!g;5L>k}}klzI4#HJ+2X9zfTZTDy4{m`Sx zDM*+EpCQ1Q*TppfA1gavf4cdhcX8@S)O@5#Y0qwqQMg3;UQO6~H6Gm&U*A9)PNkN4pNklnL&NNYpqWA8TLF6R-TA1GFLl zzNG^a;By3Mrm_BSvHOdn8XxOFa`%^4as+6`_4olD(2$?Rk{?AyiNOEl_?!c#IpPNP z{+pKkh&^M_bIh#-