From: Tayrtahn Date: Tue, 9 Apr 2024 04:20:49 +0000 (-0400) Subject: Server-only component YAML cleanup (#26836) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a0de0ab1f807be5ad69fcc04136755239d75ce8a;p=space-station-14.git Server-only component YAML cleanup (#26836) * First pass cleaning up server-only YAML errors. * Second pass --- diff --git a/Resources/Prototypes/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/Body/Organs/Animal/slimes.yml index 3bdb1aef8f..f1a3d47e66 100644 --- a/Resources/Prototypes/Body/Organs/Animal/slimes.yml +++ b/Resources/Prototypes/Body/Organs/Animal/slimes.yml @@ -37,7 +37,7 @@ - state: lung-l-slime - state: lung-r-slime - type: Lung - Alert: LowNitrogen + alert: LowNitrogen - type: Metabolizer removeEmpty: true solutionOnBody: false diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index 976fd679fd..c1e199e112 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/Resources/Prototypes/Body/Organs/arachnid.yml @@ -46,7 +46,7 @@ - ReagentId: UncookedAnimalProteins Quantity: 5 - type: Metabolizer - updateFrequency: 1.5 + updateInterval: 1.5 - type: entity id: OrganArachnidLungs @@ -60,7 +60,7 @@ - state: lung-r - type: Lung - type: Metabolizer - updateFrequency: 1.5 + updateInterval: 1.5 removeEmpty: true solutionOnBody: false solution: "Lung" @@ -92,7 +92,7 @@ - type: Sprite state: heart-on - type: Metabolizer - updateFrequency: 1.5 + updateInterval: 1.5 maxReagents: 2 metabolizerTypes: [Arachnid] groups: @@ -110,7 +110,7 @@ - type: Sprite state: liver - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol. - updateFrequency: 1.5 + updateInterval: 1.5 maxReagents: 1 metabolizerTypes: [Animal] groups: @@ -130,7 +130,7 @@ - state: kidney-r # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap. - type: Metabolizer - updateFrequency: 1.5 + updateInterval: 1.5 maxReagents: 5 metabolizerTypes: [Animal] removeEmpty: true diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml index 1e85073da9..d0e4e4d7e9 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml @@ -28,4 +28,3 @@ suffix: Voice Mask, Chameleon components: - type: VoiceMasker - default: ClothingMaskGas diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index bb017b538a..aeae35efbf 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -902,9 +902,8 @@ maxVol: 250 - type: Udder reagentId: MilkGoat - targetSolution: udder - quantity: 25 - updateRate: 20 + quantityPerUpdate: 25 + growthDelay: 20 - type: Wooly - type: Food solution: wool diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml index bc63deeac3..8a10337c94 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml @@ -84,7 +84,7 @@ 500: Dead - type: Metabolizer solutionOnBody: false - updateFrequency: 0.25 + updateInterval: 0.25 metabolizerTypes: [ Dragon ] groups: - id: Medicine @@ -165,7 +165,6 @@ explosionMaxTileIntensity: 10 - type: ProjectileAnomaly projectilePrototype: ProjectileIcicle - targetNonSentientChance: 0.1 - type: TempAffectingAnomaly tempChangePerSecond: -25 hotspotExposeTemperature: -1000 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 42b7ff9e21..5263fefd44 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -60,7 +60,6 @@ - type: NameIdentifier group: GenericNumber - type: Repairable - fuelcost: 15 doAfterDelay: 8 - type: Pullable - type: Tag diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index ca775ed35b..10e9218d6e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -86,7 +86,7 @@ methods: [ Touch ] effects: - !type:HealthChange - scaled: true + scaleByQuantity: true damage: types: Heat: 3 diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 8e3af47416..af18791fa7 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -69,8 +69,6 @@ followEntity: true - type: CargoOrderConsole - type: CrewMonitoringConsole - snap: false - precision: 3 - type: GeneralStationRecordConsole - type: DeviceNetwork deviceNetId: Wireless diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index 025b8d917c..10e4386021 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -87,7 +87,7 @@ 500: Dead - type: Metabolizer solutionOnBody: false - updateFrequency: 0.25 + updateInterval: 0.25 metabolizerTypes: [ Dragon ] groups: - id: Medicine @@ -132,8 +132,6 @@ id: MobDragon components: - type: Dragon - spawnsLeft: 2 - spawnsProto: MobCarpDragon spawnRiftAction: ActionSpawnRift - type: GenericAntag rule: Dragon diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index dbdaa9c7e3..1cac380cd0 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -46,7 +46,7 @@ methods: [ Touch ] effects: - !type:HealthChange - scaled: true + scaleByQuantity: true damage: types: Blunt: 2 @@ -61,7 +61,7 @@ methods: [ Touch ] effects: - !type:HealthChange - scaled: true + scaleByQuantity: true damage: types: Poison: 5 diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 5f78589ee8..3eabb7dc07 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -52,7 +52,7 @@ methods: [ Touch ] effects: - !type:HealthChange - scaled: true + scaleByQuantity: true damage: types: Heat: 2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index 07d07e370b..71b38959ce 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -711,7 +711,7 @@ state: suppermatter - type: SliceableFood slice: FoodCakeSuppermatterSlice - TotalCount: 8 + count: 8 - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml index 58fe2a3415..babc2533f1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -32,7 +32,6 @@ size: Tiny - type: Drink solution: food - refillable: false - type: Openable sound: collection: packetOpenSounds diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml index 372b689113..b2f159f463 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml @@ -35,6 +35,5 @@ acts: [ "Destruction" ] - type: ApcPowerReceiver powerLoad: 15000 - priority: High - type: StaticPrice price: 1500 diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml index e523bbe16e..0563826a57 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml @@ -90,5 +90,6 @@ sprite: Structures/Doors/Airlocks/Standard/security.rsi state: closed - type: LogProbeCartridge + - type: GuideHelp guides: - Forensics diff --git a/Resources/Prototypes/Entities/Objects/Devices/payload.yml b/Resources/Prototypes/Entities/Objects/Devices/payload.yml index 019f19e711..160f0c58e7 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/payload.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml @@ -33,7 +33,6 @@ maxIntensity: 10 intensitySlope: 3 totalIntensity: 120 # about a ~4 tile radius - flashRange: 7 - type: ExplodeOnTrigger - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index cb7ef20156..b43d141eb6 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1177,7 +1177,6 @@ description: New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing! components: - type: EnergySword - isSharp: false colorOptions: - DodgerBlue - type: ItemToggle diff --git a/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml b/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml index 1fe3b8a271..f170aa899e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml @@ -14,9 +14,9 @@ successChance: 1 interactSuccessSound: collection: DeskBell - params: - variation: 0.03 - volume: 3 + params: + variation: 0.03 + volume: 3 onActivate: true - type: EmitSoundOnUse sound: diff --git a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml index bc3488aaf4..43c4568e70 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml @@ -48,6 +48,5 @@ types: Heat: 5 coldDamage: {} - ColdDamageThreshold: 0 + coldDamageThreshold: 0 - type: FrictionContacts - \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml index 657201912e..a100500494 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml @@ -58,11 +58,9 @@ types: Heat: 5 coldDamage: {} - ColdDamageThreshold: 0 + coldDamageThreshold: 0 - type: Flammable fireSpread: true #If you walk into incredibly dense, flaming vines, you can expect to burn. - cold: - types: {} damage: types: Heat: 3 @@ -75,11 +73,12 @@ methods: [Touch] effects: - !type:HealthChange - scaled: true + scaleByQuantity: true damage: types: Heat: 10 - type: AtmosExposed + - type: Kudzu growthTickChance: 0.3 spreadChance: 0.4 - type: SpeedModifierContacts @@ -235,7 +234,6 @@ damage: types: Heat: 3 - growthTickChance: 0.3 - type: AtmosExposed - type: SpeedModifierContacts walkSpeedModifier: 0.3 diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml index e1f4d086d4..9561fa3538 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml @@ -59,11 +59,9 @@ types: Heat: 5 coldDamage: {} - ColdDamageThreshold: 0 + coldDamageThreshold: 0 - type: Flammable fireSpread: true - cold: - types: {} damage: types: Heat: 5 @@ -146,11 +144,9 @@ types: Heat: 5 coldDamage: {} - ColdDamageThreshold: 0 + coldDamageThreshold: 0 - type: Flammable fireSpread: true - cold: - types: {} damage: types: Heat: 5 diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index dcdb316b7e..2336945f17 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -189,7 +189,6 @@ implantAction: ActionActivateScramImplant - type: TriggerImplantAction - type: ScramImplant - teleportAttempts: 10 # small amount of risk of being teleported into space and lets you teleport off shuttles - type: entity parent: BaseSubdermalImplant diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index fef4d47be0..b4f95d81e5 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -68,7 +68,6 @@ failChance: 0 locPrefix: "necro" healSound: "/Audio/Effects/lightburn.ogg" - cooldownTime: 1.3 - type: Summonable specialItem: SpawnPointGhostCerberus respawnTime: 300 diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index ae4aaed7d2..9e68879fb4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -475,7 +475,6 @@ behaviors: - !type:SpillBehavior solution: food - transferForensics: true - !type:DoActsBehavior acts: [ "Destruction" ] - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 667d855997..695725140f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -154,7 +154,6 @@ sprite: Objects/Tools/Toolboxes/toolbox_thief.rsi state: icon - type: ThiefUndeterminedBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: # - TO DO Thief pinpointer needed - ChemistrySet diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml index 7777153bba..cc69a6304d 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml @@ -23,8 +23,8 @@ !type:DamageTrigger damage: 50 behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] + - !type:DoActsBehavior + acts: [ "Destruction" ] - type: AmbientSound volume: -5 range: 5 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 0b3c291af2..0fb69b4fdb 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -282,6 +282,7 @@ MaterialWoodPlank: min: 1 max: 1 + - type: Construction graph: RitualSeat node: chairCursed diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 49f33d1cff..40fa8cf472 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -7,7 +7,6 @@ components: - type: ApcPowerReceiver powerLoad: 350 - priority: Low - type: ExtensionCableReceiver - type: PointLight radius: 1.8 @@ -70,7 +69,8 @@ - type: PointLight color: "#e3a136" - type: SpaceVillainArcade - rewardAmount: 0 + rewardMinAmount: 0 + rewardMaxAmount: 0 possibleRewards: - ToyMouse - ToyAi @@ -146,8 +146,8 @@ board: SpaceVillainArcadeComputerCircuitboard - type: Advertise pack: SpaceVillainAds - minWait: 60 # Arcades are noisy - maxWait: 240 + minimumWait: 60 # Arcades are noisy + maximumWait: 240 - type: SpeakOnUIClosed pack: SpaceVillainGoodbyes @@ -190,7 +190,7 @@ board: BlockGameArcadeComputerCircuitboard - type: Advertise pack: BlockGameAds - minWait: 60 # Arcades are noisy - maxWait: 240 + minimumWait: 60 # Arcades are noisy + maximumWait: 240 - type: SpeakOnUIClosed pack: BlockGameGoodbyes diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 5a3dc37582..d467a01f83 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -422,7 +422,6 @@ type: ResearchClientBoundUserInterface - type: ApcPowerReceiver powerLoad: 1000 - priority: Low - type: Computer board: ResearchComputerCircuitboard - type: AccessReader @@ -471,7 +470,6 @@ type: ResearchClientBoundUserInterface - type: ApcPowerReceiver powerLoad: 1000 - priority: Low - type: Computer board: AnalysisComputerCircuitboard - type: PointLight @@ -955,7 +953,6 @@ speechVerb: Robotic - type: SurveillanceCameraSpeaker - type: SurveillanceCameraMonitor - speechEnabled: true - type: ActivatableUI key: enum.SurveillanceCameraMonitorUiKey.Key - type: ActivatableUIRequiresVision diff --git a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml index b069d28a33..8281a6548b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml @@ -23,7 +23,6 @@ machine_parts: !type:Container - type: CrewMonitoringServer - type: SingletonDeviceNetServer - ServerType: CrewMonitoringServer - type: DeviceNetwork deviceNetId: Wireless transmitFrequencyId: CrewMonitor @@ -34,7 +33,6 @@ - type: StationLimitedNetwork - type: ApcPowerReceiver powerLoad: 200 - priority: Low - type: ExtensionCableReceiver - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml index aebc4b03de..618538dccb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml @@ -55,7 +55,7 @@ activePower: 2500 lightRadiusMin: 0.75 lightRadiusMax: 2.5 - spritemap: + spriteMap: broken: "broken" unpowered: "off" off: "off" diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml index 83525a0510..948b3f84b2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/research.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml @@ -20,7 +20,6 @@ - CivilianServices - type: ApcPowerReceiver powerLoad: 200 - priority: Low - type: ExtensionCableReceiver - type: WiresPanel - type: WiresVisuals diff --git a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml index 1b279782df..a17eed5712 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml @@ -52,7 +52,6 @@ description: Locates salvage. components: - type: SalvageMagnet - offsetRadiusMax: 32 - type: ApcPowerReceiver powerLoad: 1000 diff --git a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml index c523e7d68d..ba9d7be88b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml @@ -5,7 +5,6 @@ description: A bed that massively slows down the patient's metabolism and prevents bodily decay, allowing more time to administer a proper treatment for stabilization. components: - type: StasisBed - baseMultiplier: 10 - type: AntiRotOnBuckle - type: HealOnBuckle damage: diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index e738510277..6f28b53350 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -93,7 +93,6 @@ - type: LitOnPowered - type: ApcPowerReceiver powerLoad: 200 - priority: Low - type: Actions - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-mechanical diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml index a6f831e1a5..d0f239b338 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml @@ -64,9 +64,6 @@ - type: Construction graph: GasTrinary node: filter - conditions: - - !type:TileNotBlocked - - !type:NoUnstackableInTile - type: AmbientSound enabled: false volume: -9 diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index 4ee78f1213..6e4e339ae6 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -304,7 +304,6 @@ suffix: Enabled components: - type: GasThermoMachine - enabled: true - type: ApcPowerReceiver powerDisabled: false @@ -349,7 +348,6 @@ suffix: Enabled components: - type: GasThermoMachine - enabled: true - type: ApcPowerReceiver powerDisabled: false diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml index f236bb8a41..48994ac7d8 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml @@ -59,7 +59,6 @@ maxCharge: 1000000 startingCharge: 0 - type: BatteryDischarger - activeSupplyRate: 15000 - type: TeslaCoil chargeFromLightning: 500000 - type: LightningTarget diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml index 4567c6d044..ea41ba3a20 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml @@ -85,7 +85,6 @@ - type: ChaoticJump jumpMinInterval: 8 jumpMaxInterval: 15 - offset: 1 - type: WarpPoint follow: true location: tesla ball diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index c7b3e8ab5d..aedfd262d8 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -90,7 +90,6 @@ tempChange: 420 - type: ProjectileAnomaly projectilePrototype: ProjectileAnomalyFireball - targetNonSentientChance: 0.6 projectileSpeed: 0.5 minProjectiles: 3 maxProjectiles: 6 @@ -330,7 +329,6 @@ explosionMaxTileIntensity: 20 - type: ProjectileAnomaly projectilePrototype: ProjectileIcicle - targetNonSentientChance: 0.1 - type: EntitySpawnAnomaly entries: - settings: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml index 94bc33a210..d1df619b7a 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml @@ -59,7 +59,6 @@ board: !type:Container - type: ApcPowerReceiver powerLoad: 200 - priority: Low - type: WallMount arc: 360 - type: ExtensionCableReceiver diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index f076a23538..71b20440f5 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -421,7 +421,6 @@ nutrientConsumption: 0.40 idealLight: 8 idealHeat: 298 - juicy: true splatPrototype: PuddleSplatter chemicals: Nutriment: @@ -456,7 +455,6 @@ nutrientConsumption: 0.70 idealLight: 8 idealHeat: 298 - juicy: true splatPrototype: PuddleSplatter chemicals: Nutriment: @@ -491,7 +489,6 @@ nutrientConsumption: 0.70 idealLight: 8 idealHeat: 298 - juicy: true splatPrototype: PuddleSplatter chemicals: Blood: diff --git a/Resources/Prototypes/NPCs/Combat/melee.yml b/Resources/Prototypes/NPCs/Combat/melee.yml index 2facfaa542..122875ed97 100644 --- a/Resources/Prototypes/NPCs/Combat/melee.yml +++ b/Resources/Prototypes/NPCs/Combat/melee.yml @@ -70,12 +70,11 @@ # Tries to melee attack our target. - type: htnCompound id: MeleeAttackTargetCompound - preconditions: - - !type:KeyExistsPrecondition - key: Target branches: - # Move to melee range and hit them - - tasks: + - preconditions: + - !type:KeyExistsPrecondition + key: Target + tasks: - !type:HTNPrimitiveTask operator: !type:MoveToOperator shutdownState: PlanFinished @@ -104,11 +103,11 @@ - type: htnCompound id: MeleeAttackOrderedTargetCompound - preconditions: - - !type:KeyExistsPrecondition - key: Target branches: - - tasks: + - preconditions: + - !type:KeyExistsPrecondition + key: Target + tasks: - !type:HTNPrimitiveTask operator: !type:MoveToOperator shutdownState: PlanFinished diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml index b3a7fe1bb0..e47335b1b4 100644 --- a/Resources/Prototypes/Reagents/elements.yml +++ b/Resources/Prototypes/Reagents/elements.yml @@ -72,7 +72,7 @@ Medicine: effects: - !type:ModifyBloodLevel - condition: + conditions: - !type:OrganType type: Arachnid shouldHave: true @@ -163,7 +163,7 @@ Medicine: effects: - !type:ModifyBloodLevel - condition: + conditions: - !type:OrganType type: Arachnid shouldHave: false diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 6687540128..bd960b460a 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -234,7 +234,7 @@ types: Asphyxiation: 1 Cold: 2 - groups: + groups: Brute: 0.5 - !type:Jitter conditions: @@ -1044,7 +1044,7 @@ Medicine: effects: - !type:HealthChange - condition: + conditions: - !type:TotalDamage max: 50 damage: diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 6e1ad75a35..954d4a6bef 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -480,7 +480,6 @@ conditions: - !type:OrganType type: Human - reagent: Protein type: Local visualType: MediumCaution messages: [ "generic-reagent-effect-sick" ] diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml index 5529514fdc..0bb6b4b1ce 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml @@ -121,7 +121,6 @@ actions: - !type:SetWiresPanelSecurity wiresAccessible: true - weldingAllowed: true edges: - to: glassElectronics conditions: @@ -162,7 +161,6 @@ actions: - !type:SetWiresPanelSecurity wiresAccessible: true - weldingAllowed: true edges: - to: wired conditions: @@ -201,7 +199,6 @@ actions: - !type:SetWiresPanelSecurity wiresAccessible: true - weldingAllowed: true edges: - to: medSecurityUnfinished conditions: @@ -225,7 +222,6 @@ - !type:SetWiresPanelSecurity examine: wires-panel-component-on-examine-security-level1 wiresAccessible: false - weldingAllowed: false edges: - to: glassAirlock completed: @@ -278,7 +274,6 @@ - !type:SetWiresPanelSecurity examine: wires-panel-component-on-examine-security-level2 wiresAccessible: false - weldingAllowed: false edges: - to: medSecurityUnfinished conditions: @@ -293,7 +288,6 @@ - !type:SetWiresPanelSecurity examine: wires-panel-component-on-examine-security-level3 wiresAccessible: false - weldingAllowed: false edges: - to: glassAirlock completed: @@ -346,7 +340,6 @@ - !type:SetWiresPanelSecurity examine: wires-panel-component-on-examine-security-level4 wiresAccessible: false - weldingAllowed: false edges: - to: highSecurityUnfinished conditions: @@ -369,7 +362,6 @@ - !type:SetWiresPanelSecurity examine: wires-panel-component-on-examine-security-level5 wiresAccessible: false - weldingAllowed: true edges: - to: highSecurity completed: @@ -397,7 +389,6 @@ - !type:SetWiresPanelSecurity examine: wires-panel-component-on-examine-security-level6 wiresAccessible: false - weldingAllowed: false edges: - to: maxSecurity completed: @@ -422,7 +413,6 @@ - !type:SetWiresPanelSecurity examine: wires-panel-component-on-examine-security-level7 wiresAccessible: false - weldingAllowed: false edges: - to: superMaxSecurityUnfinished conditions: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml index b0cfe30eb0..76b641a06d 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml @@ -121,7 +121,6 @@ actions: - !type:SetWiresPanelSecurity wiresAccessible: true - weldingAllowed: true edges: - to: glassElectronics conditions: @@ -146,7 +145,6 @@ actions: - !type:SetWiresPanelSecurity wiresAccessible: true - weldingAllowed: true edges: - to: wired conditions: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml index ff0ecbc4ed..43d2484bbd 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml @@ -23,7 +23,6 @@ - !type:SetAnchor value: true - !type:SnapToGrid - offset: Center edges: - to: item steps: @@ -31,4 +30,4 @@ doAfter: 3 completed: - !type:SetAnchor - value: false \ No newline at end of file + value: false diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml index 0914ae46e5..922e8857c9 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml @@ -28,18 +28,15 @@ - to: solarpanel conditions: - !type:EntityAnchored - value: true steps: - material: Glass amount: 2 doAfter: 0.5 completed: - !type:SnapToGrid - offset: Center - to: solartracker conditions: - !type:EntityAnchored - value: true steps: - tag: SolarTrackerElectronics name: Solar Tracker Electronics @@ -52,7 +49,6 @@ doAfter: 2 completed: - !type:SnapToGrid - offset: Center - node: solarpanel entity: SolarPanel diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml index 18f3acfae3..911c1c2e88 100644 --- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml @@ -106,7 +106,6 @@ - type: SolutionTransfer canChangeTransferAmount: true - type: Drink - isOpen: true solution: beaker - type: artifactEffect