fix the last ignored prototypes in prototype save test (#13672)
Closes https://github.com/space-wizards/space-station-14/issues/10595
This commit is contained in:
@@ -36,41 +36,6 @@ public sealed class PrototypeSaveTest
|
|||||||
{
|
{
|
||||||
"Singularity", // physics collision uses "AllMask" (-1). The flag serializer currently fails to save this because this features un-named bits.
|
"Singularity", // physics collision uses "AllMask" (-1). The flag serializer currently fails to save this because this features un-named bits.
|
||||||
"constructionghost",
|
"constructionghost",
|
||||||
|
|
||||||
// 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.
|
|
||||||
"HeadSkeleton",
|
|
||||||
// The followjng are all fixture-less phsyics entities that set can-collide to false on init.
|
|
||||||
"CarpRift",
|
|
||||||
"GasMinerOxygen",
|
|
||||||
"GasMinerNitrogen",
|
|
||||||
"GasMinerCarbonDioxide",
|
|
||||||
"GasMinerPlasma",
|
|
||||||
"GasMinerTritium",
|
|
||||||
"GasMinerWaterVapor",
|
|
||||||
"GasMinerMiasma",
|
|
||||||
"GasMinerNitrousOxide",
|
|
||||||
"SignalSwitch",
|
|
||||||
"SignalButton",
|
|
||||||
"ApcNetSwitch",
|
|
||||||
"SignalButtonExt1",
|
|
||||||
"SignalButtonExt2",
|
|
||||||
"SignalButtonExt3",
|
|
||||||
"SignalButtonBridge",
|
|
||||||
"SignalButtonWindows",
|
|
||||||
"GrilleBroken",
|
|
||||||
"BaseGeneratorWallmountFrame",
|
|
||||||
"GeneratorWallmountBasic",
|
|
||||||
"GeneratorWallmountAPU",
|
|
||||||
"Lightning",
|
|
||||||
"LightningRevenant",
|
|
||||||
"ChargedLightning",
|
|
||||||
"SuperchargedLightning",
|
|
||||||
"HyperchargedLightning",
|
|
||||||
"BaseSubstationWall",
|
|
||||||
"SubstationWallBasic",
|
|
||||||
"BaseSubstationWallFrame"
|
|
||||||
};
|
};
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
|||||||
@@ -32,11 +32,11 @@ public sealed class VocalSystem : EntitySystem
|
|||||||
base.Initialize();
|
base.Initialize();
|
||||||
|
|
||||||
SubscribeLocalEvent<VocalComponent, ScreamActionEvent>(OnActionPerform);
|
SubscribeLocalEvent<VocalComponent, ScreamActionEvent>(OnActionPerform);
|
||||||
SubscribeLocalEvent<VocalComponent, ComponentStartup>(OnStartup);
|
SubscribeLocalEvent<VocalComponent, MapInitEvent>(OnMapInit);
|
||||||
SubscribeLocalEvent<VocalComponent, ComponentShutdown>(OnShutdown);
|
SubscribeLocalEvent<VocalComponent, ComponentShutdown>(OnShutdown);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnStartup(EntityUid uid, VocalComponent component, ComponentStartup args)
|
private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args)
|
||||||
{
|
{
|
||||||
if (component.ScreamAction == null
|
if (component.ScreamAction == null
|
||||||
&& _proto.TryIndex(component.ActionId, out InstantActionPrototype? act))
|
&& _proto.TryIndex(component.ActionId, out InstantActionPrototype? act))
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
- state: "lightning_1"
|
- state: "lightning_1"
|
||||||
shader: unshaded
|
shader: unshaded
|
||||||
- type: Physics
|
- type: Physics
|
||||||
|
canCollide: false
|
||||||
- type: Electrified
|
- type: Electrified
|
||||||
requirePower: false
|
requirePower: false
|
||||||
- type: Lightning
|
- type: Lightning
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
- type: Clickable
|
- type: Clickable
|
||||||
- type: InteractionOutline
|
- type: InteractionOutline
|
||||||
- type: Physics
|
- type: Physics
|
||||||
|
canCollide: false
|
||||||
- type: Fixtures
|
- type: Fixtures
|
||||||
- type: Transform
|
- type: Transform
|
||||||
anchored: true
|
anchored: true
|
||||||
|
|||||||
@@ -96,6 +96,9 @@
|
|||||||
- type: Fixtures
|
- type: Fixtures
|
||||||
- type: Transform
|
- type: Transform
|
||||||
anchored: true
|
anchored: true
|
||||||
|
- type: Physics
|
||||||
|
bodyType: Static
|
||||||
|
canCollide: false
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
drawdepth: WallMountedItems
|
drawdepth: WallMountedItems
|
||||||
netsync: false
|
netsync: false
|
||||||
@@ -132,6 +135,7 @@
|
|||||||
- type: Clickable
|
- type: Clickable
|
||||||
- type: InteractionOutline
|
- type: InteractionOutline
|
||||||
- type: Physics
|
- type: Physics
|
||||||
|
canCollide: false
|
||||||
- type: Fixtures
|
- type: Fixtures
|
||||||
- type: Transform
|
- type: Transform
|
||||||
anchored: true
|
anchored: true
|
||||||
|
|||||||
@@ -102,6 +102,7 @@
|
|||||||
- type: InteractionOutline
|
- type: InteractionOutline
|
||||||
- type: Physics
|
- type: Physics
|
||||||
bodyType: Static
|
bodyType: Static
|
||||||
|
canCollide: false
|
||||||
- type: Fixtures
|
- type: Fixtures
|
||||||
- type: Transform
|
- type: Transform
|
||||||
anchored: true
|
anchored: true
|
||||||
@@ -202,6 +203,7 @@
|
|||||||
- type: InteractionOutline
|
- type: InteractionOutline
|
||||||
- type: Physics
|
- type: Physics
|
||||||
bodyType: Static
|
bodyType: Static
|
||||||
|
canCollide: false
|
||||||
- type: Fixtures
|
- type: Fixtures
|
||||||
- type: Transform
|
- type: Transform
|
||||||
anchored: true
|
anchored: true
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
anchored: true
|
anchored: true
|
||||||
- type: Physics
|
- type: Physics
|
||||||
bodyType: Static
|
bodyType: Static
|
||||||
|
canCollide: false
|
||||||
- type: Fixtures
|
- type: Fixtures
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
netsync: false
|
netsync: false
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
- type: Clickable
|
- type: Clickable
|
||||||
- type: InteractionOutline
|
- type: InteractionOutline
|
||||||
- type: Physics
|
- type: Physics
|
||||||
|
canCollide: false
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Structures/Wallmounts/switch.rsi
|
sprite: Structures/Wallmounts/switch.rsi
|
||||||
state: on
|
state: on
|
||||||
@@ -42,6 +43,7 @@
|
|||||||
- type: Clickable
|
- type: Clickable
|
||||||
- type: InteractionOutline
|
- type: InteractionOutline
|
||||||
- type: Physics
|
- type: Physics
|
||||||
|
canCollide: false
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Structures/Wallmounts/switch.rsi
|
sprite: Structures/Wallmounts/switch.rsi
|
||||||
state: dead
|
state: dead
|
||||||
@@ -87,6 +89,7 @@
|
|||||||
- type: Clickable
|
- type: Clickable
|
||||||
- type: InteractionOutline
|
- type: InteractionOutline
|
||||||
- type: Physics
|
- type: Physics
|
||||||
|
canCollide: false
|
||||||
- type: Transform
|
- type: Transform
|
||||||
anchored: true
|
anchored: true
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
|
|||||||
@@ -94,6 +94,9 @@
|
|||||||
node: grilleBroken
|
node: grilleBroken
|
||||||
deconstructionTarget: start
|
deconstructionTarget: start
|
||||||
- type: Fixtures # overwrite BaseStructure parent.
|
- type: Fixtures # overwrite BaseStructure parent.
|
||||||
|
- type: Physics
|
||||||
|
bodyType: Static
|
||||||
|
canCollide: false
|
||||||
- type: Damageable
|
- type: Damageable
|
||||||
damageContainer: Inorganic
|
damageContainer: Inorganic
|
||||||
damageModifierSet: FlimsyMetallic
|
damageModifierSet: FlimsyMetallic
|
||||||
|
|||||||
Reference in New Issue
Block a user