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.

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

Requisitons additions #6694

Merged
merged 36 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b0a0813
initial
Blundir Jul 12, 2024
4ad0bf8
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into r…
Blundir Jul 12, 2024
36f9532
Update USS_Almayer.dmm
Blundir Jul 12, 2024
6d81ed1
fix
Blundir Jul 12, 2024
25e00e7
Update explosives.dm
Blundir Jul 12, 2024
40aa831
megaphone
Blundir Jul 12, 2024
60366c6
fix
Blundir Jul 12, 2024
95f498b
jacket
Blundir Jul 12, 2024
7df3cab
upd
Blundir Jul 14, 2024
cb07cc2
Update weapons.dm
Blundir Jul 18, 2024
bacf5c2
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into r…
Blundir Jul 18, 2024
36d91c5
Update requisitions.dm
Blundir Jul 18, 2024
615a9a7
upd
Blundir Aug 1, 2024
2e4c88a
upd
Blundir Aug 1, 2024
082c941
Update gear.dm
Blundir Aug 1, 2024
2002ba9
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into r…
Blundir Aug 1, 2024
5c54155
Update box_structures.dm
Blundir Aug 1, 2024
4b97caf
beret
Blundir Aug 2, 2024
d3aff6b
Update head.dm
Blundir Aug 2, 2024
60fb68b
vending animation
Blundir Aug 2, 2024
916ee62
Update requisitions.dm
Blundir Aug 2, 2024
c9fa93d
Update cm_vending.dm
Blundir Aug 3, 2024
b5684e1
Update boxes.dm
Blundir Aug 3, 2024
79443b9
Merge branch 'master' into req_fixes
Blundir Aug 3, 2024
c2b1a4b
Update requisitions.dm
Blundir Aug 3, 2024
363c185
Merge branch 'req_fixes' of https://github.com/Blundir/cmss13 into re…
Blundir Aug 3, 2024
3be4cbc
upd
Blundir Aug 4, 2024
aac0d3f
fix bad var names
Drulikar Aug 5, 2024
61ff7d4
Implement flat icons for boxes, ammo_boxes, and reagent_containers
Drulikar Aug 5, 2024
2df6fd0
Removed unnecessary dmi file
Drulikar Aug 5, 2024
269fc51
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into r…
Blundir Aug 6, 2024
1b20431
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into r…
Blundir Aug 8, 2024
3ccb14d
Update storage.dmi
Blundir Aug 8, 2024
307328d
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into r…
Blundir Aug 18, 2024
ff22860
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into r…
Blundir Aug 22, 2024
e49bbb1
fix
Blundir Aug 22, 2024
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
5 changes: 5 additions & 0 deletions code/datums/ASRS.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
reference_package = /datum/supply_packs/ammo_m4a3_mag_box_ap
cost = ASRS_VERY_LOW_WEIGHT

/datum/supply_packs_asrs/ammo_m4a3_mag_box_hp
reference_package = /datum/supply_packs/ammo_m4a3_mag_box_hp
cost = ASRS_VERY_LOW_WEIGHT

/datum/supply_packs_asrs/ammo_mag_box
reference_package = /datum/supply_packs/ammo_mag_box
cost = ASRS_VERY_LOW_WEIGHT
Expand Down Expand Up @@ -123,3 +127,4 @@
/datum/supply_packs_asrs/ingredient
reference_package = /datum/supply_packs/ingredient
pool = ASRS_POOL_FOOD
cost = ASRS_VERY_LOW_WEIGHT
6 changes: 3 additions & 3 deletions code/datums/supply_packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
)
name = "M41AE2 HPR Magazines crate (HPR ammo box x2)"
cost = 20
containertype = /obj/structure/closet/crate
containertype = /obj/structure/closet/crate/ammo
containername = "\improper M41AE2 HPR magazines crate"
group = "Ammo"

