Skip to content

Commit

Permalink
Adds .38 Hearth and .38 Chilled ammo boxes, to the Black Market (#3425)
Browse files Browse the repository at this point in the history
## About The Pull Request

Adds ammo boxes for hotshot and iceblox variants of .38 Special, and
puts them in the black market. Slightly reflavoured to imply infusion of
trickwines by black market elements. Sprites courtesy of @rye-rice


![stuff](https://github.com/user-attachments/assets/3c29840f-e46a-4780-ad92-091c5f5f81d1)


## Why It's Good For The Game

Cute little thing to maybe make .38 attractive to some as a gimmicky
cartridge

## Changelog

:cl:
add: Adds .38 Hearth and .38 Chilled specialty ammo boxes to the black
market
/:cl:
  • Loading branch information
generalthrax authored Sep 25, 2024
1 parent 4009cd5 commit 95f9f81
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 12 deletions.
22 changes: 22 additions & 0 deletions code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -271,3 +271,25 @@
stock_min = 2
stock_max = 10
availability_prob = 10

/datum/blackmarket_item/ammo/c38hotshot
name = ".38 Hearth Ammo Box"
desc = "We got our ship cook to marinade some .38 in some hearthwine we pocketed off some hunters. It'll cook your targets to a nice well done."
item = /obj/item/ammo_box/c38/hotshot

price_min = 300
price_max = 500
stock_min = 3
stock_max = 8
availability_prob = 50

/datum/blackmarket_item/ammo/c38iceblox
name = ".38 Chilled Ammo Box"
desc = "One of our runners accidentally spilled some .38 into a fucking pristine icewine shipment. It'll freeze your targets faster than our runner froze solid outside for making a mess."
item = /obj/item/ammo_box/c38/iceblox

price_min = 300
price_max = 500
stock_min = 3
stock_max = 8
availability_prob = 50
8 changes: 4 additions & 4 deletions code/modules/projectiles/ammunition/ballistic/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@
projectile_type = /obj/projectile/bullet/c38/dumdum

/obj/item/ammo_casing/c38/hotshot
name = ".38 hot shot bullet casing"
desc = "A .38 hot shot bullet casing."
name = ".38 hearth bullet casing"
desc = "A .38 hearth bullet casing."
bullet_skin = "incen"
projectile_type = /obj/projectile/bullet/c38/hotshot

/obj/item/ammo_casing/c38/iceblox
name = ".38 iceblox bullet casing"
desc = "A .38 iceblox bullet casing."
name = ".38 chilled bullet casing"
desc = "A .38 chilled bullet casing."
bullet_skin = "surplus"
projectile_type = /obj/projectile/bullet/c38/iceblox

Expand Down
20 changes: 16 additions & 4 deletions code/modules/projectiles/boxes_magazines/ammo_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@
ammo_type = /obj/item/ammo_casing/c38/dumdum

/obj/item/ammo_box/c38/hotshot
name = "speed loader (.38 hot shot)"
desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These hot shot bullets contain an incendiary payload that set targets alight."
name = "speed loader (.38 hearth)"
desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These hearthwine bullets contain an incendiary payload that set targets alight."
ammo_type = /obj/item/ammo_casing/c38/hotshot

/obj/item/ammo_box/c38/iceblox
name = "speed loader (.38 iceblox)"
desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These iceblox bullets contain a cryogenic payload that chills targets."
name = "speed loader (.38 chilled)"
desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These icewine bullets contain a cryogenic payload that chills targets."
ammo_type = /obj/item/ammo_casing/c38/iceblox

/obj/item/ammo_box/c38/empty
Expand Down Expand Up @@ -213,6 +213,18 @@
icon_state = "38box-surplus"
ammo_type = /obj/item/ammo_casing/c38/surplus

/obj/item/ammo_box/c38_box/hotshot
name = "ammo box (.38 hearth)"
desc = "An unorthodox .38 Special cartridge infused with hearthwine. Catches the target on fire."
icon_state = "38hotshot"
ammo_type = /obj/item/ammo_casing/c38/hotshot

/obj/item/ammo_box/c38_box/iceblox
name = "ammo box (.38 chilled)"
desc = "An unorthodox .38 Special cartridge infused with icewine. Chills the target, slowing them down."
icon_state = "38iceblox"
ammo_type = /obj/item/ammo_casing/c38/iceblox

/obj/item/ammo_box/a12g
name = "ammo box (12g buckshot)"
desc = "A box of 12-gauge buckshot shells, devastating at close range."
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/projectile/bullets/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
imp.implant(M)

/obj/projectile/bullet/c38/hotshot //similar to incendiary bullets, but do not leave a flaming trail
name = ".38 hot shot bullet"
name = ".38 hearth bullet"
ricochets_max = 0

/obj/projectile/bullet/c38/hotshot/on_hit(atom/target, blocked = FALSE)
Expand All @@ -80,7 +80,7 @@
M.IgniteMob()

/obj/projectile/bullet/c38/iceblox //see /obj/projectile/temp for the original code
name = ".38 iceblox bullet"
name = ".38 chilled bullet"
var/temperature = 100
ricochets_max = 0

Expand Down
4 changes: 2 additions & 2 deletions code/modules/research/designs/weapon_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS

/datum/design/c38_hotshot
name = "Speed Loader (.38 Hot Shot)"
name = "Speed Loader (.38 Hearth)"
desc = "Designed to quickly reload revolvers. Hot Shot bullets contain an incendiary payload."
id = "c38_hotshot"
build_type = PROTOLATHE
Expand All @@ -28,7 +28,7 @@
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS

/datum/design/c38_iceblox
name = "Speed Loader (.38 Iceblox)"
name = "Speed Loader (.38 Chilled)"
desc = "Designed to quickly reload revolvers. Iceblox bullets contain a cryogenic payload."
id = "c38_iceblox"
build_type = PROTOLATHE
Expand Down
Binary file modified icons/obj/ammo.dmi
Binary file not shown.

0 comments on commit 95f9f81

Please sign in to comment.