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.

Sign up for GitHub

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

Jump to bottom

fixes being sold buckshot when you wanted slugs. #2597

Merged
merged 1 commit into from
Jul 4, 2023
Merged

fixes being sold buckshot when you wanted slugs. #2597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/WVM/wvm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
new /datum/data/wasteland_equipment(".308 Box (20 bullets)", /obj/item/ammo_box/a308box, 20),
new /datum/data/wasteland_equipment(".30-06 Box (15 bullets)", /obj/item/ammo_box/a3006box, 20),
new /datum/data/wasteland_equipment("12 Gauge Buckshot box (12 shells)", /obj/item/ammo_box/shotgun/buck, 20),
new /datum/data/wasteland_equipment("12 Gauge Slug box (12 shells)", /obj/item/ammo_box/shotgun/buck, 20),
new /datum/data/wasteland_equipment("12 Gauge Slug box (12 shells)", /obj/item/ammo_box/shotgun/slug, 20),
new /datum/data/wasteland_equipment("Shoddy Energy Cell (1/2 cap SEC)", /obj/item/stock_parts/cell/ammo/ec/bad, 20),
new /datum/data/wasteland_equipment("Shoddy Microfusion Cell (1/2 cap MFC)", /obj/item/stock_parts/cell/ammo/mfc/bad, 20),
new /datum/data/wasteland_equipment("Shoddy Electron Charge Pack (1/2 cap ECP)", /obj/item/stock_parts/cell/ammo/ecp/bad, 20),
Expand All @@ -743,7 +743,7 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
new /datum/data/wasteland_equipment(".308 Box (20 bullets)", /obj/item/ammo_box/a308box, 20),
new /datum/data/wasteland_equipment(".30-06 Box (15 bullets)", /obj/item/ammo_box/a3006box, 20),
new /datum/data/wasteland_equipment("12 Gauge Buckshot box (12 shells)", /obj/item/ammo_box/shotgun/buck, 20),
new /datum/data/wasteland_equipment("12 Gauge Slug box (12 shells)", /obj/item/ammo_box/shotgun/buck, 20),
new /datum/data/wasteland_equipment("12 Gauge Slug box (12 shells)", /obj/item/ammo_box/shotgun/slug, 20),
new /datum/data/wasteland_equipment("Shoddy Energy Cell (1/2 cap SEC)", /obj/item/stock_parts/cell/ammo/ec/bad, 20),
new /datum/data/wasteland_equipment("Shoddy Microfusion Cell (1/2 cap MFC)", /obj/item/stock_parts/cell/ammo/mfc/bad, 20),
new /datum/data/wasteland_equipment("Shoddy Electron Charge Pack (1/2 cap ECP)", /obj/item/stock_parts/cell/ammo/ecp/bad, 20),
Expand Down