diff --git a/Resources/Locale/en-US/_Omu/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Omu/store/uplink-catalog.ftl index a682ff6b74d..c1f896e447b 100644 --- a/Resources/Locale/en-US/_Omu/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_Omu/store/uplink-catalog.ftl @@ -34,3 +34,6 @@ uplink-bloodred-headphones-desc = Looks stylish, and synergizes with the Shredde uplink-hobbyist-spellbook-name = Hobbyist Spell Book uplink-hobbyist-spellbook-desc = A book given out by the Wizard Federation to get avid fanatics to finally shut up. Contains the spells: Spark, Cure Wounds, Conjure Peel, Abracaweh, and Lessest Magic Missile. + +uplink-xeno-compatibility-implanter-name = Xeno Compatibility Implanter +uplink-xeno-compatibility-implanter-desc = An implant that allows the user to make use of xenomorph organs. diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e7bfaf1d847..1691ab18dae 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -911,7 +911,7 @@ - MedicalVehiclesAdvanced - MedicalBoards - Janitor - - Genetics + #- Genetics # Omu, this pack is currently empty - MedicalCloning # Einstein Engines Packs - Translators # Language diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml index 9088c0f7ba2..b0fa1e384dd 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml @@ -223,7 +223,7 @@ - ExperimentalScienceGoob - MechBoardsScience - Pinpointers - - Genetics + #- Genetics # Omu, this pack is currently empty - XenobioPack - XenobagHoldingPack # Einstein Engines Packs diff --git a/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/genetics.yml b/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/genetics.yml index 16220ad5cff..d2f28541e58 100644 --- a/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/genetics.yml +++ b/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/genetics.yml @@ -1,4 +1,4 @@ -- type: latheRecipePack - id: Genetics # thats bait - recipes: - - XenoCompatibilityImplanter +#- type: latheRecipePack +# id: Genetics # thats bait +# recipes: +# - XenoCompatibilityImplanter # Omu, convert this into an antag item instead. diff --git a/Resources/Prototypes/_Goobstation/Recipes/Lathes/medical.yml b/Resources/Prototypes/_Goobstation/Recipes/Lathes/medical.yml index dfd83f635c3..640efd869b3 100644 --- a/Resources/Prototypes/_Goobstation/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/_Goobstation/Recipes/Lathes/medical.yml @@ -108,15 +108,15 @@ Plasma: 100 Silver: 50 -- type: latheRecipe - id: XenoCompatibilityImplanter - result: XenoCompatibilityImplanter - completetime: 8 - materials: - Steel: 500 - Glass: 750 - Plasma: 1500 - Silver: 300 +#- type: latheRecipe # Omu, convert this into an antag item instead. +# id: XenoCompatibilityImplanter +# result: XenoCompatibilityImplanter +# completetime: 8 +# materials: +# Steel: 500 +# Glass: 750 +# Plasma: 1500 +# Silver: 300 - type: latheRecipe id: MedicalPatchBasic diff --git a/Resources/Prototypes/_Goobstation/Research/experimental.yml b/Resources/Prototypes/_Goobstation/Research/experimental.yml index b44f8e305a2..44a454817a7 100644 --- a/Resources/Prototypes/_Goobstation/Research/experimental.yml +++ b/Resources/Prototypes/_Goobstation/Research/experimental.yml @@ -97,20 +97,20 @@ technologyPrerequisites: - AdvancedAnomalyResearch -- type: technology - id: XenoBiology # :trollface: - name: research-technology-xeno-biology - icon: - sprite: _White/Mobs/Aliens/Xenomorphs/drone.rsi - state: xenomorph - discipline: Experimental - tier: 2 - cost: 15000 - recipeUnlocks: - - XenoCompatibilityImplanter - position: -5,0 - technologyPrerequisites: - - ExperimentalScience +#- type: technology # Omu, convert this into an antag item instead. +# id: XenoBiology # :trollface: +# name: research-technology-xeno-biology +# icon: +# sprite: _White/Mobs/Aliens/Xenomorphs/drone.rsi +# state: xenomorph +# discipline: Experimental +# tier: 2 +# cost: 15000 +# recipeUnlocks: +# - XenoCompatibilityImplanter +# position: -5,0 +# technologyPrerequisites: +# - ExperimentalScience - type: technology id: XenobagHolding diff --git a/Resources/Prototypes/_Omu/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Omu/Catalog/uplink_catalog.yml index 3c7a8dc5e20..bf913226d34 100644 --- a/Resources/Prototypes/_Omu/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Omu/Catalog/uplink_catalog.yml @@ -88,7 +88,7 @@ Telecrystal: 125 categories: - UplinkDisruption - + - type: listing id: UplinkSwordfish name: uplink-swordfish-name @@ -154,7 +154,7 @@ Telecrystal: 3 categories: - UplinkWearables - + - type: listing id: UplinkHobbyistSpellBook name: uplink-hobbyist-spellbook-name @@ -170,3 +170,18 @@ whitelist: - Chaplain - Librarian + +- type: listing + id: UplinkXenoCompatibilityImplanterSyndi + name: uplink-xeno-compatibility-implanter-name + description: uplink-xeno-compatibility-implanter-desc + icon: { sprite: /Textures/Objects/Specific/Medical/syndi_implanter.rsi, state: implanter0 } + productEntity: XenoCompatibilityImplanterSyndi + cost: + Telecrystal: 20 + categories: + - UplinkJob + conditions: + - !type:BuyerDepartmentCondition + whitelist: + - Science diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_Omu/Entities/Objects/Misc/implanters.yml index a1666886684..9d3a22faef6 100644 --- a/Resources/Prototypes/_Omu/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/_Omu/Entities/Objects/Misc/implanters.yml @@ -13,3 +13,11 @@ components: - type: Implanter implant: BluespaceLifelineImplant100TC + +- type: entity + parent: BaseImplantOnlyImplanterSyndi + id: XenoCompatibilityImplanterSyndi + suffix: Xeno Compatibility + components: + - type: Implanter + implant: XenoCompatibilityImplant diff --git a/Resources/Prototypes/_White/Body/Organs/Animal/xenomorph.yml b/Resources/Prototypes/_White/Body/Organs/Animal/xenomorph.yml index 3e5d0c0235a..ddb50dcec77 100644 --- a/Resources/Prototypes/_White/Body/Organs/Animal/xenomorph.yml +++ b/Resources/Prototypes/_White/Body/Organs/Animal/xenomorph.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, BaseMajorContraband] # Omu, make it contra. id: BaseXenomorphOrgan abstract: true components: