From 9c6df2979fb2685f009a70634fe10e711fb441c8 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 22 Sep 2024 16:58:28 -0400 Subject: [PATCH] This SHOULD be all of it, I think --- Content.Server/Botany/SeedPrototype.cs | 2 +- .../Locale/en-US/damage/damage-types.ftl | 1 + .../en-US/metabolism/metabolizer-types.ftl | 2 + .../Chemistry/metabolizer_types.yml | 4 +- .../DeltaV/Recipes/Construction/clothing.yml | 68 ++++- .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 6 - .../Entities/Mobs/Player/humanoid.yml | 12 +- .../Entities/Objects/Tools/welders.yml | 2 +- .../Weapons/Guns/Projectiles/magic.yml | 2 +- .../Entities/Structures/Furniture/shower.yml | 4 +- .../Entities/Structures/Machines/hotplate.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 1 - .../Entities/Mobs/NPCs/mutants.yml | 250 +++++++++--------- .../Nyanotrasen/Entities/Mobs/NPCs/xeno.yml | 2 + .../Nyanotrasen/Hydroponics/seeds.yml | 1 - .../Recipes/Cooking/meal_recipes.yml | 18 +- .../Prototypes/Recipes/Lathes/security.yml | 92 +++++++ Resources/Prototypes/Store/categories.yml | 10 + .../Guidebook/Science/TraversalDistorter.xml | 18 ++ 19 files changed, 339 insertions(+), 158 deletions(-) create mode 100644 Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs index e9cf34e6ba6..dd3555f143f 100644 --- a/Content.Server/Botany/SeedPrototype.cs +++ b/Content.Server/Botany/SeedPrototype.cs @@ -70,7 +70,7 @@ public partial struct SeedChemQuantity /// When chemicals are added to produce, the potency of the seed is divided with this value. Final chemical amount is the result plus the `Min` value. /// Example: PotencyDivisor of 20 with seed potency of 55 results in 2.75, 55/20 = 2.75. If minimum is 1 then final result will be 3.75 of that chemical, 55/20+1 = 3.75. /// - [DataField("PotencyDivisor")] public int PotencyDivisor; + [DataField] public int PotencyDivisor; /// /// Inherent chemical is one that is NOT result of mutation or crossbreeding. These chemicals are removed if species mutation is executed. diff --git a/Resources/Locale/en-US/damage/damage-types.ftl b/Resources/Locale/en-US/damage/damage-types.ftl index 5c3cca156fd..3b6256864f2 100644 --- a/Resources/Locale/en-US/damage/damage-types.ftl +++ b/Resources/Locale/en-US/damage/damage-types.ftl @@ -11,3 +11,4 @@ damage-type-radiation = Radiation damage-type-shock = Shock damage-type-slash = Slash damage-type-structural = Structural +damage-type-holy = Holy diff --git a/Resources/Locale/en-US/metabolism/metabolizer-types.ftl b/Resources/Locale/en-US/metabolism/metabolizer-types.ftl index 372c5c549e0..30ab6c050e2 100644 --- a/Resources/Locale/en-US/metabolism/metabolizer-types.ftl +++ b/Resources/Locale/en-US/metabolism/metabolizer-types.ftl @@ -9,3 +9,5 @@ metabolizer-type-plant = Plant metabolizer-type-dwarf = Dwarf metabolizer-type-moth = Moth metabolizer-type-arachnid = Arachnid +metabolizer-type-vampiric = Vampiric +metabolizer-type-liquorlifeline = Liquor Lifeline diff --git a/Resources/Prototypes/Chemistry/metabolizer_types.yml b/Resources/Prototypes/Chemistry/metabolizer_types.yml index 77d3f3cd507..b49fad6c277 100644 --- a/Resources/Prototypes/Chemistry/metabolizer_types.yml +++ b/Resources/Prototypes/Chemistry/metabolizer_types.yml @@ -47,8 +47,8 @@ - type: metabolizerType id: Vampiric - name: vampiric + name: metabolizer-type-vampiric - type: metabolizerType id: LiquorLifeline - name: liquorlifeline + name: metabolizer-type-liquorlifeline diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml index 386a0211c03..e1ef86e4389 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml @@ -3,7 +3,7 @@ id: ClothingEyesPrescriptionMedHud graph: PrescriptionMedHud startNode: start - targetNode: prescmedhud + targetNode: prescmedhud category: construction-category-clothing description: Prescription medhud, merged glasses and medhud together by sheer luck and cables with glue. icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi, state: icon } @@ -14,8 +14,72 @@ id: ClothingEyesPrescriptionHudSecurity graph: PrescriptionSecHud startNode: start - targetNode: prescsechud + targetNode: prescsechud category: construction-category-clothing description: Prescription sechud, merged glasses and sechud together by sheer luck and cables with glue. icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi, state: icon } objectType: Item + +- type: constructionGraph + id: PrescriptionMedHud + start: start + graph: + - node: start + edges: + - to: prescmedhud + steps: + - tag: HudMedical + name: medical hud + icon: + sprite: Clothing/Eyes/Hud/med.rsi + state: icon + doAfter: 5 + - tag: GlassesNearsight + name: glasses + icon: + sprite: Clothing/Eyes/Glasses/glasses.rsi + state: icon + doAfter: 5 + - material: Cable + amount: 5 + doAfter: 5 + - tag: DrinkSpaceGlue + name: space glue + icon: + sprite: Objects/Consumable/Drinks/glue-tube.rsi + state: icon + doAfter: 5 + - node: prescmedhud + entity: ClothingEyesPrescriptionMedHud + +- type: constructionGraph + id: PrescriptionSecHud + start: start + graph: + - node: start + edges: + - to: prescsechud + steps: + - tag: HudSecurity + name: security hud + icon: + sprite: Clothing/Eyes/Hud/med.rsi + state: icon + doAfter: 5 + - tag: GlassesNearsight + name: glasses + icon: + sprite: Clothing/Eyes/Glasses/glasses.rsi + state: icon + doAfter: 5 + - material: Cable + amount: 5 + doAfter: 5 + - tag: DrinkSpaceGlue + name: space glue + icon: + sprite: Objects/Consumable/Drinks/glue-tube.rsi + state: icon + doAfter: 5 + - node: prescsechud + entity: ClothingEyesPrescriptionHudSecurity diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index 12c54341945..74bba2dec8a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -132,8 +132,6 @@ name: ghost-role-information-slimes-name description: ghost-role-information-slimes-description rules: deltav-ghost-role-information-softantag-rules - raffle: - settings: short - type: Speech speechVerb: Slime speechSounds: Slime @@ -238,8 +236,6 @@ - SimpleHostile # - type: GhostRole #DeltaV - all slimes neutral when ghost role # description: ghost-role-information-angry-slimes-description - raffle: - settings: short - type: entity name: yellow slime @@ -275,5 +271,3 @@ - SimpleHostile # - type: GhostRole #DeltaV - all slimes neutral when ghost role # description: ghost-role-information-angry-slimes-description - raffle: - settings: short diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index ad2f55d1ef0..2f6e5b1cda6 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -631,7 +631,7 @@ settings: short - type: GhostTakeoverAvailable - type: Loadout - roleLoadout: [ JobCargoTechnician ] + prototypes: [ JobCargoTechnician ] - type: RandomMetadata nameSegments: - names_first @@ -686,7 +686,7 @@ settings: short - type: GhostTakeoverAvailable - type: Loadout - roleLoadout: [ JobClown ] + prototypes: [ JobClown ] - type: RandomMetadata nameSegments: - names_clown @@ -744,7 +744,7 @@ settings: short - type: GhostTakeoverAvailable - type: Loadout - roleLoadout: [ JobChef ] + prototypes: [ JobChef ] - type: RandomMetadata nameSegments: - names_first @@ -807,7 +807,7 @@ settings: default - type: GhostTakeoverAvailable - type: Loadout - roleLoadout: [ JobResearchDirector ] + prototypes: [ JobResearchDirector ] - type: RandomMetadata nameSegments: - names_first @@ -825,7 +825,7 @@ settings: default - type: GhostTakeoverAvailable - type: Loadout - roleLoadout: [ JobChiefMedicalOfficer ] + prototypes: [ JobChiefMedicalOfficer ] - type: RandomMetadata nameSegments: - names_first @@ -843,7 +843,7 @@ settings: default - type: GhostTakeoverAvailable - type: Loadout - roleLoadout: [ JobCaptain ] + prototypes: [ JobCaptain ] - type: RandomMetadata nameSegments: - names_first diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 9f9df6f4f19..dde75fb499f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -109,7 +109,7 @@ - type: WeldingHealing # Same as Brutepack - Estacao Pirata IPCs damageContainers: - Silicon - fuelcost: 5 + FuelCost: 5 damage: types: Blunt: -15 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index d6adcd614e3..b3abbfdfd3f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -53,7 +53,7 @@ delay: 0.5 # line of fire as well as if it hits something - type: ExplodeOnTrigger - type: Explosive - explosionType: FireBomb + explosionType: Default totalIntensity: 5 # low intensity, the point is to burn attackers not to break open walls, dragons can just eat them intensitySlope: 1 maxIntensity: 3 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/shower.yml b/Resources/Prototypes/Entities/Structures/Furniture/shower.yml index 694202efdc6..a8ba4f25a99 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/shower.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/shower.yml @@ -24,11 +24,11 @@ canCollide: false - type: InteractionOutline - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic - type: Construction graph: Shower node: shower - damageContainer: Inorganic - damageModifierSet: Metallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml index 3764f135915..003916ce94e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml @@ -43,7 +43,7 @@ map: ["enum.SolutionHeaterVisuals.IsOn"] shader: unshaded - type: SolutionHeater - heatPerSecond: 160 + baseHeatPerSecond: 160 - type: ItemPlacer whitelist: components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 419adda8980..ef2fe8d9abf 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1367,7 +1367,6 @@ - type: LitOnPowered - type: ApcPowerReceiver powerLoad: 200 - priority: Low # - type: Advertise # pack: CuddlyCritterAds # TODO Change this - type: PointLight diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml index 996c0d87ab1..34dc9b11302 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml @@ -70,132 +70,132 @@ - type: Produce - type: NoSlip -- type: entity - name: oneirophage - parent: MobGiantSpider - id: MobGiantSpiderVampire - description: The 'dream-eater' spider, rumored to be one of the potential genetic sources for arachne. - components: - - type: Sprite - drawdepth: Mobs - layers: - - map: ["enum.DamageStateVisualLayers.Base", "movement"] - state: viper - sprite: Mobs/Animals/spider.rsi - - type: SpriteMovement - movementLayers: - movement: - state: viper-moving - noMovementLayers: - movement: - state: viper - - type: Appearance - - type: DamageStateVisuals - states: - Alive: - Base: viper - Critical: - Base: viper_dead - Dead: - Base: viper_dead - - type: ReplacementAccent - accent: xeno - - type: InteractionPopup - successChance: 0.5 - interactSuccessString: petting-success-tarantula - interactFailureString: petting-failure-generic - interactSuccessSpawn: EffectHearts - interactSuccessSound: - path: /Audio/Animals/snake_hiss.ogg - - type: Puller - needsHands: false - - type: Arachne - cocoonDelay: 8 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: Nocturine - Quantity: 20 - - type: MeleeChemicalInjector - solution: melee - transferAmount: 3.5 - - type: SolutionRegeneration - solution: melee - generated: - reagents: - - ReagentId: Nocturine - Quantity: 0.15 - - type: BloodSucker - unitsToSucc: 35 - injectWhenSucc: true - injectReagent: Cryptobiolin - unitsToInject: 10 - webRequired: true - - type: Bloodstream - bloodReagent: DemonsBlood - - type: Body - prototype: VampiricAnimalLarge - - type: Psionic - removable: false - - type: InnatePsionicPowers - powersToAdd: - - MetapsionicPower - - PsionicInvisibilityPower - - type: AntiPsionicWeapon - punish: false - modifiers: - coefficients: - Piercing: 2.25 - - type: Damageable - damageContainer: HalfSpirit - damageModifierSet: HalfSpirit - - type: StatusEffects - allowed: - - Stun - - KnockedDown - - SlowedDown - - Stutter - - SeeingRainbows - - Electrocution - - Drunk - - SlurredSpeech - - PressureImmunity - - Muted - - ForcedSleep - - TemporaryBlindness - - Pacified - - PsionicsDisabled - - PsionicallyInsulated - - type: Tag - tags: - - Oneirophage - - type: MovementAlwaysTouching - - type: PsionicInvisibleContacts - whitelist: - tags: - - ArachneWeb +#- type: entity +# name: oneirophage +# parent: MobGiantSpider +# id: MobGiantSpiderVampire +# description: The 'dream-eater' spider, rumored to be one of the potential genetic sources for arachne. +# components: +# - type: Sprite +# drawdepth: Mobs +# layers: +# - map: ["enum.DamageStateVisualLayers.Base", "movement"] +# state: viper +# sprite: Mobs/Animals/spider.rsi +# - type: SpriteMovement +# movementLayers: +# movement: +# state: viper-moving +# noMovementLayers: +# movement: +# state: viper +# - type: Appearance +# - type: DamageStateVisuals +# states: +# Alive: +# Base: viper +# Critical: +# Base: viper_dead +# Dead: +# Base: viper_dead +# - type: ReplacementAccent +# accent: xeno +# - type: InteractionPopup +# successChance: 0.5 +# interactSuccessString: petting-success-tarantula +# interactFailureString: petting-failure-generic +# interactSuccessSpawn: EffectHearts +# interactSuccessSound: +# path: /Audio/Animals/snake_hiss.ogg +# - type: Puller +# needsHands: false +# - type: Arachne +# cocoonDelay: 8 +# - type: SolutionContainerManager +# solutions: +# melee: +# reagents: +# - ReagentId: Nocturine +# Quantity: 20 +# - type: MeleeChemicalInjector +# solution: melee +# transferAmount: 3.5 +# - type: SolutionRegeneration +# solution: melee +# generated: +# reagents: +# - ReagentId: Nocturine +# Quantity: 0.15 +# - type: BloodSucker +# unitsToSucc: 35 +# injectWhenSucc: true +# injectReagent: Cryptobiolin +# unitsToInject: 10 +# webRequired: true +# - type: Bloodstream +# bloodReagent: DemonsBlood +# - type: Body +# prototype: VampiricAnimalLarge +# - type: Psionic +# removable: false +# - type: InnatePsionicPowers +# powersToAdd: +# - MetapsionicPower +# - PsionicInvisibilityPower +# - type: AntiPsionicWeapon +# punish: false +# modifiers: +# coefficients: +# Piercing: 2.25 +# - type: Damageable +# damageContainer: HalfSpirit +# damageModifierSet: HalfSpirit +# - type: StatusEffects +# allowed: +# - Stun +# - KnockedDown +# - SlowedDown +# - Stutter +# - SeeingRainbows +# - Electrocution +# - Drunk +# - SlurredSpeech +# - PressureImmunity +# - Muted +# - ForcedSleep +# - TemporaryBlindness +# - Pacified +# - PsionicsDisabled +# - PsionicallyInsulated +# - type: Tag +# tags: +# - Oneirophage +# - type: MovementAlwaysTouching +# - type: PsionicInvisibleContacts +# whitelist: +# tags: +# - ArachneWeb -- type: entity - name: oneirophage - parent: MobGiantSpiderVampire - id: MobGiantSpiderVampireAngry - suffix: Angry - components: - - type: NpcFactionMember - factions: - - SimpleHostile - - type: InputMover - - type: MobMover - - type: HTN - rootTask: - task: SimpleHostileCompound - - type: GhostRole - makeSentient: true - name: ghost-role-information-giant-spider-vampire-name - description: ghost-role-information-giant-spider-vampire-description - rules: No antagonist restrictions. Just don't talk in emote; you have telepathic chat. - - type: GhostTakeoverAvailable +#- type: entity +# name: oneirophage +# parent: MobGiantSpiderVampire +# id: MobGiantSpiderVampireAngry +# suffix: Angry +# components: +# - type: NpcFactionMember +# factions: +# - SimpleHostile +# - type: InputMover +# - type: MobMover +# - type: HTN +# rootTask: +# task: SimpleHostileCompound +# - type: GhostRole +# makeSentient: true +# name: ghost-role-information-giant-spider-vampire-name +# description: ghost-role-information-giant-spider-vampire-description +# rules: No antagonist restrictions. Just don't talk in emote; you have telepathic chat. +# - type: GhostTakeoverAvailable - type: entity parent: SimpleMobBase diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/xeno.yml index 9dbe9f95f70..e12b14d4906 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/xeno.yml @@ -6,6 +6,7 @@ id: MobPurpleSnakeGhost components: - type: GhostTakeoverAvailable + - type: GhostRole allowMovement: true allowSpeech: false makeSentient: true @@ -19,6 +20,7 @@ id: MobSmallPurpleSnakeGhost components: - type: GhostTakeoverAvailable + - type: GhostRole allowMovement: true allowSpeech: false makeSentient: true diff --git a/Resources/Prototypes/Nyanotrasen/Hydroponics/seeds.yml b/Resources/Prototypes/Nyanotrasen/Hydroponics/seeds.yml index 688af9fc50c..12744b1e06a 100644 --- a/Resources/Prototypes/Nyanotrasen/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Nyanotrasen/Hydroponics/seeds.yml @@ -17,7 +17,6 @@ nutrientConsumption: 0.25 idealLight: 8 idealHeat: 298 - juicy: true splatPrototype: PuddleSplatter chemicals: Nutriment: diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml index 51777e2f594..b61e99ba920 100644 --- a/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml @@ -26,7 +26,7 @@ solids: FoodSnackBoritos: 1 FoodCheeseSlice: 1 - FoodChili: 1 + FoodChiliPepper: 1 FoodMeatMeatball: 1 # Base ingredients: Should be moved out of microwave as soon as possible. @@ -62,7 +62,7 @@ solids: FoodTofuSlice: 2 FoodOnionSlice: 1 - FoodChili: 1 + FoodChiliPepper: 1 FoodCarrot: 1 FoodCheeseCurds: 1 @@ -97,7 +97,7 @@ solids: FoodCheeseSlice: 1 FoodCabbage: 1 - FoodChili: 1 + FoodChiliPepper: 1 FoodPotato: 1 FoodOnionSlice: 2 @@ -111,7 +111,7 @@ solids: FoodCheeseSlice: 1 #Grilled cheese slice FoodMothSaladBase: 1 - FoodChili: 1 + FoodChiliPepper: 1 FoodCabbage: 1 - type: microwaveMealRecipe @@ -142,7 +142,7 @@ FoodRiceBoiled: 1 FoodPotato: 2 FoodCabbage: 1 - FoodChili: 1 + FoodChiliPepper: 1 #Herbs: 1 - type: microwaveMealRecipe @@ -307,7 +307,7 @@ solids: FoodBowlBig: 1 FoodTofuSlice: 1 - FoodChili: 1 + FoodChiliPepper: 1 #FoodYogurt: 1 #Milk and Cream placeholder - type: microwaveMealRecipe @@ -368,7 +368,7 @@ solids: FoodBowlBig: 1 FoodTomato: 1 - FoodChili: 1 + FoodChiliPepper: 1 # Salads: These should be moved out of the microwave as soon as possible @@ -421,7 +421,7 @@ solids: FoodBowlBig: 1 FoodMothSaladBase: 1 - FoodChili: 1 + FoodChiliPepper: 1 FoodOnionRed: 1 FoodAmbrosiaVulgaris: 1 #Herbs @@ -438,7 +438,7 @@ FoodDoughFlat: 1 FoodCheeseSlice: 1 FoodMothBakedCorn: 1 - FoodChili: 1 + FoodChiliPepper: 1 - type: microwaveMealRecipe id: RecipeMothFiveCheesePizza diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index cfdcaffc4ed..04c2ad1ec1f 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -780,3 +780,95 @@ Plastic: 1000 Plasma: 500 Glass: 500 + +- type: latheRecipe + id: ShellShotgun + result: ShellShotgun + category: Ammo + completetime: 2 + materials: + Steel: 20 + +- type: latheRecipe + id: ShellShotgunSlug + result: ShellShotgunSlug + completetime: 2 + materials: + Steel: 25 + +- type: latheRecipe + id: ShellShotgunFlare + result: ShellShotgunFlare + category: Ammo + completetime: 2 + materials: + Plastic: 20 + Steel: 5 + +- type: latheRecipe + id: CartridgeLightRifleIncendiary + result: CartridgeLightRifleIncendiary + category: Ammo + completetime: 2 + materials: + Plastic: 20 + +- type: latheRecipe + id: CartridgeMagnumIncendiary + result: CartridgeMagnumIncendiary + category: Ammo + completetime: 2 + materials: + Plastic: 20 + +- type: latheRecipe + id: CartridgePistolIncendiary + result: CartridgePistolIncendiary + category: Ammo + completetime: 2 + materials: + Plastic: 10 + +- type: latheRecipe + id: CartridgeRifleIncendiary + result: CartridgeRifleIncendiary + category: Ammo + completetime: 2 + materials: + Plastic: 15 + +- type: latheRecipe + id: CartridgePistolUranium + result: CartridgePistolUranium + category: Ammo + completetime: 2 + materials: + Plastic: 5 + Uranium: 10 + +- type: latheRecipe + id: CartridgeMagnumUranium + result: CartridgeMagnumUranium + category: Ammo + completetime: 2 + materials: + Plastic: 20 + Uranium: 10 + +- type: latheRecipe + id: CartridgeLightRifleUranium + result: CartridgeLightRifleUranium + category: Ammo + completetime: 2 + materials: + Plastic: 20 + Uranium: 10 + +- type: latheRecipe + id: CartridgeRifleUranium + result: CartridgeRifleUranium + category: Ammo + completetime: 2 + materials: + Plastic: 15 + Uranium: 10 diff --git a/Resources/Prototypes/Store/categories.yml b/Resources/Prototypes/Store/categories.yml index aaff70fe111..1b377902e43 100644 --- a/Resources/Prototypes/Store/categories.yml +++ b/Resources/Prototypes/Store/categories.yml @@ -94,6 +94,16 @@ name: store-category-deception priority: 10 +- type: storeCategory + id: UplinkChemicals + name: store-category-chemicals + priority: 11 + +- type: storeCategory + id: UplinkDisruption + name: store-category-disruption + priority: 12 + #revenant - type: storeCategory id: RevenantAbilities diff --git a/Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml b/Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml new file mode 100644 index 00000000000..f46065c7440 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml @@ -0,0 +1,18 @@ + +# Traversal Distorter + +The traversal distorter is a late-game artifact machine that can aid in moving through the nodes of an artifact. + + + +Artifacts placed on top of a powered traversal distorter are subjected to a bias which affects which node they will move to after being activated. The bias can be set by clicking on the distorter. + +There are two types of biases: +- [color=#a4885c]In:[/color] favors nodes closer to the origin. Results in a decrease of depth. +- [color=#a4885c]Out:[/color] favors nodes farther away from the origin. Results in an increase of depth. + +Setting it to bias inwards allows you to return to the beginning of an artifact graph, if you've reached a dead end. + +Likewise, if you find yourself stuck at low depths, setting it to bias outward will help you find new nodes. In certain circumstances, toggling between the two allows you to repeatedly activate the same node. + +