Minor .yaml cleanup (#25717)

* cleaning

* fix

diff --git a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
index ed4014f37477cf3742809c4d5962435e64379fb6..d8f326673075e22d30c77dce21fb2ad5a5550e88 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
@@ -23,8 +23,7 @@
     removeOnInteract: true
 
 - type: entity
-  name: carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemBlack
   suffix: Black
   components:
@@ -32,9 +31,6 @@
     state: carpet-black
   - type: Item
     heldPrefix: carpet-black
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetBlack
   - type: Tag
@@ -46,8 +42,7 @@
     removeOnInteract: true
 
 - type: entity
-  name: carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemBlue
   suffix: Blue
   components:
@@ -55,9 +50,6 @@
     state: carpet-blue
   - type: Item
     heldPrefix: carpet-blue
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetBlue
   - type: Tag
@@ -69,8 +61,7 @@
     removeOnInteract: true
 
 - type: entity
-  name: carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemGreen
   suffix: Green
   components:
@@ -78,9 +69,6 @@
     state: carpet-green
   - type: Item
     heldPrefix: carpet-green
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetGreen
   - type: Tag
@@ -92,8 +80,7 @@
     removeOnInteract: true
 
 - type: entity
-  name: carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemOrange
   suffix: Orange
   components:
@@ -101,9 +88,6 @@
     state: carpet-orange
   - type: Item
     heldPrefix: carpet-orange
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetOrange
   - type: Tag
@@ -115,8 +99,7 @@
     removeOnInteract: true
 
 - type: entity
-  name: carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemSkyBlue
   suffix: Sky Blue
   components:
@@ -124,9 +107,6 @@
     state: carpet-skyblue
   - type: Item
     heldPrefix: carpet-skyblue
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetSkyBlue
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
@@ -135,8 +115,7 @@
     removeOnInteract: true
 
 - type: entity
-  name: carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemPurple
   suffix: Purple
   components:
@@ -144,9 +123,6 @@
     state: carpet-purple
   - type: Item
     heldPrefix: carpet-purple
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetPurple
   - type: Tag
@@ -158,8 +134,7 @@
     removeOnInteract: true
 
 - type: entity
-  name: carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemPink
   suffix: Pink
   components:
@@ -167,9 +142,6 @@
     state: carpet-pink
   - type: Item
     heldPrefix: carpet-pink
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetPink
   - type: Tag
@@ -181,8 +153,7 @@
     removeOnInteract: true
 
 - type: entity
-  name: carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemCyan
   suffix: Cyan
   components:
@@ -190,9 +161,6 @@
     state: carpet-cyan
   - type: Item
     heldPrefix: carpet-cyan
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetCyan
   - type: Tag
@@ -204,8 +172,7 @@
     removeOnInteract: true
 
 - type: entity
-  name: carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemWhite
   suffix: White
   components:
@@ -213,9 +180,6 @@
     state: carpet-white
   - type: Item
     heldPrefix: carpet-white
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetWhite
   - type: Tag

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 8d80e9d5a9a3428abee9d7c265c58a626c5e49be..1bdf66f5b7848c21569f4ab9502fbb0fecdb5f77 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -241,7 +241,6 @@
 
 - type: entity
   id: LockableButtonCaptain
-  name: lockable button
   suffix: Captain
   parent: LockableButton
   components:
@@ -250,7 +249,6 @@
 
 - type: entity
   id: LockableButtonHeadOfPersonnel
-  name: lockable button
   suffix: HeadOfPersonnel
   parent: LockableButton
   components:
@@ -259,7 +257,6 @@
 
 - type: entity
   id: LockableButtonChiefEngineer
-  name: lockable button
   suffix: ChiefEngineer
   parent: LockableButton
   components:
@@ -268,7 +265,6 @@
 
 - type: entity
   id: LockableButtonChiefMedicalOfficer
-  name: lockable button
   suffix: ChiefMedicalOfficer
   parent: LockableButton
   components:
@@ -277,7 +273,6 @@
 
 - type: entity
   id: LockableButtonHeadOfSecurity
-  name: lockable button
   suffix: HeadOfSecurity
   parent: LockableButton
   components:
@@ -286,7 +281,6 @@
 
 - type: entity
   id: LockableButtonResearchDirector
-  name: lockable button
   suffix: ResearchDirector
   parent: LockableButton
   components:
@@ -295,7 +289,6 @@
 
 - type: entity
   id: LockableButtonCommand
-  name: lockable button
   suffix: Command
   parent: LockableButton
   components:
@@ -304,7 +297,6 @@
 
 - type: entity
   id: LockableButtonCryogenics
-  name: lockable button
   suffix: Cryogenics
   parent: LockableButton
   components:
@@ -313,7 +305,6 @@
 
 - type: entity
   id: LockableButtonSecurity
-  name: lockable button
   suffix: Security
   parent: LockableButton
   components:
@@ -322,7 +313,6 @@
 
 - type: entity
   id: LockableButtonDetective
-  name: lockable button
   suffix: Detective
   parent: LockableButton
   components:
@@ -331,7 +321,6 @@
 
 - type: entity
   id: LockableButtonArmory
-  name: lockable button
   suffix: Armory
   parent: LockableButton
   components:
@@ -340,7 +329,6 @@
 
 - type: entity
   id: LockableButtonBrig
-  name: lockable button
   suffix: Brig
   parent: LockableButton
   components:
@@ -349,7 +337,6 @@
 
 - type: entity
   id: LockableButtonLawyer
-  name: lockable button
   suffix: Lawyer
   parent: LockableButton
   components:
@@ -358,7 +345,6 @@
 
 - type: entity
   id: LockableButtonEngineering
-  name: lockable button
   suffix: Engineering
   parent: LockableButton
   components:
@@ -367,7 +353,6 @@
 
 - type: entity
   id: LockableButtonMedical
-  name: lockable button
   suffix: Medical
   parent: LockableButton
   components:
@@ -376,7 +361,6 @@
 
 - type: entity
   id: LockableButtonQuartermaster
-  name: lockable button
   suffix: Quartermaster
   parent: LockableButton
   components:
@@ -385,7 +369,6 @@
 
 - type: entity
   id: LockableButtonSalvage
-  name: lockable button
   suffix: Salvage
   parent: LockableButton
   components:
@@ -394,7 +377,6 @@
 
 - type: entity
   id: LockableButtonCargo
-  name: lockable button
   suffix: Cargo
   parent: LockableButton
   components:
@@ -403,7 +385,6 @@
 
 - type: entity
   id: LockableButtonResearch
-  name: lockable button
   suffix: Research
   parent: LockableButton
   components:
@@ -412,7 +393,6 @@
 
 - type: entity
   id: LockableButtonService
-  name: lockable button
   suffix: Service
   parent: LockableButton
   components:
@@ -421,7 +401,6 @@
 
 - type: entity
   id: LockableButtonMaintenance
-  name: lockable button
   suffix: Maintenance
   parent: LockableButton
   components:
@@ -430,7 +409,6 @@
 
 - type: entity
   id: LockableButtonExternal
-  name: lockable button
   suffix: External
   parent: LockableButton
   components:
@@ -439,7 +417,6 @@
 
 - type: entity
   id: LockableButtonJanitor
-  name: lockable button
   suffix: Janitor
   parent: LockableButton
   components:
@@ -448,7 +425,6 @@
 
 - type: entity
   id: LockableButtonTheatre
-  name: lockable button
   suffix: Theatre
   parent: LockableButton
   components:
@@ -457,7 +433,6 @@
 
 - type: entity
   id: LockableButtonBar
-  name: lockable button
   suffix: Bar
   parent: LockableButton
   components:
@@ -466,7 +441,6 @@
 
 - type: entity
   id: LockableButtonChemistry
-  name: lockable button
   suffix: Chemistry
   parent: LockableButton
   components:
@@ -475,7 +449,6 @@
 
 - type: entity
   id: LockableButtonKitchen
-  name: lockable button
   suffix: Kitchen
   parent: LockableButton
   components:
@@ -484,7 +457,6 @@
 
 - type: entity
   id: LockableButtonChapel
-  name: lockable button
   suffix: Chapel
   parent: LockableButton
   components:
@@ -493,7 +465,6 @@
 
 - type: entity
   id: LockableButtonHydroponics
-  name: lockable button
   suffix: Hydroponics
   parent: LockableButton
   components:
@@ -502,7 +473,6 @@
 
 - type: entity
   id: LockableButtonAtmospherics
-  name: lockable button
   suffix: Atmospherics
   parent: LockableButton
   components: