Skip to content

Commit

Permalink
Raises the amount of magazines in the MP handgun cases to 6 (cmss13-d…
Browse files Browse the repository at this point in the history
…evs#5528)

# About the pull request

Basically adds three more magazines to the MP handgun cases for a total
of six magazines, as before the pistols were moved to seperate guncases.

# Explain why it's good for the game

MPs should be able to fill their holster belts without raiding squad
preps.


# Testing Photographs and Procedure

Working (probaly)


# Changelog

:cl:
add: Added three more magazines to each of the MP's handgun cases
/:cl:
  • Loading branch information
Johannes2262 authored Jan 25, 2024
1 parent 5ad14eb commit 0606046
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions code/modules/cm_marines/equipment/guncases.dm
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)

0 comments on commit 0606046

Please sign in to comment.