diff --git a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs index a792202df6..a59d38fe46 100644 --- a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs +++ b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs @@ -37,7 +37,6 @@ public sealed class PrototypeSaveTest // TODO fix more prototypes // The rest of these prototypes (probably) shouldn't be getting ignored. // There should be an issue up tracking all of these prototypes, indicating that still need to get fixed. - "C4", "WeaponProtoKineticAccelerator", "WeaponStaffHealing", "WeaponStaffPolymorphDoor", @@ -64,12 +63,10 @@ public sealed class PrototypeSaveTest "JawsOfLife", "SyndicateJawsOfLife", "LightReplacer", - "ComputerCloningConsole", "PowerDrill", "Omnitool", "GasPressurePump", "GasVolumePump", - "GasDualPortVentPump", "PortableScrubber", "ParticleAcceleratorControlBox", "GasFilter", @@ -98,11 +95,6 @@ public sealed class PrototypeSaveTest "SpaceMedipen", "HolosignWetFloor", "HeadSkeleton", - "PoweredlightEmpty", - "Poweredlight", - "PoweredlightLED", - "PoweredlightExterior", - "PoweredlightSodium", "PoweredSmallLightEmpty", "PoweredSmallLight", "PoweredLightPostSmallEmpty", @@ -123,9 +115,7 @@ public sealed class PrototypeSaveTest "MedicalTechFab", "UniformPrinter", "OreProcessor", - "MedicalScanner", "MagazinePistolSubMachineGunTopMounted", - "Recycler", "EpinephrineChemistryBottle", "RobustHarvestChemistryBottle", "NocturineChemistryBottle", @@ -137,12 +127,10 @@ public sealed class PrototypeSaveTest "BluespaceBeaker", "ClusterBang", "ClusterBangFull", - "CargoTelepad", "Vaccinator", "AirlockExternalShuttleLocked", "AirlockExternalGlassShuttleLocked", "AirlockExternalGlassShuttleEmergencyLocked", - "ConveyorBelt", "ClothingHeadHatChef", "Bucket", "AirlockShuttle", diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml index 4c240ec316..e8cbe1c08e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml @@ -19,6 +19,8 @@ canToggleStartOnStick: true - type: TriggerOnSignal - type: SignalReceiver + inputs: + Trigger: [] - type: Sticky stickDelay: 5 unstickDelay: 5 diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 8a0ceb4224..c4d3f1d826 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -94,6 +94,11 @@ - type: PoweredLightVisualizer blinkingSound: path: "/Audio/Machines/light_tube_on.ogg" + - type: SignalReceiver + inputs: + On: [] + Off: [] + Toggle: [] - type: entity id: Poweredlight diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 08e3867624..27bf9bdeff 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -609,6 +609,9 @@ color: "#1f8c28" - type: SignalTransmitter transmissionRange: 4 + outputs: + MedicalScannerSender: [] + CloningPodSender: [] - type: ActivatableUI key: enum.CloningConsoleUiKey.Key - type: ActivatableUIRequiresPower diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml index 1f4a9bb946..79cd1099a4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml @@ -32,6 +32,17 @@ - type: Construction graph: Machine node: machine + containers: + - machine_parts + - machine_board + - type: ContainerContainer + containers: + scanner-bodyContainer: !type:ContainerSlot + machine_board: !type:Container + machine_parts: !type:Container + - type: SignalReceiver + inputs: + MedicalScannerReceiver: [] - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml index 67659386a6..7168e2f009 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml @@ -31,6 +31,23 @@ layer: - Opaque - BulletImpassable + - shape: !type:PolygonShape + vertices: + - -0.55,-0.55 + - 0.55,-0.55 + - 0.55,0.55 + - -0.55,0.55 + id: conveyor + layer: + - Impassable + - MidImpassable + - LowImpassable + hard: False + - type: SignalReceiver + inputs: + Reverse: [] + Forward: [] + Off: [] - type: Transform anchored: true noRot: false diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml index c719d5bda3..cb6fa50c2f 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml @@ -240,6 +240,10 @@ inlet: inlet outlet: outlet canLink: true + - type: SignalReceiver + inputs: + Pressurize: [] + Depressurize: [] - type: Construction graph: GasBinary node: dualportventpump diff --git a/Resources/Prototypes/Entities/Structures/cargo_console.yml b/Resources/Prototypes/Entities/Structures/cargo_console.yml index 282882a963..cbbf51ab71 100644 --- a/Resources/Prototypes/Entities/Structures/cargo_console.yml +++ b/Resources/Prototypes/Entities/Structures/cargo_console.yml @@ -6,6 +6,7 @@ - type: InteractionOutline - type: Physics bodyType: Static + canCollide: false - type: Transform anchored: true noRot: true @@ -30,6 +31,9 @@ - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic + - type: SignalReceiver + inputs: + OrderReceiver: [] - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml index b8c1ef18df..513fc493df 100644 --- a/Resources/Prototypes/Entities/Structures/conveyor.yml +++ b/Resources/Prototypes/Entities/Structures/conveyor.yml @@ -21,7 +21,25 @@ - type: Physics bodyType: Static - type: Fixtures + fixtures: + - id: conveyor + shape: !type:PolygonShape + vertices: + - -0.55,-0.55 + - 0.55,-0.55 + - 0.55,0.55 + - -0.55,0.55 + layer: + - Impassable + - MidImpassable + - LowImpassable + hard: False - type: Conveyor + - type: SignalReceiver + inputs: + Reverse: [] + Forward: [] + Off: [] - type: Appearance - type: GenericVisualizer visuals: