Added support for hardsuit modules that use ammo instead of energy #18645
384
−135
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
BotBOREALIS
added
Sprites
|
!review |
github-actions
bot
added
🗺️ Mapping - Aurora
github-actions
bot
added
the
🗺️ Mapping - Away Ship/Away Site
NonQueueingMatt
requested changes
Mar 18, 2024
NonQueueingMatt
added
the
Changes Required
Generalcamo
requested review from
alsoandanswer and
DreamySkrell
as code owners
NonQueueingMatt
approved these changes
Mar 24, 2024
NonQueueingMatt
removed
the
Changes Required
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Generalcamo
force-pushed
the
magazine_hardsuit
branch
from
6993a05
to
14cea16
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Generalcamo
force-pushed
the
magazine_hardsuit
branch
from
14cea16
to
0a20544
Compare
github-actions
bot
removed
Merge Conflict
🗺️ Mapping - Aurora
Arrow768
reviewed
Jun 16, 2024
| selectable = TRUE | ||
| usable = TRUE | ||
| module_cooldown = 0 | ||
| icon_state = "lcannon" | ||
|
|
||
| engage_string = "Configure" | ||
|
|
||
| category = MODULE_HEAVY_COMBAT | ||
| category = MODULE_LIGHT_COMBAT |
There was a problem hiding this comment.
I think the re-classifies a lot of modules as light combat.
I think we should add a ballistic category (as the Primary balance there is the ammo usage) and update the combat category names to indicate that those are laser weapons.
(Maybe even a ballistic heavy / ballistic light/ launcher category)
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Fix incorrect parameters Make sure all hardsuit modules are replaced in maps
…ilure improperly.
Generalcamo
force-pushed
the
magazine_hardsuit
branch
from
6fbaa5d
to
ff3ef58
Compare
github-actions
bot
removed
Merge Conflict
🗺️ Mapping - Away Ship/Away Site
github-actions
bot
added
🗺️ Mapping - Horizon
Generalcamo
force-pushed
the
magazine_hardsuit
branch
from
d259540
to
c80b848
Compare
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.
As the title says, this adds support for hardsuit modules that use ammo instead of energy. This will allow us to have more powerful weapons potentially for hardsuits that are limited by ammo, instead of generating ammo from thin air with energy.
Two example weapons are added: The prototype SMG, and the machine pistol. To facilitate the former, 4mm ammo from Baystation12 has been ported to the Prototype SMG, and it now uses magazines.
Asset Licenses
The following assets that have not been created by myself are included in this PR: