diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index fb06d9f310fa2b..1e59ba79571862 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -46,7 +46,7 @@ public sealed class PostMapInitTest { "Dev", "Fland", - "Meta", + "MetaStation", "Packed", "Aspid", "Cluster", @@ -55,7 +55,6 @@ public sealed class PostMapInitTest "Origin", "CentComm", "Box", - "Barratry", "Saltern", "Core", "Marathon", diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 0266a7ecc0135b..2ff9b7e120a1b8 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -448,13 +448,13 @@ netsync: false - type: EmitSoundOnUse sound: - path: /Audio/Voice/Moth/scream_moth.ogg + path: /Audio/Voice/Moth/moth_scream.ogg - type: EmitSoundOnLand sound: - path: /Audio/Voice/Moth/scream_moth.ogg + path: /Audio/Voice/Moth/moth_scream.ogg - type: MeleeWeapon soundHit: - path: /Audio/Voice/Moth/scream_moth.ogg + path: /Audio/Voice/Moth/moth_scream.ogg - type: entity parent: BasePlushie diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index 85c659378a5a3d..37e23317ef7a68 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -204,6 +204,11 @@ reagents: - ReagentId: Uranium Quantity: 10 + - type: Tag + tags: + - Sheet + - DroneUsable + - Uranium - type: entity parent: SheetUranium diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index eb28eb572928a0..694e4eb1c39a17 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -235,6 +235,11 @@ - type: Appearance - type: Item heldPrefix: wood + - type: Tag + tags: + - DroneUsable + - RawMaterial + - Wood - type: entity parent: MaterialWoodPlank diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7db470a68a8732..959ff7f01ae16a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -583,7 +583,6 @@ - Ingot - Wood - Uranium - - Gold - type: entity id: AmmoTechFab diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml index 1de47332196fdc..092c10219154a7 100644 --- a/Resources/Prototypes/Voice/speech_sounds.yml +++ b/Resources/Prototypes/Voice/speech_sounds.yml @@ -37,11 +37,11 @@ - type: speechSounds id: Mothroach_scream saySound: - path: /Audio/Voice/Moth/scream_moth.ogg + path: /Audio/Voice/Moth/moth_scream.ogg askSound: - path: /Audio/Voice/Moth/scream_moth.ogg + path: /Audio/Voice/Moth/moth_scream.ogg exclaimSound: - path: /Audio/Voice/Moth/scream_moth.ogg + path: /Audio/Voice/Moth/moth_scream.ogg - type: speechSounds id: Squeak diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 90f9710e882aa5..0266aaf2b0df9c 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -463,6 +463,12 @@ - type: Tag id: Ingot +- type: Tag + id: Uranium + +- type: Tag + id: Wood + - type: Tag id: InstantDoAfters