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

Raises the amount of magazines in the MP handgun cases to 6 #5528

Merged
merged 1 commit into from
Jan 25, 2024
Merged

Raises the amount of magazines in the MP handgun cases to 6 #5528

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
15 changes: 12 additions & 3 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 @@ -354,7 +354,7 @@
/obj/item/storage/box/guncase/mod88
name = "\improper 88 Mod 4 Combat Pistol case"
desc = "A gun case containing an 88 Mod 4 Combat Pistol."
storage_slots = 5
storage_slots = 8
can_hold = list(/obj/item/attachable/flashlight, /obj/item/weapon/gun/pistol/mod88, /obj/item/ammo_magazine/pistol/mod88)

/obj/item/storage/box/guncase/mod88/fill_preset_inventory()
Expand All @@ -363,12 +363,15 @@
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88(src)

//M44 Combat Revolver
/obj/item/storage/box/guncase/m44
name = "\improper M44 Combat Revolver case"
desc = "A gun case containing an M44 Combat Revolver loaded with marksman ammo."
storage_slots = 5
storage_slots = 8
can_hold = list(/obj/item/attachable/flashlight, /obj/item/weapon/gun/revolver/m44, /obj/item/ammo_magazine/revolver)

/obj/item/storage/box/guncase/m44/fill_preset_inventory()
Expand All @@ -377,12 +380,15 @@
new /obj/item/ammo_magazine/revolver/marksman(src)
new /obj/item/ammo_magazine/revolver/marksman(src)
new /obj/item/ammo_magazine/revolver/marksman(src)
new /obj/item/ammo_magazine/revolver/marksman(src)
new /obj/item/ammo_magazine/revolver/marksman(src)
new /obj/item/ammo_magazine/revolver/marksman(src)

//M4A3 Service Pistol
/obj/item/storage/box/guncase/m4a3
name = "\improper M4A3 Service Pistol case"
desc = "A gun case containing an M4A3 Service Pistol."
storage_slots = 5
storage_slots = 8
can_hold = list(/obj/item/attachable/flashlight, /obj/item/weapon/gun/pistol/m4a3, /obj/item/ammo_magazine/pistol)

/obj/item/storage/box/guncase/m4a3/fill_preset_inventory()
Expand All @@ -391,3 +397,6 @@
new /obj/item/ammo_magazine/pistol(src)
new /obj/item/ammo_magazine/pistol(src)
new /obj/item/ammo_magazine/pistol(src)
new /obj/item/ammo_magazine/pistol(src)
new /obj/item/ammo_magazine/pistol(src)
new /obj/item/ammo_magazine/pistol(src)
Loading