Skip to content

Commit

Permalink
Merge pull request #2597 from RinPin/slug-fix
Browse files Browse the repository at this point in the history 
fixes being sold buckshot when you wanted slugs.
  • Loading branch information
@Superlagg
Superlagg committed Jul 4, 2023
2 parents 09acc00 + 18e4ee2 commit 21e6bcc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/WVM/wvm.dm
View file
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

0 comments on commit 21e6bcc

Please sign in to comment.