Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates UPP Synthetic Loadout #6098

Merged
merged 6 commits into from
Apr 17, 2024
Merged

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Apr 6, 2024

About the pull request

This PR updates the UPP Synthetic loadout to account for it no longer being a combat synthetic, this includes changing its job title to that of a Support Synthetic instead of a Combat Synthetic. This effects a large change to its loadout which is detailed below, and is showcased in the screenshots section.

Furthermore this PR adds the UPP Support Synthetic job to the UPP crew monitor, previously niche as this only applied to the survivor UPP synthetic but now relevant as the regular UPP synthetic is also considered a support synth.

The major changes to the inventory include.

  • Custom UPP synthetic armour, stats identical to USCM Synthetic armour (no armour, little slowdown)
  • Addition of a telescopic baton
  • Customized surgical vest and medical storage rig
  • Expanded tool pouch
  • New epinephrine chem bottle and hypo spray, issued to the UPP synth

Explain why it's good for the game

The change to the Combat status of the UPP (and CLF) synthetic did not actually account for their inventory to a complete and comprehensive degree, ergo these units are lacking in a effective loadout. This included the fact the synth still technically spawned with armour and items inside the armour, but the armour (and thus the items inside the armour) are automatically deleted due to the synth not being able to wear it, and that the synthetic is still listed in-game as a Combat Synth.

This PR fixes this and brings the loadout of the UPP synth up to a better standard to perform its duties as a support Synth whilst giving it some limited self-defence tools in the baton.

Testing Photographs and Procedure

Screenshots & Videos

Screenshot 2024-04-06 23 56 38

Changelog

🆑
balance: UPP Synthetic's loadout has been reworked to account for its new status as a non-combatant.
/:cl:

@github-actions github-actions bot added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Apr 6, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Apr 7, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Apr 7, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Apr 15, 2024
code/modules/gear_presets/upp.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/ties.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/upp.dm Show resolved Hide resolved
@Drulikar Drulikar removed the Stale beg a maintainer to review your PR label Apr 16, 2024
@Drulikar Drulikar marked this pull request as draft April 16, 2024 20:47
@Steelpoint Steelpoint marked this pull request as ready for review April 17, 2024 04:55
@Steelpoint
Copy link
Contributor Author

Updated rank and added blood bags

@Drulikar Drulikar added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Apr 17, 2024
@Drulikar Drulikar added this pull request to the merge queue Apr 17, 2024
Merged via the queue into cmss13-devs:master with commit f90db83 Apr 17, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Apr 17, 2024
@Steelpoint Steelpoint deleted the synthtime branch April 18, 2024 05:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants