]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Store ninja objectives in conditions 2 (#20894)
authorVyacheslav Kovalevsky <40753025+Slava0135@users.noreply.github.com>
Mon, 29 Jan 2024 04:06:32 +0000 (07:06 +0300)
committerGitHub <noreply@github.com>
Mon, 29 Jan 2024 04:06:32 +0000 (15:06 +1100)
commit7311ce671fe29d81c662b2313e28c275c4f868cb
tree3938ae678a8658c33e58f3c88968411586a69773
parent2a6705818bf510aee3026c7f3c3a4ed56f188189
Store ninja objectives in conditions 2 (#20894)

* move spider charge target from role

* shorter field names

* remove ninja role comment

* remove unused systems in SpaceNinjaSystem

* GenericAntagObjectivesAddedEvent

* check if warp point is on same map

* remove unnecessary import

* add missing loc when spider charge has no target

* a

* remove spider charge target requirement comp

* inline SpiderChargeTitle

* allow planting charge without objective

* remove map check

* fix role check when planting

* obj.Target

* Fix merge

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Content.Server/GenericAntag/GenericAntagSystem.cs
Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
Content.Server/Ninja/Systems/SpiderChargeSystem.cs
Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs
Content.Server/Objectives/Components/SpiderChargeTargetRequirementComponent.cs [deleted file]
Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
Content.Server/Objectives/Systems/SpiderChargeTargetRequirementSystem.cs [deleted file]
Content.Server/Roles/NinjaRoleComponent.cs
Resources/Locale/en-US/objectives/conditions/spider-charge.ftl
Resources/Prototypes/Objectives/ninja.yml