Reverts hidden CIC nerf (#4829)

# About the pull request Armory used to hold MK1 with AP, not regular rounds # Explain why it's good for the game # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Restores the MK1 AP mags in the CIC armory /:cl:
cmss13-devs · Nov 3, 2023 · d484dfe · d484dfe
1 parent 2faf572
commit d484dfe
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm
@@ -59,6 +59,13 @@
 	. = ..()
 	new /obj/item/storage/box/guncase/m41aMK1(src)
 
+//4 MK1 (with AP) cabinet(using guncase because it fit well here it seem)
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap
+
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap/Initialize()
+	. = ..()
+	new /obj/item/storage/box/guncase/m41aMK1AP(src)
+
 // UPPER MEDBAY ARMORY
 
 //1 shotgun armory closet 2 guns and 4 mags

diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm
@@ -81,6 +81,18 @@
 	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
 	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
 
+
+/obj/item/storage/box/guncase/m41aMK1AP
+	name = "\improper M41A pulse rifle MK1 AP case"
+	desc = "A gun case containing the M41A pulse rifle MK1 loaded with AP rounds. It can only use proprietary MK1 magazines."
+	storage_slots = 3
+	can_hold = list(/obj/item/weapon/gun/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1)
+
+/obj/item/storage/box/guncase/m41aMK1AP/fill_preset_inventory()
+	new /obj/item/weapon/gun/rifle/m41aMK1/ap(src)
+	new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src)
+	new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src)
+
 //------------
 //M79 grenade launcher
 /obj/item/storage/box/guncase/m79

diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -6654,7 +6654,7 @@
 /turf/open/floor/plating,
 /area/almayer/command/cic)
 "auR" = (
-/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle,
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap,
 /turf/open/floor/almayer{
 	icon_state = "redfull"
 	},
@@ -51626,7 +51626,7 @@
 /area/almayer/command/cichallway)
 "mtX" = (
 /obj/structure/machinery/light,
-/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle,
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap,
 /turf/open/floor/almayer{
 	icon_state = "redfull"
 	},