Expand All @@ -301,8 +301,8 @@
/obj/item/ammo_magazine/rifle/lmg/holo_target,
)
name = "M41AE2 HPR Holo-Target Magazines crate (HPR HT ammo box x2)"
cost = 30
containertype = /obj/structure/closet/crate
cost = 20
containertype = /obj/structure/closet/crate/ammo
containername = "\improper M41AE2 HPR holo-target magazines crate"
group = "Ammo"

Expand Down
22 changes: 16 additions & 6 deletions code/datums/supply_packs/explosives.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,25 +111,25 @@
containername = "\improper explosive HEDP grenade crate (WARNING)"
group = "Explosives"

/datum/supply_packs/explosives_M40_HPDP
name = "M40 HPDP white phosphorus grenades crate (x6)"
/datum/supply_packs/explosives_M40_CCDP
name = "M40 CCDP chemical compound grenades crate (x6)"
contains = list(
/obj/item/storage/box/packet/phosphorus,
/obj/item/storage/box/packet/phosphorus,
)
cost = 30
containertype = /obj/structure/closet/crate/explosives
containername = "\improper M40 HPDP grenade crate (WARNING)"
containername = "\improper M40 CCDP grenade crate (WARNING)"
group = "Explosives"

/datum/supply_packs/explosives_M40_HPDP_crate
name = "M40 HPDP white phosphorus grenade box crate (x25)"
/datum/supply_packs/explosives_M40_CCDP_crate
name = "M40 WPDP chemical compund grenade box crate (x25)"
contains = list(
/obj/item/storage/box/nade_box/phophorus,
)
cost = 100
containertype = /obj/structure/closet/crate/explosives
containername = "\improper HPDP grenade crate (WARNING)"
containername = "\improper CCDP grenade crate (WARNING)"
group = "Explosives"

/datum/supply_packs/explosives_M40_HEFA
Expand Down Expand Up @@ -186,6 +186,16 @@
containername = "\improper explosive M74 AGM-I grenades crate (WARNING)"
group = "Explosives"

/datum/supply_packs/explosives_M74_AGM_I_box
name = "M74 Airburst Grenade Munition incendiary grenades box crate (x25)"
contains = list(
/obj/item/storage/box/nade_box/airburstincen,
)
cost = 100
containertype = /obj/structure/closet/crate/explosives
containername = "\improper M74 Airburst Grenade Munition incendiary grenades crate (WARNING)"
group = "Explosives"

