From 4629903dd20340bd41cd7e6fcf19be7d5393ab30 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Mon, 25 Dec 2023 17:19:40 +0100 Subject: [PATCH] Adds Dominian Imperial Army gear. (#17971) Co-authored-by: Matt Atlas --- code/datums/uplink/gear loadout.dm | 12 ++++ .../crates_lockers/crates/gear_loadout.dm | 57 ++++++++++++++- code/modules/clothing/factions/dominia.dm | 48 +++++++++++++ code/modules/clothing/suits/modular_armor.dm | 46 ++++++++++++ code/modules/projectiles/ammunition/boxes.dm | 18 +++++ .../projectiles/guns/projectile/automatic.dm | 66 +++++++++++++++--- .../projectiles/guns/projectile/pistol.dm | 23 +++++- .../projectiles/guns/projectile/rifle.dm | 23 ++++++ html/changelogs/mattatlas-imparmy.yml | 41 +++++++++++ .../accessories/dominia_nco_badge.dmi | Bin 0 -> 508 bytes icons/clothing/backpacks/dominia_backpack.dmi | Bin 0 -> 906 bytes icons/clothing/head/dominia_army_hat.dmi | Bin 0 -> 509 bytes icons/clothing/kit/modular_armor.dmi | Bin 48905 -> 52291 bytes .../clothing/under/uniforms/dominia_army.dmi | Bin 0 -> 1391 bytes icons/obj/guns/dominia_bolt_action.dmi | Bin 0 -> 2206 bytes icons/obj/guns/dominia_carbine.dmi | Bin 0 -> 2583 bytes icons/obj/guns/dominia_lmg.dmi | Bin 0 -> 2802 bytes icons/obj/guns/dominia_pistol.dmi | Bin 0 -> 1611 bytes .../guns/{dom_rifle.dmi => dominia_rifle.dmi} | Bin .../obj/guns/{dom_smg.dmi => dominia_smg.dmi} | Bin .../dominian_corvette/dominian_corvette.dmm | 4 +- .../dominian_unathi_privateer.dmm | 4 +- .../hegemony_corvette/hegemony_corvette.dmm | 2 +- 23 files changed, 326 insertions(+), 18 deletions(-) create mode 100644 html/changelogs/mattatlas-imparmy.yml create mode 100644 icons/clothing/accessories/dominia_nco_badge.dmi create mode 100644 icons/clothing/backpacks/dominia_backpack.dmi create mode 100644 icons/clothing/head/dominia_army_hat.dmi create mode 100644 icons/clothing/under/uniforms/dominia_army.dmi create mode 100644 icons/obj/guns/dominia_bolt_action.dmi create mode 100644 icons/obj/guns/dominia_carbine.dmi create mode 100644 icons/obj/guns/dominia_lmg.dmi create mode 100644 icons/obj/guns/dominia_pistol.dmi rename icons/obj/guns/{dom_rifle.dmi => dominia_rifle.dmi} (100%) rename icons/obj/guns/{dom_smg.dmi => dominia_smg.dmi} (100%) diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index 874a6f72ab5..a51eb600988 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/code/datums/uplink/gear loadout.dm @@ -179,3 +179,15 @@ desc = "A crate containing gear for a single individual. The voidsuit is only usable by Skrell." path = /obj/structure/closet/crate/gear_loadout/qukala/single telecrystal_cost = 10 + +/datum/uplink_item/item/gear_loadout/imperial_army + name = "Imperial Army Assets (Group)" + desc = "A crate containing gear for a group." + path = /obj/structure/closet/crate/secure/gear_loadout/imperial_army + telecrystal_cost = 50 + +/datum/uplink_item/item/gear_loadout/imperial_army_single + name = "Imperial Army Assets (Single)" + desc = "A crate containing gear for a single individual." + path = /obj/structure/closet/crate/secure/gear_loadout/imperial_army/single + telecrystal_cost = 15 diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 7329a82ea7a..01dbd1c65f4 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -339,8 +339,8 @@ new /obj/item/clothing/suit/space/void/dominia(src) new /obj/item/clothing/suit/space/void/dominia(src) new /obj/item/clothing/suit/space/void/dominia(src) - new /obj/item/gun/projectile/automatic/rifle/dom(src) - new /obj/item/gun/projectile/automatic/rifle/dom(src) + new /obj/item/gun/projectile/automatic/rifle/dominia(src) + new /obj/item/gun/projectile/automatic/rifle/dominia(src) new /obj/item/ammo_magazine/c762(src) new /obj/item/ammo_magazine/c762(src) new /obj/item/ammo_magazine/c762(src) @@ -371,7 +371,7 @@ new /obj/item/clothing/under/dominia/fleet/armsman(src) new /obj/item/clothing/head/helmet/space/void/dominia(src) new /obj/item/clothing/suit/space/void/dominia(src) - new /obj/item/gun/projectile/automatic/rifle/dom(src) + new /obj/item/gun/projectile/automatic/rifle/dominia(src) new /obj/item/ammo_magazine/c762(src) new /obj/item/ammo_magazine/c762(src) new /obj/item/melee/energy/sword/pirate(src) @@ -887,6 +887,57 @@ new /obj/item/clothing/head/helmet/space/void/kala(src) new /obj/item/clothing/shoes/jackboots/kala(src) +/obj/structure/closet/crate/secure/gear_loadout/imperial_army/fill() + new /obj/item/gun/projectile/automatic/rifle/dominia(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/gun/projectile/automatic/rifle/dominia(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/gun/projectile/automatic/rifle/dominia_carbine(src) + new /obj/item/ammo_magazine/c762/dominia(src) + new /obj/item/ammo_magazine/c762/dominia(src) + new /obj/item/ammo_magazine/c762/dominia(src) + new /obj/item/ammo_magazine/c762/dominia(src) + new /obj/item/gun/projectile/automatic/rifle/dominia_lmg(src) + new /obj/item/ammo_magazine/a556/dlmg(src) + new /obj/item/ammo_magazine/a556/dlmg(src) + new /obj/item/clothing/under/dominia/army(src) + new /obj/item/clothing/under/dominia/army(src) + new /obj/item/clothing/under/dominia/army(src) + new /obj/item/clothing/under/dominia/army/nco(src) + new /obj/item/clothing/accessory/dominia/nco_badge(src) + new /obj/item/storage/backpack/dominia(src) + new /obj/item/storage/backpack/dominia(src) + new /obj/item/storage/backpack/dominia(src) + new /obj/item/storage/backpack/dominia/nco(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/belt/military(src) + new /obj/item/clothing/head/helmet/dominia(src) + new /obj/item/clothing/head/helmet/dominia(src) + new /obj/item/clothing/head/helmet/dominia(src) + new /obj/item/clothing/head/helmet/dominia/nco(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/shoes/jackboots(src) + +/obj/structure/closet/crate/secure/gear_loadout/imperial_army/single/fill() + new /obj/item/gun/projectile/automatic/rifle/dominia_carbine(src) + new /obj/item/ammo_magazine/c762/dominia(src) + new /obj/item/ammo_magazine/c762/dominia(src) + new /obj/item/ammo_magazine/c762/dominia(src) + new /obj/item/ammo_magazine/c762/dominia(src) + new /obj/item/clothing/under/dominia/army(src) + new /obj/item/storage/backpack/dominia(src) + new /obj/item/storage/belt/military(src) + new /obj/item/clothing/head/helmet/dominia(src) + new /obj/item/clothing/shoes/jackboots(src) + //ninja stuff /obj/structure/closet/crate/secure/gear_loadout/ninja var/associated_hardsuit = /obj/item/rig/light/ninja diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 7cdeed8033b..70752785a27 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -811,3 +811,51 @@ icon_state = "officercoat" item_state = "officercoat" contained_sprite = TRUE + +/obj/item/clothing/under/dominia/army + name = "imperial army uniform" + desc = "The standard-issue combat fatigues of an Imperial Army regular. This one features forest camouflage." + desc_extended = "While the Empire's nobility is known for its vibrant fashion, the common soldiers of the Imperial Army wear drab fatigues intended to conceal them \ + from view. The iconic “Morozian green,” camouflage of the Imperial Army's most common uniform has become a common symbol of the Empire's colonialist policies abroad." + icon = 'icons/clothing/under/uniforms/dominia_army.dmi' + icon_state = "dom_uniform" + item_state = "dom_uniform" + contained_sprite = TRUE + +/obj/item/clothing/under/dominia/army/nco + name = "imperial army NCO uniform" + desc = "An Imperial Army non-commissioned officer's fatigues. This one features forest camouflage." + icon_state = "dom_uniform1" + item_state = "dom_uniform1" + +/obj/item/clothing/accessory/dominia/nco_badge + name = "imperial army NCO badge" + desc = "A sleeve patch worn by non-commissioned officers of the Imperial Army." + desc_extended = "Non-commissioned officers form the backbone of the Imperial Army's troops. Typically recruited from Novi Jadran's countryside, they are well-trained \ + and well-motivated soldiers focused on ensuring their troops' survival and their mission's success." + icon = 'icons/clothing/accessories/dominia_nco_badge.dmi' + icon_state = "dom_nco" + item_state = "dom_nco" + +/obj/item/storage/backpack/dominia + name = "imperial army rucksack" + desc = "A rugged Imperial Army backpack intended for use during the Empire's frontier wars." + icon = 'icons/clothing/backpacks/dominia_backpack.dmi' + icon_state = "dom_backpack" + item_state = "dom_backpack" + +/obj/item/storage/backpack/dominia/nco + name = "imperial army NCO rucksack" + desc = "A non-commissioned officer's backpack. The radio set built into it allows for individual squads to stay in cohesion." + icon = 'icons/clothing/backpacks/dominia_backpack.dmi' + icon_state = "dom_backpack_nco" + item_state = "dom_backpack_nco" + +/obj/item/clothing/head/dominian_army + name = "imperial army field cap" + desc = "A green cap worn by enlisted members of the Imperial Army." + desc_extended = "The green of an enlisted soldier's cap both help it blend in and marks its wearer as a commoner. After all, no great house employs green in its \ + standard." + icon = 'icons/clothing/head/dominia_army_hat.dmi' + icon_state = "dom_hat" + item_state = "dom_hat" diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index 73ab0b05ac2..40694af8426 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -11,6 +11,21 @@ valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_PLATE, ACCESSORY_SLOT_ARM_GUARDS, ACCESSORY_SLOT_LEG_GUARDS, ACCESSORY_SLOT_ARMOR_POCKETS, ACCESSORY_SLOT_GENERIC, ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_CAPE, ACCESSORY_SLOT_UTILITY_MINOR) pockets = null +/obj/item/clothing/suit/armor/carrier/dominia + name = "imperial army flak vest" + desc = "Standard-issue body armor used by the Imperial Army. Has attachment points for a steel body armor plate." + desc_extended = "While not offering the protection of an entire armor set, the Empire's flak vests protect the wearer from shrapnel, some ballistics, \ + and weak lasers. It is significantly more comfortable to wear than a full steel plate, and many soldiers on Sun Reach only wear their flak vests — \ + much to the dismay of officers." + icon_state = "dom_carrier" + icon_state = "dom_carrier" + armor = list( + melee = ARMOR_MELEE_KNIVES, + bullet = ARMOR_BALLISTIC_SMALL, + laser = ARMOR_LASER_MINOR, + energy = ARMOR_ENERGY_SMALL + ) + /obj/item/clothing/suit/armor/carrier/officer starting_accessories = list( /obj/item/clothing/accessory/armor_plate, @@ -221,6 +236,14 @@ item_state = "plate_blue" slowdown = 0 // the SCC is hacking +/obj/item/clothing/accessory/armor_plate/heavy/dominia + name = "imperial army steel body armor" + desc = "Standard-issue heavy body armor used by the Imperial Army of the Empire of Dominia. When the Goddess' protection is not enough on its own, this will serve." + desc_extended = "The combat vests used by the Imperial Army protect well against lasers, ballistics, and shrapnel. They can easily turn a fatal injury into a mere \ + wound, and are worn throughout the Imperial Army. Despite the protection it offers this body armor is often hot and uncomfortable to wear due to its weight." + icon_state = "dom_plate" + item_state = "dom_plate" + /obj/item/clothing/accessory/armor_plate/tcaf name = "\improper TCAF legionnaire carapace" desc = "The blue carapace of the Tau Ceti Armed Forces. Polished and proud for Miranda Trasen's favorite soldiers." @@ -339,6 +362,29 @@ bomb = ARMOR_BOMB_PADDED, ) +/obj/item/clothing/head/helmet/dominia + name = "imperial army helmet" + desc = "A standard-issue helmet of the Imperial Army of Dominia. Wear on head for best results." + desc_extended = "The distinctive outline of the Imperial Army's helmet has made it into a symbol of Dominian imperialism abroad. The helmets themselves protect well \ + against lasers, ballistics, and shrapnel." + icon = 'icons/clothing/kit/modular_armor.dmi' + contained_sprite = TRUE + icon_state = "dom_helmet" + item_state = "dom_helmet" + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_MAJOR, + laser = ARMOR_LASER_MEDIUM, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED, + ) + +/obj/item/clothing/head/helmet/dominia/nco + name = "imperial army NCO helmet" + desc = "The standard-issue helmet of a non-commissioned officer of the Imperial Army of Dominia. Offers no additional protection." + icon_state = "dom_helmet_nco" + item_state = "dom_helmet_nco" + /obj/item/clothing/head/helmet/tcaf name = "\improper TCAF legionnaire faceplate helmet" desc = "A carapace helmet in the traditional colors of the Tau Ceti Armed Forces. This one equipped with the signature faceplate." diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index d6d822dc72f..0da57c8b321 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -129,6 +129,13 @@ max_ammo = 16 multiple_sprites = 1 +/obj/item/ammo_magazine/c45m/dominia + name = "dominian service pistol magazine (.45)" + desc = "A magazine specifically designed for a Dominian service pistol." + icon = 'icons/obj/guns/dominia_pistol.dmi' + icon_state = "dom_pistol_mag" + max_ammo = 11 + /obj/item/ammo_magazine/c46m name = "magazine (4.6mm)" icon_state = "4.6x30p" @@ -397,6 +404,12 @@ /obj/item/ammo_magazine/a556/makeshift/empty initial_ammo = 0 +/obj/item/ammo_magazine/a556/dlmg + name = "MPR-24/5 light machine gun magazine" + max_ammo = 50 + icon = 'icons/obj/guns/dominia_lmg.dmi' + icon_state = "dom_lmg_mag" + /obj/item/ammo_magazine/a65 name = "magazine (6.5mm)" icon_state = "c6.5mm" @@ -471,6 +484,11 @@ /obj/item/ammo_magazine/c762/dpra icon_state = "mrrazhak_mag" +/obj/item/ammo_magazine/c762/dominia + name = "mpr-24/5 carbine magazine (7.62mm)" + icon = 'icons/obj/guns/dominia_carbine.dmi' + icon_state = "dom_carbine_mag" + /obj/item/ammo_magazine/boltaction name = "ammo clip (7.62mm)" icon_state = "762" diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 9940c5a110b..9c6a96a4c4a 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -315,17 +315,21 @@ /datum/firemode/z8 var/use_launcher = 0 -/obj/item/gun/projectile/automatic/rifle/dom - name = "dominian assault rifle" - desc = "The standard issue rifle of the Empire of Dominia’s Imperial Army. With its sleek lines and ruggedized faux wood furniture, the MPR-24/5 \ - is as elegant as it is deadly, proving itself in service during Dominia's numerous colonial conflicts." - desc_extended = "The Moroz Pattern Rifle, Year of 2424 has been the standard issue rifle of the Imperial Army for decades thanks to its durable construction and ease of use. \ - The Imperial Army has repeatedly modernized and updated the MPR-24 over the past 40 years, and the rifle is now in its fifth modernization: one that they hope will keep it competitive well into the 2470s." - icon = 'icons/obj/guns/dom_rifle.dmi' +/obj/item/gun/projectile/automatic/rifle/dominia + name = "dominian rifle" + desc = "The standard-issue rifle of the Empire of Dominia's Imperial Army. Loads from 30 round 5.56 magazines." + desc_extended = "The Moroz Pattern Rifle, Year of 2424 has been the standard-issue rifle of the Imperial Army for decades thanks to its durable construction and ease \ + of use. The Imperial Army has repeatedly modernized and updated the MPR-24 over the past 40 years, and the rifle is now in its fifth modernization: \ + one that they hope will keep it competitive well into the 2470s." + icon = 'icons/obj/guns/dominia_rifle.dmi' icon_state = "acr" item_state = "acr" + caliber = "a556" + ammo_type = /obj/item/ammo_casing/a556 + magazine_type = /obj/item/ammo_magazine/a556 + allowed_magazines = list(/obj/item/ammo_magazine/a556) -/obj/item/gun/projectile/automatic/rifle/dom/update_icon() +/obj/item/gun/projectile/automatic/rifle/dominia/update_icon() ..() icon_state = (ammo_magazine)? "acr" : "acr-empty" @@ -603,7 +607,7 @@ desc = "A submachine gun featuring a novel top loading configuration, used by the Empire of Dominia's armed forces." desc_extended = "The Moroz Pattern Machine Carbine, Model of 2430 is a lightweight, handy weapon intended for use by vehicle crews, airborne troops, and other units that do not require a full-length rifle. \ Simplistic in design and function, the MPMC-30 is highly reliable in nearly all environments, lending itself well to use by colonial forces. In particular, the Imperial Fisanduhian Gendarmerie are known to make heavy use of the weapon." - icon = 'icons/obj/guns/dom_smg.dmi' + icon = 'icons/obj/guns/dominia_smg.dmi' icon_state = "owen" item_state = "owen" max_shells = 20 @@ -761,6 +765,49 @@ is_wieldable = TRUE max_shells = 8 +/obj/item/gun/projectile/automatic/rifle/dominia_carbine + name = "dominian carbine" + desc = "A carbine variant of the MPR-24/5 with a shorter barrel and folding stock. Loads from 20 round 7.62 magazines." + desc_extended = "The carbine variant of the MPR-24/5 is commonly seen in the hands of vehicle crews, airborne troops, and other units that do not require a \ + full-length rifle. Paramilitary units, such as the Imperial Fisanduhian Gendarmerie, are armed with these rather than full-length rifles." + icon = 'icons/obj/guns/dominia_carbine.dmi' + icon_state = "dom_carbine" + item_state = "dom_carbine" + slot_flags = SLOT_BACK|SLOT_OCLOTHING + w_class = ITEMSIZE_LARGE + ammo_type = "/obj/item/ammo_casing/a762" + handle_casings = EJECT_CASINGS + caliber = "a762" + magazine_type = /obj/item/ammo_magazine/c762/dominia + allowed_magazines = list(/obj/item/ammo_magazine/c762/dominia) + is_wieldable = TRUE + +/obj/item/gun/projectile/automatic/rifle/dominia_carbine/update_icon() + ..() + icon_state = (ammo_magazine)? "dom_carbine" : "dom_carbine-empty" + +/obj/item/gun/projectile/automatic/rifle/dominia_lmg + name = "dominian light machine gun" + desc = "A machine gun based on the MPR-24/5 platform." + desc_extended = "Originally developed as a platoon-level weapon but later converted to squad-level use, the MPR-24/5 PMG (Platoon Machine Gun) is \ + the most commonly-issued machine gun in the Imperial Army. The PMG is reliable and capable yet fairly heavy, and most non-geneboosted soldiers \ + issued it receive a special load-bearing harness to make using it easier." + icon = 'icons/obj/guns/dominia_lmg.dmi' + icon_state = "dom_lmg" + item_state = "dom_lmg" + caliber = "a556" + magazine_type = /obj/item/ammo_magazine/a556/dlmg + allowed_magazines = list(/obj/item/ammo_magazine/a556/dlmg) + firemodes = list( + list(mode_name="short bursts", burst=5, burst_accuracy = list(1,0,0,-1,-1), dispersion = list(3, 6, 9)), + list(mode_name="long bursts", burst=8, burst_accuracy = list(1,0,0,-1,-1,-1,-2,-2), dispersion = list(8)), + 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/dominia_lmg/update_icon() + ..() + icon_state = (ammo_magazine)? "dom_lmg" : "dom_lmg-empty" + /obj/item/gun/projectile/automatic/rifle/shotgun name = "assault shotgun" desc = "A experimental, semi-automatic combat shotgun, designed for boarding operations and law enforcement agencies." @@ -839,3 +886,4 @@ /obj/item/gun/projectile/automatic/rifle/shotgun/konyang/update_icon() ..() icon_state = (ammo_magazine)? "mshotgun" : "mshotgun-empty" + diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index ecfd511a386..5b9a8930903 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -342,7 +342,6 @@ /obj/item/gun/projectile/pistol/update_icon() ..() - icon_state = "pistol" if(!(ammo_magazine && ammo_magazine.stored_ammo.len)) icon_state = "[icon_state]-e" @@ -530,3 +529,25 @@ icon_state = "xanu_pistol-em" else icon_state = "xanu_pistol-e" + +/obj/item/gun/projectile/pistol/dominia + name = "dominian service pistol" + desc = "The Imperial Army's standard-issue handgun. Cheap, reliable, and easy to use." + desc_extended = "The Moroz Pattern Pistol, Year of 2450 (MPP-50) is a reliable handgun chambered in 7.62 \ + Imperial Short which features an unusual magazine. Zavodskoi Interstellar is a major producer of these handguns." + magazine_type = /obj/item/ammo_magazine/c45m/dominia + allowed_magazines = list(/obj/item/ammo_magazine/c45m/dominia) + icon = 'icons/obj/guns/dominia_pistol.dmi' + icon_state = "dom_pistol" + item_state = "dom_pistol" + caliber = ".45" + fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg' + load_method = MAGAZINE + fire_delay = ROF_PISTOL + +/obj/item/gun/projectile/pistol/dominia/update_icon() + ..() + if(ammo_magazine?.stored_ammo.len) + icon_state = "dom_pistol" + else + icon_state = "dom_pistol-e" diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm index 9ff411a1245..0752d50fa02 100644 --- a/code/modules/projectiles/guns/projectile/rifle.dm +++ b/code/modules/projectiles/guns/projectile/rifle.dm @@ -127,6 +127,29 @@ . = ..() jam_chance = min(jam_chance + 5, 100) +/obj/item/gun/projectile/shotgun/pump/rifle/dominia + name = "dominian sniper rifle" + desc = "A precision rifle used by snipers and sharpshooters of the Imperial Army. One of the few modern military-grade weapons to use a bolt for its action." + desc_extended = "The MPMR-08/2 is a precisely machined and meticulously designed rifle which prioritizes accuracy and precision over rate of fire. \ + Outside of the Imperial Army, it is commonly seen in the hands of competition shooters." + icon = 'icons/obj/guns/dominia_bolt_action.dmi' + icon_state = "dom_bolt_action" + item_state = "dom_bolt_action" + caliber = "a762" + ammo_type = /obj/item/ammo_casing/a762 + magazine_type = /obj/item/ammo_magazine/boltaction + load_method = SPEEDLOADER + +/obj/item/gun/projectile/shotgun/pump/rifle/dominia/verb/scope() + set category = "Object" + set name = "Use Scope" + set src in usr + + if(wielded) + toggle_scope(2.0, usr) + else + to_chat(usr, "You can't look through the scope without stabilizing the rifle!") + /obj/item/gun/projectile/contender name = "pocket rifle" desc = "A perfect, pristine replica of an ancient one-shot hand-cannon. This one has been modified to work almost like a bolt-action." diff --git a/html/changelogs/mattatlas-imparmy.yml b/html/changelogs/mattatlas-imparmy.yml new file mode 100644 index 00000000000..52651b5fcdf --- /dev/null +++ b/html/changelogs/mattatlas-imparmy.yml @@ -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: MattAtlas + +# 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 Dominian Imperial Army gear, which can also be bought on the uplink as part of the Imperial Army gear crate." diff --git a/icons/clothing/accessories/dominia_nco_badge.dmi b/icons/clothing/accessories/dominia_nco_badge.dmi new file mode 100644 index 0000000000000000000000000000000000000000..08c4a57a2af9384bfa9c479f1f76ed39781b407e GIT binary patch literal 508 zcmV2eo`2YX_0d!JM zQvg8b*k%9#0C{>;Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1N7zh*zB<9y65{T>V_Y?gapqPc)w}i7C+l008(&L_t(og=1hC1*2df zfe=#L=gz4nN)D)^Oaj={f&sINRpgAtPH06oQhk9AjGVic zcC9c`MiVy2su%>em@dm&mKE%cCXA~dVPN21m6?_{ZPf;x3NXO7w3wr5*~F`7;7&Vp zCXECO7#L*E-Z@B$dIrY3cX5Y0R`B*7Y3fPW!1sVe4WnQbjDjHyu=gL(fHM*sd;b9y yFs33(HeCG&RN#itfV?ZC<6d{F(s?2x*N6t0000P)t-sz`(#Y zKs6vFAU7x_E+isQUr<+US7(4{Ni#2FV`EZMQop>st*xzgc6QOx(OWz=ZACr*|Nnx5 zf^~IukB^U4RaHJdJ~J~jz`($H>8S?*0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pS zoZ^zil2jm5DJ4HQJ}EIdy8wuR3?(kkl+2=HkajN4w4%h^R1n(`yLyCTL&A#V^OE!9 zlSncjqy?89$_lQ2E?^%60QXo*NY4%2FaQ7oTuDShRA_$wSqt_&;<9h2Y&)xX25J1ehJy=zOAP8@T0u2fe0l@lksLplLVi@bZvj!bf83mQr zIyd*!W$ugxlNLc)7Y@N$WDkNe)_~@+f2Pn7JF9?1ebOR;3r*Vu_q_Pf#KpOE5Q1CK z#iwYH6=W8meb*k_&Obk7*VevY@|YFeyY#+pyXSbHviQE6=|1}xxU+MLiaS6ZL}tT7DYN0!dYpzn@3x(UJLeY!K@fz$K(jB(r)}YD zUzATP$7yq*Fz3yI!pJLl`yF8Xe;pSp{j%ymVaETjKEUJxnfn9A|7SAy z2XTOLAkxPukJ+#-^6NKe+in9nKPm zCo4!ZTYrapf;E5v()@uwU(#N`Gsd|1ZV;`#xR+jQ^M6{(YY+wBOqEYN+?j`F~L;$>;pPDC8uZ g{|ka32*N(T0n(HbcjK2K^8f$<07*qoM6N<$f;ic>;{X5v literal 0 HcmV?d00001 diff --git a/icons/clothing/head/dominia_army_hat.dmi b/icons/clothing/head/dominia_army_hat.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f27f93a4baa8e8b4749c0ac9bee11ba24a558260 GIT binary patch literal 509 zcmVBoBEEl>=00001 zbW%=J06^y0W&i*Hb$V1-bVOxyV{&P5bZKvH004NLQ&wgNJ>0{~8hCy>N^dV~M~0QyNpK~z|U?UzvtgD?<- zy}RDDwcG#yxl2{t9@bW>WrN-KBm@&gN$N2C5Ja3HYSe28JJp-2V`7UPo4%b>r*M8(r-2k?TVG)-R9P{BNL70xQw#pAvA*7Y7Kd zd%Xgu&3#fxK*Waf_5K4YYN^Ae4bfYd2aFTZ)+Iu8qOkG--lw`vee2IOVh%w-2=P8g zG_IdIRH6tH;{1s4?^L<6)5YE}4C64R1O9scKjV(`H+CP(`LXQ;TM9LMe6QO}+MBdE zxgUUCZ;Tk1&B@PMO|Mg%1DgxOFbu;mjDO|{2&D!CL%O?o00000NkvXXu0mjfIv3d+ literal 0 HcmV?d00001 diff --git a/icons/clothing/kit/modular_armor.dmi b/icons/clothing/kit/modular_armor.dmi index e569bc5abae85e56c2d356c20e0bb4c304befbbb..89aa9ed72142e5cb38cda2d4eb4eedd1f9fcb488 100644 GIT binary patch delta 9396 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 b<~r7$u_x9$n-uzQ67cMax>C8KW$6C^8)uLR delta 5984 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 literal 0 HcmV?d00001 diff --git a/icons/obj/guns/dominia_lmg.dmi b/icons/obj/guns/dominia_lmg.dmi new file mode 100644 index 0000000000000000000000000000000000000000..096d2a848d05b31f64b9c784bb342be381f2fa9e GIT binary patch literal 2802 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 literal 0 HcmV?d00001 diff --git a/icons/obj/guns/dom_rifle.dmi b/icons/obj/guns/dominia_rifle.dmi similarity index 100% rename from icons/obj/guns/dom_rifle.dmi rename to icons/obj/guns/dominia_rifle.dmi diff --git a/icons/obj/guns/dom_smg.dmi b/icons/obj/guns/dominia_smg.dmi similarity index 100% rename from icons/obj/guns/dom_smg.dmi rename to icons/obj/guns/dominia_smg.dmi diff --git a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm index 080055431c0..4ffb64be91f 100644 --- a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm +++ b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm @@ -5197,8 +5197,8 @@ name = "gun cabinet (rifles)" }, /obj/effect/floor_decal/industrial/outline/security, -/obj/item/gun/projectile/automatic/rifle/dom, -/obj/item/gun/projectile/automatic/rifle/dom, +/obj/item/gun/projectile/automatic/rifle/dominia, +/obj/item/gun/projectile/automatic/rifle/dominia, /obj/item/ammo_magazine/c762, /obj/item/ammo_magazine/c762, /obj/item/grenade/frag, diff --git a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm index 91e1de4a602..c4a8bc1ef4d 100644 --- a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm +++ b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm @@ -3811,8 +3811,8 @@ /obj/structure/closet/secure_closet/guncabinet{ req_access = null }, -/obj/item/gun/projectile/automatic/rifle/dom, -/obj/item/gun/projectile/automatic/rifle/dom, +/obj/item/gun/projectile/automatic/rifle/dominia, +/obj/item/gun/projectile/automatic/rifle/dominia, /obj/item/ammo_magazine/c762, /obj/item/ammo_magazine/c762, /obj/effect/floor_decal/industrial/outline/yellow, diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm index d239b2e3185..edf448de4af 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm @@ -5218,7 +5218,7 @@ }, /obj/item/clothing/head/dominia/fleet/officer, /obj/item/shield/energy/dominia, -/obj/item/gun/projectile/automatic/rifle/dom, +/obj/item/gun/projectile/automatic/rifle/dominia, /turf/simulated/floor, /area/hegemony_ship/trophy_room) "FO" = (