diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index a058a68c714..c80bf86b6ed 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -21,6 +21,7 @@ #define CAT_SGSUP "SMARTGUNNER SUPPLIES" #define CAT_FCSUP "COMMANDER SUPPLIES" #define CAT_SYNTH "SYNTHETIC SUPPLIES" +#define CAT_MARINE "MARINE SUPPLIES" #define CAT_LOAD "LOADOUT" // Synth Special Categories @@ -53,10 +54,17 @@ GLOBAL_LIST_INIT(marine_selector_cats, list( #define METAL_PRICE_IN_GEAR_VENDOR 2 #define PLASTEEL_PRICE_IN_GEAR_VENDOR 4 -//#define SANDBAG_PRICE_IN_GEAR_VENDOR 5 //ORIGINAL -#define SANDBAG_PRICE_IN_GEAR_VENDOR 3 //RUTGMC EDIT +#define SANDBAG_PRICE_IN_GEAR_VENDOR 3 -GLOBAL_LIST_INIT(marine_gear_listed_products, list()) +GLOBAL_LIST_INIT(marine_gear_listed_products, list( + /obj/item/storage/backpack/marine/radiopack = list(CAT_MARINE, "Radio Pack", 5, "orange"), + /obj/item/stack/sandbags_empty/half = list(CAT_MARINE, "Sandbags x25", SANDBAG_PRICE_IN_GEAR_VENDOR, "orange"), + /obj/item/fulton_extraction_pack = list(CAT_MARINE, "Fulton Extraction Pack", 5, "orange"), + /obj/item/explosive/grenade = list(CAT_MARINE, "M40 HEDP grenade", 2, "orange3"), + /obj/item/explosive/grenade/sticky = list(CAT_MARINE, "M40 adhesive charge grenade", 2, "orange3"), + /obj/item/explosive/grenade/incendiary = list(CAT_MARINE, "M40 HIDP incendiary grenade", 2, "orange3"), + /obj/item/explosive/grenade/m15 = list(CAT_MARINE, "M15 fragmentation grenade", 3, "orange3"), +)) GLOBAL_LIST_INIT(engineer_gear_listed_products, list( /obj/effect/vendor_bundle/engi = list(CAT_ESS, "Essential Engineer Set", 0, "white"), diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index b20ca89c1d6..8a93fe171f0 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -258,6 +258,9 @@ icon_state = "dogtag" item_state = "dogtag" iff_signal = TGMC_LOYALIST_IFF + marine_points = list( + CAT_MARINE = DEFAULT_TOTAL_BUY_POINTS, + ) var/dogtag_taken = FALSE /obj/item/card/id/dogtag/update_icon_state() @@ -318,6 +321,7 @@ /obj/item/card/id/dogtag/full marine_points = list( + CAT_MARINE = DEFAULT_TOTAL_BUY_POINTS, CAT_SGSUP = DEFAULT_TOTAL_BUY_POINTS, CAT_ENGSUP = ENGINEER_TOTAL_BUY_POINTS, CAT_LEDSUP = DEFAULT_TOTAL_BUY_POINTS, diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index 22ccf856ed8..40d132cf499 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -228,7 +228,6 @@ /obj/item/tool/hand_labeler = -1, /obj/item/toy/deck/kotahi = -1, /obj/item/deployable_floodlight = 5, - /obj/item/fulton_extraction_pack = 5, ), ) @@ -1377,7 +1376,6 @@ /obj/item/storage/backpack/marine/standard/scav = -1, /obj/item/tool/weldpack/marinestandard = -1, /obj/item/storage/backpack/marine/satchel/tech = 2, - /obj/item/storage/backpack/marine/radiopack = 5, ), "Instruments" = list( /obj/item/instrument/violin = -1, diff --git a/code/game/objects/machinery/vending/new_marine_vendors.dm b/code/game/objects/machinery/vending/new_marine_vendors.dm index b76d4c78f87..a764a2a946d 100644 --- a/code/game/objects/machinery/vending/new_marine_vendors.dm +++ b/code/game/objects/machinery/vending/new_marine_vendors.dm @@ -226,7 +226,7 @@ /obj/machinery/marine_selector/clothes/Initialize(mapload) . = ..() - listed_products = GLOB.marine_clothes_listed_products + GLOB.marine_gear_listed_products + listed_products = GLOB.marine_clothes_listed_products /obj/machinery/marine_selector/clothes/alpha squad_tag = "Alpha" @@ -432,6 +432,24 @@ resistance_flags = INDESTRUCTIBLE lock_flags = JOB_LOCK +/obj/machinery/marine_selector/gear/marine + name = "NEXUS Automated Marine Gear Rack" + desc = "An automated marine gear rack hooked up to a colossal storage unit." + icon_state = "marine" + icon_vend = "marine-vend" + icon_deny = "marine-deny" + vendor_role = /datum/job/terragov/squad/standard + req_access = list(ACCESS_MARINE_PREP) + +/obj/machinery/marine_selector/gear/marine/Initialize(mapload) + . = ..() + listed_products = GLOB.marine_gear_listed_products + +/obj/machinery/marine_selector/gear/marine/valhalla + vendor_role = /datum/job/fallen/marine + resistance_flags = INDESTRUCTIBLE + lock_flags = JOB_LOCK + /obj/machinery/marine_selector/gear/engi name = "NEXUS Automated Engineer Equipment Rack" desc = "An automated engineer equipment rack hooked up to a colossal storage unit." diff --git a/icons/obj/machines/vending.dmi b/icons/obj/machines/vending.dmi index 20ae0b09fde..ada3a4c04af 100644 Binary files a/icons/obj/machines/vending.dmi and b/icons/obj/machines/vending.dmi differ