Contractors #594
Merged
Contractors #594
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
Gboster-0
reviewed
Nov 23, 2023
monkestation/code/modules/antagonists/contractor/items/modsuit/modules.dm
Outdated
Show resolved
Hide resolved
|
please turn your list of PR's ported in the main comment into an un-ordered list, like so pariahstation/Pariah-Station#735 |
This was referenced Dec 8, 2023
Closed
This was referenced Dec 13, 2023
This was referenced Dec 13, 2023
Closed
|
Noting specifically that we now have a merge conflict on this PR. |
|
pain, but I can fix all of them in webeditor |
This was referenced Jan 2, 2024
Closed
This was referenced Jan 5, 2024
Closed
Closed
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.
About The Pull Request
Adds contractors via porting parts of:
Ports the rest of my Contractor PRs from skyrat pariahstation/Pariah-Station#735
Fixes some contractor items not working Skyrat-SS13/Skyrat-tg#14506
Contractor qol things Skyrat-SS13/Skyrat-tg#14740
Nerfs drifting contractors a bit Skyrat-SS13/Skyrat-tg#15510
Fixes contractor armor not having wounding Skyrat-SS13/Skyrat-tg#19497
Contractor Updates Skyrat-SS13/Skyrat-tg#19716
[MODULAR] Make drifting contractors come with a preloaded baton holster module Skyrat-SS13/Skyrat-tg#20374
[modular] contractor payouts actually work Skyrat-SS13/Skyrat-tg#20389
[MODULAR] Contractor Nerfs II: I Still Know What You Did Last Summer Skyrat-SS13/Skyrat-tg#22818
The PR that actually adds contractors is #566 due to merge order stuff.
Why It's Good For The Game
Give me my bounty AND IF THAT TOKEN BOUNCES ILL-
Changelog
🆑 OctusGit, Zonespace27, tf-4, Gyrandola, Hatterhat, Nerev4r
add: Added contractors
/:cl: