Skip to content

Commit

Permalink
Added the Xanan dNAC-6.5 assault rifle (#17613)
Browse files Browse the repository at this point in the history
Co-authored-by: Cody Brittain <[email protected]>
  • Loading branch information
Generalcamo and Cody Brittain authored Oct 21, 2023
1 parent c1228a7 commit c40d76f
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 0 deletions.
15 changes: 15 additions & 0 deletions code/modules/projectiles/ammunition/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,21 @@
/obj/item/ammo_magazine/a556/makeshift/empty
initial_ammo = 0

/obj/item/ammo_magazine/a65
name = "magazine (6.5mm)"
icon_state = "c6.5mm"
origin_tech = list(TECH_COMBAT = 3)
mag_type = MAGAZINE
caliber = "a65"
insert_sound = /singleton/sound_category/rifle_slide_reload
matter = list(DEFAULT_WALL_MATERIAL = 1800)
ammo_type = /obj/item/ammo_casing/a65
max_ammo = 20
multiple_sprites = 1

/obj/item/ammo_magazine/a65/empty
initial_ammo = 0

/obj/item/ammo_magazine/a75
name = "ammo magazine (20mm)"
icon_state = "75"
Expand Down
9 changes: 9 additions & 0 deletions code/modules/projectiles/ammunition/bullets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,15 @@
desc = "A 5.56mm blank casing."
projectile_type = /obj/item/projectile/bullet/blank

/obj/item/ammo_casing/a65
desc = "A 6.5mm bullet casing."
desc_extended = "Designed by de Namur not long after the interstellar war, the 6.5mmx40mm cartridge, designed to fit the needs of Xanu's military while going away from the legacy of NATO rounds used by the Sol Alliance. This cartridge has been wildly successful, and has been adopted by the majority of the Coalition of Colonies and beyond."
caliber = "a65"
projectile_type = /obj/item/projectile/bullet/rifle/a65
icon_state = "rifle-casing"
spent_icon = "rifle-casing-spent"
max_stack = 7

/obj/item/ammo_casing/rocket
name = "rocket shell"
desc = "A high explosive designed to be fired from a launcher."
Expand Down
20 changes: 20 additions & 0 deletions code/modules/projectiles/guns/projectile/automatic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,26 @@
..()
icon_state = (ammo_magazine)? "owen" : "owen-empty"

/obj/item/gun/projectile/automatic/rifle/dnac
name = "dNAC-6.5 assault rifle"
desc = "A durable, sleek-looking bullpup rifle manufactured by d.N.A Defense & Aerospace for the All-Xanu Armed Forces. This model has been adopted by a majority of the Coalition's military forces as well due to its simplicity and reliability."
icon = 'icons/obj/guns/xanu_rifle.dmi'
icon_state = "xanu_rifle"
item_state = "xanu_rifle"
magazine_type = /obj/item/ammo_magazine/a65
allowed_magazines = list(/obj/item/ammo_magazine/a65)
caliber = "a65"

firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=ROF_RIFLE),
list(mode_name="3-round bursts", burst=3, burst_accuracy=list(1,0,0), dispersion=list(0, 5, 10)),
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=5, fire_delay_wielded=2, one_hand_fa_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25)),
)

/obj/item/gun/projectile/automatic/rifle/dnac/update_icon()
..()
icon_state = (ammo_magazine)? "xanu_rifle" : "xanu_rifle-empty"

/obj/item/gun/projectile/automatic/railgun
name = "railgun"
desc = "An advanced rifle that magnetically propels hyperdense rods at breakneck speeds to devastating effect."
Expand Down
5 changes: 5 additions & 0 deletions code/modules/projectiles/projectile/bullets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,11 @@
armor_penetration = 34
penetrating = FALSE

/obj/item/projectile/bullet/rifle/a65
damage = 30
armor_penetration = 30
penetrating = FALSE

/obj/item/projectile/bullet/rifle/a145
damage = 80
stun = 3
Expand Down
41 changes: 41 additions & 0 deletions html/changelogs/GeneralCamo - Xanu Rifle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################

# Your name.
author: GeneralCamo, NobleRow

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added the dNAC-6.5 assault rifle, and a new caliber to go with it (6.5mm)"
Binary file modified icons/obj/ammo.dmi
Binary file not shown.
Binary file added icons/obj/guns/xanu_rifle.dmi
Binary file not shown.

0 comments on commit c40d76f

Please sign in to comment.