diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs index 0734b30371..f39f1e3585 100644 --- a/Content.Server/Physics/Controllers/MoverController.cs +++ b/Content.Server/Physics/Controllers/MoverController.cs @@ -224,7 +224,7 @@ namespace Content.Server.Physics.Controllers { // Walking on a tile. var def = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId]; - soundToPlay = def.FootstepSounds.GetSound(); + soundToPlay = def.FootstepSounds?.GetSound(); if (string.IsNullOrEmpty(soundToPlay)) return; } diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 199659901e..8d84978bcc 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -32,7 +32,7 @@ namespace Content.Shared.Maps [DataField("can_crowbar")] public bool CanCrowbar { get; private set; } - [DataField("footstep_sounds", required: true)] public SoundSpecifier FootstepSounds { get; } = default!; + [DataField("footstep_sounds")] public SoundSpecifier? FootstepSounds { get; } [DataField("friction")] public float Friction { get; set; } diff --git a/Resources/Prototypes/Entities/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Markers/construction_ghost.yml index c6904d65f4..64f61c77ad 100644 --- a/Resources/Prototypes/Entities/Markers/construction_ghost.yml +++ b/Resources/Prototypes/Entities/Markers/construction_ghost.yml @@ -9,14 +9,3 @@ - type: Physics - type: Clickable - type: InteractionOutline - -- type: entity - name: somebody-messed-up frame - id: structureconstructionframe - abstract: true - components: - - type: Sprite - - type: Construction - - type: Physics - - type: Clickable - - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml index e669d5cb6d..8eaa746d15 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -52,6 +52,7 @@ - type: Sprite state: glass - type: Stack + stackType: Glass count: 1 - type: entity @@ -92,6 +93,7 @@ - type: Sprite state: rglass - type: Stack + stackType: ReinforcedGlass count: 1 - type: entity @@ -129,6 +131,7 @@ - type: Sprite state: pglass - type: Stack + stackType: PlasmaGlass count: 1 - type: entity @@ -166,6 +169,7 @@ - type: Sprite state: rpglass - type: Stack + stackType: ReinforcedPlasmaGlass count: 1 - type: entity @@ -200,6 +204,7 @@ - type: Sprite state: titaniumglass - type: Stack + stackType: TitaniumGlass count: 1 - type: entity @@ -234,4 +239,5 @@ - type: Sprite state: plastitaniumglass - type: Stack + stackType: PlastitaniumGlass count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml index 90f199947a..fdef2b2354 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -49,6 +49,7 @@ - type: Sprite state: steel - type: Stack + stackType: Steel count: 1 - type: entity @@ -83,6 +84,7 @@ - type: Sprite state: plasteel - type: Stack + stackType: Plasteel count: 1 - type: entity @@ -117,6 +119,7 @@ - type: Sprite state: titanium - type: Stack + stackType: Titanium count: 1 - type: entity @@ -151,6 +154,7 @@ - type: Sprite state: plastitanium - type: Stack + stackType: Plastitanium count: 1 - type: entity @@ -185,4 +189,5 @@ - type: Sprite state: brass - type: Stack + stackType: Brass count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml index 58e99697d8..7ea18fabcc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml @@ -15,6 +15,7 @@ - type: DeleteOnTrigger - type: TriggerOnCollide - type: Projectile + damage: {} deleteOnCollide: false - type: Explosive devastationRange: 3 diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index 3f7d0848fe..ff5e68a980 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -1,55 +1,69 @@ - type: stack id: FloorTileSteel name: steel tile + spawn: FloorTileItemSteel - type: stack id: FloorTileWood name: wood floor + spawn: FloorTileItemWood - type: stack id: FloorTileWhite name: white tile + spawn: FloorTileItemWhite - type: stack id: FloorTileDark name: dark tile + spawn: FloorTileItemDark - type: stack id: FloorTileTechmaint name: techmaint floor + spawn: FloorTileItemTechmaint - type: stack id: FloorTileFreezer name: freezer tile + spawn: FloorTileItemFreezer - type: stack id: FloorTileShowroom name: showroom tile + spawn: FloorTileItemShowroom - type: stack id: FloorTileGCircuit name: green-circuit floor + spawn: FloorTileItemGCircuit - type: stack id: FloorTileGold name: gold floor + spawn: FloorTileItemGold - type: stack id: FloorTileReinforced name: reinforced tile + spawn: FloorTileItemReinforced - type: stack id: FloorTileMono name: mono tile + spawn: FloorTileItemMono - type: stack id: FloorTileLino name: linoleum floor + spawn: FloorTileItemLino - type: stack id: FloorTileHydro name: hydro tile + spawn: FloorTileItemHydro - type: stack id: FloorTileDirty name: dirty tile + spawn: FloorTileItemDirty diff --git a/Resources/Prototypes/Stacks/medical_stacks.yml b/Resources/Prototypes/Stacks/medical_stacks.yml index 1de2f80231..b8d493c615 100644 --- a/Resources/Prototypes/Stacks/medical_stacks.yml +++ b/Resources/Prototypes/Stacks/medical_stacks.yml @@ -1,11 +1,17 @@ - type: stack id: Ointment name: ointment + icon: "/Textures/Objects/Specific/Medical/medical.rsi/ointment.png" + spawn: Ointment - type: stack id: Gauze name: gauze + icon: "/Textures/Objects/Specific/Medical/medical.rsi/gauze.png" + spawn: Gauze - type: stack id: Brutepack name: brutepack + icon: "/Textures/Objects/Specific/Medical/medical.rsi/gauze.png" + spawn: Brutepack diff --git a/Resources/Prototypes/Stacks/power_stacks.yml b/Resources/Prototypes/Stacks/power_stacks.yml index 932be34dd7..a06961be4b 100644 --- a/Resources/Prototypes/Stacks/power_stacks.yml +++ b/Resources/Prototypes/Stacks/power_stacks.yml @@ -7,8 +7,11 @@ - type: stack id: CableMV name: mv cable - spawn: CableHVStack1 + icon: "/Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png" + spawn: CableMVStack1 - type: stack id: CableHV name: hv cable + icon: "/Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png" + spawn: CableHVStack1