Ed 5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync ...

# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

2025-04-15 00:44:29 +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

…

FreeObjectiveComponent.cs

THE WIZARD (#35406)

2025-02-25 22:34:07 -07:00

HelpProgressConditionComponent.cs

…

HijackShuttleConditionComponent.cs

Fix hijack objective (#21241)

2023-10-27 22:33:18 -04: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

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

PickRandomPersonComponent.cs

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

PickSpecificPersonComponent.cs

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

RandomTraitorAliveComponent.cs

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

RandomTraitorProgressComponent.cs

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

RoleRequirementComponent.cs

remove mind roles from EntityWhitelist (#36089)

2025-04-10 20:45:12 +10:00

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

Bank implementation (#512)

2024-10-26 18:18:30 +03:00

StealConditionComponent.cs

Thief beacons (try 2) (#29997)

2024-08-08 16:17:50 +03:00

StealResearchConditionComponent.cs

Use conditions to store progress for Ninja objectives (#20254)

2023-10-10 09:32:10 +03:00

SurviveConditionComponent.cs

…

TargetObjectiveComponent.cs

…

TargetOverrideComponent.cs

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00