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.

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

XM43A Pulse Carbine #375

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 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
9698a01
fixes issue
Jun 22, 2024
c040c59
how tf did this get changed
KoishiVibe Jun 25, 2024
d681f97
flask draftoid
KoishiVibe Aug 13, 2024
71341c8
mre obliteration
KoishiVibe Aug 13, 2024
a810a40
first start
KoishiVibe Aug 13, 2024
182c800
wtf why doid this change
KoishiVibe Aug 13, 2024
731c263
guh
KoishiVibe Aug 13, 2024
346dca8
fucking piece of shit
KoishiVibe Aug 13, 2024
2776ead
fucking shitheel
KoishiVibe Aug 13, 2024
5bb11aa
d
KoishiVibe Aug 14, 2024
17430c3
sprites are in
KoishiVibe Aug 15, 2024
d4907ca
Merge branch 'master' into xm43a
KoishiVibe Aug 15, 2024
1ab06f0
Merge branch 'master' into xm43a
KoishiVibe Aug 29, 2024
f874be0
and done!
KoishiVibe Aug 29, 2024
5b6e65b
done
KoishiVibe Aug 29, 2024
ae4692c
oopsie
KoishiVibe Aug 29, 2024
71c82b9
broi i just wanna debug
KoishiVibe Aug 29, 2024
70e1df5
hopefully fixed
KoishiVibe Aug 29, 2024
a11faab
Merge branch 'master' into xm43a
KoishiVibe Sep 4, 2024
8477f83
Merge branch 'master' into xm43a
KoishiVibe Sep 5, 2024
b9724b0
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…
Sep 16, 2024
4565f09
Merge branch 'master' into xm43a
KoishiVibe Sep 19, 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
11 changes: 11 additions & 0 deletions code/modules/cm_marines/equipment/guncases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,17 @@
new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src)
new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src)

/obj/item/storage/box/guncase/m41aMK1/carbine
name = "\improper XM43A pulse carbine case"
desc = "Contains an unloaded XM43A pulse carbine and three 99 round clips."
storage_slots = 4
can_hold = list(/obj/item/weapon/gun/rifle/m41aMK1/carbine, /obj/item/ammo_magazine/rifle/m41aMK1)

/obj/item/storage/box/guncase/m41aMK1/carbine/fill_preset_inventory()
new /obj/item/weapon/gun/rifle/m41aMK1/carbine(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)

//------------
//M79 grenade launcher
/obj/item/storage/box/guncase/m79
Expand Down
7 changes: 7 additions & 0 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3420,6 +3420,13 @@ Defined in conflicts.dm of the #defines folder.
scatter_unwielded_mod = -SCATTER_AMOUNT_TIER_9
accuracy_unwielded_mod = HIT_ACCURACY_MULT_TIER_1

/obj/item/attachable/lasersight/carbine
name = "XM43A carbine underbarrel laser module"
desc = "What in god's name is this doing off the gun?"
icon_state = "lasersight"
attach_icon = "carbine_laser_a"
flags_attach_features = NO_FLAGS

/obj/item/attachable/lasersight/upp
name = "Zvezda Laser Module"
desc = "Visible band 512nm green laser, compatible with NVG and IR. Bears striking resemblance to an old Weyland Yutani offering... Decreases scatter, especially onehanded, slightly boosts accuracy. "
Expand Down
37 changes: 37 additions & 0 deletions code/modules/projectiles/guns/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,43 @@
/obj/item/weapon/gun/rifle/m41aMK1/forecon/unloaded
current_mag = null

//-------------------------------------------------------
//XM43A, a cut down official carbine modification of the M41A. Y'know, a space XM177 or whatever.

/obj/item/weapon/gun/rifle/m41aMK1/carbine
name = "XM43A pulse carbine"
desc = "Pulse action 10x24mm caseless carbine, semi-experimental. Exchanges the firepower of a grenade launcher and some modularity for handling."
icon_state = "xm43a"
item_state = "xm43a"
current_mag = /obj/item/ammo_magazine/rifle/m41aMK1
starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/lasersight/carbine)
aim_slowdown = SLOWDOWN_ADS_QUICK_MINUS
wield_delay = WIELD_DELAY_MIN
attachable_allowed = list(
/obj/item/attachable/bayonet,
/obj/item/attachable/bayonet/upp,
/obj/item/attachable/bayonet/co2,
/obj/item/attachable/stock/rifle,
/obj/item/attachable/stock/rifle/collapsible,
/obj/item/attachable/lasersight/carbine,
)

/obj/item/weapon/gun/rifle/m41aMK1/carbine/set_gun_config_values()
..()
set_fire_delay(FIRE_DELAY_TIER_11)
set_burst_amount(BURST_AMOUNT_TIER_4)
set_burst_delay(FIRE_DELAY_TIER_11)
accuracy_mult = BASE_ACCURACY_MULT
accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_4
scatter = SCATTER_AMOUNT_TIER_7
burst_scatter_mult = SCATTER_AMOUNT_TIER_9
scatter_unwielded = SCATTER_AMOUNT_TIER_3
damage_mult = BASE_BULLET_DAMAGE_MULT
recoil_unwielded = RECOIL_AMOUNT_TIER_4

/obj/item/weapon/gun/rifle/m41aMK1/carbine/unloaded
current_mag = null

//----------------------------------------------
//Special gun for the CO to replace the smartgun

Expand Down
Binary file modified icons/obj/items/weapons/guns/attachments/under.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi
Binary file not shown.
Loading