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

[PORT] Cargo and Cyborg Munitions Upgrade #2427

Merged
merged 10 commits into from
Jul 28, 2023

Conversation

Bobbanz1
Copy link
Contributor

@Bobbanz1 Bobbanz1 commented May 25, 2023

About The Pull Request

What this PR in simplicity does is it adds the following:

  • A framework to allow for future custom borg skins, IE drakeborgs or more doomba roombas.
  • This PR ports the Cargo Borg from Skyrat-TG alongside two of it's skins.
  • This PR also adds a new upgrade to the Engineering Borg module, once printed and installed it will allow that borg to perform munitions duties!

Ports from: Skyrat-TG

Ports from: TGstation

Why It's Good For The Game

Allows for future implementation of additional borg module icons rather than the static ones we currently have.
Allows for a borg to do Cargo work and free up the space if it so desires.
Allows for engineering borgs to finally help their Munition Comrades in making stuff go boom!

Testing Photographs and Procedure

Screenshots&Videos
2023-05-29.14-07-18.mp4
2023-05-25.18-35-27.mp4

Changelog

🆑Bobbanz1, KasparoVy, Fikou, Seris02, GoldenAlpharex, Serijas for the Cyborg sprites, Reco201
add: Added a new cyborg module: Cargo Cyborgs! Paperwork experts and aces at delivery, they'll truly complement the Silicon gameplay by finally allowing you to scratch that forms-filling itch you had for so long!
fix: Fixed cyborgs re-generating a bunch of icons every time they'd pick a model, with more optimizations to that to come.
add: Cargo Borgs now come equip with a export scanner.
add: Added a new cyborg upgrade to Engineering borgs which allows them to perform some munitions work!
refactor: refactored the borg icon stuff to allow for easier implementation of other skins for borg modules
balance: Cargoborgs upgraded clamp can now carry two wrapped crates instead of one.
/:cl:

@github-actions
Copy link

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

@Karmic-Skink
Copy link
Contributor

As discussed, munitions borg really needs more modules to make it unique and worthwhile.

Also 0/10 for the sprite not being a vtol minifighter.

@Bobbanz1 Bobbanz1 marked this pull request as draft May 26, 2023 10:34
Adds other stuff to the module
@Bobbanz1 Bobbanz1 changed the title [PORT] Cargo and Munitions Borg [PORT] Cargo and Munitions Module Upgrade May 29, 2023
@Bobbanz1 Bobbanz1 marked this pull request as ready for review May 29, 2023 12:26
@Bobbanz1 Bobbanz1 changed the title [PORT] Cargo and Munitions Module Upgrade [PORT] Cargo and EngiBorg Munitions Upgrade May 29, 2023
@Bobbanz1 Bobbanz1 changed the title [PORT] Cargo and EngiBorg Munitions Upgrade [PORT] Cargo and Cyborg Munitions Upgrade May 29, 2023
@Crus0 Crus0 mentioned this pull request Jun 30, 2023
Copy link
Contributor

@Bokkiewokkie Bokkiewokkie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feature creep confirmed

@Bokkiewokkie Bokkiewokkie added the Port Ports code from a codebase other than Beestation label Jul 28, 2023
@Bokkiewokkie Bokkiewokkie merged commit 8364a56 into BeeStation:master Jul 28, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Active Test Merge Balance/Rebalance Feature Munitions Issues and pull requests related to munitions. Port Ports code from a codebase other than Beestation Refactor Sound Sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants