Skip to content

M46C Guncase + Attachment Vendor Tweaks #12123

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

Open
matttheficus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

M46C Guncase + Attachment Vendor Tweaks #12123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 1 deletion code/__DEFINES/vendors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@
#define CIVILIAN_CAN_BUY_SHOES "civilian_shoes"
#define CIVILIAN_CAN_BUY_GLOVES "civilian_gloves"
#define CIVILIAN_CAN_BUY_ACCESSORY "civilian_accessory"
#define MISC_CAN_BUY_RAIL "misc_rail"
#define MISC_CAN_BUY_UNDER "misc_under"
#define MISC_CAN_BUY_BARREL "misc_barrel"


#define MARINE_CAN_BUY_ALL list(MARINE_CAN_BUY_UNIFORM = 1, MARINE_CAN_BUY_SHOES = 1, MARINE_CAN_BUY_HELMET = 1, MARINE_CAN_BUY_ARMOR = 1, MARINE_CAN_BUY_GLOVES = 1, MARINE_CAN_BUY_EAR = 1, MARINE_CAN_BUY_BACKPACK = 1, MARINE_CAN_BUY_POUCH = 2, MARINE_CAN_BUY_BELT = 1, MARINE_CAN_BUY_GLASSES = 1, MARINE_CAN_BUY_PILOT_VISOR= 1, MARINE_CAN_BUY_MASK = 1, MARINE_CAN_BUY_ESSENTIALS = 1, MARINE_CAN_BUY_SPECIALIZATION = 1, MARINE_CAN_BUY_SECONDARY = 1, MARINE_CAN_BUY_ATTACHMENT = 1, MARINE_CAN_BUY_MRE = 1, MARINE_CAN_BUY_MAP = 1, MARINE_CAN_BUY_ACCESSORY = 1, MARINE_CAN_BUY_COMBAT_SHOES = 1, MARINE_CAN_BUY_COMBAT_HELMET = 1, MARINE_CAN_BUY_COMBAT_ARMOR = 1, MARINE_CAN_BUY_KIT = 1, MARINE_CAN_BUY_DRESS = 99, CIVILIAN_CAN_BUY_UNIFORM = 5, CIVILIAN_CAN_BUY_SUIT = 5, CIVILIAN_CAN_BUY_HAT = 5, CIVILIAN_CAN_BUY_GLASSES = 2, CIVILIAN_CAN_BUY_SHOES = 2, CIVILIAN_CAN_BUY_GLOVES = 2, CIVILIAN_CAN_BUY_ACCESSORY = 5)
#define MARINE_CAN_BUY_ALL list(MARINE_CAN_BUY_UNIFORM = 1, MARINE_CAN_BUY_SHOES = 1, MARINE_CAN_BUY_HELMET = 1, MARINE_CAN_BUY_ARMOR = 1, MARINE_CAN_BUY_GLOVES = 1, MARINE_CAN_BUY_EAR = 1, MARINE_CAN_BUY_BACKPACK = 1, MARINE_CAN_BUY_POUCH = 2, MARINE_CAN_BUY_BELT = 1, MARINE_CAN_BUY_GLASSES = 1, MARINE_CAN_BUY_PILOT_VISOR= 1, MARINE_CAN_BUY_MASK = 1, MARINE_CAN_BUY_ESSENTIALS = 1, MARINE_CAN_BUY_SPECIALIZATION = 1, MARINE_CAN_BUY_SECONDARY = 1, MARINE_CAN_BUY_ATTACHMENT = 1, MARINE_CAN_BUY_MRE = 1, MARINE_CAN_BUY_MAP = 1, MARINE_CAN_BUY_ACCESSORY = 1, MARINE_CAN_BUY_COMBAT_SHOES = 1, MARINE_CAN_BUY_COMBAT_HELMET = 1, MARINE_CAN_BUY_COMBAT_ARMOR = 1, MARINE_CAN_BUY_KIT = 1, MARINE_CAN_BUY_DRESS = 99, CIVILIAN_CAN_BUY_UNIFORM = 5, CIVILIAN_CAN_BUY_SUIT = 5, CIVILIAN_CAN_BUY_HAT = 5, CIVILIAN_CAN_BUY_GLASSES = 2, CIVILIAN_CAN_BUY_SHOES = 2, CIVILIAN_CAN_BUY_GLOVES = 2, CIVILIAN_CAN_BUY_ACCESSORY = 5, MISC_CAN_BUY_RAIL = 1, MISC_CAN_BUY_UNDER = 1, MISC_CAN_BUY_BARREL = 1)

