From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Wed, 13 Dec 2023 08:53:05 +0000 (+1100) Subject: New pinpointer sprites (#22435) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0552cd2e10f9eb7b0a14bee5170c0cfdc6882640;p=space-station-14.git New pinpointer sprites (#22435) * add * fix? * a * maybe * aaa --- 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 0000000000..2b931884db Binary files /dev/null and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png differ 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 0000000000..66c0b9dec0 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png differ 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 46e9fbba6c..0000000000 Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_syndicate.png and /dev/null differ