Added the Xanan service pistol (#17696)

* Added the Xanan service pistol

* Shrunk the Xanu pistol icon

* Request from loreteam

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
Cody Brittain
2023-11-01 16:13:52 +00:00
committed by GitHub
co-authored by Cody Brittain
parent 51851343f4
commit b79764e16c
8 changed files with 92 additions and 8 deletions
+1 -1
View File
@@ -176,7 +176,7 @@
backpack_contents = list(
/obj/item/device/camera = 1,
/obj/item/gun/projectile/colt/super = 1
/obj/item/gun/projectile/xanupistol = 1
)
/datum/citizenship/elyra
@@ -123,6 +123,17 @@
max_ammo = 16
multiple_sprites = 1
/obj/item/ammo_magazine/c46m
name = "magazine (4.6mm)"
icon_state = "4.6x30p"
origin_tech = list(TECH_COMBAT = 2)
mag_type = MAGAZINE
caliber = "4.6mm"
desc = "A magazine designed for the dNAC-4.6 pistol."
ammo_type = /obj/item/ammo_casing/c46mm
max_ammo = 15
multiple_sprites = TRUE
/obj/item/ammo_magazine/super_heavy
name = ".599 magazine"
desc = "A bulky magazine for the Kumar Arms 2557."
@@ -99,6 +99,12 @@
projectile_type = /obj/item/projectile/bullet/pistol/medium
max_stack = 7
/obj/item/ammo_casing/c46mm
desc = "A 4.6mm bullet casing."
caliber = "4.6mm"
projectile_type = /obj/item/projectile/bullet/pistol
max_stack = 15
/obj/item/ammo_casing/shotgun
name = "shotgun slug"
desc = "A 12-gauge slug."
@@ -264,7 +270,7 @@
/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."
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 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"
@@ -499,3 +499,30 @@
LH.take_damage(30)
else
RH.take_damage(30)
/obj/item/gun/projectile/xanupistol
name = "\improper Xanan service pistol"
desc = "A sleek metal-framed semi-automatic pistol, produced by d.N.A Defense for the All-Xanu Armed Forces."
desc_extended = "The dNAC-4.6 pistol is the standard issue sidearm for the All-Xanu Armed Forces. Designed to use 4.6x30mm rounds with less weight but better armor penetration than the 9mm pistols it replaced, the dNAC-4.6 has seen great success in Xanu Prime and beyond, as it has been adopted as a standard sidearm for police forces, military units, and other entities across the Coalition of Colonies and beyond."
magazine_type = /obj/item/ammo_magazine/c46m
allowed_magazines = list(/obj/item/ammo_magazine/c46m)
icon = 'icons/obj/guns/xanu_pistol.dmi'
icon_state = "pistol"
item_state = "pistol"
caliber = "4.6mm"
accuracy = 1
offhand_accuracy = 1
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
fire_sound = 'sound/weapons/gunshot/gunshot_light.ogg'
load_method = MAGAZINE
fire_delay = ROF_PISTOL
/obj/item/gun/projectile/xanupistol/update_icon()
..()
if(ammo_magazine)
if(ammo_magazine.stored_ammo.len)
icon_state = "pistol"
else
icon_state = "pistol-em"
else
icon_state = "pistol-e"