cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Dominian Imperial Army gear. (#17971)

Browse Source 
Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2023-12-25 16:19:40 +00:00
committed by GitHub
co-authored by Matt Atlas
parent 67849aca55
commit 4629903dd2
23 changed files with 326 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink/gear loadout.dm
+12
View File
@@ -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
code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
+54 -3
View File
@@ -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
code/modules/clothing/factions/dominia.dm
+48
View File
@@ -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"
code/modules/clothing/suits/modular_armor.dm
+46
View File
@@ -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."
code/modules/projectiles/ammunition/boxes.dm
+18
View File
@@ -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"
code/modules/projectiles/guns/projectile/automatic.dm
+57 -9
View File
@@ -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"
code/modules/projectiles/guns/projectile/pistol.dm
+22 -1
View File
@@ -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"
code/modules/projectiles/guns/projectile/rifle.dm
+23
View File
@@ -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, "<span class='warning'>You can't look through the scope without stabilizing the rifle!</span>")
/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."
html/changelogs/mattatlas-imparmy.yml
+41
View File
@@ -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."
icons/clothing/accessories/dominia_nco_badge.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 508 B

icons/clothing/backpacks/dominia_backpack.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 906 B

icons/clothing/head/dominia_army_hat.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 509 B

icons/clothing/kit/modular_armor.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 51 KiB

icons/clothing/under/uniforms/dominia_army.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

icons/obj/guns/dominia_bolt_action.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

icons/obj/guns/dominia_carbine.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

icons/obj/guns/dominia_lmg.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

icons/obj/guns/dominia_pistol.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

icons/obj/guns/dom_rifle.dmi → icons/obj/guns/dominia_rifle.dmi
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

icons/obj/guns/dom_smg.dmi → icons/obj/guns/dominia_smg.dmi
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 770 B

After

Width:  |  Height:  |  Size: 770 B

maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm
+2 -2
View File
@@ -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,
maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm
+2 -2
View File
@@ -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,
maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
+1 -1
View File
@@ -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" = (