git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
	Sun, 30 Jun 2024 03:43:43 +0000 (05:43 +0200)
committer	GitHub <noreply@github.com>
	Sun, 30 Jun 2024 03:43:43 +0000 (13:43 +1000)
commit	b9fa941ca6ea1e207f88d0dd21ac51708bd5fa0f
tree	8045cc3612120bf236a19cb1dfb678a4e6ff4c9f	tree \| snapshot
parent	250109f0b4625af75b19d12aa09dc9012ab346ff	commit \| diff

Turn ReagentEffects into generic EntityEffects (#28168)

* Oh the possibilities

* Merge fixes

* Forgot to remote LavaSystem oops

* Changed EntityEffectArgs to EntityEffectBaseArgs and EntityEffectReagentArgs

* Throw exception for unimplemented effectargs

* Remove Json and overrideable datafields

* Fix test issues

* Actually fix the compiling issue

* Fix comments and remove EntityEffectArgs (no longer used, replaced with EntityEffectBaseArgs)

127 files changed:

Content.Server/Body/Systems/BloodstreamSystem.cs		diff \| blob \| history
Content.Server/Body/Systems/MetabolizerSystem.cs		diff \| blob \| history
Content.Server/Body/Systems/RespiratorSystem.cs		diff \| blob \| history
Content.Server/Botany/SeedPrototype.cs		diff \| blob \| history
Content.Server/Chemistry/EntitySystems/HypospraySystem.cs		diff \| blob \| history
Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/Electrocute.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/Oxygenate.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs	[deleted file]	blob \| history
Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs	[deleted file]	blob \| history
Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs	[moved from Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs with 76% similarity]	diff \| blob \| history
Content.Server/EntityEffects/EffectConditions/JobCondition.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/EffectConditions/OrganType.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/EffectConditions/TotalDamage.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/EffectConditions/TotalHunger.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/ActivateArtifact.cs	[moved from Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs with 56% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/AdjustAlert.cs	[moved from Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs with 76% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/AdjustReagent.cs	[moved from Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs with 58% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/AdjustTemperature.cs	[moved from Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs with 56% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/AreaReactionEffect.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/CauseZombieInfection.cs	[moved from Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs with 65% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/ChemVomit.cs	[moved from Content.Server/Chemistry/ReagentEffects/ChemVomit.cs with 65% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs	[moved from Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs with 80% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/CreateGas.cs	[moved from Content.Server/Chemistry/ReagentEffects/CreateGas.cs with 62% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/CureZombieInfection.cs	[moved from Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs with 73% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/Drunk.cs	[moved from Content.Server/Chemistry/ReagentEffects/Drunk.cs with 64% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/Electrocute.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/Emote.cs	[moved from Content.Server/Chemistry/ReagentEffects/Emote.cs with 72% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/EmpReactionEffect.cs	[moved from Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs with 67% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/ExtinguishReaction.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/FlammableReaction.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/HealthChange.cs	[moved from Content.Server/Chemistry/ReagentEffects/HealthChange.cs with 84% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/Ignite.cs	[moved from Content.Server/Chemistry/ReagentEffects/Ignite.cs with 50% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/MakeSentient.cs	[moved from Content.Server/Chemistry/ReagentEffects/MakeSentient.cs with 87% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs	[moved from Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs with 50% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs	[moved from Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs with 52% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/ModifyLungGas.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/MovespeedModifier.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/Oxygenate.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/Paralyze.cs	[moved from Content.Server/Chemistry/ReagentEffects/Paralyze.cs with 62% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/Polymorph.cs	[moved from Content.Server/Chemistry/ReagentEffects/Polymorph.cs with 80% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/PopupMessage.cs	[moved from Content.Server/Chemistry/ReagentEffects/PopupMessage.cs with 60% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/ReduceRotting.cs	[moved from Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs with 61% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs	[moved from Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs with 63% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/SatiateHunger.cs	[moved from Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs with 53% similarity]	diff \| blob \| history
Content.Server/EntityEffects/Effects/SatiateThirst.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs	[new file with mode: 0644]	blob
Content.Server/EntityEffects/Effects/WearableReaction.cs	[moved from Content.Server/Chemistry/ReagentEffects/WearableReaction.cs with 50% similarity]	diff \| blob \| history
Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs		diff \| blob \| history
Content.Server/Fluids/EntitySystems/SmokeSystem.cs		diff \| blob \| history
Content.Server/GuideGenerator/ChemistryJsonGenerator.cs		diff \| blob \| history
Content.Server/GuideGenerator/ReactionJsonGenerator.cs		diff \| blob \| history
Content.Server/GuideGenerator/ReagentEntry.cs		diff \| blob \| history
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs		diff \| blob \| history
Content.Server/Tiles/LavaComponent.cs	[deleted file]	blob \| history
Content.Server/Tiles/LavaSystem.cs	[deleted file]	blob \| history
Content.Server/Tiles/TileEntityEffectComponent.cs	[new file with mode: 0644]	blob
Content.Server/Tiles/TileEntityEffectSystem.cs	[new file with mode: 0644]	blob
Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs		diff \| blob \| history
Content.Shared/Chemistry/Reaction/ReactionPrototype.cs		diff \| blob \| history
Content.Shared/Chemistry/Reaction/ReactiveComponent.cs		diff \| blob \| history
Content.Shared/Chemistry/ReactiveSystem.cs		diff \| blob \| history
Content.Shared/Chemistry/Reagent/ReagentEffect.cs	[deleted file]	blob \| history
Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs	[deleted file]	blob \| history
Content.Shared/Chemistry/Reagent/ReagentPrototype.cs		diff \| blob \| history
Content.Shared/EntityEffects/EntityEffect.cs	[new file with mode: 0644]	blob
Content.Shared/EntityEffects/EntityEffectCondition.cs	[new file with mode: 0644]	blob
Resources/Prototypes/Entities/Tiles/lava.yml		diff \| blob \| history
Resources/Prototypes/Entities/Tiles/liquid_plasma.yml		diff \| blob \| history

Форк Space Station 14 с переводами на русский

RSS Atom