Factional Cargo, done in a day #3758
Merged
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
rye-rice
requested review from
MarkSuckerberg and
FalloutFalcon
as code owners
github-actions
bot
added
DME Edit
TGUI
Code change
Erikafox
reviewed
Nov 14, 2024
firebudgy
reviewed
Nov 14, 2024
|
hellow should the egun lasgun and mini egun have a discount for nt since theyre sharplite. thanks and have fun |
|
for magazines, remember to offer the smallest size. stuff like the 6 round box mags for the bulldog & mastiff for both syndies & inteq |
All of these are the smallest sizes as appropriate for their respective guns. Already covered my bases. |
|
through the time this was testmerged, it didnt break anything - why hasnt it been merged yet? even if there ends up being a handful of things missing, itd be almost comedically easy to add on in further prs |
Sadhorizon
reviewed
Nov 25, 2024
| @@ -75,54 +91,70 @@ | |||
| desc = "Contains a .22lr magazine for the Himehabu pistol, containing ten rounds." | |||
| contains = list(/obj/item/ammo_box/magazine/m22lr_himehabu) | |||
| cost = 200 | |||
| faction = /datum/faction/scarborough_arms | |||
|
|
|||
| /datum/supply_pack/magazine/himehabu_mag | |||
There was a problem hiding this comment.
oh hey, this should be /asp_mag
rye-rice
commented
Nov 25, 2024
Signed-off-by: rye-rice <[email protected]>
MarkSuckerberg
requested changes
Nov 27, 2024
Co-authored-by: Mark Suckerberg <[email protected]> Signed-off-by: rye-rice <[email protected]>
Signed-off-by: Mark Suckerberg <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]> Signed-off-by: rye-rice <[email protected]>
MarkSuckerberg
approved these changes
Nov 29, 2024
shiptest-server
pushed a commit
that referenced
this pull request
Nov 29, 2024
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Dec 27, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> Split off from Overmap Expansion # 5 This was done in a day. Yes. This Thing that has been anticipated for 2-3 years was done in a day. How did I even accomplish this? While attempting to unhardcode cargo/clean up outpost code, I noticed that factional cargo was actually really easy to do. So I did it. If I really wanted to be fancy, I could take 12 months to code cargo from scratch. But this was easier. So I did it. huge thanks to @firebudgy for coding support and adding more stuff to factional cargo instead of this just being a bare framework    :cl: rye-rice, firebudgy add: Factional cargo. del: the remminants of the P16 as it was already completely removed in Serene Sporting balance: Sporter is now 400 credits. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: rye-rice <[email protected]> Signed-off-by: Mark Suckerberg <[email protected]> Co-authored-by: retlaw34 <[email protected]> Co-authored-by: Mark Suckerberg <[email protected]>
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
Split off from Overmap Expansion # 5
This was done in a day.
Yes. This Thing that has been anticipated for 2-3 years was done in a day.
How did I even accomplish this?
While attempting to unhardcode cargo/clean up outpost code, I noticed that factional cargo was actually really easy to do. So I did it. If I really wanted to be fancy, I could take 12 months to code cargo from scratch. But this was easier. So I did it.
huge thanks to @firebudgy for coding support and adding more stuff to factional cargo instead of this just being a bare framework
Why It's Good For The Game
Changelog
🆑 rye-rice, firebudgy
add: Factional cargo.
del: the remminants of the P16 as it was already completely removed in Serene Sporting
balance: Sporter is now 400 credits.
/:cl: