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

Reverts hidden CIC nerf #4829

Merged
merged 3 commits into from
Nov 3, 2023
Merged

Reverts hidden CIC nerf #4829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7577ce
Update guncases.dm
TheGamerdk Nov 2, 2023
559f833
Update USS_Almayer.dmm
TheGamerdk Nov 2, 2023
7021406
Update level_red.dm
TheGamerdk Nov 2, 2023
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
7 changes: 7 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 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 @@ -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
Expand Down
4 changes: 2 additions & 2 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down