From 659029989bd49c225a5407675c91be3ac429f134 Mon Sep 17 00:00:00 2001 From: checkraze Date: Thu, 1 Feb 2024 17:00:00 -0500 Subject: [PATCH] yml cleanup --- .../Catalog/Fills/Boxes/ammunition.yml | 117 ------------------ .../Entities/Clothing/Shoes/boots.yml | 2 +- .../Entities/Mobs/Species/arachnid.yml | 5 - .../Consumable/Drinks/drinks_bottles.yml | 2 - .../Entities/Objects/Tools/gas_tanks.yml | 13 -- Resources/Prototypes/GameRules/events.yml | 46 +++---- .../Objects/Faction/churchofweedgod.yml | 1 - .../_NF/Entities/Objects/Misc/ashtray.yml | 2 +- .../Service/vending_machine_restock.yml | 1 - .../_Nyano/Accents/full_replacements.yml | 8 -- .../_Nyano/Entities/Mobs/NPCs/mothroach.yml | 111 ----------------- .../Consumable/Drinks/drinks_bottles.yml | 2 +- .../Objects/Consumable/Drinks/drinks_cups.yml | 4 +- .../Objects/Consumable/Drinks/drinks_oil.yml | 2 +- .../Entities/Objects/Consumable/Food/moth.yml | 2 - .../Prototypes/_Nyano/Flavors/flavors.yml | 5 - Resources/Prototypes/silicon-laws.yml | 9 -- 17 files changed, 28 insertions(+), 304 deletions(-) delete mode 100644 Resources/Prototypes/_Nyano/Accents/full_replacements.yml delete mode 100644 Resources/Prototypes/_Nyano/Entities/Mobs/NPCs/mothroach.yml diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index 0f134a4434e..cd9a54e7b98 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index b6433167b6e..505e7754dd5 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/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. diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index c4c73746e78..8dce12d7486 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/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) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 2bc32ebac8a..2402888a848 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 9a0143e0846..251334f0475 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/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 diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 27eb7470d21..2fe3a25b715 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/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 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Faction/churchofweedgod.yml b/Resources/Prototypes/_NF/Entities/Objects/Faction/churchofweedgod.yml index be9c7d3bb48..1bdac624942 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Faction/churchofweedgod.yml +++ b/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 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml index 24d0b77e94a..cd38d5c4a7c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml +++ b/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 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml index c73d3584a13..d975a91dea1 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/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: diff --git a/Resources/Prototypes/_Nyano/Accents/full_replacements.yml b/Resources/Prototypes/_Nyano/Accents/full_replacements.yml deleted file mode 100644 index 00047c0e835..00000000000 --- a/Resources/Prototypes/_Nyano/Accents/full_replacements.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: accent - id: mothroach - fullReplacements: - - accent-words-mothroach-1 - - accent-words-mothroach-2 - - accent-words-mothroach-3 - - accent-words-mothroach-4 - - accent-words-mothroach-5 diff --git a/Resources/Prototypes/_Nyano/Entities/Mobs/NPCs/mothroach.yml b/Resources/Prototypes/_Nyano/Entities/Mobs/NPCs/mothroach.yml deleted file mode 100644 index 903bb4f6118..00000000000 --- a/Resources/Prototypes/_Nyano/Entities/Mobs/NPCs/mothroach.yml +++ /dev/null @@ -1,111 +0,0 @@ -- type: entity - name: mothroach - parent: SimpleMobBase - id: MobMothroach - description: This is the adorable by-product of multiple attempts at genetically mixing mothpeople with cockroaches. - components: - - type: GhostRole - makeSentient: true - allowSpeech: true - allowMovement: true - whitelistRequired: false - name: ghost-role-information-mothroach-name - description: ghost-role-information-mothroach-description - - type: GhostTakeoverAvailable - - type: Speech - speechSounds: Chitter - - type: Sprite - drawdepth: SmallMobs - sprite: Nyanotrasen/Mobs/Animals/mothroach.rsi - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: mothroach - - type: Item - size: 15 - - type: Clothing - quickEquip: false - sprite: Nyanotrasen/Mobs/Animals/mothroach.rsi - equippedPrefix: 0 - slots: - - HEAD - - type: Appearance - - type: DamageStateVisuals - states: - Alive: - Base: mothroach - Critical: - Base: mothroach_dead - Dead: - Base: mothroach_dead - - type: Physics - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.3 - density: 10 - mask: - - SmallMobMask - layer: - - SmallMobLayer - - type: MobState - - type: MobThresholds - thresholds: - 0: Alive - 25: Critical - 50: Dead - - type: MovementSpeedModifier - baseWalkSpeed : 3.5 - baseSprintSpeed : 5 - - type: Damageable - damageContainer: Biological - damageModifierSet: Moff # moff - - type: Respirator - damage: - types: - Asphyxiation: 0.5 - damageRecovery: - types: - Asphyxiation: -0.5 - # TODO: Remove CombatMode when Prototype Composition is added - - type: CombatMode - combatToggleAction: ActionCombatModeToggleOff - - type: Butcherable - spawned: - - id: FoodMeatRat - amount: 2 - - id: HideMothroach # Gotta make the plushies - amount: 1 - prob: 0.5 - - type: Extractable - grindableSolutionName: food - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: UncookedAnimalProteins - Quantity: 5 - - type: Bloodstream - bloodMaxVolume: 70 - - type: ReplacementAccent - accent: mothroach - - type: Vocal - sounds: - Male: Mothroach - Female: Mothroach - Unsexed: Mothroach - wilhelmProbability: 0.001 - - type: MobPrice - price: 60 - - type: Tag - tags: - - Trash - - CannotSuicide - - type: CanEscapeInventory - - type: NpcFactionMember - factions: - - Passive - - type: HTN - rootTask: - task: MouseCompound diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 40a4be2423e..5a6fd993e9a 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/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: | diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 5dbe313ced8..e1538b1e1fa 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/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 \ No newline at end of file + state: icon \ No newline at end of file diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_oil.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_oil.yml index e8efda6d5ac..c2b807e55a0 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_oil.yml +++ b/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: diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Food/moth.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Food/moth.yml index 71cfd936e18..c365459480c 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Food/moth.yml +++ b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Food/moth.yml @@ -81,8 +81,6 @@ - type: Icon sprite: Nyanotrasen/Objects/Consumable/Food/moth.rsi state: condimentbowl - - type: TrashOnEmpty - solution: food # Tomato Sauce - type: entity diff --git a/Resources/Prototypes/_Nyano/Flavors/flavors.yml b/Resources/Prototypes/_Nyano/Flavors/flavors.yml index b14a5885539..02ed59a3d7b 100644 --- a/Resources/Prototypes/_Nyano/Flavors/flavors.yml +++ b/Resources/Prototypes/_Nyano/Flavors/flavors.yml @@ -8,11 +8,6 @@ flavorType: Complex description: flavor-complex-sublime -- type: flavor - id: holy - flavorType: Complex - description: flavor-complex-holy - - type: flavor id: seeds flavorType: Base diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 19463cf61ac..1851294eaa2 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -173,12 +173,3 @@ Drone: 0.5 Ninja: 0.25 -# ion storm random lawsets -- type: weightedRandom - id: IonStormLawsets - weights: - # its crewsimov by default dont be lame - Crewsimov: 0.25 - Corporate: 1 - NTDefault: 1 - Drone: 0.5