From e5ce73a4711b9b7182fddb892ce4cc2dcf36d254 Mon Sep 17 00:00:00 2001 From: Samuka <47865393+Samuka-C@users.noreply.github.com> Date: Wed, 14 Jan 2026 17:22:28 -0300 Subject: [PATCH] Xenoborgs now drop pieces of pinpointer (#42295) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * add sprites * update sprite * repaired sprite * repaired pinpointer * different id * piece of pinpointer core * borgs drop the piece * end of file new line * typo Co-authored-by: āda * make the tape darker * four variations * same variation in the crafting menu --------- Co-authored-by: āda --- Resources/Locale/en-US/recipes/tags.ftl | 1 + .../Mobs/Cyborgs/base_borg_chassis.yml | 2 +- .../Entities/Mobs/Cyborgs/xenoborgs.yml | 2 +- .../Entities/Objects/Devices/pinpointer.yml | 47 ++++++++++++++++-- .../Graphs/repaired_xenoborg_pinpointer.yml | 34 +++++++++++++ .../Recipes/Crafting/improvised.yml | 8 +++ Resources/Prototypes/tags.yml | 3 ++ .../Objects/Devices/pinpointer.rsi/meta.json | 20 +++++++- .../pinpointer-xenoborg-piece-1.png | Bin 0 -> 410 bytes .../pinpointer-xenoborg-piece-2.png | Bin 0 -> 316 bytes .../pinpointer-xenoborg-piece-3.png | Bin 0 -> 315 bytes .../pinpointer-xenoborg-piece-4.png | Bin 0 -> 374 bytes .../pinpointer-xenoborg-repaired.png | Bin 0 -> 504 bytes .../pinpointer.rsi/pinpointer-xenoborg.png | Bin 0 -> 353 bytes 14 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/repaired_xenoborg_pinpointer.yml create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-1.png create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-2.png create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-3.png create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-4.png create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-repaired.png create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg.png diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl index 1b4ca5656d..8d739eef6f 100644 --- a/Resources/Locale/en-US/recipes/tags.ftl +++ b/Resources/Locale/en-US/recipes/tags.ftl @@ -73,6 +73,7 @@ construction-graph-tag-apron = an apron construction-graph-tag-utility-belt = a utility belt soil-construction-graph-any-mushroom = any mushroom construction-graph-tag-mop-basic = mop +construction-graph-tag-core-pinpointer-piece = piece of core pinpointer # toys construction-graph-tag-rubber-ducky = a rubber ducky diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 7b2adf1a22..ed61df6eff 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -519,7 +519,7 @@ collection: MetalBreak - !type:SpawnEntitiesBehavior spawn: - PinpointerMothership: # drop a pinpointer to the mothership upon being destructed + PinpointerMothershipPiece: # drop a piece of core pinpointer upon being destructed (4 pieces to make a core pinpointer) min: 1 max: 1 - !type:EmptyContainersBehaviour diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml index ae07eab6c9..921eab377a 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml @@ -120,7 +120,7 @@ collection: MetalBreak - !type:SpawnEntitiesBehavior spawn: - PinpointerMothership: # drop a pinpointer to the mothership upon being destructed + PinpointerMothershipPiece: # drop a piece of core pinpointer upon being destructed (4 pieces to make a core pinpointer) min: 1 max: 1 - !type:EmptyContainersBehaviour diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml index e6ab450c93..f71cb29b36 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml @@ -168,12 +168,11 @@ parent: [ PinpointerBase, BaseXenoborgContraband ] id: PinpointerMothership name: core pinpointer - suffix: Mothership description: A handheld tracking device that leads to the direction of the Mothership core. components: - type: Sprite layers: - - state: pinpointer-station + - state: pinpointer-xenoborg map: ["enum.PinpointerLayers.Base"] - state: pinonnull map: ["enum.PinpointerLayers.Screen"] @@ -194,7 +193,49 @@ color: "#3a3a3a" - state: inhand-right-top - type: Icon - state: pinpointer-station + state: pinpointer-xenoborg - type: Pinpointer component: MothershipCore targetName: the Mothership + +- type: entity + parent: BaseItem + id: PinpointerMothershipPiece + name: piece of core pinpointer + description: A piece of a core pinpointer. You need four pieces to repair it. + components: + - type: Sprite + sprite: Objects/Devices/pinpointer.rsi + layers: + - state: pinpointer-xenoborg-piece-1 + map: [ "base" ] + - type: RandomSprite + available: + - base: + pinpointer-xenoborg-piece-1: "" + pinpointer-xenoborg-piece-2: "" + pinpointer-xenoborg-piece-3: "" + pinpointer-xenoborg-piece-4: "" + - type: Item + - type: Tag + tags: + - MothershipPinpointerPiece + - type: Construction + graph: RepairMothershipPinpointer + node: start + +- type: entity + parent: PinpointerMothership + id: PinpointerMothershipRepaired + name: repaired core pinpointer + description: A handheld tracking device that leads to the direction of the Mothership core. This one has seen better days. + components: + - type: Sprite + layers: + - state: pinpointer-xenoborg-repaired + map: ["enum.PinpointerLayers.Base"] + - type: Icon + state: pinpointer-xenoborg-repaired + - type: Construction + graph: RepairMothershipPinpointer + node: repairedPinpointer diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/repaired_xenoborg_pinpointer.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/repaired_xenoborg_pinpointer.yml new file mode 100644 index 0000000000..beaf73dd6c --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/repaired_xenoborg_pinpointer.yml @@ -0,0 +1,34 @@ +- type: constructionGraph + id: RepairMothershipPinpointer + start: start + graph: + - node: start + edges: + - to: repairedPinpointer + steps: + - tag: MothershipPinpointerPiece + name: construction-graph-tag-core-pinpointer-piece + icon: + sprite: Objects/Devices/pinpointer.rsi + state: pinpointer-xenoborg-piece-1 + doAfter: 4 + - tag: MothershipPinpointerPiece + name: construction-graph-tag-core-pinpointer-piece + icon: + sprite: Objects/Devices/pinpointer.rsi + state: pinpointer-xenoborg-piece-1 + doAfter: 4 + - tag: MothershipPinpointerPiece + name: construction-graph-tag-core-pinpointer-piece + icon: + sprite: Objects/Devices/pinpointer.rsi + state: pinpointer-xenoborg-piece-1 + doAfter: 4 + - tag: MothershipPinpointerPiece + name: construction-graph-tag-core-pinpointer-piece + icon: + sprite: Objects/Devices/pinpointer.rsi + state: pinpointer-xenoborg-piece-1 + doAfter: 4 + - node: repairedPinpointer + entity: PinpointerMothershipRepaired diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index d7e03c5257..357aa6c6ab 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -150,6 +150,14 @@ category: construction-category-misc objectType: Item +- type: construction + id: RepairMothershipPinpointer + graph: RepairMothershipPinpointer + startNode: start + targetNode: repairedPinpointer + category: construction-category-misc + objectType: Item + - type: construction id: HardsuitGoliath graph: HardsuitGoliath diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 7bf3da6fef..3aae89c4ae 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -977,6 +977,9 @@ - type: Tag id: MothershipModule # Cyborg module category for evil xenoborg core +- type: Tag + id: MothershipPinpointerPiece # ConstructionGraph: RepairMothershipPinpointer + - type: Tag id: Mouse # CargoBounty: BountyMouse diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json index fe592577c4..785bc392a8 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, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github). Modified by @whatston3 and @Quantum-cross (github) to center the sprite so arrow rotation is around the proper axis.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github). xenoborg by Samuka-C (github). Modified by @whatston3 and @Quantum-cross (github) to center the sprite so arrow rotation is around the proper axis.", "states": [ { "name": "pinonalert", @@ -156,6 +156,24 @@ { "name": "pinpointer-station" }, + { + "name": "pinpointer-xenoborg" + }, + { + "name": "pinpointer-xenoborg-piece-1" + }, + { + "name": "pinpointer-xenoborg-piece-2" + }, + { + "name": "pinpointer-xenoborg-piece-3" + }, + { + "name": "pinpointer-xenoborg-piece-4" + }, + { + "name": "pinpointer-xenoborg-repaired" + }, { "name": "inhand-left-base", "directions": 4 diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-1.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-1.png new file mode 100644 index 0000000000000000000000000000000000000000..fe3c864ff03e525c1ccac24d6f8bd3bcb64e1dc5 GIT binary patch literal 410 zcmV;L0cHM)P)Px$R7pfZR9J=WmCs7UKoG{il!m5TqG1tQ!6FOd$#?LSi=bB#^dUU?44(2X9;A@7 zPoM`Qg;sj1N@+ktHZ6`9Q-b}sDF&(R@3g~wWIkqQH-JW?`7a1Npg%Rhd1EC5rQf%* zW(EvZp|ArQJI8bLNg@FN{rI62y(%BgVLSgHIF!Nkg$VE zEbM@q&HdtjO1$O~zPp0Vf@b5wif2g+{yb|m8qHer1>iJ%QdsEt82|tP07*qoM6N<$ Ef;-T;#sB~S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-2.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-2.png new file mode 100644 index 0000000000000000000000000000000000000000..1049c5afc09e9638f98e727b371f5dcb92b9f1c6 GIT binary patch literal 316 zcmV-C0mJ@@P)Px#_DMuRR9J=WlsyiDKoo?>p9+E`FGgu7Xz&F6!h4c;9JmoF7tLOFgiR;$*EPx#^+`lQR9J=WlsyW>Mym9p zVw40$aBPf)_%o4!2=i65?Bns6nO#5-1mWLM%B5%Zw^X=7WBc^%oQHV4FCAk#WNe?5 za>>{}8PlO&GrFI9&4?VQUpR!t6*^9z+AWRMI>BNwf2o^{G~&a6?aLkkm!vjC-YJg0 zT6O?^ULsC^+<_vmqx1kcdC0Pm-GQ%`@Ew~?7XVPV#@MFQkN$;spxx5%4RPx$FiAu~R9J=WlQB!fKp2Lf#Fm6hC6Epxv_qlz6I`9TWbNRR|KV@w)WtvH>QD-q zUHk_XL8YQqq!4M2q%A$CR@8`>qTq1PbjSPh-Fx?a2L^+|VAuj7I;v>B4R#rG;Pq9} zejVbo{_6pJJKP)+czuP_V{hkl6UMhgn$3e!AuJt}5FO=OAvisT!}AYXw;SQt1pAds z9+!tCGs$>-rBxT8qGOUWwj?nvd!!&K^jzQG;5BrQeMh?mLUdG8Ju1{3w@T2CaNO$O z1&}hf$WIEjJX;VfFUYe+=>S^23cS9`)Bu2b{qBqI*97VP8D8UPx$vPnciR9J=WmCs57Q51*2A~XNg)DUW*L?Ete)1sYif?l9S1P0OGXKB%_^*a0HX28C;RiW4uGO$P4^fQ**p}A)P0ju zTc2+NTwXuTe!W^_YUrGc{49R|blpsZkbn>J`QoSVsx36?g-frigD;^OiugA{c0 zkkd_bb|nDd;BenqtA?%NUt3+rIpV+>jsXsahn=SRdeVe?wTAq1j9#r-#`bIqF0V4s z)TEsdK7!NTYqB?rQT9$Gw^Hwoxk#m?pgx($3kf*dPE#p~N_}H_a=XtxW u+u6_d?g5zJ47B|(m%A6Px$8%ab#R9J=WmBDJlKoExiin`ILDN7LxdMJpezKsVF;?sF3eGo4`fkGhhR&5DU zOv!En@n8#{HnY?q()~_>e9Zi0va^7}a8JCn*LfK(8P0p;qExr?r$kra<^dk4BImu_ zwmam)QVIaTcDqsbAO#ozEB)?7qGWJyL);K4ACr z?6jJN{{DDw{Cgp((7Fw&?j>RPLGEEN82%?G7gA&*$zqi?00000NkvXXu0mjfxGb2A literal 0 HcmV?d00001 -- 2.52.0