VigersRay 67c8ba2471 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs # Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml # Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs # Content.Server/Light/EntitySystems/PoweredLightSystem.cs # Content.Server/Medical/HealthAnalyzerSystem.cs # Content.Server/Medical/SuitSensors/SuitSensorComponent.cs # Content.Server/StationEvents/Events/MeteorSwarmSystem.cs # Content.Server/StationEvents/Events/StationEventSystem.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Interaction/SharedInteractionSystem.cs # Resources/Prototypes/AlertLevels/alert_levels.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/misc.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml # Resources/Prototypes/Datasets/Names/fortunes.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Neck/mantles.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Objects/Fun/pai.yml # Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml # Resources/Prototypes/Recipes/Lathes/clothing.yml # Resources/Prototypes/game_presets.yml # Resources/Prototypes/secret_weights.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json # Resources/Textures/Clothing/Mask/ert.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png # Resources/Textures/Objects/Tools/crowbar.rsi/meta.json # Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png # Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json # Resources/migration.yml		2024-08-14 19:55:44 +03:00
..
AbsorbConditionComponent.cs	Говнокрад (#268)	2024-08-08 09:28:44 +03:00
CarpRiftsConditionComponent.cs
CodeConditionSystem.cs	ninja criminal records hacking (#24982)	2024-05-08 23:35:11 -07:00
DieConditionComponent.cs
DoorjackConditionComponent.cs	Use conditions to store progress for Ninja objectives (#20254)	2023-10-10 09:32:10 +03:00
EscapeShuttleConditionComponent.cs
HelpProgressConditionComponent.cs
HijackShuttleConditionComponent.cs	Fix hijack objective (#21241)	2023-10-27 22:33:18 -04:00
ImpersonateConditionComponent.cs	Говнокрад (#268)	2024-08-08 09:28:44 +03:00
KeepAliveConditionComponent.cs
KillPersonConditionComponent.cs
MultipleTraitorsRequirementComponent.cs
NotCommandRequirementComponent.cs
NotJobRequirementComponent.cs
NumberObjectiveComponent.cs
ObjectiveBlacklistRequirementComponent.cs
ObjectiveLimitComponent.cs	add limits to steal objectives (#22672)	2023-12-24 17:20:55 -08:00
PickRandomHeadComponent.cs
PickRandomPersonComponent.cs
RandomTraitorAliveComponent.cs
RandomTraitorProgressComponent.cs
RoleRequirementComponent.cs
SocialObjectiveComponent.cs
SpeciesRequirmentComponent.cs	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
SpiderChargeConditionComponent.cs	ninja criminal records hacking (#24982)	2024-05-08 23:35:11 -07:00
StealAreaComponent.cs	Thief beacons (try 2) (#29997)	2024-08-08 16:17:50 +03:00
StealConditionComponent.cs	Thief beacons (try 2) (#29997)	2024-08-08 16:17:50 +03:00
StealDNAConditionComponent.cs	Говнокрад (#268)	2024-08-08 09:28:44 +03:00
StealResearchConditionComponent.cs	Use conditions to store progress for Ninja objectives (#20254)	2023-10-10 09:32:10 +03:00
StealTargetComponent.cs	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
SurviveConditionComponent.cs
TargetObjectiveComponent.cs