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

Revives CMB Black Market Investigation #4405

Merged
merged 18 commits into from
Sep 14, 2023

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Sep 12, 2023

Revival of #3223 by BeagleGaming1

About the pull request

Ordering black market goods can either lower or increase a number. At 100, the CMB gets called to investigate and disable the black market.

Explain why it's good for the game

People can purchase unlimited goods such as weapons or CLF crates. This causes req to have to at least pay attention to what they are buying, and to buy stuff other than clothing or weapons from other factions.

Changelog

🆑 BeagleGaming1, forest2001
add: Adds a CMB ERT to investigate the Black Market
add: Adds a [cmb] logo for papers
add: Adds a quiet_launch var for distress beacons, to differentiate between ERTs who should announce their response reception, but not the beacon going out in the first place.
del: Removes banhammer from normal acquisition.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Sep 12, 2023
@realforest2001 realforest2001 added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Sep 12, 2023
Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

scanner is missing the scanner_on animation the original PR had
scanr

Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

sprites ✅

@sleepynecrons sleepynecrons added the Sprites Approved confirmed no stray pixels label Sep 13, 2023
code/datums/emergency_calls/inspection.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/cmb.dm Outdated Show resolved Hide resolved
maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm Outdated Show resolved Hide resolved
code/game/objects/effects/spawners/random.dm Outdated Show resolved Hide resolved
code/datums/supply_packs/black_market.dm Show resolved Hide resolved
code/game/objects/items/circuitboards/computer.dm Outdated Show resolved Hide resolved
code/game/supplyshuttle.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft September 14, 2023 07:59
@realforest2001 realforest2001 marked this pull request as ready for review September 14, 2023 15:46
@harryob harryob added this pull request to the merge queue Sep 14, 2023
Merged via the queue into cmss13-devs:master with commit 8a88d56 Sep 14, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Sep 14, 2023
@kooarbiter
Copy link

time to call in enough black market weapons that a CMB team is codewise forced to arrive, conveniently before the aliens hijack so they have to help out, big brained moment for free ert

@realforest2001 realforest2001 deleted the Black-Market branch October 21, 2023 08:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants