From d484dfe50c9be90cc66d94984b25b79440fd6669 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Fri, 3 Nov 2023 15:59:20 +0100 Subject: [PATCH] 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
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Restores the MK1 AP mags in the CIC armory /:cl: --- .../closets/secure/guncabinet/level_red.dm | 7 +++++++ code/modules/cm_marines/equipment/guncases.dm | 12 ++++++++++++ maps/map_files/USS_Almayer/USS_Almayer.dmm | 4 ++-- 3 files changed, 21 insertions(+), 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 index 093aac33f7d0..487ffd546d8e 100644 --- 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 index ddf010547ba4..8ab83116f605 100644 --- 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 index 91d5bdfe79bc..b53d1a52fd89 100644 --- 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" },