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

author	Jackson Langley <tripwiregamer@gmail.com>
	Sun, 20 Apr 2025 21:34:19 +0000 (16:34 -0500)
committer	GitHub <noreply@github.com>
	Sun, 20 Apr 2025 21:34:19 +0000 (17:34 -0400)
commit	256b6b88fb0832b0f82b61140c5be4b940052b95
tree	70f86cee6e154c858f71d269f80008d8f620b30c	tree \| snapshot
parent	1ba2dfa10e064fd8abdd3be4d8b3c3422bdcb64d	commit \| diff

Require traitors to maroon their objective no matter what (#35825)

* jesus

* okay.

* OOPS

* ok

* ok

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* ok

* Update Resources/Prototypes/Objectives/paradoxClone.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Resources/Prototypes/Objectives/base_objectives.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* m

* ok

* ok

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

Content.Server/Objectives/Components/KillPersonConditionComponent.cs		diff \| blob \| history
Content.Server/Objectives/Systems/KillPersonConditionSystem.cs		diff \| blob \| history
Resources/Locale/en-US/objectives/conditions/kill-person.ftl		diff \| blob \| history
Resources/Prototypes/Objectives/paradoxClone.yml		diff \| blob \| history
Resources/Prototypes/Objectives/traitor.yml		diff \| blob \| history