#define MARINE_TOTAL_BUY_POINTS 45
#define MARINE_TOTAL_SNOWFLAKE_POINTS 120
Expand Down
50 changes: 22 additions & 28 deletions code/game/machinery/vending/vendor_types/crew/commanding_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list(
list("COMMANDER'S PRIMARY (CHOOSE 1)", 0, null, null, null),
list("M46C Pulse Rifle", 0, /obj/effect/essentials_set/co/riflepreset, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
list("M46C Pulse Rifle", 0, /obj/item/storage/box/guncase/m46c, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),
list("M56A2C Smartgun", 0, /obj/item/storage/box/m56a2c_system, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY),

list("PRIMARY AMMUNITION", 0, null, null, null),
Expand Down Expand Up @@ -40,27 +40,27 @@ GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list(
list("Medical Visor", 5, /obj/item/device/helmet_visor/medical/advanced, null, VENDOR_ITEM_REGULAR),
list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR),

list("RAIL ATTACHMENTS", 0, null, null, null),
list("Red-Dot Sight", 15, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR),
list("S5-Micro Dot Sight", 15, /obj/item/attachable/reddot/small, null, VENDOR_ITEM_REGULAR),
list("Reflex Sight", 15, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR),
list("S4 2x Telescopic Mini-Scope", 15, /obj/item/attachable/scope/mini, null, VENDOR_ITEM_REGULAR),

list("UNDERBARREL ATTACHMENTS", 0, null, null, null),
list("Laser Sight", 15, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR),
list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR),
list("Vertical Grip", 15, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR),
list("Underbarrel Shotgun", 15, /obj/item/attachable/attached_gun/shotgun, null, VENDOR_ITEM_REGULAR),
list("Underbarrel Extinguisher", 15, /obj/item/attachable/attached_gun/extinguisher, null, VENDOR_ITEM_REGULAR),
list("Underbarrel Flamethrower", 15, /obj/item/attachable/attached_gun/flamer, null, VENDOR_ITEM_REGULAR),
list("Underbarrel Grenade Launcher", 5, /obj/item/attachable/attached_gun/grenade, null, VENDOR_ITEM_REGULAR),

list("BARREL ATTACHMENTS", 0, null, null, null),
list("Extended Barrel", 15, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR),
list("Extended Recoil Compensator", 15, /obj/item/attachable/extended_barrel/vented, null, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", 15, /obj/item/attachable/compensator, null, VENDOR_ITEM_REGULAR),
list("Suppressor", 15, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR),
list("Suppressor, Compact", 15, /obj/item/attachable/suppressor/sleek, null, VENDOR_ITEM_REGULAR),
list("RAIL ATTACHMENTS (CHOOSE 1)", 0, null, null, null),
list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MISC_CAN_BUY_RAIL, VENDOR_ITEM_REGULAR),
list("S5-Micro Dot Sight", 0, /obj/item/attachable/reddot/small, MISC_CAN_BUY_RAIL, VENDOR_ITEM_REGULAR),
list("Reflex Sight", 0, /obj/item/attachable/reflex, MISC_CAN_BUY_RAIL, VENDOR_ITEM_REGULAR),
list("S4 2x Telescopic Mini-Scope", 0, /obj/item/attachable/scope/mini, MISC_CAN_BUY_RAIL, VENDOR_ITEM_REGULAR),

list("UNDERBARREL ATTACHMENTS (CHOOSE 1)", 0, null, null, null),
list("Laser Sight", 0, /obj/item/attachable/lasersight, MISC_CAN_BUY_UNDER, VENDOR_ITEM_REGULAR),
list("Angled Grip", 0, /obj/item/attachable/angledgrip, MISC_CAN_BUY_UNDER, VENDOR_ITEM_REGULAR),
list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MISC_CAN_BUY_UNDER, VENDOR_ITEM_REGULAR),
list("Underbarrel Shotgun", 0, /obj/item/attachable/attached_gun/shotgun, MISC_CAN_BUY_UNDER, VENDOR_ITEM_REGULAR),
list("Underbarrel Extinguisher", 0, /obj/item/attachable/attached_gun/extinguisher, MISC_CAN_BUY_UNDER, VENDOR_ITEM_REGULAR),
list("Underbarrel Flamethrower", 0, /obj/item/attachable/attached_gun/flamer, MISC_CAN_BUY_UNDER, VENDOR_ITEM_REGULAR),
list("Underbarrel Grenade Launcher", 0, /obj/item/attachable/attached_gun/grenade, MISC_CAN_BUY_UNDER, VENDOR_ITEM_REGULAR),

list("BARREL ATTACHMENTS (CHOOSE 1)", 0, null, null, null),
list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MISC_CAN_BUY_BARREL, VENDOR_ITEM_REGULAR),
list("Extended Recoil Compensator", 0, /obj/item/attachable/extended_barrel/vented, MISC_CAN_BUY_BARREL, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", 0, /obj/item/attachable/compensator, MISC_CAN_BUY_BARREL, VENDOR_ITEM_REGULAR),
list("Suppressor", 0, /obj/item/attachable/suppressor, MISC_CAN_BUY_BARREL, VENDOR_ITEM_REGULAR),
list("Suppressor, Compact", 0, /obj/item/attachable/suppressor/sleek, MISC_CAN_BUY_BARREL, VENDOR_ITEM_REGULAR),
))

