Skip to content

Commit

Permalink
Merge pull request Occulus-Server#1007 from Zenitheevee/s5magvend
Browse files Browse the repository at this point in the history
Adds short magazine (.50 rubbershot and beanbag) to bullethaven vendors
  • Loading branch information
WeNeedMorePhoron authored Jun 4, 2023
2 parents 0a465b5 + 6e322d5 commit 7aff495
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions zzzz_modular_occulus/code/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@
/obj/item/ammo_magazine/ammobox/shotgun/beanbags = 5,
/obj/item/ammo_magazine/ammobox/shotgun/rubbershot = 5,
/obj/item/cell/small/high = 10,
/obj/item/ammo_magazine/s5mag/rubbershot = 10,
/obj/item/ammo_magazine/s5mag/beanbag = 10,
/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_cheap_guns/generic = 2
)
premium = list(
Expand All @@ -206,6 +208,8 @@
/obj/item/ammo_magazine/ammobox/shotgun/beanbags = 575,
/obj/item/ammo_magazine/ammobox/shotgun/rubbershot = 575,
/obj/item/cell/small/high = 500,
/obj/item/ammo_magazine/s5mag/beanbag = 125,
/obj/item/ammo_magazine/s5mag/rubbershot = 125,
/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_cheap_guns/generic = 2500,
/obj/item/storage/pouch/ammo = 750,
/obj/item/ammo_magazine/ammobox/clrifle/rubber = 1500,
Expand Down

0 comments on commit 7aff495

Please sign in to comment.