/datum/supply_packs/explosives_airburst_smoke
name = "M74 Airburst Grenade Munition smoke grenades crate (x6)"
contains = list(
Expand Down
15 changes: 15 additions & 0 deletions code/datums/supply_packs/mortar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,18 @@
containertype = /obj/structure/closet/crate/secure/mortar_ammo
containername = "\improper M402 mortar flare shells crate"
group = "Mortar"

/datum/supply_packs/ammo_mortar_frag
name = "M402 mortar shells crate (x6 Frag)"
cost = 20
contains = list(
/obj/item/mortar_shell/frag,
/obj/item/mortar_shell/frag,
/obj/item/mortar_shell/frag,
/obj/item/mortar_shell/frag,
/obj/item/mortar_shell/frag,
/obj/item/mortar_shell/frag,
)
containertype = /obj/structure/closet/crate/secure/mortar_ammo
containername = "\improper M402 mortar frag shells crate"
group = "Mortar"
3 changes: 2 additions & 1 deletion code/game/machinery/vending/cm_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1216,6 +1216,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list(
/obj/item/ammo_box/magazine/lever_action/training/empty = /obj/item/ammo_box/magazine/lever_action/training,
/obj/item/ammo_box/magazine/lever_action/tracker/empty = /obj/item/ammo_box/magazine/lever_action/tracker,
/obj/item/ammo_box/magazine/lever_action/marksman/empty = /obj/item/ammo_box/magazine/lever_action/marksman,
/obj/item/ammo_box/magazine/lever_action/xm88/empty = /obj/item/ammo_box/magazine/lever_action/xm88,

/obj/item/ammo_box/rounds/smg/empty = /obj/item/ammo_box/rounds/smg,
/obj/item/ammo_box/rounds/smg/ap/empty = /obj/item/ammo_box/rounds/smg/ap,
Expand Down Expand Up @@ -1346,7 +1347,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list(
if(LAZYLEN(itemspec)) //making sure it's not empty
if(vend_delay)
overlays.Cut()
icon_state = "[initial(icon_state)]_vend"
flick("[initial(icon_state)]_vend", src)
Blundir marked this conversation as resolved.
Show resolved Hide resolved
if(vend_sound)
playsound(loc, vend_sound, 25, 1, 2) //heard only near vendor
sleep(vend_delay)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_req_officer, list(
list("Quartermaster Uniform", 0, /obj/item/clothing/under/rank/qm_suit, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/qm, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("Quartermaster Jacket", 0, /obj/item/clothing/suit/storage/RO, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
list("Quartermaster Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/RO, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),

list("Headgear (CHOOSE 1)", 0, null, null, null),
list("Quartermaster Cap", 0, /obj/item/clothing/head/cmcap/req/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("Quartermaster Beret", 0, /obj/item/clothing/head/beret/marine/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("Requisitions Cap", 0, /obj/item/clothing/head/cmcap/req, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),

list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/crew/synthetic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("Windbreaker, Exploration", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant, null, VENDOR_ITEM_REGULAR),
list("Labcoat", 12, /obj/item/clothing/suit/storage/labcoat, null, VENDOR_ITEM_REGULAR),
list("Labcoat, Researcher", 12, /obj/item/clothing/suit/storage/labcoat/researcher, null, VENDOR_ITEM_REGULAR),
list("Quartermaster Jacket", 12, /obj/item/clothing/suit/storage/RO, null, VENDOR_ITEM_REGULAR),
list("Quartermaster Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/RO, null, VENDOR_ITEM_REGULAR),
list("Bio Suit", 12, /obj/item/clothing/suit/storage/synthbio, null, VENDOR_ITEM_REGULAR),
list("Black Suit Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/corporate/black, null, VENDOR_ITEM_REGULAR),
list("Brown Suit Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/corporate/brown, null, VENDOR_ITEM_REGULAR),
Expand Down
63 changes: 46 additions & 17 deletions code/game/machinery/vending/vendor_types/requisitions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
list("M20 Claymore Anti-Personnel Mine", floor(scale * 4), /obj/item/explosive/mine, VENDOR_ITEM_REGULAR),
list("M40 HEDP Grenade", floor(scale * 25), /obj/item/explosive/grenade/high_explosive, VENDOR_ITEM_REGULAR),
list("M40 HIDP Incendiary Grenade", floor(scale * 4), /obj/item/explosive/grenade/incendiary, VENDOR_ITEM_REGULAR),
list("M40 HPDP White Phosphorus Smoke Grenade", floor(scale * 4), /obj/item/explosive/grenade/phosphorus, VENDOR_ITEM_REGULAR),
list("M40 CCDP Chemical Compound Smoke Grenade", floor(scale * 4), /obj/item/explosive/grenade/phosphorus, VENDOR_ITEM_REGULAR),
list("M40 HSDP Smoke Grenade", floor(scale * 5), /obj/item/explosive/grenade/smokebomb, VENDOR_ITEM_REGULAR),
list("M74 AGM-Frag Airburst Grenade", floor(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst, VENDOR_ITEM_REGULAR),
list("M74 AGM-Incendiary Airburst Grenade", floor(scale * 4), /obj/item/explosive/grenade/incendiary/airburst, VENDOR_ITEM_REGULAR),
Expand All @@ -68,6 +68,7 @@
list("Webbing", floor(scale * 5), /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR),
list("Knife Webbing", floor(scale * 1), /obj/item/clothing/accessory/storage/knifeharness, VENDOR_ITEM_REGULAR),
list("Drop Pouch", floor(scale * 2), /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
list("External Webbing", floor(scale * 5), /obj/item/clothing/suit/storage/webbing, VENDOR_ITEM_REGULAR),
Blundir marked this conversation as resolved.
Show resolved Hide resolved

list("BACKPACKS", -1, null, null),
list("Lightweight IMP Backpack", floor(scale * 15), /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -118,7 +119,7 @@
list("Large Shotgun Shell Pouch", floor(scale * 1), /obj/item/storage/pouch/shotgun/large, VENDOR_ITEM_REGULAR),

list("MISCELLANEOUS", -1, null, null),
list("Combat Flashlight", floor(scale * 5), /obj/item/device/flashlight/combat, VENDOR_ITEM_REGULAR),
list("Combat Flashlight", floor(scale * 8), /obj/item/device/flashlight/combat, VENDOR_ITEM_REGULAR),
list("Entrenching Tool", floor(scale * 4), /obj/item/tool/shovel/etool/folded, VENDOR_ITEM_REGULAR),
list("Gas Mask", floor(scale * 10), /obj/item/clothing/mask/gas, VENDOR_ITEM_REGULAR),
list("M89-S Signal Flare Pack", floor(scale * 2), /obj/item/storage/box/m94/signal, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -147,19 +148,24 @@
list("M40 HEDP Grenade Packet", 0, /obj/item/storage/box/packet/high_explosive, VENDOR_ITEM_REGULAR),
list("M40 HEDP Grenade Box", 0, /obj/item/storage/box/nade_box, VENDOR_ITEM_REGULAR),
list("M40 HIDP Grenade Packet", 0, /obj/item/storage/box/packet/incendiary, VENDOR_ITEM_REGULAR),
list("M40 HPDP Grenade Box", 0, /obj/item/storage/box/nade_box/phophorus, VENDOR_ITEM_REGULAR),
list("M40 HIDP Grenade Box", 0, /obj/item/storage/box/nade_box/incen, VENDOR_ITEM_REGULAR),
list("M40 CCDP Grenade Packet", 0, /obj/item/storage/box/packet/phosphorus/strong, VENDOR_ITEM_REGULAR),
list("M40 CCDP Grenade Box", 0, /obj/item/storage/box/nade_box/phophorus, VENDOR_ITEM_REGULAR),
list("M40 HSDP Grenade Packet", 0, /obj/item/storage/box/packet/smoke, VENDOR_ITEM_REGULAR),
list("M40 MFHS Grenade Packet", 0, /obj/item/storage/box/packet/foam, VENDOR_ITEM_REGULAR),
list("M40 HIRR Baton Slug Packet", 0, /obj/item/storage/box/packet/baton_slug, VENDOR_ITEM_REGULAR),
list("M74 AGM-Airburst Grenade Packet", 0, /obj/item/storage/box/packet/airburst_he, VENDOR_ITEM_REGULAR),
list("M74 AGM-F grenade box", 0, /obj/item/storage/box/nade_box/airburst, VENDOR_ITEM_REGULAR),
list("M74 AGM-Airburst Incendiary Grenade Packet", 0, /obj/item/storage/box/packet/airburst_incen, VENDOR_ITEM_REGULAR),
list("M74 AGM-Airburst Smoke Grenade Packet", 0, /obj/item/storage/box/packet/airburst_smoke, VENDOR_ITEM_REGULAR),
list("M74 AGM-F Grenade Packet", 0, /obj/item/storage/box/packet/airburst_he, VENDOR_ITEM_REGULAR),
list("M74 AGM-F Grenade box", 0, /obj/item/storage/box/nade_box/airburst, VENDOR_ITEM_REGULAR),
list("M74 AGM-I Grenade Packet", 0, /obj/item/storage/box/packet/airburst_incen, VENDOR_ITEM_REGULAR),
list("M74 AGM-I Grenade Box", 0, /obj/item/storage/box/nade_box/airburstincen, VENDOR_ITEM_REGULAR),
list("M74 AGM-S Smoke Grenade Packet", 0, /obj/item/storage/box/packet/airburst_smoke, VENDOR_ITEM_REGULAR),
list("M74 AGM-S Star Shell Packet", 0, /obj/item/storage/box/packet/flare, VENDOR_ITEM_REGULAR),
list("M74 AGM-H Hornet Shell Packet", 0, /obj/item/storage/box/packet/hornet, VENDOR_ITEM_REGULAR),
list("G2 Electroshock grenade packet", 0, /obj/item/storage/box/packet/sebb, VENDOR_ITEM_REGULAR),
list("M20 mine box", 0, /obj/item/storage/box/explosive_mines, VENDOR_ITEM_REGULAR),

list("OTHER BOXES", -1, null, null),
list("Box of Combat Flashlights", 0, /obj/item/ammo_box/magazine/misc/flashlight/combat, VENDOR_ITEM_REGULAR),
list("Box of M94 Marking Flare Packs", 0, /obj/item/ammo_box/magazine/misc/flares, VENDOR_ITEM_REGULAR),
list("Box of M89 Signal Flare Packs", 0, /obj/item/ammo_box/magazine/misc/flares/signal, VENDOR_ITEM_REGULAR),
list("Box of High-Capacity Power Cells", 0, /obj/item/ammo_box/magazine/misc/power_cell, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -206,6 +212,8 @@

/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend
icon_state = "req_guns_wall"
vend_delay = 3
vend_sound = 'sound/machines/vending_drop.ogg'
tiles_with = list(
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/airlock,
Expand Down Expand Up @@ -236,6 +244,7 @@
list("Box Of Buckshot Shells", floor(scale * 56), /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
list("Box Of Flechette Shells", floor(scale * 56), /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
list("Box Of Shotgun Slugs", floor(scale * 56), /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR),
list("Box Of Breaching Slugs", floor(scale * 4), /obj/item/ammo_magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
list("M4RA Magazine (10x24mm)", floor(scale * 60), /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR),
list("M41A MK2 Magazine (10x24mm)", floor(scale * 100), /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR),
list("M39 HV Magazine (10x20mm)", floor(scale * 100), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR),
Expand All @@ -260,6 +269,7 @@
list("M44 Marksman Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR),
list("M4A3 HP Magazine (9mm)", floor(scale * 2), /obj/item/ammo_magazine/pistol/hp, VENDOR_ITEM_REGULAR),
list("M41AE2 Holo Target Rounds (10x24mm)", floor(scale * 2), /obj/item/ammo_magazine/rifle/lmg/holo_target, VENDOR_ITEM_REGULAR),
list("Box Of .458 SOCOM Rounds (.458 SOCOM)", floor(scale * 4), /obj/item/ammo_magazine/lever_action/xm88, VENDOR_ITEM_REGULAR),

list("RESTRICTED FIREARM AMMUNITION", -1, null, null),
list("VP78 Magazine", 11, /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -291,11 +301,12 @@
list("Shotgun Shell Box (Buckshot x 100)", 0, /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (Flechette x 100)", 0, /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (Slugs x 100)", 0, /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (16g) (Breaching x 120)", 1, /obj/item/ammo_box/magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (16g) (Breaching x 120)", 0, /obj/item/ammo_box/magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
list("Magazine Box (88 Mod 4 AP x 16)", 0, /obj/item/ammo_box/magazine/mod88, VENDOR_ITEM_REGULAR),
list("Magazine Box (SU-6 x 16)", 0, /obj/item/ammo_box/magazine/su6, VENDOR_ITEM_REGULAR),
list("Magazine Box (VP78 x 16)", 0, /obj/item/ammo_box/magazine/vp78, VENDOR_ITEM_REGULAR),
list("Magazine Box (XM51 x 8)", 0, /obj/item/ammo_box/magazine/xm51, VENDOR_ITEM_REGULAR),
list("Rounds Box (.458 SOCOM x 300)", 0, /obj/item/ammo_box/magazine/lever_action/xm88, VENDOR_ITEM_REGULAR),
Blundir marked this conversation as resolved.
Show resolved Hide resolved
list("Ammo Box (M2C x 8)", 0, /obj/item/ammo_box/magazine/m2c, VENDOR_ITEM_REGULAR),
list("Drum Box (M56B x 8)", 0, /obj/item/ammo_box/magazine/m56b, VENDOR_ITEM_REGULAR),
list("Drum Box (M56D x 8)", 0, /obj/item/ammo_box/magazine/m56d, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -339,11 +350,14 @@
return //We found our item, no reason to go on.

/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend
icon_state = "req_ammo_wall"
tiles_with = list(
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/airlock,
/turf/closed/wall/almayer)
icon_state = "req_ammo_wall"
vend_delay = 3
vend_sound = 'sound/machines/vending_drop.ogg'
tiles_with = list(
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/airlock,
/turf/closed/wall/almayer,
)

//Special cargo-specific vendor with vending offsets
/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo
Expand Down Expand Up @@ -410,6 +424,8 @@

/obj/structure/machinery/cm_vending/sorted/attachments/blend
icon_state = "req_attach_wall"
vend_delay = 3
vend_sound = 'sound/machines/vending_drop.ogg'
tiles_with = list(
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/airlock,
Expand All @@ -428,12 +444,24 @@

listed_products = list(
list("UNIFORM", -1, null, null),
list("Lightweight IMP Backpack", 20, /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
list("USCM Uniform", 20, /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR),
list("USCM Combat Technician Uniform", 5, /obj/item/clothing/under/marine/engineer, VENDOR_ITEM_REGULAR),
list("USCM Hospital Corpsman uniform", 5, /obj/item/clothing/under/marine/medic, VENDOR_ITEM_REGULAR),

list("BOOTS", -1, null, null),
list("Marine Combat Boots", 20, /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR),
list("M276 Ammo Load Rig", 10, /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 10, /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR),
list("Marine Brown Combat Boots", 5, /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR),
list("Marine Jungle Combat Boots", 5, /obj/item/clothing/shoes/marine/jungle, VENDOR_ITEM_REGULAR),

list("BACKPACKS", -1, null, null),
list("Lightweight IMP Backpack", 20, /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
list("USCM Satchel", 20, /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR),
list("USCM Uniform", 20, /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR),
list("USCM Chestrig", 10, /obj/item/storage/backpack/marine/satchel/chestrig, VENDOR_ITEM_REGULAR),
list("USCM Technician Backpack", 10, /obj/item/storage/backpack/marine/tech, VENDOR_ITEM_REGULAR),
list("USCM Technician Chestrig", 10, /obj/item/storage/backpack/marine/satchel/tech, VENDOR_ITEM_REGULAR),
list("USCM Corpsman Backpack", 10, /obj/item/storage/backpack/marine/medic, VENDOR_ITEM_REGULAR),
list("USCM Corpsman Satchel", 10, /obj/item/storage/backpack/marine/satchel/medic, VENDOR_ITEM_REGULAR),


list("ARMOR", -1, null, null),
list("M10 Pattern Marine Helmet", 20, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),
Expand All @@ -450,6 +478,7 @@
list("GLOVES", -1, null, null),
list("Marine Combat Gloves", 40, /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
list("Marine Black Combat Gloves", 40, /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR),
list("Marine Brown Combat Gloves", 20, /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR),

list("RADIO", -1, null, null),
list("Alpha Squad Radio Encryption Key", 5, /obj/item/device/encryptionkey/alpha, VENDOR_ITEM_REGULAR),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list(
list("EXPLOSIVES", 0, null, null, null),
list("M40 HEDP High Explosive Packet (x3 grenades)", 18, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
list("M40 HIDP Incendiary Packet (x3 grenades)", 18, /obj/item/storage/box/packet/incendiary, null, VENDOR_ITEM_REGULAR),
list("M40 HPDP White Phosphorus Packet (x3 grenades)", 18, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR),
list("M40 WPDP White Phosphorus Packet (x3 grenades)", 18, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR),
list("M40 HSDP Smoke Packet (x3 grenades)", 9, /obj/item/storage/box/packet/smoke, null, VENDOR_ITEM_REGULAR),
list("M74 AGM-Frag Airburst Packet (x3 airburst grenades)", 18, /obj/item/storage/box/packet/airburst_he, null, VENDOR_ITEM_REGULAR),
list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 18, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR),
Expand Down
Loading
Loading