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] Removes illegal tech from legally bought suppressors' deconstructor value #582

Merged
merged 1 commit into from
Nov 12, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#24888

About The Pull Request

Closes Skyrat-SS13/Skyrat-tg#24779

What it says on the tin. Illegal tech was easily attainable this way.

Created a new subtype, /obj/item/suppressor/standard which is considered legal, and that is now what is purchasable through cargo.

Uplink/opfor suppressors use the original type and can be deconstructed as before to attain illegal tech.

Also rearranged some modular overrides in techweb/all_nodes just in case upstream changes something.

How This Contributes To The Skyrat Roleplay Experience

Fix an oversight

Proof of Testing

Two kinds, one legal one not.

image

image

Changelog

🆑 vinylspiders
fix: legally purchased suppressors no longer give illegal tech when deconstructed
/:cl:

…alue (#24888)

* Removes suppressor from illegal tech

* Removes suppressor from illegal tech

* Makes a subtype of suppressor that are considered legal

Syndicate ones are now their own type.

* Update tgstation.dme

* Update armament_utility.dm
@Iajret Iajret merged commit 0668731 into master Nov 12, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-24888 branch November 12, 2023 20:53
AnywayFarus added a commit that referenced this pull request Nov 12, 2023
Iajret pushed a commit that referenced this pull request Feb 9, 2024
* ICSpawning support for quirks & loadout items

Also includes an expanded Bluespace Technician's BSRPED that comes with 50 T4 scanners & 150 of all other T4 stock parts.

* Quirk selector should respect cancel button now

Also reducing the # of starting parts for the BST RPED to reduce lag

* WIP: BST RPED can manufacture parts

* Removing debug prints from BST RPED

Clear All Items is not yet implemented, so it just returns for now

* BST RPED improvements, cont'd

Total freedom to pick subtypes of any stock part, beaker, or machine board.

It's also nicely documented now!

* It would be good if I included beakers in the list

* BST RPEDs can make parts when mid-upgrade.

It tries to be smart & spawn in the best parts available, but for recipes that still call for raw cells or similar over their stock_part datums (e.g, chem dispensers calling for /obj/item/stock_parts/cell = 1), it has no way of knowing.

* Hotfixing dropped quirk items, auto-clean mode

* Review Refactors, Pt 1.

Less janky names and desc, per request.

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

* Review Refactors, Pt 2.

Better var names, spacing & documentation.  Begone to single-letter var names!

* Apply suggestions from code review

so much homework 😭 (/silliness)

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

* Cleaner indents for input_list selects

* trying to unhaunt item removal

* Actually Fixing Fucked Up And Haunted Inventory

it was a change to return_inv

* Hotfix for a loadout thing that'll also be broken

* Apply suggestions from code review

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

* Secondary sanity check to avoid admin warcrimes

* Apply suggestions from review (ft. Vinylspiders)

* nuking extraneous ispath

---------

Co-authored-by: Bloop <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Suppressor from cargo has illegal tech value
3 participants