From 0d4a605a946a14275b2ca65506465120b0e2d7f0 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 6 Nov 2022 15:26:45 -0500 Subject: [PATCH] bunch of prototype save fixes (#12421) --- .../Tests/PrototypeSaveTest.cs | 33 ------------------- Resources/Prototypes/Body/Parts/skeleton.yml | 2 +- .../Entities/Objects/Misc/fluff_lights.yml | 2 ++ .../Objects/Specific/Cargo/cargo_pallet.yml | 2 ++ .../Objects/Specific/Janitorial/janitor.yml | 1 + .../Objects/Specific/Security/barrier.yml | 2 ++ .../Entities/Objects/Tools/jaws_of_life.yml | 1 + .../Entities/Objects/Tools/tools.yml | 2 ++ .../Structures/Decoration/curtains.yml | 2 ++ .../Structures/Holographic/projections.yml | 1 + .../Structures/Lighting/base_lighting.yml | 8 +++++ .../Structures/Lighting/ground_lighting.yml | 5 +++ .../Structures/Machines/cloning_machine.yml | 7 ++++ .../Structures/Machines/gravity_generator.yml | 5 +++ .../Structures/Piping/Atmospherics/binary.yml | 2 ++ .../Piping/Atmospherics/portable.yml | 1 + .../Piping/Atmospherics/trinary.yml | 2 ++ .../Power/Generation/PA/control_box.yml | 1 + .../Structures/Shuttles/thrusters.yml | 1 + 19 files changed, 46 insertions(+), 34 deletions(-) diff --git a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs index e56e618ea0..2ef6f53aa8 100644 --- a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs +++ b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs @@ -38,41 +38,8 @@ 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. - "Thruster", - "Gyroscope", - "JawsOfLife", - "SyndicateJawsOfLife", - "PowerDrill", - "Omnitool", - "GasPressurePump", - "GasVolumePump", - "PortableScrubber", - "ParticleAcceleratorControlBox", - "GasFilter", - "GasFilterFlipped", - "GasMixer", - "GasMixerFlipped", - "HospitalCurtainsOpen", - "CargoPallet", - "ParticlesProjectile", - "FloorDrain", - "Floodlight", - "HolosignWetFloor", "HeadSkeleton", - "PoweredSmallLightEmpty", - "PoweredSmallLight", - "PoweredLightPostSmallEmpty", - "PoweredLightPostSmall", - "DeployableBarrier", "CrateArtifactContainer", - "CloningPod", - "GravityGenerator", - "GravityGeneratorMini", - "AirlockExternalShuttleLocked", - "AirlockExternalGlassShuttleLocked", - "AirlockExternalGlassShuttleEmergencyLocked", - "AirlockShuttle", - "AirlockGlassShuttle", // The followjng are all fixture-less phsyics entities that set can-collide to false on init. "CarpRift", "GasMinerOxygen", diff --git a/Resources/Prototypes/Body/Parts/skeleton.yml b/Resources/Prototypes/Body/Parts/skeleton.yml index 00f672b5f6..af2ea2c6eb 100644 --- a/Resources/Prototypes/Body/Parts/skeleton.yml +++ b/Resources/Prototypes/Body/Parts/skeleton.yml @@ -52,6 +52,7 @@ baseSprintSpeed: 0 - type: Speech - type: SkeletonAccent + - type: Actions - type: Vocal maleScream: /Audio/Voice/Skeleton/skeleton_scream.ogg femaleScream: /Audio/Voice/Skeleton/skeleton_scream.ogg @@ -61,7 +62,6 @@ proper: true - type: Examiner - type: DoAfter - - type: Actions - type: MobState thresholds: 0: Alive diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index 223db78063..fbaa1c3312 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -53,6 +53,8 @@ energy: 2 - type: ToggleableLightVisuals - type: Appearance + - type: Physics + canCollide: false - type: entity name: lamp diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml index b1cbf1316f..251da09f5d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml @@ -11,3 +11,5 @@ layers: - texture: Structures/catwalk.rsi/catwalk_preview.png - type: CollideOnAnchor + - type: Physics + canCollide: false diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 47a97ac403..d705b13e06 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -248,6 +248,7 @@ anchored: true - type: Physics bodyType: Static + canCollide: false - type: Drain - type: AmbientSound enabled: false diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml index 4f26ea8737..f25dd4d6b7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml @@ -12,6 +12,8 @@ state: idle - type: InteractionOutline - type: Physics + bodyType: Dynamic + canCollide: false - type: Fixtures fixtures: - shape: diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index f90e1dcdd0..45e3880562 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -24,6 +24,7 @@ qualities: - Prying speed: 1.5 + useSound: /Audio/Items/jaws_pry.ogg - type: ToolForcePowered - type: MultipleTool statusShowBehavior: true diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 75c0669c91..621aad3bb2 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -222,6 +222,7 @@ qualities: - Screwing speed: 1.5 + useSound: /Audio/Items/drill_use.ogg - type: MultipleTool statusShowBehavior: true entries: @@ -320,6 +321,7 @@ qualities: - Screwing speed: 1.2 # Kept for future adjustments. Currently 1.2x for balance + useSound: /Audio/Items/drill_use.ogg - type: MultipleTool statusShowBehavior: true entries: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml index 4bccf3d1a5..acd48ec789 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml @@ -67,3 +67,5 @@ state: Open - type: Occluder enabled: false + - type: Physics + canCollide: false diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml index 6497258c7e..b633484c19 100644 --- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml +++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml @@ -9,6 +9,7 @@ anchored: true - type: Physics bodyType: Static + canCollide: false - type: Sprite sprite: Structures/Holo/wetfloor.rsi state: icon diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index c4d3f1d826..d6a269855e 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -248,6 +248,9 @@ - type: PointLight enabled: false offset: "0, -0.5" + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot - type: PoweredLight bulb: Bulb damage: @@ -262,6 +265,11 @@ - type: Appearance visuals: - type: PoweredLightVisualizer + - type: SignalReceiver + inputs: + On: [] + Off: [] + Toggle: [] - type: entity id: PoweredSmallLight diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 8b02ca60ce..ff9a932bb9 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -95,6 +95,11 @@ - type: PoweredLightVisualizer blinkingSound: path: "/Audio/Machines/light_tube_on.ogg" + - type: SignalReceiver + inputs: + On: [] + Off: [] + Toggle: [] - type: entity id: PoweredLightPostSmall diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml index 602fdb0864..42eaa0eedf 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml @@ -29,6 +29,13 @@ - type: Construction graph: Machine node: machine + containers: + - machine_board + - machine_parts + - clonepod-bodyContainer + - type: SignalReceiver + inputs: + CloningPodReceiver: [] - type: EmptyOnMachineDeconstruct containers: - clonepod-bodyContainer diff --git a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml index 5fcc92aa44..30bbe34d46 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml @@ -7,6 +7,7 @@ mode: AlignTileAny components: - type: AmbientSound + enabled: false volume: -6 range: 7 sound: @@ -25,6 +26,7 @@ - type: Transform anchored: true - type: ApcPowerReceiver + powerLoad: 2500 - type: ExtensionCableReceiver - type: Physics bodyType: Static @@ -67,6 +69,7 @@ off: "off" on: "on" - type: PointLight + radius: 2.5 energy: 0.5 # Gravity generator is a large machine, not casting shadows is fine within the radius set above. castShadows: false @@ -103,6 +106,8 @@ - LargeMobMask layer: - WallLayer + - type: ApcPowerReceiver + powerLoad: 500 - type: GravityGenerator idlePower: 15 activePower: 500 diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml index e0013984a6..42a022d884 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml @@ -46,6 +46,7 @@ False: { state: pumpPressure } - type: PipeColorVisuals - type: GasPressurePump + enabled: false - type: UserInterface interfaces: - key: enum.GasPressurePumpUiKey.Key @@ -86,6 +87,7 @@ False: { state: pumpVolume } - type: PipeColorVisuals - type: GasVolumePump + enabled: false - type: UserInterface interfaces: - key: enum.GasVolumePumpUiKey.Key diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml index d2ff430366..ac201105a0 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml @@ -9,6 +9,7 @@ - type: InteractionOutline - type: Physics bodyType: Dynamic + canCollide: false - type: Fixtures fixtures: - shape: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml index c02a6f4998..7462643ee4 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml @@ -56,6 +56,7 @@ - key: enum.GasFilterUiKey.Key type: GasFilterBoundUserInterface - type: GasFilter + enabled: false - type: Flippable mirrorEntity: GasFilterFlipped - type: Construction @@ -142,6 +143,7 @@ - key: enum.GasMixerUiKey.Key type: GasMixerBoundUserInterface - type: GasMixer + enabled: false inletOne: inlet inletTwo: filter - type: Flippable diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml index 8153183b29..f9574d49a7 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml @@ -18,6 +18,7 @@ - type: ParticleAcceleratorPartVisualizer baseState: unlit - type: ApcPowerReceiver + powerLoad: 250 - type: ExtensionCableReceiver - type: ParticleAcceleratorControlBox - type: Construction diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index 3682321c49..da0ad12e37 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -4,6 +4,7 @@ abstract: true components: - type: AmbientSound + enabled: false range: 4 volume: -4 sound: