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

[MIRROR] Cleans up a lot of old gun stuff, and either adds or tweaks some crates in preparation for some stuff i want to do later #1908

Merged
merged 3 commits into from
Feb 20, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#689

About The Pull Request

Adds two new crates, one with three renoster shotguns and some bandoliers, and another with identical contents to the armory kiboko launcher.

The CIN surplus crate has been reworked with some new items and some changed up random item code.

Some unused ammo and as a result broken black mesa mobs (unused entirely) have been deleted, among some other random bits like autolathe ammo for guns we don't use anymore.

And lastly, I re-sorted the modular weapons folder a bit to let there be a few less unsorted files.

How This Contributes To The Nova Sector Roleplay Experience

It'd be neat to have security be able to re-order some of their own weapons from their order console, especially more niche stuff like the kiboko.

I also have some plans later that'll involve crates like this, but that's later.

Also having so much unused extra stuff isn't very coolio.

Proof of Testing

image

Changelog

🆑 Paxilmaniac
add: Two new crates can be found in the security armory tab, with renoster shotguns and kiboko launchers.
balance: The contents of the CIN surplus box have been changed around to contain some of the new CIN weapons, among other things. The weighting list has been changed as well.
code: Some unused or otherwise pointless code additions from really old gunsec have been either tweaked or removed.
refactor: The CIN surplus crate has had its code refactored a bit.
code: We no longer have to non-modularly comment out the russian surplus crate, instead using a single variable to hide it.
/:cl:

…es in preparation for some stuff i want to do later (#689)

* sweeps up a bit

* oh yeah baby

* whoops!

* fixes the surplus box

* yknow i fucked up

* Update modular_nova/modules/modular_weapons/code/cargo_crates/surplus_crates.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/modular_weapons/code/cargo_crates/surplus_crates.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/modular_weapons/code/cargo_crates/surplus_crates.dm

Co-authored-by: Bloop <[email protected]>

* Update surplus_crates.dm

---------

Co-authored-by: Bloop <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота Nova Mirror labels Feb 9, 2024
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 label Feb 17, 2024
@Iajret Iajret merged commit 0a2da7b into master Feb 20, 2024
23 checks passed
@Iajret Iajret deleted the upstream-mirror-689 branch February 20, 2024 11:40
AnywayFarus added a commit that referenced this pull request Feb 20, 2024
Iajret pushed a commit that referenced this pull request Apr 10, 2024
* Wraps `lowertext()` to ensure proper stringification.

* Modular

---------

Co-authored-by: san7890 <[email protected]>
Co-authored-by: Mal <[email protected]>
ReezeBL added a commit that referenced this pull request Apr 11, 2024
* [MIRROR] Wraps `lowertext()` to ensure proper stringification. (#1908)

* Wraps `lowertext()` to ensure proper stringification.

* Modular

---------

Co-authored-by: san7890 <[email protected]>
Co-authored-by: Mal <[email protected]>

* replaced lower_text with macros.

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: san7890 <[email protected]>
Co-authored-by: Mal <[email protected]>
Co-authored-by: ReezeBL <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота Nova Mirror Stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants