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

Replace all restricted gun crates for rifleman by making all the items they contain available for sell #5090

Closed
wants to merge 3 commits into from
Closed

Replace all restricted gun crates for rifleman by making all the items they contain available for sell #5090

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
611d264
seperate crate so you can select each piece of gea
Dec 1, 2023
524165c
small adjustments
Dec 1, 2023
e51536b
shaving change to make a PR that will get ignore
Dec 1, 2023
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
18 changes: 15 additions & 3 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,21 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list(
list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),

list("RESTRICTED FIREARMS", 0, null, null, null),
list("VP78 Pistol", 15, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR),
list("SU-6 Smart Pistol", 15, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR),
list("M79 Grenade Launcher", 30, /obj/item/storage/box/guncase/m79, null, VENDOR_ITEM_REGULAR),

list("VP78", 0, null, null, null),
list("VP78 Pistol", 4, /obj/item/weapon/gun/pistol/vp78, null, VENDOR_ITEM_REGULAR),
list("VP78 Magazine", 2, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),

list("SU-6", 0, null, null, null),
list("SU-6 Smart Pistol", 4, /obj/item/weapon/gun/pistol/smart, null, VENDOR_ITEM_REGULAR),
list("M276 pattern SU-6 Smartpistol holster rig", 1, /obj/item/storage/belt/gun/smartpistol, null, VENDOR_ITEM_REGULAR),//shouldn't be full.
list("SU-6 Smartpistol magazine (.45)", 2, /obj/item/ammo_magazine/pistol/smart, null, VENDOR_ITEM_REGULAR),

list("SU-6 Smart Pistol", 0, null, null, null),
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
list("M79 Grenade Launcher", 12, /obj/item/weapon/gun/launcher/grenade/m81/m79, null, VENDOR_ITEM_REGULAR),
list("M74 AGM-S star shell packet", 6, /obj/item/storage/box/packet/flare, null, VENDOR_ITEM_REGULAR),
list("HIRR baton slug packet", 6, /obj/item/storage/box/packet/baton_slug, null, VENDOR_ITEM_REGULAR),
list("M74 AGM-H hornet shell packet", 6, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR),

list("EXPLOSIVES", 0, null, null, null),
list("M40 HEDP High Explosive Packet (x3 grenades)", 20, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
Expand Down
Loading