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

Black market ammo shop category + new ammo boxes #6324

Merged
merged 11 commits into from
Jun 6, 2024

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented May 22, 2024

About the pull request

Adds dedicated ammo category to black market, it has all the ammo types of guns that are available on black market already.

I mostly took prices of corresponding weapon kits, doubled amount of ammo, doubled the price, which is fair imo, since you do not get the gun, but pay that price for practicality of packaging.
In cases of ammo boxes, just used the same logic and multipled price by amount of ammo in ammo box.

Deagle High Impact Armor-Piercing ammo box is empty, honk.

Added a lot of new ammo boxes for all the ammo that is in the black market, also added some additional ones (mar30 ex, mar50, they are unavailable in req, I just added boxes), also added craft recipe to all of them.

Explain why it's good for the game

Balance wise, i didn't add anything new, i didn't add nsg ap/ex or type 19 ex or so on, i didn't make it cheaper to shoot those guns, you can already just order weapon kits and gather ammo from there, and it costs even a bit cheaper, but it's just less convenient and more frustrating to buy 10 same kits when you just want the ammo, also buying a lot of kits creates a lot of contraband guns in general, which isn't good.

Testing Photographs and Procedure

Screenshots & Videos

aFLhIk7Vfv

dreamseeker_c6Xo5oHFvn

dreamseeker_hccBNDu8rA

Changelog

🆑
add: contraband ammo selection in black market
add: tons of new ammo boxes
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label May 22, 2024
@Blundir Blundir marked this pull request as draft May 30, 2024 17:59
@github-actions github-actions bot added the Sprites Remove the soul from the game. label Jun 1, 2024
@Blundir Blundir changed the title Black market ammo shop category Black market ammo shop category + new ammo boxes Jun 1, 2024
@Blundir Blundir marked this pull request as ready for review June 4, 2024 01:20
@vero5123
Copy link
Contributor

vero5123 commented Jun 4, 2024

bazooka when

@Blundir
Copy link
Contributor Author

Blundir commented Jun 5, 2024

bazooka when

i'm not suicidal, yet

@harryob harryob added this pull request to the merge queue Jun 5, 2024
@harryob harryob added the Sprites Approved confirmed no stray pixels label Jun 5, 2024
code/modules/projectiles/ammo_boxes/magazine_boxes.dm Outdated Show resolved Hide resolved
@harryob harryob removed this pull request from the merge queue due to a manual request Jun 5, 2024
@Blundir Blundir requested a review from Zonespace27 June 6, 2024 09:41
@Zonespace27 Zonespace27 added this pull request to the merge queue Jun 6, 2024
Merged via the queue into cmss13-devs:master with commit fba613a Jun 6, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Jun 6, 2024
Git-Nivrak pushed a commit to Git-Nivrak/cmss13 that referenced this pull request Jun 9, 2024
# About the pull request

Adds dedicated ammo category to black market, it has all the ammo types
of guns that are available on black market already.

I mostly took prices of corresponding weapon kits, doubled amount of
ammo, doubled the price, which is fair imo, since you do not get the
gun, but pay that price for practicality of packaging.
In cases of ammo boxes, just used the same logic and multipled price by
amount of ammo in ammo box.

Deagle High Impact Armor-Piercing ammo box is empty, honk.

Added a lot of new ammo boxes for all the ammo that is in the black
market, also added some additional ones (mar30 ex, mar50, they are
unavailable in req, I just added boxes), also added craft recipe to all
of them.

# Explain why it's good for the game

Balance wise, i didn't add anything new, i didn't add nsg ap/ex or type
19 ex or so on, i didn't make it cheaper to shoot those guns, you can
already just order weapon kits and gather ammo from there, and it costs
even a bit cheaper, but it's just less convenient and more frustrating
to buy 10 same kits when you just want the ammo, also buying a lot of
kits creates a lot of contraband guns in general, which isn't good.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![aFLhIk7Vfv](https://github.com/cmss13-devs/cmss13/assets/100090741/d3e17fca-118a-4971-82c6-930a76275d83)


![dreamseeker_c6Xo5oHFvn](https://github.com/cmss13-devs/cmss13/assets/100090741/0a496449-04a3-4ed3-a9ff-c8c2c1396b9d)


![dreamseeker_hccBNDu8rA](https://github.com/cmss13-devs/cmss13/assets/100090741/ee77834a-4dfd-4035-8c71-12af63896504)


</details>


# Changelog
:cl:
add: contraband ammo selection in black market
add: tons of new ammo boxes
/:cl:
Git-Nivrak pushed a commit to Git-Nivrak/cmss13 that referenced this pull request Jun 9, 2024
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants