diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index cdac7b46e54..4a7206c7b1a 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -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 diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 516fe2bc955..449f8d988dd 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -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." diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 0b10989927a..43503c95290 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -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" diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index f7e83cca274..e7b2cc7b2a7 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -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" diff --git a/html/changelogs/GeneralCamo - Xanu Pistol.yml b/html/changelogs/GeneralCamo - Xanu Pistol.yml new file mode 100644 index 00000000000..4be7ebd95e7 --- /dev/null +++ b/html/changelogs/GeneralCamo - Xanu Pistol.yml @@ -0,0 +1,43 @@ +################################ +# 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 Xanan service pistol, and its associated ammo and magazine." + - tweak: "Replaced the San Colette pistol given to the Coalition Consular with a Xanan service pistol." + - maptweak: "Replaced the San Colette pistol given to the Frontier Rangers with a Xanan service pistol." diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index c1751c71e5e..e442d8ad873 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/xanu_pistol.dmi b/icons/obj/guns/xanu_pistol.dmi new file mode 100644 index 00000000000..504b491364d Binary files /dev/null and b/icons/obj/guns/xanu_pistol.dmi differ diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm index 00660ada1e5..df8fbdceb26 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm @@ -3568,12 +3568,9 @@ /obj/item/ammo_magazine/mc9mm, /obj/item/ammo_magazine/mc9mm, /obj/item/gun/energy/pistol/hegemony, -/obj/item/gun/projectile/colt/super{ - desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette. Uses .45 rounds. This example sports a short slide, wood-paneled grips, and various other modifications. While it seems to have originally been a very expensive pistol, this one has seen constant and heavy use, and is now thoroughly worn - though it still functions well."; - name = "worn-out ornamental .45 combat pistol" - }, -/obj/item/ammo_magazine/c45m, -/obj/item/ammo_magazine/c45m, +/obj/item/gun/projectile/xanupistol, +/obj/item/ammo_magazine/c46m, +/obj/item/ammo_magazine/c46m, /obj/item/gun/energy/blaster, /obj/item/gun/projectile/revolver/lemat, /obj/item/ammo_magazine/c38,