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

makes MK1 mags accurate (URGENT MERGE NOW) #18

Merged
merged 1 commit into from
Oct 22, 2023
Merged

makes MK1 mags accurate (URGENT MERGE NOW) #18

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
12 changes: 6 additions & 6 deletions code/modules/projectiles/magazines/rifles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

/obj/item/ammo_magazine/rifle/m41aMK1
name = "\improper M41A MK1 magazine (10x24mm)"
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds."
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds."
icon_state = "m41a_mk1"
max_rounds = 99
gun_type = /obj/item/weapon/gun/rifle/m41aMK1
Expand All @@ -89,31 +89,31 @@

/obj/item/ammo_magazine/rifle/m41aMK1/ap
name = "\improper M41A MK1 AP magazine (10x24mm)"
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds. This one contains AP bullets."
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains AP bullets."
default_ammo = /datum/ammo/bullet/rifle/ap
ammo_band_color = AMMO_BAND_COLOR_AP

/obj/item/ammo_magazine/rifle/m41aMK1/heap
name = "\improper M41A MK1 HEAP magazine (10x24mm)"
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds. This one contains High-Explosive Armor-Piercing bullets."
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains High-Explosive Armor-Piercing bullets."
default_ammo = /datum/ammo/bullet/rifle/heap
ammo_band_color = AMMO_BAND_COLOR_HEAP

/obj/item/ammo_magazine/rifle/m41aMK1/incendiary
name = "\improper M41A MK1 incendiary magazine (10x24mm)"
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds. This one contains incendiary bullets."
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains incendiary bullets."
default_ammo = /datum/ammo/bullet/rifle/incendiary
ammo_band_color = AMMO_BAND_COLOR_INCENDIARY

/obj/item/ammo_magazine/rifle/m41aMK1/toxin
name = "\improper M41A MK1 toxin magazine (10x24mm)"
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds. This one contains toxic bullets."
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains toxic bullets."
default_ammo = /datum/ammo/bullet/rifle/ap/toxin
ammo_band_color = AMMO_BAND_COLOR_TOXIN

/obj/item/ammo_magazine/rifle/m41aMK1/penetrating
name = "\improper M41A MK1 wall-penetrating magazine (10x24mm)"
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds. This one contains wall-penetrating bullets."
desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains wall-penetrating bullets."
default_ammo = /datum/ammo/bullet/rifle/ap/penetrating
ammo_band_color = AMMO_BAND_COLOR_PENETRATING
//-------------------------------------------------------
Expand Down
Loading