From 0552cd2e10f9eb7b0a14bee5170c0cfdc6882640 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Wed, 13 Dec 2023 19:53:05 +1100 Subject: [PATCH] New pinpointer sprites (#22435) * add * fix? * a * maybe * aaa --- .../Catalog/Fills/Backpacks/duffelbag.yml | 4 +-- .../Entities/Objects/Devices/pinpointer.yml | 27 ++++++++++++++++-- .../Objects/Devices/pinpointer.rsi/meta.json | 13 +++++---- ...inpointer_crew.png => pinpointer-crew.png} | Bin ...r_crewprox.png => pinpointer-crewprox.png} | Bin .../pinpointer.rsi/pinpointer-station.png | Bin 0 -> 1391 bytes .../pinpointer.rsi/pinpointer-syndicate.png | Bin 0 -> 1362 bytes ...{pinpointer_way.png => pinpointer-way.png} | Bin .../pinpointer.rsi/pinpointer_syndicate.png | Bin 237 -> 0 bytes 9 files changed, 34 insertions(+), 10 deletions(-) rename Resources/Textures/Objects/Devices/pinpointer.rsi/{pinpointer_crew.png => pinpointer-crew.png} (100%) rename Resources/Textures/Objects/Devices/pinpointer.rsi/{pinpointer_crewprox.png => pinpointer-crewprox.png} (100%) create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png rename Resources/Textures/Objects/Devices/pinpointer.rsi/{pinpointer_way.png => pinpointer-way.png} (100%) delete mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_syndicate.png diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 499122f7bc..1aa7387d8b 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -297,7 +297,7 @@ contents: - id: BoxSurvivalSyndicate - id: WeaponPistolViper - - id: PinpointerNuclear + - id: PinpointerSyndicateNuclear - id: DeathAcidifierImplanter @@ -315,7 +315,7 @@ - id: Cautery - id: CombatKnife - id: WeaponPistolViper - - id: PinpointerNuclear + - id: PinpointerSyndicateNuclear - id: HandheldHealthAnalyzer - id: CombatMedipen - id: DeathAcidifierImplanter diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml index 2bd0c31faf..8d48573d65 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml @@ -17,6 +17,9 @@ map: ["enum.PinpointerLayers.Screen"] shader: unshaded visible: false + - type: Icon + sprite: Objects/Devices/pinpointer.rsi + state: pinpointer - type: Item sprite: Objects/Devices/pinpointer.rsi - type: Pinpointer @@ -45,21 +48,39 @@ component: NukeDisk targetName: nuclear authentication disk +- type: entity + name: syndicate pinpointer + description: Produced specifically for nuclear operative missions, get that disk! + id: PinpointerSyndicateNuclear + parent: PinpointerBase + components: + - type: Icon + state: pinpointer-syndicate + - type: Pinpointer + component: NukeDisk + targetName: nuclear authentication disk + - type: entity name: universal pinpointer description: A handheld tracking device that locks onto any physical entity while off. Keep upright to retain accuracy. id: PinpointerUniversal parent: PinpointerBase components: - - type: Pinpointer - updateTargetName: true - canRetarget: true + - type: Icon + state: pinpointer-way + - type: Pinpointer + updateTargetName: true + canRetarget: true - type: entity parent: PinpointerBase + name: station pinpointer + description: A handheld tracking device that leads to the direction of any nearby station. id: PinpointerStation suffix: Station components: + - type: Icon + state: pinpointer-station - type: Pinpointer component: BecomesStation targetName: the station diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json index 5e05af6671..d827f509cf 100644 --- a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser", "states": [ { "name": "pinonalert", @@ -139,16 +139,19 @@ "name": "pinpointer" }, { - "name": "pinpointer_crew" + "name": "pinpointer-crew" }, { - "name": "pinpointer_crewprox" + "name": "pinpointer-crewprox" }, { - "name": "pinpointer_syndicate" + "name": "pinpointer-syndicate" }, { - "name": "pinpointer_way" + "name": "pinpointer-way" + }, + { + "name": "pinpointer-station" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_crew.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png similarity index 100% rename from Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_crew.png rename to Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_crewprox.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png similarity index 100% rename from Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_crewprox.png rename to Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png new file mode 100644 index 0000000000000000000000000000000000000000..2b931884db423c8983a40b65c90db0ec24e246e4 GIT binary patch literal 1391 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|=rF42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#S$nRx~InRz9tMK<~nb*TCwqNv8&=woq#4anbC zkwK}&`8lPakhe23GqC}O28t*m4j?)ruWvNRNYgHL>x=}P*+vq?8dWT}_` zB$g(Hgkrt(Y@NrB>6||BdCx|Jg4pd{H{X@qxUasZ`39>|`6oq{)dCM*A2x6Nw(uxR z%>9+MW=w)&0{MxKzw*7-!7$|k*{QDi|KIqdtb{jM%cE6>} Y^=l`GJE+w4M1TrAPgg&ebxsLQ0BFJ71poj5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png new file mode 100644 index 0000000000000000000000000000000000000000..66c0b9dec09718cae7a9dd5d94ef99f70acd669f GIT binary patch literal 1362 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|=rF42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#S$nRx~InRz9tMK<~nb*TCwqNv8&=woq#4anbC zkwK}&`8lPakhe23GqC}O28t*m4j?)ru8{fQmd9&mGp+lz(4YUFrCOxn0TlDPfqR5U1 z7yd9D$W@xdB$9N!^uW%ScF8=X~7rD$3iI+g)Aq`fzMeY60W>rf&`}JR1to`bsNenwvjs#5Ze^b9f(jwRX#1XBHcdzig z@OINXdir`?;X2!=JOTWb93QLpTHb6g*}3G?pIPo=3zU7_Z!>(}DfjEMb>^0HiSK_e t|8?uFTuG9ghm70=LsKgO*&peAHB2(hf$sb#*IWXXXP&NpF6*2UngAg?&p!YF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_way.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-way.png similarity index 100% rename from Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_way.png rename to Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-way.png diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_syndicate.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_syndicate.png deleted file mode 100644 index 46e9fbba6cf168a369b67eeb6fd8f7174726fbf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmVm#} z`#$m{u0z!mP=RRz_uSSBJYLVW0^a+z0#cUGfOr*;Zo-rjwrvA&(kdQVuYi08L>(AP n{=rcP*csry)7keGMfrc;1p+uXgxLLX00000NkvXXu0mjf19oCY -- 2.52.0