War Ops, reinforcements, and Syndicate Uplink tweaks. Bounty #6148 #6167
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
github-actions
bot
added
Scene Changes
github-actions
bot
added
the
Status: Merge Conflicts
corp-0
changed the title
ThatDan123
added
Status: Awaiting Review
github-actions
bot
added
the
Status: Merge Conflicts
|
can you solve the conflicts so I review? It should be easy enough to be honest, those files were just moved out of Resources. |
done |
corp-0
reviewed
Mar 23, 2021
UnityProject/Assets/Scripts/Objects/Consoles/SyndicateOpConsole.cs
Outdated
Show resolved
Hide resolved
UnityProject/Assets/Scripts/Objects/Consoles/SyndicateOpConsole.cs
Outdated
Show resolved
Hide resolved
UnityProject/Assets/Scripts/Objects/Consoles/SyndicateOpConsole.cs
Outdated
Show resolved
Hide resolved
UnityProject/Assets/Scripts/Objects/Consoles/SyndicateTelecrystalStation.cs
Outdated
Show resolved
Hide resolved
UnityProject/Assets/Scripts/Systems/Antagonists/AntagManager.cs
Outdated
Show resolved
Hide resolved
accidentally commited that instead of the populator, fixed now tho |
corp-0
reviewed
Mar 23, 2021
UnityProject/Assets/Scripts/Objects/Consoles/SyndicateOpConsole.cs
Outdated
Show resolved
Hide resolved
corp-0
reviewed
Mar 23, 2021
UnityProject/Assets/Scripts/Systems/Antagonists/AntagManager.cs
Outdated
Show resolved
Hide resolved
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.
A method for Nukies to declare war, either on the syndicate operations console or on the upload/receive station
TC upload/Receive station that allows nukies to deposit and withdraw TC like a money machine.
Physical, shareable Telecrystals
Separated nukie and traitor TC uplinks
Nukie reinforcement - both the ghost role and their teleporters
weapon bundles should be added to the nukie TC uplink, as well as any other nukie items that can be added (this should not require any new code, and could be handled by maintainers)
all new mapping features need to be mapped into the appropriate scenes (should be easy)
CL: Implement Warops, reinforcement teleporter and nuke op exclusive uplink items
closes #5556
closes #6148