yml cleanup

Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml

@@ -279,123 +279,6 @@
       - id: MagazineShotgunIncendiary
         amount: 4
 
-# base BallisticAmmoProvider dispensers
-- type: entity
-  parent: BaseItem
-  id: BaseAmmoProvider
-  abstract: true
-  components:
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: Item
-    size: 20
-  - type: Sprite
-    sprite: Objects/Storage/boxes.rsi
-
-- type: entity
-  parent: BaseAmmoProvider
-  id: AmmoProviderShotgunShell
-  abstract: true
-  components:
-    - type: BallisticAmmoProvider
-      whitelist:
-        tags:
-        - ShellShotgun
-      capacity: 20
-
-# Shotgun Shells
-- type: entity
-  name: shotgun beanbag cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxBeanbag
-  description: A dispenser box full of beanbag shots, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunBeanbag
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellbeanbag
-
-- type: entity
-  name: shotgun lethal cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxLethalshot
-  description: A dispenser box full of lethal pellet shots, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgun
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shelllethal
-
-- type: entity
-  name: shotgun slug cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxShotgunSlug
-  description: A dispenser box full of slugs, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunSlug
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellslug
-
-- type: entity
-  name: shotgun flare cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxShotgunFlare
-  description: A dispenser box full of flare cartridges, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunFlare
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellflare
-
-- type: entity
-  name: shotgun incendiary cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxShotgunIncendiary
-  description: A dispenser box full of incendiary cartridges, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunIncendiary
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellincendiary
-
-- type: entity
-  name: shotgun practice cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxShotgunPractice
-  description: A dispenser box full of practice cartridges, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunPractice
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellpractice
-
-- type: entity
-  name: tranquilizer cartridges dispenser
-  parent: AmmoProviderShotgunShell
-  id: BoxShellTranquilizer
-  description: A dispenser box full of tranquilizer cartridges, designed for riot shotguns.
-  components:
-    - type: BallisticAmmoProvider
-      proto: ShellTranquilizer
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellslug
-
 # Rifle
 - type: entity
   name: box of .20 rifle magazines

Resources/Prototypes/Entities/Clothing/Shoes/boots.yml

@@ -71,7 +71,7 @@
     sprite: Clothing/Shoes/Boots/highheelboots.rsi
 
 - type: entity
-  parent: ClothingShoesStorageBase
+  parent: ClothingShoesBootsJack
   id: ClothingShoesBootsMercenary # Frontier - Merc to Mercenary
   name: mercenary boots
   description: Boots that have gone through many conflicts and that have proven their combat reliability.

Resources/Prototypes/Entities/Mobs/Species/arachnid.yml

@@ -28,11 +28,6 @@
     - FootstepSound
     - DoorBumpOpener
     - SpiderCraft
-  - type: Butcherable
-    butcheringType: Spike
-    spawned:
-      - id: FoodMeatSpider
-        amount: 5
   - type: Inventory
     templateId: arachnid
   # Damage (Self)

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml

@@ -73,8 +73,6 @@
   - type: PhysicalComposition
     materialComposition:
       Glass: 100
-  - type: TrashOnEmpty
-    solution: drink
   - type: StaticPrice
     price: 16
 

Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml

@@ -137,19 +137,6 @@
   - type: Clothing
     sprite: Objects/Tanks/emergency_extended.rsi
 
-- type: entity
-  parent: ExtendedEmergencyOxygenTank
-  id: ExtendedEmergencyNitrogenTank
-  name: extended-capacity emergency nitrogen tank
-  description: An emergency tank with extended capacity. Technically rated for prolonged use.
-  components:
-  - type: Sprite
-    sprite: Objects/Tanks/emergency_extended_red.rsi
-  - type: Item
-    sprite: Objects/Tanks/emergency_extended_red.rsi
-  - type: Clothing
-    sprite: Objects/Tanks/emergency_extended_red.rsi
-
 - type: entity
   parent: ExtendedEmergencyOxygenTank
   id: DoubleEmergencyOxygenTank

Resources/Prototypes/GameRules/events.yml

@@ -165,29 +165,29 @@
     # startDelay: 30
   # - type: MeteorSwarmRule
 
- - type: entity
-   id: MouseMigration
-   parent: BaseGameRule
-   noSpawn: true
-   components:
-   - type: StationEvent
-     earliestStart: 30
-     minimumPlayers: 15
-     weight: 5
-     duration: 50
-   - type: VentCrittersRule
-     entries:
-     - id: MobMouse
-       prob: 0.015
-     - id: MobMouse1
-       prob: 0.015
-     - id: MobMouse2
-       prob: 0.015
-     - id: MobRatServant
-       prob: 0.015
-     specialEntries:
-     - id: SpawnPointGhostRatKing
-       prob: 0.005
+- type: entity
+  id: MouseMigration
+  parent: BaseGameRule
+  noSpawn: true
+  components:
+  - type: StationEvent
+    earliestStart: 30
+    minimumPlayers: 15
+    weight: 5
+    duration: 50
+  - type: VentCrittersRule
+    entries:
+    - id: MobMouse
+      prob: 0.015
+    - id: MobMouse1
+      prob: 0.015
+    - id: MobMouse2
+      prob: 0.015
+    - id: MobRatServant
+      prob: 0.015
+    specialEntries:
+    - id: SpawnPointGhostRatKing
+      prob: 0.005
 
 - type: entity
   id: CockroachMigration

Resources/Prototypes/_NF/Entities/Objects/Faction/churchofweedgod.yml

@@ -60,7 +60,6 @@
     mixMessage: "bible-mixing-success"
     reactionTypes:
     - Holy
-  - type: ItemCooldown
   - type: Sprite
     sprite: _NF/Faction/Objects/weejurnum.rsi
     state: icon

Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml

@@ -1,6 +1,6 @@
 - type: entity
   name: ashtray
-  id: Ashtray
+  id: NFAshtray
   parent: BaseStorageItem
   components:
   - type: Sprite

Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml

@@ -15,7 +15,6 @@
   - type: CargoSellBlacklist
   - type: StaticPrice
     price: 0
-  - type: ItemCooldown
   - type: MeleeWeapon
     damage:
       types:

Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_bottles.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: DrinkBottleBaseFull
+  parent: DrinkBottleBaseEmpty
   id: DrinkSakeBottleFull
   name: sake bottle
   description: | 

Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml

@@ -12,6 +12,4 @@
           Quantity: 20
   - type: Sprite
     sprite: Nyanotrasen/Objects/Consumable/Drinks/sakecup.rsi
-    state: icon
-  - type: TrashOnEmpty
-    solution: drink
+    state: icon

Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_oil.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: DrinkBottleBaseFull
+  parent: DrinkBottleBaseEmpty
   id: BaseOilJar
   abstract: true
   components: