Traitor Deathmatch #2719
Merged
Traitor Deathmatch #2719
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DrSmugleaf
added
the
T: New Feature
|
Making not-draft. The gamemode runs and @Tomeno wanted me to make it non-draft because of that. |
|
...and then merge conflicts came along |
|
Ok, so in order to prevent further alterations from making even more of a mess, I am going to be moving the "refactor" parts of this into a separate PR, and then. As such, the merge conflicts (and thus do-not-merge status) will remain until I've dealt with that. |
…te object counts as dead. [ROFL]
…ix bug where PDAs are not tagged with their owner names
|
The TraitorDM PR is now operational again. |
gradientvera
approved these changes
Dec 13, 2020
Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchRedemptionComponent.cs
Outdated
Show resolved
Hide resolved
Content.Server/GameTicking/GamePresets/PresetTraitorDeathMatch.cs
Outdated
Show resolved
Hide resolved
…osts for spawnpoint selection
gradientvera
approved these changes
Dec 13, 2020
Fildrance
pushed a commit
to Fildrance/space-station-14
that referenced
this pull request
Dec 2, 2024
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com> Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Kirus59
pushed a commit
to Kirus59/space-station-14
that referenced
this pull request
Dec 29, 2024
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com> Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
stalengd
pushed a commit
to SerbiaStrong-220/space-station-14
that referenced
this pull request
Dec 30, 2024
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> * fix locale (space-wizards#2688) * Fix morgue.ftl locale (space-wizards#2707) * Translate Upstream space-wizards#2718 (space-wizards#2719) Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com> Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> * fix arrivals gender locale (space-wizards#2723) * fix law locale (space-wizards#2734) * Фикс законов боргов. (space-wizards#2754) * replace zzz (space-wizards#2758) * Translate Upstream space-wizards#2785 (space-wizards#2797) Co-authored-by: lapatison <lapatisonsocial@gmail.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com> * translate borer names (space-wizards#2835) * Перевод Upstream space-wizards#2830 (space-wizards#2836) Co-authored-by: lapatison <lapatisonsocial@gmail.com> Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com> * Translate Upstream space-wizards#2748 (space-wizards#2837) Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> * duplicates fix * duplicates fix 2 * duplicates fix 3 * gender fix * change timers desc * delete corvax locale * delete corvax comment * SS220 antimov law * Lost soul tweaks * change comments --------- Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com> Co-authored-by: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Co-authored-by: lapatison <lapatisonsocial@gmail.com> Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note that I'm not sure this is really sufficiently finished, so I'm marking as a draft PR.