tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplifying Machine Upgrading (#15802)

Browse Source
This commit is contained in:
Nemanja
2023-04-28 23:23:49 -04:00
committed by GitHub
parent cedec8d415
commit 823c8204c9
49 changed files with 199 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
View File

@@ -33,8 +33,6 @@ public abstract partial class InteractionTest
protected const string Cap4 = "QuadraticCapacitorStockPart";
protected const string Manipulator1 = "MicroManipulatorStockPart";
protected const string Manipulator4 = "FemtoManipulatorStockPart";
protected const string Laser1 = "MicroLaserStockPart";
protected const string Laser2 = "QuadUltraMicroLaserStockPart";
protected const string Battery1 = "PowerCellSmall";
protected const string Battery4 = "PowerCellHyper";
}

2
Content.Server/Anomaly/Components/AnomalyVesselComponent.cs
View File

@@ -32,7 +32,7 @@ public sealed class AnomalyVesselComponent : Component
/// The machine part that affects the point multiplier of the vessel
/// </summary>
[DataField("machinePartPointModifier", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartPointModifier = "ScanningModule";
public string MachinePartPointModifier = "Capacitor";
/// <summary>
/// A value used to scale the point multiplier

2
Content.Server/Atmos/Piping/Binary/Components/GasRecyclerComponent.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Server.Atmos.Piping.Binary.Components
public float BaseMinTemp = 300 + Atmospherics.T0C;
[DataField("machinePartMinTemp", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartMinTemp = "Laser";
public string MachinePartMinTemp = "Capacitor";
[DataField("partRatingMinTempMultiplier")]
public float PartRatingMinTempMultiplier = 0.95f;

2
Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
View File

@@ -91,7 +91,7 @@ namespace Content.Server.Atmos.Piping.Unary.Components
/// The machine part that affects the temperature range.
/// </summary>
[DataField("machinePartTemperature", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartTemperature = "Laser";
public string MachinePartTemperature = "Capacitor";
}
}

2
Content.Server/Bed/Components/StasisBedComponent.cs
View File

@@ -16,6 +16,6 @@ namespace Content.Server.Bed.Components
public float Multiplier = 10f;
[DataField("machinePartMetabolismModifier", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartMetabolismModifier = "Manipulator";
public string MachinePartMetabolismModifier = "Capacitor";
}
}

2
Content.Server/Chemistry/Components/SolutionHeaterComponent.cs
View File

@@ -12,7 +12,7 @@ public sealed class SolutionHeaterComponent : Component
public float HeatMultiplier = 1;
[DataField("machinePartHeatPerSecond")]
public string MachinePartHeatPerSecond = "Laser";
public string MachinePartHeatPerSecond = "Capacitor";
[DataField("partRatingHeatMultiplier")]
public float PartRatingHeatMultiplier = 1.5f;

4
Content.Server/Cloning/Components/CloningPodComponent.cs
View File

@@ -49,7 +49,7 @@ namespace Content.Server.Cloning.Components
/// The machine part that affects cloning speed
/// </summary>
[DataField("machinePartCloningSpeed", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartCloningSpeed = "ScanningModule";
public string MachinePartCloningSpeed = "Manipulator";
/// <summary>
/// The current amount of time it takes to clone a body
@@ -74,7 +74,7 @@ namespace Content.Server.Cloning.Components
/// The machine part that decreases the amount of material needed for cloning
/// </summary>
[DataField("machinePartMaterialUse", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartMaterialUse = "Manipulator";
public string MachinePartMaterialUse = "MatterBin";
[ViewVariables(VVAccess.ReadWrite)]
public CloningPodStatus Status;

2
Content.Server/Kitchen/Components/MicrowaveComponent.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.Kitchen.Components
[DataField("cookTimeMultiplier"), ViewVariables(VVAccess.ReadWrite)]
public float CookTimeMultiplier = 1;
[DataField("machinePartCookTimeMultiplier", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartCookTimeMultiplier = "Laser";
public string MachinePartCookTimeMultiplier = "Capacitor";
[DataField("cookTimeScalingConstant")]
public float CookTimeScalingConstant = 0.5f;

4
Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Server.Medical.BiomassReclaimer
/// Machine part whose rating modifies the yield per mass.
/// </summary>
[DataField("machinePartYieldAmount", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartYieldAmount = "Manipulator";
public string MachinePartYieldAmount = "MatterBin";
/// <summary>
/// How much the machine part quality affects the yield.
@@ -89,7 +89,7 @@ namespace Content.Server.Medical.BiomassReclaimer
/// The machine part that increses the processing speed.
/// </summary>
[DataField("machinePartProcessSpeed", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartProcessingSpeed = "Laser";
public string MachinePartProcessingSpeed = "Manipulator";
/// <summary>
/// How much the machine part quality affects the yield.

2
Content.Server/Medical/Components/MedicalScannerComponent.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.Medical.Components
public float CloningFailChanceMultiplier = 1f;
[DataField("machinePartCloningFailChance", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartCloningFailChance = "ScanningModule";
public string MachinePartCloningFailChance = "Capacitor";
[DataField("partRatingCloningFailChanceMultiplier")]
public float PartRatingFailMultiplier = 0.75f;

2
Content.Server/Nutrition/Components/FatExtractorComponent.cs
View File

@@ -37,7 +37,7 @@ public sealed class FatExtractorComponent : Component
/// Which machine part affects the nutrition rate
/// </summary>
[DataField("machinePartNutritionRate", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartNutritionRate = "Laser";
public string MachinePartNutritionRate = "Manipulator";
/// <summary>
/// The increase in rate per each rating above 1.

2
Content.Server/Shuttles/Components/ThrusterComponent.cs
View File

@@ -83,7 +83,7 @@ namespace Content.Server.Shuttles.Components
public TimeSpan NextFire;
[DataField("machinePartThrust", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartThrust = "Laser";
public string MachinePartThrust = "Capacitor";
[DataField("partRatingThrustMultiplier")]
public float PartRatingThrustMultiplier = 1.5f;

5
Content.Server/Singularity/EntitySystems/EmitterSystem.cs
View File

@@ -179,11 +179,8 @@ namespace Content.Server.Singularity.EntitySystems
private void OnRefreshParts(EntityUid uid, EmitterComponent component, RefreshPartsEvent args)
{
var powerUseRating = args.PartRatings[component.MachinePartPowerUse];
var fireRateRating = args.PartRatings[component.MachinePartFireRate];
component.PowerUseActive = (int) (component.BasePowerUseActive * MathF.Pow(component.PowerUseMultiplier, powerUseRating - 1));
component.FireInterval = component.BaseFireInterval * MathF.Pow(component.FireRateMultiplier, fireRateRating - 1);
component.FireBurstDelayMin = component.BaseFireBurstDelayMin * MathF.Pow(component.FireRateMultiplier, fireRateRating - 1);
component.FireBurstDelayMax = component.BaseFireBurstDelayMax * MathF.Pow(component.FireRateMultiplier, fireRateRating - 1);
@@ -192,8 +189,6 @@ namespace Content.Server.Singularity.EntitySystems
private void OnUpgradeExamine(EntityUid uid, EmitterComponent component, UpgradeExamineEvent args)
{
args.AddPercentageUpgrade("emitter-component-upgrade-fire-rate", (float) (component.BaseFireInterval.TotalSeconds / component.FireInterval.TotalSeconds));
// TODO: Remove this and use UpgradePowerDrawComponent instead.
args.AddPercentageUpgrade("upgrade-power-draw", component.PowerUseActive / (float) component.BasePowerUseActive);
}
public void SwitchOff(EmitterComponent component)

2
Content.Server/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
View File

@@ -30,7 +30,7 @@ public sealed class ArtifactAnalyzerComponent : Component
/// The machine part that modifies analysis duration.
/// </summary>
[DataField("machinePartAnalysisDuration", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartAnalysisDuration = "ScanningModule";
public string MachinePartAnalysisDuration = "Manipulator";
/// <summary>
/// The modifier raised to the part rating to determine the duration multiplier.

2
Content.Server/Xenoarchaeology/Equipment/Components/TraversalDistorterComponent.cs
View File

@@ -17,7 +17,7 @@ public sealed class TraversalDistorterComponent : Component
public float BaseBiasChance = 0.7f;
[DataField("machinePartBiasChance", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartBiasChance = "ScanningModule";
public string MachinePartBiasChance = "Manipulator";
[DataField("partRatingBiasChance")]
public float PartRatingBiasChance = 1.1f;

9
Content.Shared/Construction/MachinePartSystem.cs
View File

@@ -1,5 +1,7 @@
using Content.Shared.Construction.Components;
using Content.Shared.Construction.Prototypes;
using Content.Shared.Examine;
using Robust.Shared.Prototypes;
namespace Content.Shared.Construction
{
@@ -8,6 +10,8 @@ namespace Content.Shared.Construction
/// </summary>
public sealed class MachinePartSystem : EntitySystem
{
[Dependency] private readonly IPrototypeManager _prototype = default!;
public override void Initialize()
{
base.Initialize();
@@ -24,7 +28,7 @@ namespace Content.Shared.Construction
{
args.PushMarkup(Loc.GetString("machine-board-component-required-element-entry-text",
("amount", amount),
("requiredElement", Loc.GetString(part))));
("requiredElement", Loc.GetString(_prototype.Index<MachinePartPrototype>(part).Name))));
}
foreach (var (material, amount) in component.MaterialRequirements)
@@ -54,7 +58,8 @@ namespace Content.Shared.Construction
if (!args.IsInDetailsRange)
return;
args.PushMarkup(Loc.GetString("machine-part-component-on-examine-rating-text", ("rating", component.Rating)));
args.PushMarkup(Loc.GetString("machine-part-component-on-examine-type-text", ("type", component.PartType)));
args.PushMarkup(Loc.GetString("machine-part-component-on-examine-type-text", ("type",
Loc.GetString(_prototype.Index<MachinePartPrototype>(component.PartType).Name))));
}
}
}

10
Content.Shared/Construction/Prototypes/MachinePartPrototype.cs
View File

@@ -14,9 +14,15 @@ public sealed class MachinePartPrototype : IPrototype
[IdDataField]
public string ID { get; } = default!;
/// <summary>
/// A human-readable name for the machine part type.
/// </summary>
[DataField("name")]
public readonly string Name = string.Empty;
/// <summary>
/// A stock part entity based on the machine part.
/// </summary>
[DataField("stockPartPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string? StockPartPrototype { get; }
[DataField("stockPartPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>), required: true)]
public readonly string StockPartPrototype = string.Empty;
}

22
Content.Shared/Singularity/Components/SharedEmitterComponent.cs
View File

@@ -39,26 +39,6 @@ public sealed class EmitterComponent : Component
[DataField("powerUseActive")]
public int PowerUseActive = 600;
/// <summary>
/// The base amount of power that is consumed.
/// Used in machine part rating calculations.
/// </summary>
[DataField("basePowerUseActive"), ViewVariables(VVAccess.ReadWrite)]
public int BasePowerUseActive = 600;
/// <summary>
/// Multiplier that is applied to the basePowerUseActive
/// to get the actual power use.
/// </summary>
[DataField("powerUseMultiplier")]
public float PowerUseMultiplier = 0.75f;
/// <summary>
/// The machine part used to reduce the power use of the machine.
/// </summary>
[DataField("machinePartPowerUse", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartPowerUse = "Capacitor";
/// <summary>
/// The amount of shots that are fired in a single "burst"
/// </summary>
@@ -114,7 +94,7 @@ public sealed class EmitterComponent : Component
/// The machine part that affects burst delay.
/// </summary>
[DataField("machinePartFireRate", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartFireRate = "Laser";
public string MachinePartFireRate = "Capacitor";
/// <summary>
/// The visual state that is set when the emitter is turned on

4
Resources/Locale/en-US/machine/machine.ftl
View File

@@ -8,6 +8,10 @@ machine-upgrade-increased-by-amount = [color=yellow]{CAPITALIZE($upgraded)}[/col
machine-upgrade-decreased-by-amount = [color=yellow]{CAPITALIZE($upgraded)}[/color] decreased by {$difference}.
machine-upgrade-not-upgraded = [color=yellow]{CAPITALIZE($upgraded)}[/color] not upgraded.
machine-part-name-capacitor = Capacitor
machine-part-name-manipulator = Manipulator
machine-part-name-matter-bin = Matter Bin
upgrade-power-draw = power draw
upgrade-max-charge = max charge
upgrade-power-supply = power supply

2
Resources/Maps/Salvage/medium-dock.yml
View File

@@ -1176,7 +1176,7 @@ entities:
parent: 50
type: Transform
- uid: 114
type: TriphasicScanningModuleStockPart
type: QuadraticCapacitorStockPart
components:
- pos: -5.6509933,-2.338189
parent: 50

68
Resources/Maps/Shuttles/striker.yml
View File

@@ -2931,7 +2931,7 @@ entities:
- canCollide: False
type: Physics
- uid: 241
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- flags: InContainer
type: MetaData
@@ -2940,7 +2940,7 @@ entities:
- canCollide: False
type: Physics
- uid: 242
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3014,7 +3014,7 @@ entities:
- canCollide: False
type: Physics
- uid: 250
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3023,7 +3023,7 @@ entities:
- canCollide: False
type: Physics
- uid: 251
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3032,7 +3032,7 @@ entities:
- canCollide: False
type: Physics
- uid: 252
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3041,7 +3041,7 @@ entities:
- canCollide: False
type: Physics
- uid: 253
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3079,7 +3079,7 @@ entities:
- canCollide: False
type: Physics
- uid: 257
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3088,7 +3088,7 @@ entities:
- canCollide: False
type: Physics
- uid: 258
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3097,7 +3097,7 @@ entities:
- canCollide: False
type: Physics
- uid: 259
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3106,7 +3106,7 @@ entities:
- canCollide: False
type: Physics
- uid: 260
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3144,7 +3144,7 @@ entities:
- canCollide: False
type: Physics
- uid: 264
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3153,7 +3153,7 @@ entities:
- canCollide: False
type: Physics
- uid: 265
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3162,7 +3162,7 @@ entities:
- canCollide: False
type: Physics
- uid: 266
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3171,7 +3171,7 @@ entities:
- canCollide: False
type: Physics
- uid: 267
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3209,7 +3209,7 @@ entities:
- canCollide: False
type: Physics
- uid: 271
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3218,7 +3218,7 @@ entities:
- canCollide: False
type: Physics
- uid: 272
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3227,7 +3227,7 @@ entities:
- canCollide: False
type: Physics
- uid: 273
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3236,7 +3236,7 @@ entities:
- canCollide: False
type: Physics
- uid: 274
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3274,7 +3274,7 @@ entities:
- canCollide: False
type: Physics
- uid: 278
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3283,7 +3283,7 @@ entities:
- canCollide: False
type: Physics
- uid: 279
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3292,7 +3292,7 @@ entities:
- canCollide: False
type: Physics
- uid: 280
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3301,7 +3301,7 @@ entities:
- canCollide: False
type: Physics
- uid: 281
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3339,7 +3339,7 @@ entities:
- canCollide: False
type: Physics
- uid: 285
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3348,7 +3348,7 @@ entities:
- canCollide: False
type: Physics
- uid: 286
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3357,7 +3357,7 @@ entities:
- canCollide: False
type: Physics
- uid: 287
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3366,7 +3366,7 @@ entities:
- canCollide: False
type: Physics
- uid: 288
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3404,7 +3404,7 @@ entities:
- canCollide: False
type: Physics
- uid: 292
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3413,7 +3413,7 @@ entities:
- canCollide: False
type: Physics
- uid: 293
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3422,7 +3422,7 @@ entities:
- canCollide: False
type: Physics
- uid: 294
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3431,7 +3431,7 @@ entities:
- canCollide: False
type: Physics
- uid: 295
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3469,7 +3469,7 @@ entities:
- canCollide: False
type: Physics
- uid: 299
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3478,7 +3478,7 @@ entities:
- canCollide: False
type: Physics
- uid: 300
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3487,7 +3487,7 @@ entities:
- canCollide: False
type: Physics
- uid: 301
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -3496,7 +3496,7 @@ entities:
- canCollide: False
type: Physics
- uid: 302
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData

24
Resources/Maps/Test/dev_map.yml
View File

@@ -3569,12 +3569,6 @@ entities:
- pos: 3.6877818,5.312015
parent: 179
type: Transform
- uid: 463
type: HighPowerMicroLaserStockPart
components:
- pos: -5.7834854,8.24448
parent: 179
type: Transform
- uid: 464
type: WallSolid
components:
@@ -5249,24 +5243,6 @@ entities:
- pos: 7.5,16.5
parent: 179
type: Transform
- uid: 697
type: MicroLaserStockPart
components:
- pos: -5.3147354,8.275752
parent: 179
type: Transform
- uid: 698
type: QuadUltraMicroLaserStockPart
components:
- pos: -6.6168184,8.327871
parent: 179
type: Transform
- uid: 699
type: UltraHighPowerMicroLaserStockPart
components:
- pos: -6.200152,8.2966
parent: 179
type: Transform
- uid: 700
type: AdvancedCapacitorStockPart
components:

10
Resources/Maps/bagel.yml
View File

@@ -81049,7 +81049,7 @@ entities:
parent: 60
type: Transform
- uid: 9425
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: -45.496006,-9.58335
parent: 60
@@ -106413,7 +106413,7 @@ entities:
parent: 60
type: Transform
- uid: 13015
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- pos: -67.444885,9.609138
parent: 60
@@ -106425,7 +106425,7 @@ entities:
parent: 60
type: Transform
- uid: 13017
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- pos: -67.61676,9.687263
parent: 60
@@ -153533,13 +153533,13 @@ entities:
- bodyType: Static
type: Physics
- uid: 19181
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 23.305836,21.651909
parent: 60
type: Transform
- uid: 19182
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 23.430836,21.558159
parent: 60

22
Resources/Maps/barratry.yml
View File

@@ -22002,7 +22002,7 @@ entities:
parent: 1
type: Transform
- uid: 1671
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 14.5277,-7.4270515
parent: 1
@@ -112649,19 +112649,19 @@ entities:
parent: 1
type: Transform
- uid: 13663
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: -16.101051,-14.435623
parent: 1
type: Transform
- uid: 13664
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: -15.913552,-14.341873
parent: 1
type: Transform
- uid: 13665
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: -15.757302,-14.435623
parent: 1
@@ -124476,7 +124476,7 @@ entities:
type: Physics
- type: InsideEntityStorage
- uid: 15088
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- flags: InContainer
type: MetaData
@@ -124486,7 +124486,7 @@ entities:
type: Physics
- type: InsideEntityStorage
- uid: 15089
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- flags: InContainer
type: MetaData
@@ -124496,7 +124496,7 @@ entities:
type: Physics
- type: InsideEntityStorage
- uid: 15090
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- flags: InContainer
type: MetaData
@@ -124506,7 +124506,7 @@ entities:
type: Physics
- type: InsideEntityStorage
- uid: 15091
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- flags: InContainer
type: MetaData
@@ -124556,7 +124556,7 @@ entities:
type: Physics
- type: InsideEntityStorage
- uid: 15096
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- flags: InContainer
type: MetaData
@@ -124694,7 +124694,7 @@ entities:
- enabled: True
type: AmbientSound
- uid: 15114
type: AdvancedScanningModuleStockPart
type: AdvancedCapacitorStockPart
components:
- pos: 14.793325,-7.4583015
parent: 1
@@ -124706,7 +124706,7 @@ entities:
parent: 1
type: Transform
- uid: 15116
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 14.2777,-7.5208015
parent: 1

8
Resources/Maps/box.yml
View File

@@ -122307,7 +122307,7 @@ entities:
parent: 8364
type: Transform
- uid: 16356
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: -8.652201,-39.009583
parent: 8364
@@ -122355,7 +122355,7 @@ entities:
- enabled: True
type: AmbientSound
- uid: 16363
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- pos: -8.441639,-39.39827
parent: 8364
@@ -158819,7 +158819,7 @@ entities:
parent: 8364
type: Transform
- uid: 21185
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: 74.25775,-19.490871
parent: 8364
@@ -158914,7 +158914,7 @@ entities:
parent: 8364
type: Transform
- uid: 21198
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- pos: 74.72912,-20.240425
parent: 8364

4
Resources/Maps/cluster.yml
View File

@@ -70308,7 +70308,7 @@ entities:
parent: 1
type: Transform
- uid: 9500
type: AdvancedScanningModuleStockPart
type: AdvancedCapacitorStockPart
components:
- pos: -3.7302828,-31.280602
parent: 1
@@ -70320,7 +70320,7 @@ entities:
parent: 1
type: Transform
- uid: 9502
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: -3.960114,-31.306107
parent: 1

14
Resources/Maps/fland.yml
View File

@@ -132689,13 +132689,13 @@ entities:
parent: 0
type: Transform
- uid: 15532
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: 54.353794,-20.39325
parent: 0
type: Transform
- uid: 15533
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: 54.55692,-20.471375
parent: 0
@@ -223673,13 +223673,13 @@ entities:
parent: 0
type: Transform
- uid: 27918
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 62.644222,-3.6298528
parent: 0
type: Transform
- uid: 27919
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 62.503597,-3.5673528
parent: 0
@@ -223715,13 +223715,13 @@ entities:
parent: 0
type: Transform
- uid: 27925
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- pos: 62.3291,-2.7915568
parent: 0
type: Transform
- uid: 27926
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- pos: 62.3291,-2.5415568
parent: 0
@@ -253465,7 +253465,7 @@ entities:
parent: 0
type: Transform
- uid: 31901
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: -27.469536,6.4936976
parent: 0

6
Resources/Maps/kettle.yml
View File

@@ -121792,13 +121792,13 @@ entities:
parent: 82
type: Transform
- uid: 15004
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 24.905888,58.755814
parent: 82
type: Transform
- uid: 15005
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 25.017,58.575256
parent: 82
@@ -121828,7 +121828,7 @@ entities:
parent: 82
type: Transform
- uid: 15010
type: AdvancedScanningModuleStockPart
type: AdvancedCapacitorStockPart
components:
- pos: 25.575817,58.709774
parent: 82

8
Resources/Maps/marathon.yml
View File

@@ -164246,7 +164246,7 @@ entities:
parent: 30
type: Transform
- uid: 20970
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 2.559926,21.402208
parent: 30
@@ -164272,7 +164272,7 @@ entities:
parent: 30
type: Transform
- uid: 20974
type: AdvancedScanningModuleStockPart
type: AdvancedCapacitorStockPart
components:
- pos: 2.2878256,21.230333
parent: 30
@@ -174229,7 +174229,7 @@ entities:
parent: 30
type: Transform
- uid: 22099
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 2.731801,21.495958
parent: 30
@@ -175931,7 +175931,7 @@ entities:
parent: 30
type: Transform
- uid: 22441
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- pos: 2.452661,20.541075
parent: 30

6
Resources/Maps/meta.yml
View File

@@ -178622,7 +178622,7 @@ entities:
parent: 5350
type: Transform
- uid: 22297
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: 12.593327,-30.87613
parent: 5350
@@ -197270,13 +197270,13 @@ entities:
parent: 5350
type: Transform
- uid: 24716
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 40.44346,10.567184
parent: 5350
type: Transform
- uid: 24717
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 40.56846,10.489059
parent: 5350

4
Resources/Maps/moose.yml
View File

@@ -42234,7 +42234,7 @@ entities:
parent: 6
type: Transform
- uid: 5390
type: AdvancedScanningModuleStockPart
type: AdvancedCapacitorStockPart
components:
- pos: -9.340726,-53.888344
parent: 6
@@ -42252,7 +42252,7 @@ entities:
parent: 6
type: Transform
- uid: 5393
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: -9.525309,-54.22893
parent: 6

8
Resources/Maps/omega.yml
View File

@@ -48994,19 +48994,19 @@ entities:
parent: 0
type: Transform
- uid: 6202
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 7.436289,-15.783581
parent: 0
type: Transform
- uid: 6203
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 7.623789,-15.783581
parent: 0
type: Transform
- uid: 6204
type: HighPowerMicroLaserStockPart
type: NanoManipulatorStockPart
components:
- pos: 7.811289,-15.783581
parent: 0
@@ -49054,7 +49054,7 @@ entities:
parent: 0
type: Transform
- uid: 6212
type: PhasicScanningModuleStockPart
type: SuperCapacitorStockPart
components:
- pos: 7.5679626,-16.149172
parent: 0

4
Resources/Maps/origin.yml
View File

@@ -127047,7 +127047,7 @@ entities:
parent: 1
type: Transform
- uid: 15512
type: ScanningModuleStockPart
type: CapacitorStockPart
components:
- pos: -50.47893,-28.448412
parent: 1
@@ -228027,7 +228027,7 @@ entities:
- powerLoad: 0
type: ApcPowerReceiver
- uid: 28651
type: MicroLaserStockPart
type: MicroManipulatorStockPart
components:
- pos: 57.42882,-47.52101
parent: 1

6
Resources/Prototypes/Catalog/Research/technologies.yml
View File

@@ -516,9 +516,7 @@
- TechDiskComputerCircuitboard
- CapacitorStockPart
- MatterBinStockPart
- MicroLaserStockPart
- MicroManipulatorStockPart
- ScanningModuleStockPart
- NodeScanner
- AnomalyScanner
- AnomalyLocator
@@ -586,9 +584,7 @@
unlockedRecipes:
- AdvancedCapacitorStockPart
- AdvancedMatterBinStockPart
- HighPowerMicroLaserStockPart
- NanoManipulatorStockPart
- AdvancedScanningModuleStockPart
- type: technology
name: technologies-magboots-technology
@@ -617,6 +613,4 @@
unlockedRecipes:
- SuperCapacitorStockPart
- SuperMatterBinStockPart
- UltraHighPowerMicroLaserStockPart
- PicoManipulatorStockPart
- PhasicScanningModuleStockPart

2
Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml
View File

@@ -6,8 +6,6 @@
CableApcStack: 2
FlashlightLantern: 2
PowerCellSmallPrinted: 3
MicroLaserStockPart: 4
MatterBinStockPart: 4
CapacitorStockPart: 4
MicroManipulatorStockPart: 4
ScanningModuleStockPart: 4

6
Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
View File

@@ -62,9 +62,7 @@
- type: RandomSpawner
prototypes:
- AdvancedCapacitorStockPart
- AdvancedScanningModuleStockPart
- NanoManipulatorStockPart
- HighPowerMicroLaserStockPart
- AdvancedMatterBinStockPart
offset: 0.0
@@ -81,16 +79,12 @@
- type: RandomSpawner
rarePrototypes:
- QuadraticCapacitorStockPart
- TriphasicScanningModuleStockPart
- FemtoManipulatorStockPart
- QuadUltraMicroLaserStockPart
- BluespaceMatterBinStockPart
rareChance: 0.05
prototypes:
- SuperCapacitorStockPart
- PhasicScanningModuleStockPart
- PicoManipulatorStockPart
- UltraHighPowerMicroLaserStockPart
- SuperMatterBinStockPart
chance: 0.95
offset: 0.0

121
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
View File

@@ -109,7 +109,7 @@
prototype: UniformPrinter
requirements:
MatterBin: 1
Laser: 2
Manipulator: 2
- type: entity
id: VaccinatorMachineCircuitboard
@@ -140,11 +140,18 @@
state: medical
- type: MachineBoard
prototype: DiseaseDiagnoser
requirements:
Manipulator: 1
Laser: 2
materialRequirements:
Cable: 5
tagRequirements:
GlassBeaker:
Amount: 1
DefaultPrototype: Beaker
ExamineName: Glass Beaker
componentRequirements:
DiseaseSwab:
Amount: 1
DefaultPrototype: DiseaseSwab
ExamineName: Swab
- type: entity
id: ArtifactAnalyzerMachineCircuitboard
@@ -157,7 +164,7 @@
- type: MachineBoard
prototype: MachineArtifactAnalyzer
requirements:
ScanningModule: 3
Manipulator: 3
Capacitor: 1
materialRequirements:
Glass: 5
@@ -173,7 +180,7 @@
- type: MachineBoard
prototype: MachineTraversalDistorter
requirements:
ScanningModule: 1
Manipulator: 1
Capacitor: 2
materialRequirements:
Steel: 5
@@ -190,7 +197,7 @@
- type: MachineBoard
prototype: MachineAnomalyVessel
requirements:
ScanningModule: 5
Capacitor: 5
materialRequirements:
Cable: 1
PlasmaGlass: 10
@@ -206,10 +213,10 @@
- type: MachineBoard
prototype: MachineAPE
requirements:
Capacitor: 1
Laser: 3
Capacitor: 2
materialRequirements:
Cable: 1
Glass: 1
- type: entity
id: ThermomachineFreezerMachineCircuitBoard
@@ -222,8 +229,8 @@
- type: MachineBoard
prototype: GasThermoMachineFreezer
requirements:
MatterBin: 3
Laser: 3
MatterBin: 2
Manipulator: 2
materialRequirements:
Cable: 5
- type: Construction
@@ -242,8 +249,8 @@
- type: MachineBoard
prototype: GasThermoMachineHeater
requirements:
MatterBin: 3
Laser: 3
MatterBin: 2
Manipulator: 2
materialRequirements:
Cable: 5
- type: Construction
@@ -262,7 +269,7 @@
- type: MachineBoard
prototype: PortableScrubber
requirements:
MatterBin: 3
MatterBin: 1
Manipulator: 2
materialRequirements:
Cable: 5
@@ -279,7 +286,7 @@
- type: MachineBoard
prototype: CloningPod
requirements:
ScanningModule: 2
MatterBin: 2
Manipulator: 2
materialRequirements:
Glass: 1
@@ -296,7 +303,6 @@
- type: MachineBoard
prototype: MedicalScanner
requirements:
ScanningModule: 2
Capacitor: 1
materialRequirements:
Glass: 5
@@ -310,9 +316,6 @@
components:
- type: MachineBoard
prototype: CrewMonitoringServer
requirements:
Capacitor: 1
ScanningModule: 2
materialRequirements:
Steel: 1
Cable: 2
@@ -327,12 +330,8 @@
state: medical
- type: MachineBoard
prototype: CryoPod
requirements:
ScanningModule: 1
Manipulator: 1
MatterBin: 2
materialRequirements:
Glass: 1
Glass: 5
Cable: 1
- type: entity
@@ -346,9 +345,10 @@
- type: MachineBoard
prototype: chem_master
requirements:
Manipulator: 1
Capacitor: 1
materialRequirements:
Glass: 1
Cable: 1
tagRequirements:
GlassBeaker:
Amount: 2
@@ -367,10 +367,14 @@
prototype: chem_dispenser
requirements:
Capacitor: 1
Manipulator: 1
MatterBin: 2
materialRequirements:
Glass: 1
Steel: 3
tagRequirements:
GlassBeaker:
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
- type: entity
id: BiomassReclaimerMachineCircuitboard
@@ -381,7 +385,7 @@
- type: MachineBoard
prototype: BiomassReclaimer
requirements:
Laser: 1
MatterBin: 2
Manipulator: 1
tagRequirements:
Pipe:
@@ -407,14 +411,10 @@
state: service
- type: MachineBoard
prototype: hydroponicsTray
# See: https://github.com/vgstation-coders/vgstation13/blob/e9a806f30b4db0efa2a68b9eb42e3120d2321b6a/code/modules/hydroponics/hydro_tray.dm#L57
requirements:
MatterBin: 2
ScanningModule: 1
Capacitor: 1
materialRequirements:
# replacing the console screen
Glass: 1
Glass: 5
Cable: 2
tagRequirements:
GlassBeaker:
Amount: 2
@@ -451,7 +451,7 @@
- type: MachineBoard
prototype: SMESBasicEmpty
requirements:
Capacitor: 10
Capacitor: 5
- type: entity
id: SubstationMachineCircuitboard
@@ -479,11 +479,9 @@
components:
- type: MachineBoard
prototype: DawInstrument
requirements:
Capacitor: 4
ScanningModule: 5
materialRequirements:
Glass: 1
Cable: 1
tagRequirements:
# One instrument to bring them all and in the darkness bind them...
KeyedInstrument:
@@ -534,8 +532,7 @@
- type: MachineBoard
prototype: Thruster
requirements:
Laser: 4
Capacitor: 1
Capacitor: 4
materialRequirements:
Steel: 5
@@ -547,7 +544,7 @@
- type: MachineBoard
prototype: Gyroscope
requirements:
ScanningModule: 2
Manipulator: 2
Capacitor: 1
materialRequirements:
Glass: 2
@@ -580,7 +577,6 @@
- type: MachineBoard
prototype: KitchenReagentGrinder
requirements:
Capacitor: 1
MatterBin: 2
Manipulator: 2
tagRequirements:
@@ -598,9 +594,9 @@
- type: MachineBoard
prototype: ChemistryHotplate
requirements:
Laser: 2
Capacitor: 2
materialRequirements:
Steel: 2
Glass: 1
- type: entity
id: StasisBedMachineCircuitboard
@@ -613,12 +609,11 @@
prototype: StasisBed
requirements:
Capacitor: 1
Manipulator: 1
materialRequirements:
Cable: 3
tagRequirements:
Pipe:
Amount: 4
Amount: 1
DefaultPrototype: GasPipeStraight
ExamineName: Pipe
Cryobeaker:
@@ -652,8 +647,7 @@
prototype: OreProcessor
requirements:
MatterBin: 1
Manipulator: 1
Laser: 2
Manipulator: 3
materialRequirements:
Glass: 1
@@ -668,7 +662,6 @@
prototype: KitchenMicrowave
requirements:
Capacitor: 1
Laser: 1
materialRequirements:
Glass: 2
Cable: 2
@@ -683,7 +676,7 @@
- type: MachineBoard
prototype: FatExtractor
requirements:
Laser: 1
Manipulator: 1
componentRequirements:
Utensil:
Amount: 1
@@ -700,8 +693,7 @@
- type: MachineBoard
prototype: Emitter
requirements:
Capacitor: 1
Laser: 1
Capacitor: 2
materialRequirements:
CableHV: 5
Glass: 2
@@ -714,8 +706,8 @@
components:
- type: MachineBoard
prototype: SurveillanceCameraRouterConstructed
requirements:
Capacitor: 4
materialRequirements:
Cable: 1
- type: entity
id: SurveillanceCameraWirelessRouterCircuitboard
@@ -725,9 +717,9 @@
components:
- type: MachineBoard
prototype: SurveillanceCameraWirelessRouterConstructed
requirements:
Laser: 1
Capacitor: 4
materialRequirements:
Cable: 2
Glass: 1
- type: entity
id: SurveillanceWirelessCameraMovableCircuitboard
@@ -737,9 +729,6 @@
components:
- type: MachineBoard
prototype: SurveillanceWirelessCameraMovableConstructed
requirements:
Laser: 1
Capacitor: 4
materialRequirements:
Glass: 2
Cable: 2
@@ -752,12 +741,9 @@
components:
- type: MachineBoard
prototype: SurveillanceWirelessCameraAnchoredConstructed
requirements:
Laser: 1
Capacitor: 4
materialRequirements:
Glass: 2
Cable: 2
Glass: 1
- type: entity
id: GasRecyclerMachineCircuitboard
@@ -768,8 +754,8 @@
- type: MachineBoard
prototype: GasRecycler
requirements:
Laser: 2
Manipulator: 2
Capacitor: 1
Manipulator: 1
materialRequirements:
Steel: 10
Plasma: 5
@@ -818,9 +804,6 @@
components:
- type: MachineBoard
prototype: TelecomServer
requirements:
Capacitor: 1
ScanningModule: 2
materialRequirements:
Steel: 1
Cable: 2

140
Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
View File

@@ -8,8 +8,8 @@
- type: Sprite
netsync: false
sprite: Objects/Misc/stock_parts.rsi
- type: MachinePart
rating: 1
- type: Item
size: 1
- type: GuideHelp
guides:
- MachineUpgrading
@@ -28,23 +28,11 @@
part: Capacitor
rating: 1
- type: entity
id: ScanningModuleStockPart
name: scanning module
parent: BaseStockPart
description: A compact, high resolution scanning module used in the construction of certain devices.
components:
- type: Sprite
state: scan_module
- type: MachinePart
part: ScanningModule
rating: 1
- type: entity
id: MicroManipulatorStockPart
name: micro-manipulator
name: manipulator
parent: BaseStockPart
description: A tiny little manipulator used in the construction of certain devices.
description: A basic manipulator used in the construction of a variety of devices.
components:
- type: Sprite
state: micro_mani
@@ -52,23 +40,11 @@
part: Manipulator
rating: 1
- type: entity
id: MicroLaserStockPart
name: micro-laser
parent: BaseStockPart
description: A tiny laser used in certain devices.
components:
- type: Sprite
state: micro_laser
- type: MachinePart
part: Laser
rating: 1
- type: entity
id: MatterBinStockPart
name: matter bin
parent: BaseStockPart
description: A container designed to hold compressed matter awaiting reconstruction.
description: A basic matter bin used in the construction of a variety of devices.
components:
- type: Sprite
state: matter_bin
@@ -89,44 +65,22 @@
- type: MachinePart
rating: 2
- type: entity
id: AdvancedScanningModuleStockPart
name: advanced scanning module
parent: ScanningModuleStockPart
description: A compact, high resolution scanning module used in the construction of certain devices.
components:
- type: Sprite
state: adv_scan_module
- type: MachinePart
rating: 2
- type: entity
id: NanoManipulatorStockPart
name: nano-manipulator
name: advanced manipulator
parent: MicroManipulatorStockPart
description: A tiny little manipulator used in the construction of certain devices.
description: An advanced manipulator used in the construction of a variety of devices.
components:
- type: Sprite
state: nano_mani
- type: MachinePart
rating: 2
- type: entity
id: HighPowerMicroLaserStockPart
name: high-power micro-laser
parent: MicroLaserStockPart
description: A tiny laser used in certain devices.
components:
- type: Sprite
state: high_micro_laser
- type: MachinePart
rating: 2
- type: entity
id: AdvancedMatterBinStockPart
name: advanced matter bin
parent: MatterBinStockPart
description: A container designed to hold compressed matter awaiting reconstruction.
description: An advanced matter bin used in the construction of a variety of devices.
components:
- type: Sprite
state: advanced_matter_bin
@@ -139,51 +93,29 @@
id: SuperCapacitorStockPart
name: super capacitor
parent: CapacitorStockPart
description: A super-high capacity capacitor used in the construction of a variety of devices.
description: A super capacitor used in the construction of a variety of devices.
components:
- type: Sprite
state: super_capacitor
- type: MachinePart
rating: 3
- type: entity
id: PhasicScanningModuleStockPart
name: phasic scanning module
parent: ScanningModuleStockPart
description: A compact, high resolution phasic scanning module used in the construction of certain devices.
components:
- type: Sprite
state: super_scan_module
- type: MachinePart
rating: 3
- type: entity
id: PicoManipulatorStockPart
name: pico-manipulator
name: super manipulator
parent: MicroManipulatorStockPart
description: A tiny little manipulator used in the construction of certain devices.
description: A super manipulator used in the construction of a variety of devices.
components:
- type: Sprite
state: pico_mani
- type: MachinePart
rating: 3
- type: entity
id: UltraHighPowerMicroLaserStockPart
name: ultra-high-power micro-laser
parent: MicroLaserStockPart
description: A tiny laser used in certain devices.
components:
- type: Sprite
state: ultra_high_micro_laser
- type: MachinePart
rating: 3
- type: entity
id: SuperMatterBinStockPart
name: super matter bin
parent: MatterBinStockPart
description: A container designed to hold compressed matter awaiting reconstruction.
description: A super matter bin used in the construction of a variety of devices.
components:
- type: Sprite
state: super_matter_bin
@@ -194,60 +126,38 @@
- type: entity
id: QuadraticCapacitorStockPart
name: quadratic capacitor
name: bluespace capacitor
parent: CapacitorStockPart
description: A quadratic capacity capacitor used in the construction of a variety of devices.
description: A bluespace capacitor used in the construction of a variety of devices.
components:
- type: Sprite
state: quadratic_capacitor
- type: MachinePart
rating: 4
- type: entity
id: TriphasicScanningModuleStockPart
name: triphasic scanning module
parent: ScanningModuleStockPart
description: A compact, ultra resolution triphasic scanning module used in the construction of certain devices.
components:
- type: Sprite
state: triphasic_scan_module
- type: MachinePart
rating: 4
- type: entity
id: FemtoManipulatorStockPart
name: femto-manipulator
name: bluespace manipulator
parent: MicroManipulatorStockPart
description: A tiny little manipulator used in the construction of certain devices.
description: A bluespace manipulator used in the construction of a variety of devices.
components:
- type: Sprite
state: femto_mani
- type: MachinePart
rating: 4
- type: entity
id: QuadUltraMicroLaserStockPart
name: quad-ultra micro-laser
parent: MicroLaserStockPart
description: A tiny laser used in certain devices.
components:
- type: Sprite
state: quadultra_micro_laser
- type: MachinePart
rating: 4
- type: entity
id: BluespaceMatterBinStockPart
name: bluespace matter bin
parent: MatterBinStockPart
description: A container designed to hold compressed matter in bluespace awaiting reconstruction.
description: A bluespace matter bin used in the construction of a variety of devices.
components:
- type: Sprite
state: bluespace_matter_bin
- type: MachinePart
rating: 4
# Subspace stock parts
# Subspace stock parts (REMOVE THESE)
- type: entity
id: AnsibleSubspaceStockPart
@@ -257,8 +167,6 @@
components:
- type: Sprite
state: subspace_ansible
- type: MachinePart
part: Ansible
- type: entity
id: FilterSubspaceStockPart
@@ -268,8 +176,6 @@
components:
- type: Sprite
state: hyperwave_filter
- type: MachinePart
part: Filter
- type: entity
id: AmplifierSubspaceStockPart
@@ -279,8 +185,6 @@
components:
- type: Sprite
state: subspace_amplifier
- type: MachinePart
part: Amplifier
- type: entity
id: TreatmentSubspaceStockPart
@@ -290,8 +194,6 @@
components:
- type: Sprite
state: treatment_disk
- type: MachinePart
part: Treatment
- type: entity
id: AnalyzerSubspaceStockPart
@@ -301,8 +203,6 @@
components:
- type: Sprite
state: wavelength_analyzer
- type: MachinePart
part: Analyzer
- type: entity
id: CrystalSubspaceStockPart
@@ -312,8 +212,6 @@
components:
- type: Sprite
state: ansible_crystal
- type: MachinePart
part: Crystal
- type: entity
id: TransmitterSubspaceStockPart
@@ -323,5 +221,3 @@
components:
- type: Sprite
state: subspace_transmitter
- type: MachinePart
part: Transmitter

7
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View File

@@ -197,20 +197,14 @@
- Drone
- Flash
- MicroManipulatorStockPart
- ScanningModuleStockPart
- MicroLaserStockPart
- MatterBinStockPart
- CapacitorStockPart
- AdvancedCapacitorStockPart
- AdvancedMatterBinStockPart
- HighPowerMicroLaserStockPart
- NanoManipulatorStockPart
- AdvancedScanningModuleStockPart
- SuperCapacitorStockPart
- SuperMatterBinStockPart
- UltraHighPowerMicroLaserStockPart
- PicoManipulatorStockPart
- PhasicScanningModuleStockPart
- FirelockElectronics
- DoorElectronics
- APCElectronics
@@ -468,7 +462,6 @@
- type: Lathe
idleState: icon
runningState: icon
machinePartPrintSpeed: Laser
staticRecipes:
- HandheldHealthAnalyzer
- ClothingHandsGlovesLatex

3
Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
View File

@@ -82,9 +82,6 @@
- type: Climbable
- type: ApcPowerReceiver
powerLoad: 200 #Receives most of its power from the console
- type: UpgradePowerDraw #upgrade it for the meme?
powerDrawMultiplier: 0.75
scaling: Exponential
- type: EmptyOnMachineDeconstruct
containers:
- scanner-bodyContainer

3
Resources/Prototypes/Entities/Structures/Machines/microwave.yml
View File

@@ -59,9 +59,6 @@
acts: ["Breakage"]
- type: ApcPowerReceiver
powerLoad: 400
- type: UpgradePowerDraw
powerDrawMultiplier: 0.75
scaling: Exponential
- type: Machine
board: MicrowaveMachineCircuitboard
- type: ContainerContainer

3
Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
View File

@@ -41,9 +41,6 @@
state: "juicer0"
- type: ApcPowerReceiver
powerLoad: 300
- type: UpgradePowerDraw
powerDrawMultiplier: 0.75
scaling: Exponential
- type: ItemSlots
slots:
beakerSlot:

3
Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
View File

@@ -19,9 +19,6 @@
- type: Appearance
- type: ApcPowerReceiver
powerLoad: 1000
- type: UpgradePowerDraw
powerDrawMultiplier: 0.75
scaling: Exponential
- type: ExtensionCableReceiver
- type: Damageable
damageContainer: Inorganic

5
Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
View File

@@ -49,9 +49,6 @@
- type: Thruster
- type: Machine
board: ThrusterMachineCircuitboard
- type: UpgradePowerDraw
powerDrawMultiplier: 0.75
scaling: Exponential
- type: Sprite
sprite: Structures/Shuttles/thruster.rsi
layers:
@@ -96,7 +93,7 @@
thrusterType: Angular
requireSpace: false
baseThrust: 5000
machinePartThrust: ScanningModule
machinePartThrust: Manipulator
- type: Sprite
# Listen I'm not the biggest fan of the sprite but it was the most appropriate thing I could find.
sprite: Structures/Shuttles/gyroscope.rsi

39
Resources/Prototypes/MachineParts/machine_parts.yml
View File

@@ -1,47 +1,14 @@
- type: machinePart
id: Capacitor
name: machine-part-name-capacitor
stockPartPrototype: CapacitorStockPart
- type: machinePart
id: ScanningModule
stockPartPrototype: ScanningModuleStockPart
- type: machinePart
id: Manipulator
name: machine-part-name-manipulator
stockPartPrototype: MicroManipulatorStockPart
- type: machinePart
id: Laser
stockPartPrototype: MicroLaserStockPart
- type: machinePart
id: MatterBin
name: machine-part-name-matter-bin
stockPartPrototype: MatterBinStockPart
- type: machinePart
id: Ansible
stockPartPrototype: AnsibleSubspaceStockPart
- type: machinePart
id: Filter
stockPartPrototype: FilterSubspaceStockPart
- type: machinePart
id: Amplifier
stockPartPrototype: AmplifierSubspaceStockPart
- type: machinePart
id: Treatment
stockPartPrototype: TreatmentSubspaceStockPart
- type: machinePart
id: Analyzer
stockPartPrototype: AnalyzerSubspaceStockPart
- type: machinePart
id: Crystal
stockPartPrototype: CrystalSubspaceStockPart
- type: machinePart
id: Transmitter
stockPartPrototype: TransmitterSubspaceStockPart

4
Resources/Prototypes/Procedural/salvage_loot.yml
View File

@@ -20,15 +20,11 @@
CrateMaterialGlass: 1.0
# Uncommon
SuperCapacitorStockPart: 0.25
PhasicScanningModuleStockPart: 0.25
PicoManipulatorStockPart: 0.25
UltraHighPowerMicroLaserStockPart: 0.25
SuperMatterBinStockPart: 0.25
# Rare
QuadraticCapacitorStockPart: 0.10
TriphasicScanningModuleStockPart: 0.10
FemtoManipulatorStockPart: 0.10
QuadUltraMicroLaserStockPart: 0.10
BluespaceMatterBinStockPart: 0.10
# Crates

60
Resources/Prototypes/Recipes/Lathes/Parts.yml
View File

@@ -15,15 +15,6 @@
Steel: 50
Plastic: 50
- type: latheRecipe
id: MicroLaserStockPart
result: MicroLaserStockPart
completetime: 1
materials:
Steel: 50
Glass: 50
Plastic: 50
- type: latheRecipe
id: MicroManipulatorStockPart
result: MicroManipulatorStockPart
@@ -32,15 +23,6 @@
Steel: 50
Plastic: 50
- type: latheRecipe
id: ScanningModuleStockPart
result: ScanningModuleStockPart
completetime: 1
materials:
Steel: 50
Glass: 50
Plastic: 50
#Rating 2
- type: latheRecipe
id: AdvancedCapacitorStockPart
@@ -60,16 +42,6 @@
Plastic: 150
Plasma: 75
- type: latheRecipe
id: HighPowerMicroLaserStockPart
result: HighPowerMicroLaserStockPart
completetime: 3
materials:
Steel: 150
Glass: 150
Plastic: 150
Plasma: 50
- type: latheRecipe
id: NanoManipulatorStockPart
result: NanoManipulatorStockPart
@@ -79,16 +51,6 @@
Plastic: 150
Plasma: 75
- type: latheRecipe
id: AdvancedScanningModuleStockPart
result: AdvancedScanningModuleStockPart
completetime: 3
materials:
Steel: 150
Glass: 150
Plastic: 150
Plasma: 50
#Rating 3
- type: latheRecipe
id: SuperCapacitorStockPart
@@ -110,17 +72,6 @@
Plasma: 100
Gold: 125
- type: latheRecipe
id: UltraHighPowerMicroLaserStockPart
result: UltraHighPowerMicroLaserStockPart
completetime: 3
materials:
Steel: 250
Glass: 250
Plastic: 250
Plasma: 100
Gold: 100
- type: latheRecipe
id: PicoManipulatorStockPart
result: PicoManipulatorStockPart
@@ -130,14 +81,3 @@
Plastic: 250
Plasma: 100
Gold: 125
- type: latheRecipe
id: PhasicScanningModuleStockPart
result: PhasicScanningModuleStockPart
completetime: 3
materials:
Steel: 250
Glass: 250
Plastic: 250
Plasma: 100
Gold: 100

18
Resources/Prototypes/XenoArch/Effects/normal_effects.yml
View File

@@ -390,20 +390,14 @@
maxSpawns: 10
spawns:
- id: QuadraticCapacitorStockPart
prob: 0.3
maxAmount: 2
- id: TriphasicScanningModuleStockPart
prob: 0.3
maxAmount: 2
prob: 0.5
maxAmount: 3
- id: FemtoManipulatorStockPart
prob: 0.3
maxAmount: 2
- id: QuadUltraMicroLaserStockPart
prob: 0.3
maxAmount: 2
prob: 0.5
maxAmount: 3
- id: BluespaceMatterBinStockPart
prob: 0.3
maxAmount: 2
prob: 0.5
maxAmount: 3
- type: artifactEffect
id: EffectDisease

4
Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
View File

@@ -8,11 +8,7 @@ Machines help the station run smoothly, and as a scientist, you can help them ru
<Box>
<GuideEntityEmbed Entity="CapacitorStockPart"/>
<GuideEntityEmbed Entity="MatterBinStockPart"/>
<GuideEntityEmbed Entity="MicroLaserStockPart"/>
</Box>
<Box>
<GuideEntityEmbed Entity="MicroManipulatorStockPart"/>
<GuideEntityEmbed Entity="ScanningModuleStockPart"/>
</Box>
You can examine each machine part to see both the type and the rating, which range from 1 to 4.