From 8b87bdc0cc1c5dfcf3c724ffa5f3bf0890f6d343 Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Mon, 13 Oct 2025 14:02:39 +0200 Subject: [PATCH] Reapply "Merge branch 'master' into stable" This reverts commit be78d230689147a84ca1366fea783bc45b739ac6. --- .github/CODEOWNERS | 1 + BuildChecker/git_helper.py | 2 +- BuildChecker/hooks/post-checkout | 2 +- BuildChecker/hooks/post-merge | 2 +- .../Access/UI/IdCardConsoleWindow.xaml | 19 +- .../Access/UI/IdCardConsoleWindow.xaml.cs | 23 +- .../UI/BanPanel/BanPanel.xaml.cs | 4 +- .../Administration/UI/Logs/AdminLogsEui.cs | 2 +- Content.Client/Crayon/CrayonComponent.cs | 14 - Content.Client/Crayon/CrayonSystem.cs | 49 +- Content.Client/Credits/CreditsWindow.xaml.cs | 4 +- .../CriminalRecordsConsoleWindow.xaml | 2 +- .../Damage/Systems/DamageOtherOnHitSystem.cs | 5 + .../HumanoidMarkingModifierWindow.xaml | 6 +- .../HumanoidMarkingModifierWindow.xaml.cs | 6 +- .../Lobby/UI/HumanoidProfileEditor.xaml.cs | 1 + .../CrewMonitoringNavMapControl.cs | 2 +- .../CrewMonitoring/CrewMonitoringWindow.xaml | 12 +- .../CrewMonitoringWindow.xaml.cs | 2 +- Content.Client/NPC/NPCWindow.xaml | 18 +- Content.Client/PAI/PAISystem.cs | 8 - Content.Client/Physics/JointVisualsOverlay.cs | 6 +- .../Pinpointer/UI/StationMapWindow.xaml | 2 +- .../Borgs/BorgSwitchableTypeSystem.cs | 19 - Content.Client/Silicons/Bots/HugBotSystem.cs | 5 + .../Temperature/Systems/TemperatureSystem.cs | 8 + Content.Client/UserInterface/StatValuesEui.cs | 2 +- .../Systems/Bwoink/AHelpUIController.cs | 2 +- .../Controls/Roles/MakeGhostRoleWindow.xaml | 22 +- .../Roles/MakeGhostRoleWindow.xaml.cs | 8 +- .../Systems/Storage/Controls/StorageWindow.cs | 2 +- .../Tests/MaterialArbitrageTest.cs | 2 +- .../Systems/AdminVerbSystem.Tools.cs | 82 +- .../Atmos/EntitySystems/FlammableSystem.cs | 2 +- Content.Server/Atmos/Rotting/RottingSystem.cs | 2 +- .../Body/Components/MetabolizerComponent.cs | 4 +- .../Body/Systems/MetabolizerSystem.cs | 348 +-- .../Body/Systems/RespiratorSystem.cs | 15 +- .../Body/Systems/ThermalRegulatorSystem.cs | 2 +- Content.Server/Botany/SeedPrototype.cs | 11 +- .../Botany/Systems/BotanySystem.Produce.cs | 7 +- .../Botany/Systems/MutationSystem.cs | 7 +- .../Botany/Systems/PlantHolderSystem.cs | 5 +- .../Chat/Systems/AutoEmoteSystem.cs | 6 +- .../Commands/DumpReagentGuideText.cs | 2 +- .../Clothing/Systems/OutfitSystem.cs | 5 +- Content.Server/Cluwne/CluwneSystem.cs | 68 +- .../ConstructionSystem.Interactions.cs | 1 + Content.Server/Crayon/CrayonComponent.cs | 28 - Content.Server/Crayon/CrayonSystem.cs | 48 +- .../Components/DamageOtherOnHitComponent.cs | 19 - .../Damage/Systems/DamageOtherOnHitSystem.cs | 74 +- .../BreathingEntityConditionSystem.cs | 19 + .../MetabolizerTypesEntityConditionSystem.cs | 21 + .../Atmos/CreateGasEntityEffectSystem.cs | 22 + .../Atmos/FlammableEntityEffectSystem.cs | 25 + .../Effects/Atmos/IgniteEntityEffectSystem.cs | 23 + .../Body/OxygenateEntityEffectsSystem.cs | 20 + .../PlantAdjustHealthEntityEffectSystem.cs | 20 + ...ntAdjustMutationLevelEntityEffectSystem.cs | 20 + ...lantAdjustMutationModEntityEffectSystem.cs | 16 + .../PlantAdjustNutritionEntityEffectSystem.cs | 16 + .../PlantAdjustPestsEntityEffectSystem.cs | 16 + .../PlantAdjustPotencyEntityEffectSystem.cs | 19 + .../PlantAdjustToxinsEntityEffectSystem.cs | 16 + .../PlantAdjustWaterEntityEffectSystem.cs | 16 + .../PlantAdjustWeedsEntityEffectSystem.cs | 16 + .../PlantAffectGrowthEntityEffectSystem.cs | 19 + .../PlantChangeStatEntityEffectSystem.cs | 122 + .../PlantCryoxadoneEntityEffectSystem.cs | 30 + .../PlantDestroySeedsEntityEffectSystem.cs | 31 + .../PlantDiethylamineEntityEffectSystem.cs | 31 + .../PlantPhalanximineEntityEffectSystem.cs | 16 + .../PlantRestoreSeedsEntityEffectSystem.cs | 26 + .../RobustHarvestEntityEffectSystem.cs | 41 + .../PlantMutateChemicalsEntityEffectSystem.cs | 43 + .../PlantMutateGasesEntityEffectSystem.cs | 53 + .../PlantMutateHarvestEntityEffectSystem.cs | 25 + ...ntMutateSpeciesChangeEntityEffectSystem.cs | 31 + .../Effects/EmoteEntityEffectSystem.cs | 22 + .../Effects/MakeSentientEntityEffectSystem.cs | 42 + .../Effects/PolymorphEntityEffectSystem.cs | 19 + .../AreaReactionEntityEffectSystem.cs | 51 + .../Transform/ExplosionEntityEffectSystem.cs | 28 + .../EntityEffects/EntityEffectSystem.cs | 976 ------- .../Fluids/EntitySystems/SmokeSystem.cs | 7 +- .../GuideGenerator/ChemistryJsonGenerator.cs | 3 +- Content.Server/GuideGenerator/ReagentEntry.cs | 2 +- Content.Server/Holopad/HolopadSystem.cs | 3 + .../Kitchen/EntitySystems/MicrowaveSystem.cs | 1 + Content.Server/Medical/CryoPodSystem.cs | 2 +- .../Medical/HealthAnalyzerSystem.cs | 2 +- .../Preconditions/IsEmaggedPrecondition.cs | 31 + .../Combat/Melee/MeleeAttackOperator.cs | 70 + .../PrimitiveTasks/Operators/SpeakOperator.cs | 50 +- .../Specific/RaiseEventForOwnerOperator.cs | 47 + .../NPC/Queries/Queries/ComponentFilter.cs | 7 + .../NPC/Systems/NPCUtilitySystem.cs | 13 +- .../SpiderChargeConditionComponent.cs | 8 + .../Systems/NinjaConditionsSystem.cs | 12 +- Content.Server/PAI/PAISystem.cs | 18 +- .../Power/EntitySystems/BatterySystem.cs | 2 +- Content.Server/PowerSink/PowerSinkSystem.cs | 2 +- .../Revenant/EntitySystems/RevenantSystem.cs | 19 - Content.Server/Silicons/Bots/HugBotSystem.cs | 65 + .../Bots/RecentlyHuggedByHugBotComponent.cs | 15 + .../SingularityGeneratorSystem.cs | 5 +- Content.Server/Store/Systems/StoreSystem.cs | 16 +- .../Stunnable/Systems/StunOnCollideSystem.cs | 1 + .../Temperature/Systems/TemperatureSystem.cs | 19 +- .../Tiles/TileEntityEffectComponent.cs | 2 +- .../Tiles/TileEntityEffectSystem.cs | 10 +- .../Weapons/Melee/MeleeWeaponSystem.cs | 18 +- .../Ranged/Systems/GunSystem.Battery.cs | 51 - .../Systems/ArtifactCrusherSystem.cs | 94 +- .../Zombies/ZombieSystem.Transform.cs | 2 +- Content.Shared.Database/LogType.cs | 4 +- .../Body/Components/LungComponent.cs | 2 +- Content.Shared/Body/Systems/LungSystem.cs | 12 +- .../Body/Systems/SharedBloodstreamSystem.cs | 7 +- .../Chat/Prototypes/AutoEmotePrototype.cs | 30 +- .../SharedSolutionContainerSystem.cs | 21 + .../Reaction/ChemicalReactionSystem.cs | 18 +- .../Chemistry/Reaction/ReactionPrototype.cs | 2 +- .../Chemistry/Reaction/ReactiveComponent.cs | 2 +- Content.Shared/Chemistry/ReactiveSystem.cs | 98 +- .../Chemistry/Reagent/ReagentPrototype.cs | 77 +- .../Clothing/EntitySystems/MaskSystem.cs | 22 +- Content.Shared/Cluwne/CluwneComponent.cs | 84 +- Content.Shared/Crayon/CrayonComponent.cs | 119 + .../Crayon/SharedCrayonComponent.cs | 113 - .../Components/DamageExaminableComponent.cs | 7 +- .../Components/DamageOtherOnHitComponent.cs | 24 + .../Damage/Events/DamageExamineEvent.cs | 4 + .../Systems/SharedDamageOtherOnHitSystem.cs | 32 + .../Destructible/SharedDestructibleSystem.cs | 14 +- .../DeviceLinking/SharedDeviceLinkSystem.cs | 11 + .../Body/BreathingEntityCondition.cs | 10 + .../Body/HungerEntityConditionSystem.cs | 33 + .../Body/InternalsEntityConditionSystem.cs | 23 + .../Body/MetabolizerTypeEntityCondition.cs | 31 + .../Body/MobStateEntityConditionSystem.cs | 28 + .../Conditions/JobEntityConditionSystem.cs | 59 + .../ReagentEntityConditionSystem.cs | 44 + .../Tags/HasAllTagsEntityConditionSystem.cs | 43 + .../Tags/HasAnyTagEntityConditionSystem.cs | 43 + .../Tags/HasTagEntityConditionSystem.cs | 28 + .../TemperatureEntityConditionSystem.cs | 52 + .../TemplateEntityConditionSystem.cs | 20 + .../TotalDamageEntityConditionSystem.cs | 33 + .../SharedEntityConditionsSystem.cs | 152 ++ .../EffectConditions/BodyTemperature.cs | 23 - .../EffectConditions/BreathingCondition.cs | 21 - .../EffectConditions/HasTagCondition.cs | 28 - .../EffectConditions/InternalsCondition.cs | 30 - .../EffectConditions/JobCondition.cs | 52 - .../EffectConditions/MobStateCondition.cs | 28 - .../EffectConditions/OrganType.cs | 28 - .../EffectConditions/ReagentThreshold.cs | 56 - .../EffectConditions/SolutionTemperature.cs | 36 - .../EffectConditions/TotalDamage.cs | 33 - .../EffectConditions/TotalHunger.cs | 33 - .../Effects/AddToSolutionReaction.cs | 35 - .../EntityEffects/Effects/AdjustAlert.cs | 58 - .../Effects/AdjustAlertEntityEffectSystem.cs | 65 + .../EntityEffects/Effects/AdjustReagent.cs | 90 - .../Effects/AdjustTemperature.cs | 15 - .../AdjustTemperatureEntityEffectsSystem.cs | 30 + .../Effects/AreaReactionEffect.cs | 43 - .../Effects/ArtifactDurabilityRestore.cs | 36 - .../Effects/ArtifactEntityEffectsSystem.cs | 72 + .../EntityEffects/Effects/ArtifactUnlock.cs | 44 - .../Effects/Atmos/CreateGasEntityEffect.cs | 35 + .../Atmos/ExtinguishEntityEffectSystem.cs | 36 + .../Effects/Atmos/FlammableEntityEffect.cs | 28 + .../Effects/Atmos/IgniteEntityEffect.cs | 18 + .../CleanBloodstreamEntityEffectSystem.cs | 43 + .../Body/EyeDamageEntityEffectSystem.cs | 32 + .../Body/ModifyBleedEntityEffectSystem.cs | 32 + .../ModifyBloodLevelEntityEffectSystem.cs | 34 + .../Body/ModifyLungGasEntityEffectSystem.cs | 33 + .../Effects/Body/OxygenateEntityEffect.cs | 14 + .../Body/ReduceRottingEntityEffectSystem.cs | 36 + .../Effects/Body/SatiateEntityEffectSystem.cs | 63 + .../Effects/Body/VomitEntityEffectSystem.cs | 37 + .../BasePlantAdjustAttributeEntityEffect.cs | 37 + .../PlantAttributes/PlantAdjustHealth.cs | 7 + .../PlantAdjustMutationLevel.cs | 7 + .../PlantAttributes/PlantAdjustMutationMod.cs | 7 + .../PlantAttributes/PlantAdjustNutrition.cs | 6 + .../PlantAttributes}/PlantAdjustPests.cs | 4 +- .../PlantAttributes/PlantAdjustPotency.cs | 9 + .../PlantAttributes}/PlantAdjustToxins.cs | 5 +- .../PlantAttributes/PlantAdjustWater.cs | 7 + .../PlantAttributes}/PlantAdjustWeeds.cs | 4 +- .../PlantAttributes/PlantAffectGrowth.cs | 7 + .../Botany/PlantAttributes/PlantChangeStat.cs | 21 + .../Botany/PlantAttributes/PlantCryoxadone.cs | 9 + .../PlantAttributes/PlantDestroySeeds.cs | 12 + .../PlantAttributes/PlantDiethylamine.cs | 11 + .../PlantAttributes/PlantPhalanximine.cs | 10 + .../PlantAttributes/PlantRestoreSeeds.cs | 12 + .../Botany/PlantAttributes/RobustHarvest.cs | 22 + .../PlantMutateChemicalsEntityEffect.cs | 16 + .../Botany/PlantMutateGasesEntityEffect.cs | 22 + .../Botany/PlantMutateHarvestEntityEffect.cs | 6 + .../PlantMutateSpeciesChangeEntityEffect.cs | 6 + .../Effects/CauseZombieInfection.cs | 9 - .../Effects/ChemCleanBloodstream.cs | 15 - .../Effects/ChemHealEyeDamage.cs | 28 - .../EntityEffects/Effects/ChemVomit.cs | 19 - .../Effects/CreateEntityReactionEffect.cs | 26 - .../EntityEffects/Effects/CreateGas.cs | 32 - .../Effects/CureZombieInfection.cs | 18 - Content.Shared/EntityEffects/Effects/Drunk.cs | 27 - .../EntityEffects/Effects/Electrocute.cs | 37 - Content.Shared/EntityEffects/Effects/Emote.cs | 44 - .../Effects/EmoteEntityEffect.cs | 40 + .../Effects/EmpReactionEffect.cs | 34 - .../BaseSpawnEntityEntityEffect.cs | 36 + .../SpawnEntityEntityEffectSystem.cs | 37 + ...pawnEntityInContainerEntityEffectSystem.cs | 51 + ...tityInContainerOrDropEntityEffectSystem.cs | 49 + ...pawnEntityInInventoryEntityEffectSystem.cs | 35 + .../EntityEffects/Effects/EvenHealthChange.cs | 139 - .../EvenHealthChangeEntityEffectSystem.cs | 114 + .../Effects/ExtinguishReaction.cs | 32 - .../Effects/FlammableReaction.cs | 21 - .../Effects/FlashReactionEffect.cs | 48 - Content.Shared/EntityEffects/Effects/Glow.cs | 48 - .../Effects/GlowEntityEffectSystem.cs | 55 + .../EntityEffects/Effects/HealthChange.cs | 126 - .../Effects/HealthChangeEntityEffectSystem.cs | 91 + .../EntityEffects/Effects/Ignite.cs | 18 - .../EntityEffects/Effects/MakeSentient.cs | 10 - .../Effects/MakeSentientEntityEffect.cs | 22 + .../Effects/ModifyBleedAmount.cs | 16 - .../EntityEffects/Effects/ModifyBloodLevel.cs | 17 - .../EntityEffects/Effects/ModifyLungGas.cs | 14 - .../Effects/MovespeedModifier.cs | 78 - .../EntityEffects/Effects/Oxygenate.cs | 13 - .../EntityEffects/Effects/Paralyze.cs | 37 - .../PlantMetabolism/PlantAdjustAttribute.cs | 39 - .../PlantMetabolism/PlantAdjustHealth.cs | 7 - .../PlantAdjustMutationLevel.cs | 6 - .../PlantMetabolism/PlantAdjustMutationMod.cs | 6 - .../PlantMetabolism/PlantAdjustNutrition.cs | 6 - .../PlantMetabolism/PlantAdjustPotency.cs | 12 - .../PlantMetabolism/PlantAdjustWater.cs | 7 - .../PlantMetabolism/PlantAffectGrowth.cs | 7 - .../PlantMetabolism/PlantChangeStat.cs | 24 - .../PlantMetabolism/PlantCryoxadone.cs | 8 - .../PlantMetabolism/PlantDestroySeeds.cs | 13 - .../PlantMetabolism/PlantDiethylamine.cs | 9 - .../PlantMetabolism/PlantPhalanximine.cs | 8 - .../PlantMetabolism/PlantRestoreSeeds.cs | 12 - .../Effects/PlantMetabolism/RobustHarvest.cs | 18 - .../Effects/PlantMutateChemicals.cs | 16 - .../EntityEffects/Effects/PlantMutateGases.cs | 39 - .../Effects/PlantMutateHarvest.cs | 14 - .../Effects/PlantSpeciesChange.cs | 14 - .../EntityEffects/Effects/Polymorph.cs | 19 - .../Effects/PolymorphEntityEffect.cs | 19 + .../EntityEffects/Effects/PopupMessage.cs | 54 - .../EntityEffects/Effects/ReduceRotting.cs | 32 - .../EntityEffects/Effects/ResetNarcolepsy.cs | 19 - .../ResetNarcolepsyEntityEffectSystem.cs | 34 + .../EntityEffects/Effects/SatiateHunger.cs | 40 - .../EntityEffects/Effects/SatiateThirst.cs | 31 - .../EntityEffects/Effects/Slipify.cs | 37 - .../Effects/SlipifyEntityEffectSystem.cs | 44 + .../AddReagentToSolutionEntityEffectSystem.cs | 59 + .../AdjustReagentEntityEffectSystem.cs | 52 + ...AdjustReagentsByGroupEntityEffectSystem.cs | 52 + .../Solution/AreaReactionEntityEffect.cs | 39 + .../SolutionTemperatureEntityEffectsSystem.cs | 145 ++ .../Effects/SolutionTemperatureEffects.cs | 143 -- .../BaseStatusEffectEntityEffect.cs | 35 + .../StatusEffects/DrunkEntityEffectSystem.cs | 34 + .../ElectrocuteEntityEffectSystem.cs | 51 + .../StatusEffects/GenericStatusEffect.cs | 76 - .../GenericStatusEffectEntityEffectSystem.cs | 64 + .../Effects/StatusEffects/Jitter.cs | 41 - .../StatusEffects/JitterEntityEffectSystem.cs | 45 + .../Effects/StatusEffects/ModifyKnockdown.cs | 99 - .../ModifyKnockdownEntityEffectSystem.cs | 72 + .../ModifyParalysisEntityEffectSystem.cs | 51 + .../StatusEffects/ModifyStatusEffect.cs | 78 - .../ModifyStatusEffectEntityEffectSystem.cs | 66 + ...MovementSpeedModifierEntityEffectSystem.cs | 92 + .../Effects/TemplateEntityEffectSystem.cs | 21 + .../Transform/EmpEntityEffectSystem.cs | 58 + .../ExplosionEntityEffect.cs} | 19 +- .../Transform/FlashEntityEffectSystem.cs | 81 + .../PopupMessageEntityEffectSystem.cs | 64 + .../Effects/WashCreamPieEntityEffectSystem.cs | 27 + .../Effects/WashCreamPieReaction.cs | 19 - .../EntityEffects/Effects/WearableReaction.cs | 47 - .../Effects/ZombieEntityEffectsSystem.cs | 67 + Content.Shared/EntityEffects/EntityEffect.cs | 145 -- .../EntityEffects/EntityEffectCondition.cs | 29 - .../EntityEffects/EventEntityEffect.cs | 12 - .../EventEntityEffectCondition.cs | 14 - .../SharedEntityEffectsSystem.cs | 251 ++ .../Components/FlashImmunityComponent.cs | 6 + Content.Shared/Flash/SharedFlashSystem.cs | 3 +- .../Systems/MovementModStatusSystem.cs | 1 + .../Components/BombingTargetComponent.cs | 7 - .../EntitySystems/IngestionSystem.API.cs | 9 +- Content.Shared/PAI/PAIComponent.cs | 12 +- Content.Shared/PAI/SharedPAISystem.cs | 38 - .../ParcelWrappingSystem.WrappedParcel.cs | 5 +- .../Physics/JointVisualsComponent.cs | 19 +- .../Revenant/Components/RevenantComponent.cs | 2 - Content.Shared/Revenant/SharedRevenant.cs | 4 - Content.Shared/Roles/JobPrototype.cs | 34 +- Content.Shared/Roles/SharedRoleSystem.cs | 3 +- .../Borgs/SharedBorgSwitchableTypeSystem.cs | 19 + .../Silicons/Bots/HugBotComponent.cs | 12 + .../Silicons/Bots/SharedHugBotSystem.cs | 38 + Content.Shared/Stacks/StackPrototype.cs | 14 +- .../StatusEffectNew/StatusEffectSystem.API.cs | 18 + .../EntitySystems/SharedStorageSystem.cs | 4 +- .../Store/Events/IntrinsicStoreActionEvent.cs | 11 + .../Stunnable/SharedStunSystem.Knockdown.cs | 9 +- Content.Shared/Stunnable/SharedStunSystem.cs | 7 +- .../Components/TemperatureComponent.cs | 2 +- .../Systems/SharedTemperatureSystem.cs | 19 +- .../MindRoleTriggerConditionComponent.cs | 27 + .../WhitelistTriggerConditionComponent.cs | 6 +- .../Systems/DnaScrambleOnTriggerSystem.cs | 12 + .../Systems/TriggerSystem.Condition.cs | 79 +- .../Trigger/Systems/TriggerSystem.cs | 4 + .../Weapons/Melee/SharedMeleeWeaponSystem.cs | 18 +- .../Weapons/Misc/SharedGrapplingGunSystem.cs | 2 +- .../Ranged/Components/AmmoComponent.cs | 6 + .../Ranged/Systems/SharedGunSystem.Battery.cs | 51 + .../Weapons/Ranged/Systems/SharedGunSystem.cs | 10 + .../Components/AnalysisConsoleComponent.cs | 4 +- .../Components/ArtifactAnalyzerComponent.cs | 9 +- .../Components/ArtifactCrusherComponent.cs | 22 +- .../Equipment/SharedArtifactAnalyzerSystem.cs | 84 +- .../Equipment/SharedArtifactCrusherSystem.cs | 106 +- .../Zombies/IncurableZombieComponent.cs | 3 +- Content.Tools/test/run.sh | 2 +- Resources/Changelog/Changelog.yml | 382 +-- Resources/Changelog/Maps.yml | 21 + Resources/Credits/GitHub.txt | 2 +- Resources/Credits/Patrons.yml | 1664 +++++------- .../components/id-card-console-component.ftl | 4 +- .../Locale/en-US/accessories/human-hair.ftl | 1 + .../en-US/administration/admin-verbs.ftl | 45 + .../Locale/en-US/administration/bwoink.ftl | 1 + Resources/Locale/en-US/cluwne/cluwne.ftl | 2 + .../en-US/components/storage-component.ftl | 1 + .../Locale/en-US/credits/credits-window.ftl | 2 + .../Locale/en-US/ghost/make-ghost-gui.ftl | 21 + .../Locale/en-US/guidebook/chemistry/core.ftl | 5 +- .../guidebook/chemistry/statuseffects.ftl | 16 - .../conditions.ftl | 0 .../{chemistry => entity-effects}/effects.ftl | 166 +- .../healthchange.ftl | 0 .../entity-effects/statuseffects.ftl | 16 + Resources/Locale/en-US/guidebook/guides.ftl | 2 + Resources/Locale/en-US/info/ban.ftl | 1 + .../Locale/en-US/job/job-supervisors.ftl | 3 +- .../Locale/en-US/materials/materials.ftl | 2 + .../components/crew-monitoring-component.ftl | 23 +- .../en-US/navmap-beacons/station_map.ftl | 1 + Resources/Locale/en-US/npc/hugbot.ftl | 26 + Resources/Locale/en-US/npc/npc-debug.ftl | 11 + .../en-US/preferences/ui/markings-picker.ftl | 6 + Resources/Locale/en-US/recipes/tags.ftl | 1 + Resources/Locale/en-US/station-laws/laws.ftl | 9 +- .../Locale/en-US/store/uplink-catalog.ftl | 3 + Resources/Locale/en-US/ui/navmap.ftl | 1 + Resources/Locale/en-US/ui/stat-values.ftl | 1 + Resources/Maps/exo.yml | 13 - Resources/Maps/packed.yml | 104 +- Resources/Maps/plasma.yml | 2244 +++++++++++++---- Resources/Maps/saltern.yml | 107 - Resources/Prototypes/Actions/revenant.yml | 7 +- Resources/Prototypes/Actions/types.yml | 11 + Resources/Prototypes/Body/Prototypes/bot.yml | 16 + .../Catalog/Fills/Lockers/heads.yml | 1 + .../Catalog/Fills/Lockers/security.yml | 3 + Resources/Prototypes/Catalog/hugbot.yml | 17 + .../Prototypes/Catalog/uplink_catalog.yml | 11 +- .../Entities/Clothing/Hands/colored.yml | 2 - .../Markers/Spawners/Random/maintenance.yml | 1 + .../Entities/Markers/warp_point.yml | 21 - .../Customization/Markings/human_hair.yml | 7 + .../Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- .../Entities/Mobs/NPCs/elemental.yml | 28 +- .../Entities/Mobs/NPCs/miscellaneous.yml | 20 +- .../Entities/Mobs/NPCs/revenant.yml | 3 + .../Prototypes/Entities/Mobs/NPCs/silicon.yml | 37 + .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 6 +- .../Prototypes/Entities/Mobs/NPCs/space.yml | 2 +- .../Entities/Mobs/Species/arachnid.yml | 6 +- .../Prototypes/Entities/Mobs/Species/base.yml | 2 +- .../Entities/Mobs/Species/diona.yml | 14 +- .../Entities/Mobs/Species/skeleton.yml | 9 +- .../Entities/Mobs/Species/slime.yml | 6 +- .../Objects/Deliveries/deliveries_tables.yml | 6 + .../Objects/Devices/station_beacon.yml | 9 + .../Entities/Objects/Fun/crayons.yml | 17 +- .../Prototypes/Entities/Objects/Fun/pai.yml | 10 +- .../Entities/Objects/Fun/plushies.yml | 3 +- .../Entities/Objects/Misc/kudzu.yml | 12 +- .../Entities/Objects/Misc/paper.yml | 3 - .../Entities/Objects/Misc/space_cash.yml | 6 - .../Entities/Objects/Power/powersink.yml | 4 +- .../Specific/Xenoarchaeology/node_scanner.yml | 2 +- .../Objects/Specific/rehydrateable.yml | 6 +- .../Guns/Ammunition/Cartridges/pistol.yml | 4 + .../Weapons/Guns/Battery/battery_guns.yml | 1 + .../Weapons/Guns/Projectiles/projectiles.yml | 4 +- .../Entities/StatusEffects/movement.yml | 21 + .../Structures/Doors/Airlocks/access.yml | 13 +- .../Structures/Doors/Airlocks/airlocks.yml | 9 + .../Machines/Computers/computers.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 4 + .../Specific/Anomaly/anomaly_injectors.yml | 60 + .../Entities/Structures/Storage/glass_box.yml | 24 +- .../Prototypes/Entities/Structures/soil.yml | 3 +- Resources/Prototypes/Entities/Tiles/lava.yml | 2 +- .../Entities/Tiles/liquid_plasma.yml | 2 +- Resources/Prototypes/Entities/Tiles/water.yml | 4 +- Resources/Prototypes/Guidebook/science.yml | 18 +- .../Hydroponics/randomMutations.yml | 6 +- Resources/Prototypes/NPCs/debug.yml | 7 +- Resources/Prototypes/NPCs/firebot.yml | 9 +- Resources/Prototypes/NPCs/hugbot.yml | 134 + Resources/Prototypes/NPCs/medibot.yml | 3 +- Resources/Prototypes/Objectives/ninja.yml | 4 + Resources/Prototypes/Objectives/thief.yml | 1 - Resources/Prototypes/Parallaxes/train.yml | 30 - .../Reagents/Consumable/Drink/alcohol.yml | 70 +- .../Reagents/Consumable/Drink/base_drink.yml | 4 +- .../Reagents/Consumable/Drink/drinks.yml | 17 +- .../Reagents/Consumable/Drink/soda.yml | 6 +- .../Reagents/Consumable/Food/food.yml | 4 +- .../Reagents/Consumable/Food/ingredients.yml | 19 +- .../Prototypes/Reagents/Materials/ores.yml | 2 +- Resources/Prototypes/Reagents/biological.yml | 14 +- Resources/Prototypes/Reagents/botany.yml | 81 +- Resources/Prototypes/Reagents/chemicals.yml | 16 +- Resources/Prototypes/Reagents/cleaning.yml | 14 +- Resources/Prototypes/Reagents/elements.yml | 22 +- Resources/Prototypes/Reagents/fun.yml | 93 +- Resources/Prototypes/Reagents/gases.yml | 282 +-- Resources/Prototypes/Reagents/medicine.yml | 224 +- Resources/Prototypes/Reagents/narcotics.yml | 79 +- Resources/Prototypes/Reagents/pyrotechnic.yml | 26 +- Resources/Prototypes/Reagents/toxins.yml | 127 +- .../Recipes/Crafting/Graphs/bots/hugbot.yml | 33 + .../Prototypes/Recipes/Crafting/bots.yml | 8 + .../Recipes/Lathes/Packs/biogen.yml | 6 + .../Recipes/Lathes/Packs/medical.yml | 1 + .../Recipes/Lathes/Packs/shared.yml | 1 + .../Recipes/Lathes/Packs/syndicate.yml | 2 + Resources/Prototypes/Recipes/Lathes/ammo.yml | 16 + .../Prototypes/Recipes/Lathes/biogen.yml | 21 +- .../Prototypes/Recipes/Lathes/chemistry.yml | 4 +- Resources/Prototypes/Recipes/Lathes/sheet.yml | 10 + .../Recipes/Reactions/chemicals.yml | 8 +- .../Prototypes/Recipes/Reactions/food.yml | 26 +- .../Prototypes/Recipes/Reactions/fun.yml | 14 +- .../Recipes/Reactions/pyrotechnic.yml | 4 +- .../Prototypes/Recipes/Reactions/soap.yml | 12 +- .../Prototypes/Stacks/Materials/crystals.yml | 5 - .../Prototypes/Stacks/Materials/ingots.yml | 13 - .../Prototypes/Stacks/Materials/materials.yml | 111 - .../Prototypes/Stacks/Materials/parts.yml | 6 - .../Stacks/{Materials => }/Sheets/glass.yml | 14 +- .../Stacks/{Materials => }/Sheets/metal.yml | 6 +- .../Prototypes/Stacks/Sheets/organic.yml | 13 + .../Stacks/{Materials => }/Sheets/other.yml | 13 +- .../Stacks/Specific/engineering.yml | 36 + .../medical.yml} | 16 +- .../science.yml} | 6 +- .../Prototypes/Stacks/Specific/security.yml | 6 + Resources/Prototypes/Stacks/Tiles/alien.yml | 38 + Resources/Prototypes/Stacks/Tiles/brass.yml | 13 + Resources/Prototypes/Stacks/Tiles/carpet.yml | 84 + .../Prototypes/Stacks/Tiles/concrete.yml | 55 + .../Prototypes/Stacks/Tiles/electronic.yml | 19 + Resources/Prototypes/Stacks/Tiles/fancy.yml | 37 + Resources/Prototypes/Stacks/Tiles/faux.yml | 55 + .../Prototypes/Stacks/Tiles/four_square.yml | 112 + Resources/Prototypes/Stacks/Tiles/maints.yml | 25 + Resources/Prototypes/Stacks/Tiles/organic.yml | 13 + Resources/Prototypes/Stacks/Tiles/other.yml | 25 + Resources/Prototypes/Stacks/Tiles/planet.yml | 19 + Resources/Prototypes/Stacks/Tiles/retro.yml | 31 + Resources/Prototypes/Stacks/Tiles/shuttle.yml | 43 + Resources/Prototypes/Stacks/Tiles/steel.yml | 55 + .../Prototypes/Stacks/Tiles/steel_dark.yml | 55 + .../Prototypes/Stacks/Tiles/steel_white.yml | 55 + Resources/Prototypes/Stacks/Tiles/wood.yml | 19 + Resources/Prototypes/Stacks/base_stacks.yml | 42 + Resources/Prototypes/Stacks/cloth.yml | 27 + .../{consumable_stacks.yml => consumable.yml} | 27 +- Resources/Prototypes/Stacks/currency.yml | 11 + .../Prototypes/Stacks/engineering_stacks.yml | 12 - .../Prototypes/Stacks/floor_tile_stacks.yml | 720 ------ .../Prototypes/Stacks/{Materials => }/ore.yml | 22 +- Resources/Prototypes/Stacks/ore_refined.yml | 30 + Resources/Prototypes/Stacks/organic.yml | 59 + Resources/Prototypes/Stacks/other.yml | 15 + Resources/Prototypes/Stacks/power_stacks.yml | 30 - Resources/Prototypes/Voice/auto_emotes.yml | 9 + Resources/Prototypes/silicon-laws.yml | 6 - Resources/Prototypes/tags.yml | 2 + .../Guidebook/Science/AnalysisConsole.xml | 22 + .../Guidebook/Science/ArtifactReports.xml | 24 - .../Guidebook/Science/UnlockingNodes.xml | 48 + .../Guidebook/Science/Xenoarchaeology.xml | 104 +- .../Gloves/Color/black.rsi/equipped-HAND.png | Bin 381 -> 362 bytes .../Gloves/Color/black.rsi/inhand-left.png | Bin 16598 -> 262 bytes .../Gloves/Color/black.rsi/inhand-right.png | Bin 16598 -> 276 bytes .../Hands/Gloves/Color/black.rsi/meta.json | 2 +- .../Customization/human_hair.rsi/meta.json | 6 +- .../human_hair.rsi/overeyepigtail.png | Bin 0 -> 810 bytes .../Mobs/Silicon/Bots/hugbot.rsi/hugbot.png | Bin 0 -> 342 bytes .../Mobs/Silicon/Bots/hugbot.rsi/meta.json | 14 + .../Mobs/Species/Human/organs.rsi/meta.json | 2 +- .../Mobs/Species/Human/organs.rsi/stomach.png | Bin 191 -> 384 bytes .../Standard/hatch.rsi/bolted_unlit.png | Bin 324 -> 105 bytes .../Standard/hatch.rsi/closed_unlit.png | Bin 339 -> 106 bytes .../Airlocks/Standard/hatch.rsi/closing.png | Bin 2938 -> 2575 bytes .../Standard/hatch.rsi/closing_unlit.png | Bin 1163 -> 193 bytes .../Standard/hatch.rsi/deny_unlit.png | Bin 925 -> 250 bytes .../Standard/hatch.rsi/emergency_unlit.png | Bin 340 -> 110 bytes .../Airlocks/Standard/hatch.rsi/meta.json | 392 +-- .../Airlocks/Standard/hatch.rsi/open.png | Bin 586 -> 313 bytes .../Airlocks/Standard/hatch.rsi/opening.png | Bin 3052 -> 2513 bytes .../Standard/hatch.rsi/opening_unlit.png | Bin 1162 -> 197 bytes .../Standard/hatch_maint.rsi/assembly.png | Bin 752 -> 895 bytes .../Standard/hatch_maint.rsi/bolted_unlit.png | Bin 324 -> 105 bytes .../Standard/hatch_maint.rsi/closed.png | Bin 775 -> 1011 bytes .../Standard/hatch_maint.rsi/closed_unlit.png | Bin 339 -> 106 bytes .../Standard/hatch_maint.rsi/closing.png | Bin 1643 -> 2738 bytes .../hatch_maint.rsi/closing_unlit.png | Bin 1163 -> 193 bytes .../Standard/hatch_maint.rsi/deny_unlit.png | Bin 925 -> 250 bytes .../hatch_maint.rsi/emergency_unlit.png | Bin 340 -> 110 bytes .../Standard/hatch_maint.rsi/meta.json | 392 +-- .../Standard/hatch_maint.rsi/open.png | Bin 593 -> 562 bytes .../Standard/hatch_maint.rsi/opening.png | Bin 1639 -> 2686 bytes .../hatch_maint.rsi/opening_unlit.png | Bin 1162 -> 197 bytes .../Standard/hatch_maint.rsi/panel_open.png | Bin 514 -> 184 bytes .../Standard/hatch_syndicate.rsi/assembly.png | Bin 0 -> 871 bytes .../hatch_syndicate.rsi/bolted_unlit.png | Bin 0 -> 105 bytes .../Standard/hatch_syndicate.rsi/closed.png | Bin 0 -> 400 bytes .../hatch_syndicate.rsi/closed_unlit.png | Bin 0 -> 106 bytes .../Standard/hatch_syndicate.rsi/closing.png | Bin 0 -> 2613 bytes .../hatch_syndicate.rsi/closing_unlit.png | Bin 0 -> 193 bytes .../hatch_syndicate.rsi/deny_unlit.png | Bin 0 -> 250 bytes .../hatch_syndicate.rsi/emergency_unlit.png | Bin 0 -> 110 bytes .../Standard/hatch_syndicate.rsi/meta.json | 198 ++ .../Standard/hatch_syndicate.rsi/open.png | Bin 0 -> 528 bytes .../Standard/hatch_syndicate.rsi/opening.png | Bin 0 -> 2547 bytes .../hatch_syndicate.rsi/opening_unlit.png | Bin 0 -> 197 bytes .../hatch_syndicate.rsi/panel_closing.png | Bin 0 -> 451 bytes .../hatch_syndicate.rsi/panel_open.png | Bin 0 -> 184 bytes .../hatch_syndicate.rsi/panel_opening.png | Bin 0 -> 432 bytes .../Standard/hatch_syndicate.rsi/sparks.png | Bin 0 -> 697 bytes .../hatch_syndicate.rsi/sparks_broken.png | Bin 0 -> 315 bytes .../hatch_syndicate.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../hatch_syndicate.rsi/sparks_open.png | Bin 0 -> 281 bytes .../Standard/hatch_syndicate.rsi/welded.png | Bin 0 -> 341 bytes .../bluespace_ARACHNID.png | Bin 0 -> 3858 bytes .../inner_anom_layer.rsi/bluespace_MOTH.png | Bin 0 -> 3775 bytes .../inner_anom_layer.rsi/fire_ARACHNID.png | Bin 0 -> 3567 bytes .../inner_anom_layer.rsi/fire_MOTH.png | Bin 0 -> 3541 bytes .../inner_anom_layer.rsi/flesh_ARACHNID.png | Bin 0 -> 4232 bytes .../inner_anom_layer.rsi/flesh_MOTH.png | Bin 0 -> 4127 bytes .../inner_anom_layer.rsi/flora_ARACHNID.png | Bin 0 -> 4776 bytes .../inner_anom_layer.rsi/flora_MOTH.png | Bin 0 -> 4692 bytes .../inner_anom_layer.rsi/frost_ARACHNID.png | Bin 0 -> 5145 bytes .../inner_anom_layer.rsi/frost_MOTH.png | Bin 0 -> 5018 bytes .../inner_anom_layer.rsi/grav_ARACHNID.png | Bin 0 -> 5253 bytes .../inner_anom_layer.rsi/grav_MOTH.png | Bin 0 -> 5304 bytes .../Anomalies/inner_anom_layer.rsi/meta.json | 1938 +++++++++----- .../inner_anom_layer.rsi/rock_ARACHNID.png | Bin 0 -> 4456 bytes .../inner_anom_layer.rsi/rock_MOTH.png | Bin 0 -> 4454 bytes .../inner_anom_layer.rsi/shadow_ARACHNID.png | Bin 0 -> 3807 bytes .../inner_anom_layer.rsi/shadow_MOTH.png | Bin 0 -> 3749 bytes .../inner_anom_layer.rsi/shock_ARACHNID.png | Bin 0 -> 3795 bytes .../inner_anom_layer.rsi/shock_MOTH.png | Bin 0 -> 3615 bytes .../inner_anom_layer.rsi/tech_ARACHNID.png | Bin 0 -> 4136 bytes .../inner_anom_layer.rsi/tech_MOTH.png | Bin 0 -> 4073 bytes Resources/migration.yml | 4 +- Tools/dump_patrons.ps1 | 2 +- Tools/mapping-merge-driver.sh | 2 +- runclient-Tools.sh | 2 +- runclient.sh | 2 +- runserver-Tools.sh | 2 +- runserver.sh | 2 +- 600 files changed, 13395 insertions(+), 9872 deletions(-) delete mode 100644 Content.Client/Crayon/CrayonComponent.cs create mode 100644 Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs delete mode 100644 Content.Client/PAI/PAISystem.cs create mode 100644 Content.Client/Silicons/Bots/HugBotSystem.cs create mode 100644 Content.Client/Temperature/Systems/TemperatureSystem.cs delete mode 100644 Content.Server/Crayon/CrayonComponent.cs delete mode 100644 Content.Server/Damage/Components/DamageOtherOnHitComponent.cs create mode 100644 Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs create mode 100644 Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/EmoteEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs create mode 100644 Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs delete mode 100644 Content.Server/EntityEffects/EntityEffectSystem.cs create mode 100644 Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs create mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs create mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs create mode 100644 Content.Server/Silicons/Bots/HugBotSystem.cs create mode 100644 Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs create mode 100644 Content.Shared/Crayon/CrayonComponent.cs delete mode 100644 Content.Shared/Crayon/SharedCrayonComponent.cs create mode 100644 Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs create mode 100644 Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs create mode 100644 Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs create mode 100644 Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs create mode 100644 Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/JobCondition.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/OrganType.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs delete mode 100644 Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs delete mode 100644 Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs delete mode 100644 Content.Shared/EntityEffects/Effects/AdjustAlert.cs create mode 100644 Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/AdjustReagent.cs delete mode 100644 Content.Shared/EntityEffects/Effects/AdjustTemperature.cs create mode 100644 Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs create mode 100644 Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs create mode 100644 Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs rename Content.Shared/EntityEffects/Effects/{PlantMetabolism => Botany/PlantAttributes}/PlantAdjustPests.cs (53%) create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs rename Content.Shared/EntityEffects/Effects/{PlantMetabolism => Botany/PlantAttributes}/PlantAdjustToxins.cs (53%) create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs rename Content.Shared/EntityEffects/Effects/{PlantMetabolism => Botany/PlantAttributes}/PlantAdjustWeeds.cs (53%) create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs delete mode 100644 Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ChemVomit.cs delete mode 100644 Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs delete mode 100644 Content.Shared/EntityEffects/Effects/CreateGas.cs delete mode 100644 Content.Shared/EntityEffects/Effects/CureZombieInfection.cs delete mode 100644 Content.Shared/EntityEffects/Effects/Drunk.cs delete mode 100644 Content.Shared/EntityEffects/Effects/Electrocute.cs delete mode 100644 Content.Shared/EntityEffects/Effects/Emote.cs create mode 100644 Content.Shared/EntityEffects/Effects/EmoteEntityEffect.cs delete mode 100644 Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/EvenHealthChange.cs create mode 100644 Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs delete mode 100644 Content.Shared/EntityEffects/Effects/FlammableReaction.cs delete mode 100644 Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs delete mode 100644 Content.Shared/EntityEffects/Effects/Glow.cs create mode 100644 Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/HealthChange.cs create mode 100644 Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/Ignite.cs delete mode 100644 Content.Shared/EntityEffects/Effects/MakeSentient.cs create mode 100644 Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ModifyLungGas.cs delete mode 100644 Content.Shared/EntityEffects/Effects/MovespeedModifier.cs delete mode 100644 Content.Shared/EntityEffects/Effects/Oxygenate.cs delete mode 100644 Content.Shared/EntityEffects/Effects/Paralyze.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMutateGases.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs delete mode 100644 Content.Shared/EntityEffects/Effects/Polymorph.cs create mode 100644 Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs delete mode 100644 Content.Shared/EntityEffects/Effects/PopupMessage.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ReduceRotting.cs delete mode 100644 Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs create mode 100644 Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/SatiateHunger.cs delete mode 100644 Content.Shared/EntityEffects/Effects/SatiateThirst.cs delete mode 100644 Content.Shared/EntityEffects/Effects/Slipify.cs create mode 100644 Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs rename Content.Shared/EntityEffects/Effects/{ExplosionReactionEffect.cs => Transform/ExplosionEntityEffect.cs} (69%) create mode 100644 Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs create mode 100644 Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs delete mode 100644 Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs delete mode 100644 Content.Shared/EntityEffects/Effects/WearableReaction.cs create mode 100644 Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs delete mode 100644 Content.Shared/EntityEffects/EntityEffect.cs delete mode 100644 Content.Shared/EntityEffects/EntityEffectCondition.cs delete mode 100644 Content.Shared/EntityEffects/EventEntityEffect.cs delete mode 100644 Content.Shared/EntityEffects/EventEntityEffectCondition.cs create mode 100644 Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs delete mode 100644 Content.Shared/Ninja/Components/BombingTargetComponent.cs delete mode 100644 Content.Shared/PAI/SharedPAISystem.cs create mode 100644 Content.Shared/Silicons/Bots/HugBotComponent.cs create mode 100644 Content.Shared/Silicons/Bots/SharedHugBotSystem.cs create mode 100644 Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs rename {Content.Server => Content.Shared}/Temperature/Components/TemperatureComponent.cs (98%) create mode 100644 Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs rename {Content.Server => Content.Shared}/Zombies/IncurableZombieComponent.cs (77%) create mode 100644 Resources/Locale/en-US/ghost/make-ghost-gui.ftl delete mode 100644 Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl rename Resources/Locale/en-US/guidebook/{chemistry => entity-effects}/conditions.ftl (100%) rename Resources/Locale/en-US/guidebook/{chemistry => entity-effects}/effects.ftl (71%) rename Resources/Locale/en-US/guidebook/{chemistry => entity-effects}/healthchange.ftl (100%) create mode 100644 Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl create mode 100644 Resources/Locale/en-US/npc/hugbot.ftl create mode 100644 Resources/Locale/en-US/npc/npc-debug.ftl create mode 100644 Resources/Locale/en-US/ui/stat-values.ftl create mode 100644 Resources/Prototypes/Catalog/hugbot.yml create mode 100644 Resources/Prototypes/NPCs/hugbot.yml create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml delete mode 100644 Resources/Prototypes/Stacks/Materials/crystals.yml delete mode 100644 Resources/Prototypes/Stacks/Materials/ingots.yml delete mode 100644 Resources/Prototypes/Stacks/Materials/materials.yml delete mode 100644 Resources/Prototypes/Stacks/Materials/parts.yml rename Resources/Prototypes/Stacks/{Materials => }/Sheets/glass.yml (87%) rename Resources/Prototypes/Stacks/{Materials => }/Sheets/metal.yml (85%) create mode 100644 Resources/Prototypes/Stacks/Sheets/organic.yml rename Resources/Prototypes/Stacks/{Materials => }/Sheets/other.yml (68%) create mode 100644 Resources/Prototypes/Stacks/Specific/engineering.yml rename Resources/Prototypes/Stacks/{medical_stacks.yml => Specific/medical.yml} (85%) rename Resources/Prototypes/Stacks/{science_stacks.yml => Specific/science.yml} (63%) create mode 100644 Resources/Prototypes/Stacks/Specific/security.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/alien.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/brass.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/carpet.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/concrete.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/electronic.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/fancy.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/faux.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/four_square.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/maints.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/organic.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/other.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/planet.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/retro.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/shuttle.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/steel.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/steel_dark.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/steel_white.yml create mode 100644 Resources/Prototypes/Stacks/Tiles/wood.yml create mode 100644 Resources/Prototypes/Stacks/base_stacks.yml create mode 100644 Resources/Prototypes/Stacks/cloth.yml rename Resources/Prototypes/Stacks/{consumable_stacks.yml => consumable.yml} (78%) create mode 100644 Resources/Prototypes/Stacks/currency.yml delete mode 100644 Resources/Prototypes/Stacks/engineering_stacks.yml delete mode 100644 Resources/Prototypes/Stacks/floor_tile_stacks.yml rename Resources/Prototypes/Stacks/{Materials => }/ore.yml (83%) create mode 100644 Resources/Prototypes/Stacks/ore_refined.yml create mode 100644 Resources/Prototypes/Stacks/organic.yml create mode 100644 Resources/Prototypes/Stacks/other.yml delete mode 100644 Resources/Prototypes/Stacks/power_stacks.yml create mode 100644 Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml delete mode 100644 Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml create mode 100644 Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png create mode 100644 Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/hugbot.png create mode 100644 Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/assembly.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/bolted_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/deny_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/emergency_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/open.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_closing.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_open.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_opening.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_broken.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_damaged.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_open.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/welded.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_ARACHNID.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_MOTH.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_ARACHNID.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_MOTH.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_ARACHNID.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_MOTH.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_ARACHNID.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_MOTH.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_ARACHNID.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_MOTH.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_ARACHNID.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_MOTH.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_ARACHNID.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_MOTH.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_ARACHNID.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_MOTH.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_ARACHNID.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_MOTH.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_ARACHNID.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_MOTH.png diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 14f591ec87..defe08ef23 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -28,6 +28,7 @@ /Content.*/Stunnable/ @Princess-Cheeseballs /Content.*/Nutrition/ @Princess-Cheeseballs +/Content.*/EntityEffects @Princess-Cheeseballs @sowelipililimute # SKREEEE /Content.*.Database/ @PJB3005 @DrSmugleaf diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py index 66d2463669..bd6603bd34 100644 --- a/BuildChecker/git_helper.py +++ b/BuildChecker/git_helper.py @@ -13,7 +13,7 @@ from typing import List SOLUTION_PATH = Path("..") / "SpaceStation14.sln" # If this doesn't match the saved version we overwrite them all. -CURRENT_HOOKS_VERSION = "3" +CURRENT_HOOKS_VERSION = "4" QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet" diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout index ee4309de1d..1b91112ff0 100755 --- a/BuildChecker/hooks/post-checkout +++ b/BuildChecker/hooks/post-checkout @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash gitroot=$(git rev-parse --show-toplevel) diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge index 5cf3d91120..864a9cff50 100755 --- a/BuildChecker/hooks/post-merge +++ b/BuildChecker/hooks/post-merge @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Just call post-checkout since it does the same thing. gitroot=$(git rev-parse --git-path hooks) diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml index a2f5f3382b..0a695a3dce 100644 --- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml +++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml @@ -1,6 +1,7 @@ + +