Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Oct 22, 2023
2 parents fba9dcb + fa42039 commit 76f0791
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions code/modules/projectiles/magazines/rifles.dm
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

0 comments on commit 76f0791

Please sign in to comment.