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

Mk2 Super Dies #305

Closed
wants to merge 20 commits into from
Closed

Mk2 Super Dies #305

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
de6c369
fuck that shit
Jun 2, 2024
2b6c465
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 2, 2024
8ea6f23
emails
Jun 2, 2024
1e582ef
should hopefully accidently unfuck this
Jun 2, 2024
38aee5f
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Jun 3, 2024
b69183d
FUCK.
Jun 6, 2024
d5078fe
unfucks that.
Jun 6, 2024
edf2ede
try to fix the problem
Jun 6, 2024
a361ab2
i dont know why hpefully fixed????
Jun 6, 2024
0f713b9
hopefully fixed wait no this needs to mathc
Jun 6, 2024
115e852
done
KoishiVibe Jun 13, 2024
f0b4d03
fucking fix you piece of shit
Jun 20, 2024
017baf3
undoes a fuckup with the master
Jun 22, 2024
3be565c
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 22, 2024
25c68f9
mk2 dies
Jun 22, 2024
5fe31ab
super die and one bugfix
Jun 22, 2024
1b4c590
weird bug fix
Jun 22, 2024
dfa3a81
hopefully fixes weird error
Jun 22, 2024
b09f26a
Update code/modules/projectiles/ammo_boxes/ammo_boxes.dm
KoishiVibe Jun 24, 2024
574ab05
Merge branch 'master' into misc-2
KoishiVibe Jun 24, 2024
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
2 changes: 1 addition & 1 deletion code/game/objects/prop.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@

/obj/item/prop/magazine/boots/n054
name = "Boots!: Issue No.54"
desc = "The only official USCM magazine, the headline reads 'ARMAT strikes back against litigants in M41A-MK2 self cleaning case'"
desc = "The only official USCM magazine, the headline reads 'ARMAT strikes back against litigants in M41AE1 self cleaning case'"

/obj/item/prop/magazine/boots/n055
name = "Boots!: Issue No.55"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/cbrn.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap(new_human), WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap(new_human), WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/device/analyzer(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/reagent_scanner(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/prop/geiger_counter(new_human), WEAR_IN_BACK)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammo_boxes/ammo_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@

/obj/item/ammo_box/rounds
name = "\improper rifle ammunition box (10x24mm)"
desc = "A 10x24mm ammunition box. Used to refill M41A MK1, MK2, M4RA and M41AE2 HPR magazines. It comes with a leather strap allowing to wear it on the back."
desc = "A 10x24mm ammunition box. Used to refill M41A MK1, M4RA and M41AE2 HPR magazines. It comes with a leather strap allowing to wear it on the back."
KoishiVibe marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "base_m41"
item_state = "base_m41"
flags_equip_slot = SLOT_BACK
Expand Down
6 changes: 3 additions & 3 deletions code/modules/projectiles/ammo_boxes/round_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/obj/item/ammo_box/rounds/ap
name = "\improper rifle ammunition box (10x24mm AP)"
desc = "A 10x24mm armor-piercing ammunition box. Used to refill M41A MK2, and M4RA AP magazines. It comes with a leather strap allowing to wear it on the back."
desc = "A 10x24mm armor-piercing ammunition box. Used to refill M41A and M4RA AP magazines. It comes with a leather strap allowing to wear it on the back."
overlay_content = "_ap"
default_ammo = /datum/ammo/bullet/rifle/ap

Expand All @@ -13,7 +13,7 @@

/obj/item/ammo_box/rounds/le
name = "\improper rifle ammunition box (10x24mm LE)"
desc = "A 10x24mm armor-shredding ammunition box. Used to refill M41A MK2 LE magazines. It comes with a leather strap allowing to wear it on the back."
desc = "A 10x24mm armor-shredding ammunition box. Used to refill M41A LE magazines. It comes with a leather strap allowing to wear it on the back."
overlay_content = "_le"
default_ammo = /datum/ammo/bullet/rifle/le

Expand All @@ -22,7 +22,7 @@

/obj/item/ammo_box/rounds/incen
name = "\improper rifle ammunition box (10x24mm Incen)"
desc = "A 10x24mm incendiary ammunition box. Used to refill M41A MK2 and M4RA incendiary magazines. It comes with a leather strap allowing to wear it on the back."
desc = "A 10x24mm incendiary ammunition box. Used to refill M41A and M4RA incendiary magazines. It comes with a leather strap allowing to wear it on the back."
overlay_content = "_incen"
default_ammo = /datum/ammo/bullet/rifle/incendiary
bullet_amount = 400 //Incen is OP
Expand Down
20 changes: 10 additions & 10 deletions code/modules/projectiles/guns/rifles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
//M41A PULSE RIFLE

/obj/item/weapon/gun/rifle/m41a
name = "\improper M41A pulse rifle MK2"
desc = "The standard issue rifle of the Colonial Marines. Commonly carried by most combat personnel. Uses 10x24mm caseless ammunition."
name = "\improper M41AE1 pulse rifle"
desc = "A modification of the M41A in limited trials, the M41AE1 improves handling and flexibility with increased modification support, while improving reliability by eliminating the legacy U-type magazine for a more traditional design."
icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
icon_state = "m41a"
item_state = "m41a"
Expand Down Expand Up @@ -112,7 +112,7 @@

/obj/item/weapon/gun/rifle/nsg23
name = "\improper NSG 23 assault rifle"
desc = "A rare sight, this rifle is seen most commonly in the hands of Weyland-Yutani PMCs. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance at long and medium range, but compares similarly up close."
desc = "A rare sight, this rifle is seen most commonly in the hands of Weyland-Yutani PMCs. Compared to the M41A, it has noticeably improved handling and vastly improved performance at long and medium range, but compares similarly up close."
icon = 'icons/obj/items/weapons/guns/guns_by_faction/wy.dmi'
icon_state = "nsg23"
item_state = "nsg23"
Expand Down Expand Up @@ -200,7 +200,7 @@

/obj/item/weapon/gun/rifle/m41a/elite
name = "\improper M41A/2 pulse rifle"
desc = "A modified version M41A Pulse Rifle MK2, re-engineered for better weight, handling and accuracy. Fires precise two-round bursts. Given only to elite units."
desc = "A modified version M41AE1 Pulse Rifle, re-engineered for better weight, handling and accuracy. Fires precise two-round bursts. Given only to elite units."
icon_state = "m41a2"
item_state = "m41a2"

Expand Down Expand Up @@ -249,7 +249,7 @@
starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/magnetic_harness, /obj/item/attachable/angledgrip, /obj/item/attachable/suppressor)

