From 24efdb1dafe2b1be07f314f6ae2fa9a458b72456 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Sun, 3 Nov 2024 19:54:49 -0600 Subject: [PATCH 1/4] aaa aaa --- Resources/Locale/en-US/store/uplink-catalog.ftl | 4 ++++ Resources/Prototypes/Catalog/uplink_catalog.yml | 17 ++++++++++++++++- .../Prototypes/Floof/Catalog/uplink_catalog.yml | 15 ++++++++++++++- .../Floof/Entities/Objects/Tools/uplink.yml | 17 +++++++++++++++++ 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Floof/Entities/Objects/Tools/uplink.yml diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index ad7639143b6..e0e0ea817a5 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -163,6 +163,10 @@ uplink-syndicate-martyr-module-desc = Turn your emagged borg friend into a walki uplink-singularity-beacon-name = Singularity Beacon uplink-singularity-beacon-desc = A device that attracts singularities. Has to be anchored and powered. Causes singularities to grow when consumed. +# Floof station +uplink-Cryptobiolininjector-name = Cryptobiolin Hypospray +uplink-Cryptobiolininjector-desc = Made by SESWC. This item is prefilled with 20u of Cryptobiolin to help you get rid of those pesky psionic weirdo's. + # Implants uplink-storage-implanter-name = Storage Implanter uplink-storage-implanter-desc = Hide goodies inside of yourself with new bluespace technology! diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index ca7e37dde37..64626f714c5 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1778,4 +1778,19 @@ conditions: - !type:ListingLimitedStockCondition stock: 1 - + + + +# Floof +# Looks like it wont show up if it isnt in this folder, Probably why the socks arent showing up either. + +- type: listing + id: UplinkCryoinjector + name: uplink-Cryptobiolininjector-name + description: uplink-Cryptobiolininjector-desc + icon: { sprite: Objects/Specific/Medical/syndihypo.rsi, state: hypo } + productEntity: CryptobiolinInjector + cost: + Telecrystal: 2 + categories: + - UplinkUtility diff --git a/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml b/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml index 741be24908f..5259396a440 100644 --- a/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml @@ -1,3 +1,5 @@ +# Looks like it wont show up if it isnt in based folder. Put it in here as a back up save until its fix + - type: listing id: UplinkSocksCoderValid name: uplink-coder-socks-valid-name @@ -7,4 +9,15 @@ Telecrystal: 1 categories: - UplinkPointless - \ No newline at end of file + + +- type: listing + id: UplinkCryoinjector + name: uplink-Cryptobiolininjector-name + description: uplink-Cryptobiolininjector-desc + icon: { sprite: Objects/Specific/Medical/syndihypo.rsi, state: hypo } + productEntity: CryptobiolinInjector + cost: + Telecrystal: 2 + categories: + - UplinkUtility diff --git a/Resources/Prototypes/Floof/Entities/Objects/Tools/uplink.yml b/Resources/Prototypes/Floof/Entities/Objects/Tools/uplink.yml new file mode 100644 index 00000000000..3eb9fd3336f --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Tools/uplink.yml @@ -0,0 +1,17 @@ +- type: entity + name: Cryptobiolin injector + id: CryptobiolinInjector + parent: SyndiHypo + description: Made by SESWC. This item is prefilled with 20u of Cryptobiolin to help you get rid of those pesky psionic weirdo's. + components: + - type: Sprite + sprite: Objects/Specific/Medical/hypospray.rsi + state: combat_hypo + - type: SolutionContainerManager + solutions: + hypospray: + maxVol: 20 + reagents: + - ReagentId: Cryptobiolin + Quantity: 20 + From b86dc282dc947ac604e7c7070f4a20f99b76c323 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Sun, 3 Nov 2024 22:12:44 -0600 Subject: [PATCH 2/4] Update uplink_catalog.yml --- .../Floof/Catalog/uplink_catalog.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml b/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml index 5259396a440..2e5f55571ba 100644 --- a/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml @@ -11,13 +11,13 @@ - UplinkPointless -- type: listing - id: UplinkCryoinjector - name: uplink-Cryptobiolininjector-name - description: uplink-Cryptobiolininjector-desc - icon: { sprite: Objects/Specific/Medical/syndihypo.rsi, state: hypo } - productEntity: CryptobiolinInjector - cost: - Telecrystal: 2 - categories: - - UplinkUtility +# type: listing + # id: UplinkCryoinjector + #name: uplink-Cryptobiolininjector-name + #description: uplink-Cryptobiolininjector-desc + #icon: { sprite: Objects/Specific/Medical/syndihypo.rsi, state: hypo } + #productEntity: CryptobiolinInjector + #cost: + # Telecrystal: 2 + #categories: + #- UplinkUtility From a8d49e0fe4aa759ba588158e93bbaf89d62fc900 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Mon, 4 Nov 2024 13:44:44 -0600 Subject: [PATCH 3/4] updated as requested This updates it to make the hypo a pen instead and change the Icon --- Resources/Locale/en-US/store/uplink-catalog.ftl | 2 +- Resources/Prototypes/Catalog/uplink_catalog.yml | 2 +- Resources/Prototypes/Floof/Catalog/uplink_catalog.yml | 2 +- .../Prototypes/Floof/Entities/Objects/Tools/uplink.yml | 10 ++++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index e0e0ea817a5..063f340e4b9 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -164,7 +164,7 @@ uplink-singularity-beacon-name = Singularity Beacon uplink-singularity-beacon-desc = A device that attracts singularities. Has to be anchored and powered. Causes singularities to grow when consumed. # Floof station -uplink-Cryptobiolininjector-name = Cryptobiolin Hypospray +uplink-Cryptobiolininjector-name = Cryptobiolin injector uplink-Cryptobiolininjector-desc = Made by SESWC. This item is prefilled with 20u of Cryptobiolin to help you get rid of those pesky psionic weirdo's. # Implants diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 64626f714c5..b813789c5e9 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1788,7 +1788,7 @@ id: UplinkCryoinjector name: uplink-Cryptobiolininjector-name description: uplink-Cryptobiolininjector-desc - icon: { sprite: Objects/Specific/Medical/syndihypo.rsi, state: hypo } + icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: penacid } productEntity: CryptobiolinInjector cost: Telecrystal: 2 diff --git a/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml b/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml index 2e5f55571ba..2dca5050e41 100644 --- a/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml @@ -15,7 +15,7 @@ # id: UplinkCryoinjector #name: uplink-Cryptobiolininjector-name #description: uplink-Cryptobiolininjector-desc - #icon: { sprite: Objects/Specific/Medical/syndihypo.rsi, state: hypo } + #icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: arithpen } #productEntity: CryptobiolinInjector #cost: # Telecrystal: 2 diff --git a/Resources/Prototypes/Floof/Entities/Objects/Tools/uplink.yml b/Resources/Prototypes/Floof/Entities/Objects/Tools/uplink.yml index 3eb9fd3336f..2464c42669f 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Tools/uplink.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Tools/uplink.yml @@ -1,15 +1,17 @@ - type: entity name: Cryptobiolin injector id: CryptobiolinInjector - parent: SyndiHypo + parent: ChemicalMedipen description: Made by SESWC. This item is prefilled with 20u of Cryptobiolin to help you get rid of those pesky psionic weirdo's. components: - type: Sprite - sprite: Objects/Specific/Medical/hypospray.rsi - state: combat_hypo + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: penacid + map: ["enum.SolutionContainerLayers.Fill"] - type: SolutionContainerManager solutions: - hypospray: + pen: maxVol: 20 reagents: - ReagentId: Cryptobiolin From 97b0434e4b0171b2c8a787733625dd43437107a2 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Wed, 6 Nov 2024 22:42:16 -0600 Subject: [PATCH 4/4] moved files moved files --- Resources/Locale/en-US/Floof/store/uplink-catalog.ftl | 6 +++++- Resources/Locale/en-US/store/uplink-catalog.ftl | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl b/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl index c80a39fb314..5be7cb53fd7 100644 --- a/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl @@ -1,3 +1,7 @@ # Pointless uplink-coder-socks-valid-name = Blood-red Coder Socks -uplink-coder-socks-valid-desc = These socks add onto your robustness by making you look breedable. Make trojans, not war. \ No newline at end of file +uplink-coder-socks-valid-desc = These socks add onto your robustness by making you look breedable. Make trojans, not war. + +# Floof station +uplink-Cryptobiolininjector-name = Cryptobiolin injector +uplink-Cryptobiolininjector-desc = Made by SESWC. This item is prefilled with 20u of Cryptobiolin to help you get rid of those pesky psionic weirdo's. diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 063f340e4b9..ad7639143b6 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -163,10 +163,6 @@ uplink-syndicate-martyr-module-desc = Turn your emagged borg friend into a walki uplink-singularity-beacon-name = Singularity Beacon uplink-singularity-beacon-desc = A device that attracts singularities. Has to be anchored and powered. Causes singularities to grow when consumed. -# Floof station -uplink-Cryptobiolininjector-name = Cryptobiolin injector -uplink-Cryptobiolininjector-desc = Made by SESWC. This item is prefilled with 20u of Cryptobiolin to help you get rid of those pesky psionic weirdo's. - # Implants uplink-storage-implanter-name = Storage Implanter uplink-storage-implanter-desc = Hide goodies inside of yourself with new bluespace technology!