/obj/structure/machinery/cm_vending/gear/commanding_officer
Expand Down Expand Up @@ -168,9 +168,3 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list(
/obj/item/device/megaphone,
/obj/item/clothing/accessory/device/whistle/trench,
)

// This gets around the COs' weapon not spawning without incendiary mag.
/obj/effect/essentials_set/co/riflepreset
spawned_gear_list = list(
/obj/item/weapon/gun/rifle/m46c,
)
24 changes: 14 additions & 10 deletions code/game/machinery/vending/vendor_types/crew/corporate_security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,20 @@ GLOBAL_LIST_INIT(cm_vending_gear_corporate_security_full, list(
list("88M4 AP Magazine (9mm)", 4, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR),
list("VP78 Magazine (9mm)", 6, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),

list("RAIL ATTACHMENTS (CHOOSE 2)", 0, null, null, null),
list("Red-Dot Sight", 0, /obj/item/attachable/reddot, CIVILIAN_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("Reflex Sight", 0, /obj/item/attachable/reflex, CIVILIAN_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("S4 2x Telescopic Mini-Scope", 0, /obj/item/attachable/scope/mini, CIVILIAN_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("Magnetic Harness", 0, /obj/item/attachable/magnetic_harness, CIVILIAN_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("Laser Sight", 0, /obj/item/attachable/lasersight, CIVILIAN_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("Angled Grip", 0, /obj/item/attachable/angledgrip, CIVILIAN_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, CIVILIAN_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, CIVILIAN_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("Suppressor", 0, /obj/item/attachable/suppressor, CIVILIAN_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("RAIL ATTACHMENTS (CHOOSE 1)", 0, null, null, null),
list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MISC_CAN_BUY_RAIL, VENDOR_ITEM_REGULAR),
list("Reflex Sight", 0, /obj/item/attachable/reflex, MISC_CAN_BUY_RAIL, VENDOR_ITEM_REGULAR),
list("S4 2x Telescopic Mini-Scope", 0, /obj/item/attachable/scope/mini, MISC_CAN_BUY_RAIL, VENDOR_ITEM_REGULAR),
list("Magnetic Harness", 0, /obj/item/attachable/magnetic_harness, MISC_CAN_BUY_RAIL, VENDOR_ITEM_REGULAR),

list("UNDERBARREL ATTACHMENTS (CHOOSE 1)", 0, null, null, null),
list("Laser Sight", 0, /obj/item/attachable/lasersight, MISC_CAN_BUY_UNDER, VENDOR_ITEM_REGULAR),
list("Angled Grip", 0, /obj/item/attachable/angledgrip, MISC_CAN_BUY_UNDER, VENDOR_ITEM_REGULAR),
list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MISC_CAN_BUY_UNDER, VENDOR_ITEM_REGULAR),

list("BARREL ATTACHMENTS (CHOOSE 1)", 0, null, null, null),
list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MISC_CAN_BUY_BARREL, VENDOR_ITEM_REGULAR),
list("Suppressor", 0, /obj/item/attachable/suppressor, MISC_CAN_BUY_BARREL, VENDOR_ITEM_REGULAR),

list("SPARE EQUIPMENT", 0, null, null, null),
list("Handheld Flash", 2, /obj/item/device/flash, null, VENDOR_ITEM_REGULAR),
Expand Down
13 changes: 13 additions & 0 deletions code/modules/cm_marines/equipment/guncases.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,19 @@
new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src)
new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src)

//------------
//M46C pulse rifle
/obj/item/storage/box/guncase/m46c
name = "\improper M46C pulse rifle MK1 AP case"
desc = "A gun case containing the M46C pulse rifle loaded with AP rounds. Uses standard MK1 & MK2 rifle magazines."
storage_slots = 3
can_hold = list(/obj/item/weapon/gun/rifle/m46c, /obj/item/ammo_magazine/rifle/m41aMK1)

/obj/item/storage/box/guncase/m46c/fill_preset_inventory()
new /obj/item/weapon/gun/rifle/m46c/ap(src)
new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src)
new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src)

//------------
//M85A1 grenade launcher
/obj/item/storage/box/guncase/m85a1
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/guns/rifles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,9 @@
var/is_locked = TRUE
var/iff_enabled = TRUE

/obj/item/weapon/gun/rifle/m46c/ap
current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/ap

/obj/item/weapon/gun/rifle/m46c/Initialize(mapload, ...)
LAZYADD(actions_types, /datum/action/item_action/m46c/toggle_lethal_mode)
. = ..()
Expand Down
Loading