/obj/item/weapon/gun/rifle/m41a/corporate
desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition."
desc = "A Weyland-Yutani creation, this M41AE1 comes equipped in corporate white. Uses 10x24mm caseless ammunition."
icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi'
item_icons = list(
WEAR_L_HAND = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi',
Expand All @@ -262,7 +262,7 @@
starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible)

/obj/item/weapon/gun/rifle/m41a/corporate/no_lock //for PMC nightmares.
desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. This one had its IFF electronics removed."
desc = "A Weyland-Yutani creation, this M41AE1 comes equipped in corporate white. Uses 10x24mm caseless ammunition. This one had its IFF electronics removed."
flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER

/obj/item/weapon/gun/rifle/m41a/corporate/detainer //for chem ert
Expand All @@ -286,7 +286,7 @@

/obj/item/weapon/gun/rifle/m41a/elite/xm40
name = "\improper XM40 pulse rifle"
desc = "One of the experimental predecessors to the M41 line that never saw widespread adoption beyond elite marine units. Of the rifles in the USCM inventory that are still in production, this is the only one to feature an integrated suppressor. It can accept M41A MK2 magazines, but also features its own proprietary magazine system. Extremely lethal in burstfire mode."
desc = "One of the experimental predecessors to the M41A line that never saw widespread adoption beyond elite marine units. Of the rifles in the USCM inventory that are still in production, this is the only one to feature an integrated suppressor. It can accept M41AE1 magazines, but also features its own proprietary magazine system. Extremely lethal in burstfire mode."
icon_state = "m40sd"
item_state = "m40sd"
reload_sound = 'sound/weapons/handling/m40sd_reload.ogg'
Expand Down Expand Up @@ -418,12 +418,12 @@
current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/ap

/obj/item/weapon/gun/rifle/m41aMK1/anchorpoint
desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel shotgun. Uses 10x24mm caseless ammunition."
desc = "A classic M41A Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel shotgun. Uses 10x24mm caseless ammunition."
starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/shotgun)
current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/ap

/obj/item/weapon/gun/rifle/m41aMK1/anchorpoint/gl
desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel grenade launcher. Uses 10x24mm caseless ammunition."
desc = "A classic M41A Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel grenade launcher. Uses 10x24mm caseless ammunition."
starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/grenade/mk1)

/obj/item/weapon/gun/rifle/m41aMK1/forecon
Expand All @@ -441,7 +441,7 @@

/obj/item/weapon/gun/rifle/m46c
name = "\improper M46C pulse rifle"
desc = "A prototype M46C, an experimental rifle platform built to outperform the standard M41A. Back issue only. Uses standard MK1 & MK2 rifle magazines."
desc = "A prototype M46C, an experimental rifle platform built to outperform the standard M41A. Back issue only. Can feed from the standard magazines as well as the short M41AE1 mags."
icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
icon_state = "m46c"
item_state = "m46c"
Expand Down
Loading