From 23789d4113a259b8e55aeebdc96194a8281bd964 Mon Sep 17 00:00:00 2001
From: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
Date: Wed, 25 Mar 2026 11:37:50 -0400
Subject: [PATCH] Sorts out existing projectile weapons (#22059)
This PR is intended to sort out our existing guns into something
resembling organization. In addition, ancient decrepit guns are removed,
and abstract paths are labeled as such.
In addition, all guns are now standardized to refer to their model.
Considering the huge number of weapons we have, a `pistol` is not
descriptive enough.
NOTE: At over 200 files touched, this is being split. Not everything was
sorted, but this is already a monster to sort through. The rest can
wait.
---
aurorastation.dme | 1 -
code/__DEFINES/sound.dm | 1 +
code/__HELPERS/game.dm | 2 +-
code/datums/outfits/ert/zenghu.dm | 6 +-
code/datums/outfits/event/outfit_megacorps.dm | 6 +-
code/datums/trading/unique.dm | 2 +-
.../highly visible and dangerous weapons.dm | 2 +-
code/game/gamemodes/objective.dm | 2 +-
code/game/machinery/portable_turret.dm | 4 +-
.../objects/items/weapons/storage/boxes.dm | 8 +-
.../objects/items/weapons/storage/lockbox.dm | 2 +-
code/game/objects/random/loot.dm | 6 +-
code/game/objects/random/weapon.dm | 29 +---
code/game/objects/random/weapon_and_ammo.dm | 13 +-
.../crates_lockers/closets/gimmick.dm | 12 +-
code/game/sound/sound_keys/sound_keys.dm | 8 +
code/modules/cargo/items/weaponry.dm | 10 +-
code/modules/clothing/chameleon.dm | 4 +-
.../clothing/spacesuits/rig/modules/combat.dm | 2 +-
.../modules/heavy_vehicle/equipment/combat.dm | 4 +-
code/modules/item_worth/worths_list.dm | 11 +-
.../mob/living/silicon/robot/robot_modules.dm | 8 +-
.../living/simple_animal/hostile/pirate.dm | 2 +-
code/modules/projectiles/ammunition/boxes.dm | 8 +-
.../modules/projectiles/ammunition/bullets.dm | 6 +-
code/modules/projectiles/gun.dm | 11 +-
code/modules/projectiles/guns/alien.dm | 107 ------------
code/modules/projectiles/guns/bang.dm | 154 ++++++++++++++----
code/modules/projectiles/guns/bang/pistol.dm | 107 ++++++------
.../modules/projectiles/guns/bang/revolver.dm | 4 +-
code/modules/projectiles/guns/energy.dm | 4 +-
.../projectiles/guns/energy/blaster.dm | 22 +--
code/modules/projectiles/guns/energy/crank.dm | 4 +-
.../projectiles/guns/energy/freezeray.dm | 4 +-
code/modules/projectiles/guns/energy/laser.dm | 145 ++---------------
.../projectiles/guns/energy/lawgiver.dm | 24 +--
.../projectiles/guns/energy/nuclear.dm | 34 ++--
code/modules/projectiles/guns/energy/pulse.dm | 48 +++++-
code/modules/projectiles/guns/energy/rifle.dm | 148 ++++++++++-------
.../projectiles/guns/energy/special.dm | 62 ++-----
code/modules/projectiles/guns/energy/stun.dm | 12 +-
code/modules/projectiles/guns/launcher.dm | 2 +-
.../projectiles/guns/launcher/crossbow.dm | 13 --
.../projectiles/guns/launcher/rocket.dm | 4 +-
code/modules/projectiles/guns/projectile.dm | 4 +-
.../projectiles/guns/projectile/automatic.dm | 132 +++++++--------
.../projectiles/guns/projectile/cannon.dm | 14 +-
.../projectiles/guns/projectile/improvised.dm | 6 +-
.../projectiles/guns/projectile/pistol.dm | 111 +++++++------
.../projectiles/guns/projectile/plasma.dm | 14 +-
.../projectiles/guns/projectile/revolver.dm | 38 ++---
.../projectiles/guns/projectile/rifle.dm | 69 +++++---
.../projectiles/guns/projectile/shotgun.dm | 20 +--
.../projectiles/guns/projectile/sniper.dm | 18 +-
code/modules/projectiles/projectile/beams.dm | 2 +-
code/modules/projectiles/suppressor.dm | 2 +-
code/modules/random_map/drop/drop_types.dm | 6 +-
.../reagents/reagent_containers/spray.dm | 2 +-
config/example/custom_items.json | 2 +-
.../GeneralCamo - Gun Organization.yml | 63 +++++++
icons/obj/bang_flag.dmi | Bin 256 -> 751 bytes
icons/obj/guns/{ => attachments}/bayonet.dmi | Bin
icons/obj/guns/attachments/suppressor.dmi | Bin 0 -> 417 bytes
icons/obj/guns/bfg.dmi | Bin 1123 -> 0 bytes
icons/obj/guns/colt.dmi | Bin 691 -> 0 bytes
.../guns/{ => faction/antique}/caplaser.dmi | Bin
.../obj/guns/{ => faction/antique}/deagle.dmi | Bin
.../guns/{ => faction/antique}/detective.dmi | Bin
.../obj/guns/{ => faction/antique}/retro.dmi | Bin
.../{ => faction/antique}/springfield.dmi | Bin
.../guns/{ => faction/antique}/tommygun.dmi | Bin
.../{c20r.dmi => faction/caisc/ca-25e.dmi} | Bin
.../guns/{l6.dmi => faction/caisc/ca-75e.dmi} | Bin
.../caisc/ornamental_pattern_5.dmi} | Bin
icons/obj/guns/faction/caisc/pattern_5.dmi | Bin 0 -> 722 bytes
.../caisc/pattern_5_auto.dmi} | Bin
.../{ => faction/dna_defense}/xanu_pistol.dmi | Bin
.../{ => faction/dna_defense}/xanu_rifle.dmi | Bin
.../dna_defense}/xanu_shotgun.dmi | Bin
.../dna_defense}/xanu_shotgun_mags.dmi | Bin
.../{ => faction/dna_defense}/xanu_smg.dmi | Bin
.../dominian_empire}/dominia_bolt_action.dmi | Bin
.../dominian_empire}/dominia_carbine.dmi | Bin
.../dominian_empire}/dominia_lmg.dmi | Bin
.../dominian_empire}/dominia_pistol.dmi | Bin
.../dominian_empire}/dominia_rifle.dmi | Bin
.../dominian_empire}/dominia_smg.dmi | Bin
.../{ => faction/dpra}/golden_mrrazhak.dmi | Bin
.../obj/guns/{ => faction/dpra}/mrrazhak.dmi | Bin
.../dpra/mrrazhakulii_suppressed_pistol.dmi} | Bin
.../{ => faction/dpra}/recoilless_rifle.dmi | Bin
.../{ => faction/elyran_republic}/bolter.dmi | Bin
.../elyran_republic}/plasma_pistol.dmi | Bin
.../{ => faction/elyran_republic}/slammer.dmi | Bin
.../eridani_federation}/assassin_smg.dmi | Bin
.../eridani_federation}/autorevolver.dmi | Bin
.../guns/{ => faction/frontier}/arifle.dmi | Bin
.../guns/{ => faction/frontier}/bcarbine.dmi | Bin
.../guns/{ => faction/frontier}/derringer.dmi | Bin
.../{ => faction/frontier}/gauss_carbine.dmi | Bin
.../{ => faction/frontier}/heavysniper.dmi | Bin
.../obj/guns/{ => faction/frontier}/lemat.dmi | Bin
.../obj/guns/faction/frontier/leveraction.dmi | Bin 0 -> 1387 bytes
.../guns/{ => faction/frontier}/overunder.dmi | Bin
.../guns/{ => faction/frontier}/pockrifle.dmi | Bin
.../guns/{ => faction/frontier}/shorty.dmi | Bin
.../guns/{ => faction/frontier}/shotgun.dmi | Bin
.../guns/{ => faction/frontier}/zipgun.dmi | Bin
.../galatean_technocracy}/galatea_laser.dmi | Bin
.../galatean_technocracy}/galatea_nitro.dmi | Bin
.../golden_deep}/goldendeep_ornatepistol.dmi | Bin
.../hephaestus_industries}/cshotgun.dmi | Bin
.../himeo_free_consortium}/himeo_blaster.dmi | Bin
.../himeo_free_consortium}/himeo_pistol.dmi | Bin
.../guns/{ => faction/improvised}/ipistol.dmi | Bin
.../{ => faction/improvised}/ishotgun.dmi | Bin
.../guns/{ => faction/improvised}/ismg.dmi | Bin
.../izweski_hegemony}/hegemony_pistol.dmi | Bin
.../izweski_hegemony}/hegemony_rifle.dmi | Bin
.../izweski_hegemony}/unathi_ballistics.dmi | Bin
.../izweski_hegemony}/unathi_slugger.dmi | Bin
.../{ => faction/konyang}/konyang_weapons.dmi | Bin
.../blaster_carbine.dmi | Bin
.../blaster_pistol.dmi | Bin
.../blaster_revolver.dmi | Bin
.../nanotrasen_corporation}/blaster_rifle.dmi | Bin
.../nanotrasen_corporation}/burst_rifle.dmi | Bin
.../nanotrasen_corporation}/detgun.dmi | Bin
.../nanotrasen_corporation}/ecarbine.dmi | Bin
.../nanotrasen_corporation}/epistol.dmi | Bin
.../nanotrasen_corporation}/erifle.dmi | Bin
.../nanotrasen_corporation/everyman.dmi} | Bin
.../nanotrasen_corporation}/gauss_thumper.dmi | Bin
.../nanotrasen_corporation}/ionrifle.dmi | Bin
.../nanotrasen_corporation}/lasercannon.dmi | Bin
.../nanotrasen_corporation}/laserrifle.dmi | Bin
.../nanotrasen_corporation}/lasershotgun.dmi | Bin
.../nt_laser_sniper.dmi} | Bin
.../nanotrasen_corporation}/pestishock.dmi | Bin
.../nanotrasen_corporation}/pulse.dmi | Bin
.../nanotrasen_corporation}/pulse_carbine.dmi | Bin
.../nanotrasen_corporation}/pulse_pistol.dmi | Bin
.../nanotrasen_corporation}/secgun.dmi | Bin
.../nanotrasen_corporation}/secgun_wood.dmi | Bin
.../nanotrasen_corporation/stunpistol.dmi} | Bin
.../nanotrasen_corporation}/stunrevolver.dmi | Bin
.../nanotrasen_corporation/tanto.dmi} | Bin
.../nanotrasen_corporation}/x9.dmi | Bin
.../nanotrasen_corporation}/xenogun.dmi | Bin
.../nanotrasen_corporation}/xray.dmi | Bin
.../nanotrasen_corporation}/xrifle.dmi | Bin
.../{ => faction/nka}/adhomian_revolver.dmi | Bin
icons/obj/guns/{ => faction/nka}/cannon.dmi | Bin
.../nralakk_federation}/nralakkpistol.dmi | Bin
.../nralakk_federation}/nralakksmg.dmi | Bin
.../{ => faction/pra}/adhomian_pistol.dmi | Bin
icons/obj/guns/faction/pra/bolt.dmi | Bin 0 -> 1577 bytes
.../obj/guns/{ => faction/pra}/bolt_scope.dmi | Bin
.../{tesla.dmi => faction/pra/elektrotek.dmi} | Bin
.../{dragunov.dmi => faction/pra/hotaki.dmi} | Bin
icons/obj/guns/{ => faction/pra}/icelance.dmi | Bin
.../pra/maidhaztha.dmi} | Bin
.../pra/naltor_heavy_pistol.dmi} | Bin
.../{ => faction/sol_alliance}/sol_pistol.dmi | Bin
.../{ => faction/sol_alliance}/sol_rifle.dmi | Bin
.../sol_alliance}/sol_shotgun.dmi | Bin
.../{ => faction/sol_alliance}/sol_smg.dmi | Bin
.../combipistol.dmi} | Bin
.../erepeater.dmi | Bin
.../stellar_corporate_conglomerate}/peac.dmi | Bin
.../sccpistol.dmi | Bin
icons/obj/guns/{ => faction/toy}/bluetag.dmi | Bin
icons/obj/guns/{ => faction/toy}/redtag.dmi | Bin
.../guns/{ => faction/toy}/xenoblaster.dmi | Bin
.../vaurca_hives/gatling_laser.dmi} | Bin
.../{ => faction/vaurca_hives}/megaglaive.dmi | Bin
.../vaurca_hives/thermic_blaster.dmi} | Bin
.../assaultshotgun.dmi | Bin
.../zavodskoi_interstellar}/blaster_ar.dmi | Bin
.../captain_revolver.dmi | Bin
.../zavodskoi_interstellar}/carbine.dmi | Bin
.../zavodskoi_interstellar}/crew_laser.dmi | Bin
.../zavodskoi_interstellar}/crew_rifle.dmi | Bin
.../faction/zavodskoi_interstellar/pistol.dmi | Bin 0 -> 1070 bytes
.../zavodskoi_interstellar}/revolver.dmi | Bin
.../zavodskoi_interstellar}/tranqsniper.dmi | Bin
.../zavodskoi_interstellar}/w556.dmi | Bin
.../zavodskoi_interstellar}/wt550.dmi | Bin
icons/obj/guns/leveraction.dmi | Bin 1447 -> 0 bytes
icons/obj/guns/moistnugget.dmi | Bin 1457 -> 0 bytes
icons/obj/guns/noisecannon.dmi | Bin 788 -> 0 bytes
icons/obj/guns/oldenergy.dmi | Bin 11661 -> 0 bytes
icons/obj/guns/oldlaser.dmi | Bin 5432 -> 0 bytes
icons/obj/guns/pistol.dmi | Bin 1055 -> 0 bytes
icons/obj/guns/spikethrower.dmi | Bin 877 -> 0 bytes
icons/obj/guns/suppressor.dmi | Bin 416 -> 0 bytes
icons/obj/guns/taserold.dmi | Bin 1462 -> 0 bytes
icons/obj/guns/toxgun.dmi | Bin 782 -> 0 bytes
icons/obj/guns/{ => unused}/energy.dmi | Bin
icons/obj/guns/{ => unused}/incinerator.dmi | Bin
icons/obj/guns/{ => unused}/m1911.dmi | Bin
icons/obj/guns/{ => unused}/p08.dmi | Bin
icons/obj/random.dmi | Bin 60425 -> 64634 bytes
.../away_site/abandoned_mining/cursed.dmm | 2 +-
.../away_site/first_aurora/first_aurora.dmm | 4 +-
.../away_site/hivebot_hub/hivebot_hub.dmm | 2 +-
.../treasure_trove/treasure_trove.dmm | 6 +-
.../enviro_testing_facility_submaps_main.dmm | 2 +-
.../nuclear_silo/nuclear_silo_submaps.dmm | 2 +-
maps/dungeon_spawns/vault_unique.dmm | 2 +-
maps/event/generic_dock/generic_dock-1.dmm | 10 +-
maps/event/idris_cruise/idris_cruise-1.dmm | 2 +-
maps/sccv_horizon/sccv_horizon.dmm | 12 +-
sound/weapons/empty/dryfire_plastic_01.ogg | Bin 0 -> 5659 bytes
sound/weapons/empty/dryfire_plastic_02.ogg | Bin 0 -> 4988 bytes
sound/weapons/empty/dryfire_plastic_03.ogg | Bin 0 -> 5033 bytes
216 files changed, 797 insertions(+), 818 deletions(-)
delete mode 100644 code/modules/projectiles/guns/alien.dm
create mode 100644 html/changelogs/GeneralCamo - Gun Organization.yml
rename icons/obj/guns/{ => attachments}/bayonet.dmi (100%)
create mode 100644 icons/obj/guns/attachments/suppressor.dmi
delete mode 100644 icons/obj/guns/bfg.dmi
delete mode 100644 icons/obj/guns/colt.dmi
rename icons/obj/guns/{ => faction/antique}/caplaser.dmi (100%)
rename icons/obj/guns/{ => faction/antique}/deagle.dmi (100%)
rename icons/obj/guns/{ => faction/antique}/detective.dmi (100%)
rename icons/obj/guns/{ => faction/antique}/retro.dmi (100%)
rename icons/obj/guns/{ => faction/antique}/springfield.dmi (100%)
rename icons/obj/guns/{ => faction/antique}/tommygun.dmi (100%)
rename icons/obj/guns/{c20r.dmi => faction/caisc/ca-25e.dmi} (100%)
rename icons/obj/guns/{l6.dmi => faction/caisc/ca-75e.dmi} (100%)
rename icons/obj/guns/{coltsuper.dmi => faction/caisc/ornamental_pattern_5.dmi} (100%)
create mode 100644 icons/obj/guns/faction/caisc/pattern_5.dmi
rename icons/obj/guns/{coltauto.dmi => faction/caisc/pattern_5_auto.dmi} (100%)
rename icons/obj/guns/{ => faction/dna_defense}/xanu_pistol.dmi (100%)
rename icons/obj/guns/{ => faction/dna_defense}/xanu_rifle.dmi (100%)
rename icons/obj/guns/{ => faction/dna_defense}/xanu_shotgun.dmi (100%)
rename icons/obj/guns/{ => faction/dna_defense}/xanu_shotgun_mags.dmi (100%)
rename icons/obj/guns/{ => faction/dna_defense}/xanu_smg.dmi (100%)
rename icons/obj/guns/{ => faction/dominian_empire}/dominia_bolt_action.dmi (100%)
rename icons/obj/guns/{ => faction/dominian_empire}/dominia_carbine.dmi (100%)
rename icons/obj/guns/{ => faction/dominian_empire}/dominia_lmg.dmi (100%)
rename icons/obj/guns/{ => faction/dominian_empire}/dominia_pistol.dmi (100%)
rename icons/obj/guns/{ => faction/dominian_empire}/dominia_rifle.dmi (100%)
rename icons/obj/guns/{ => faction/dominian_empire}/dominia_smg.dmi (100%)
rename icons/obj/guns/{ => faction/dpra}/golden_mrrazhak.dmi (100%)
rename icons/obj/guns/{ => faction/dpra}/mrrazhak.dmi (100%)
rename icons/obj/guns/{silenced_pistol.dmi => faction/dpra/mrrazhakulii_suppressed_pistol.dmi} (100%)
rename icons/obj/guns/{ => faction/dpra}/recoilless_rifle.dmi (100%)
rename icons/obj/guns/{ => faction/elyran_republic}/bolter.dmi (100%)
rename icons/obj/guns/{ => faction/elyran_republic}/plasma_pistol.dmi (100%)
rename icons/obj/guns/{ => faction/elyran_republic}/slammer.dmi (100%)
rename icons/obj/guns/{ => faction/eridani_federation}/assassin_smg.dmi (100%)
rename icons/obj/guns/{ => faction/eridani_federation}/autorevolver.dmi (100%)
rename icons/obj/guns/{ => faction/frontier}/arifle.dmi (100%)
rename icons/obj/guns/{ => faction/frontier}/bcarbine.dmi (100%)
rename icons/obj/guns/{ => faction/frontier}/derringer.dmi (100%)
rename icons/obj/guns/{ => faction/frontier}/gauss_carbine.dmi (100%)
rename icons/obj/guns/{ => faction/frontier}/heavysniper.dmi (100%)
rename icons/obj/guns/{ => faction/frontier}/lemat.dmi (100%)
create mode 100644 icons/obj/guns/faction/frontier/leveraction.dmi
rename icons/obj/guns/{ => faction/frontier}/overunder.dmi (100%)
rename icons/obj/guns/{ => faction/frontier}/pockrifle.dmi (100%)
rename icons/obj/guns/{ => faction/frontier}/shorty.dmi (100%)
rename icons/obj/guns/{ => faction/frontier}/shotgun.dmi (100%)
rename icons/obj/guns/{ => faction/frontier}/zipgun.dmi (100%)
rename icons/obj/guns/{ => faction/galatean_technocracy}/galatea_laser.dmi (100%)
rename icons/obj/guns/{ => faction/galatean_technocracy}/galatea_nitro.dmi (100%)
rename icons/obj/guns/{ => faction/golden_deep}/goldendeep_ornatepistol.dmi (100%)
rename icons/obj/guns/{ => faction/hephaestus_industries}/cshotgun.dmi (100%)
rename icons/obj/guns/{ => faction/himeo_free_consortium}/himeo_blaster.dmi (100%)
rename icons/obj/guns/{ => faction/himeo_free_consortium}/himeo_pistol.dmi (100%)
rename icons/obj/guns/{ => faction/improvised}/ipistol.dmi (100%)
rename icons/obj/guns/{ => faction/improvised}/ishotgun.dmi (100%)
rename icons/obj/guns/{ => faction/improvised}/ismg.dmi (100%)
rename icons/obj/guns/{ => faction/izweski_hegemony}/hegemony_pistol.dmi (100%)
rename icons/obj/guns/{ => faction/izweski_hegemony}/hegemony_rifle.dmi (100%)
rename icons/obj/guns/{ => faction/izweski_hegemony}/unathi_ballistics.dmi (100%)
rename icons/obj/guns/{ => faction/izweski_hegemony}/unathi_slugger.dmi (100%)
rename icons/obj/guns/{ => faction/konyang}/konyang_weapons.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/blaster_carbine.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/blaster_pistol.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/blaster_revolver.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/blaster_rifle.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/burst_rifle.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/detgun.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/ecarbine.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/epistol.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/erifle.dmi (100%)
rename icons/obj/guns/{leyon.dmi => faction/nanotrasen_corporation/everyman.dmi} (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/gauss_thumper.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/ionrifle.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/lasercannon.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/laserrifle.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/lasershotgun.dmi (100%)
rename icons/obj/guns/{sniper.dmi => faction/nanotrasen_corporation/nt_laser_sniper.dmi} (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/pestishock.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/pulse.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/pulse_carbine.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/pulse_pistol.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/secgun.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/secgun_wood.dmi (100%)
rename icons/obj/guns/{taser.dmi => faction/nanotrasen_corporation/stunpistol.dmi} (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/stunrevolver.dmi (100%)
rename icons/obj/guns/{c05r.dmi => faction/nanotrasen_corporation/tanto.dmi} (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/x9.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/xenogun.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/xray.dmi (100%)
rename icons/obj/guns/{ => faction/nanotrasen_corporation}/xrifle.dmi (100%)
rename icons/obj/guns/{ => faction/nka}/adhomian_revolver.dmi (100%)
rename icons/obj/guns/{ => faction/nka}/cannon.dmi (100%)
rename icons/obj/guns/{ => faction/nralakk_federation}/nralakkpistol.dmi (100%)
rename icons/obj/guns/{ => faction/nralakk_federation}/nralakksmg.dmi (100%)
rename icons/obj/guns/{ => faction/pra}/adhomian_pistol.dmi (100%)
create mode 100644 icons/obj/guns/faction/pra/bolt.dmi
rename icons/obj/guns/{ => faction/pra}/bolt_scope.dmi (100%)
rename icons/obj/guns/{tesla.dmi => faction/pra/elektrotek.dmi} (100%)
rename icons/obj/guns/{dragunov.dmi => faction/pra/hotaki.dmi} (100%)
rename icons/obj/guns/{ => faction/pra}/icelance.dmi (100%)
rename icons/obj/guns/{blockbuster.dmi => faction/pra/maidhaztha.dmi} (100%)
rename icons/obj/guns/{adhomian_heavy_pistol.dmi => faction/pra/naltor_heavy_pistol.dmi} (100%)
rename icons/obj/guns/{ => faction/sol_alliance}/sol_pistol.dmi (100%)
rename icons/obj/guns/{ => faction/sol_alliance}/sol_rifle.dmi (100%)
rename icons/obj/guns/{ => faction/sol_alliance}/sol_shotgun.dmi (100%)
rename icons/obj/guns/{ => faction/sol_alliance}/sol_smg.dmi (100%)
rename icons/obj/guns/{lawgiver.dmi => faction/stellar_corporate_conglomerate/combipistol.dmi} (100%)
rename icons/obj/guns/{ => faction/stellar_corporate_conglomerate}/erepeater.dmi (100%)
rename icons/obj/guns/{ => faction/stellar_corporate_conglomerate}/peac.dmi (100%)
rename icons/obj/guns/{ => faction/stellar_corporate_conglomerate}/sccpistol.dmi (100%)
rename icons/obj/guns/{ => faction/toy}/bluetag.dmi (100%)
rename icons/obj/guns/{ => faction/toy}/redtag.dmi (100%)
rename icons/obj/guns/{ => faction/toy}/xenoblaster.dmi (100%)
rename icons/obj/guns/{gatling.dmi => faction/vaurca_hives/gatling_laser.dmi} (100%)
rename icons/obj/guns/{ => faction/vaurca_hives}/megaglaive.dmi (100%)
rename icons/obj/guns/{blaster.dmi => faction/vaurca_hives/thermic_blaster.dmi} (100%)
rename icons/obj/guns/{ => faction/zavodskoi_interstellar}/assaultshotgun.dmi (100%)
rename icons/obj/guns/{ => faction/zavodskoi_interstellar}/blaster_ar.dmi (100%)
rename icons/obj/guns/{ => faction/zavodskoi_interstellar}/captain_revolver.dmi (100%)
rename icons/obj/guns/{ => faction/zavodskoi_interstellar}/carbine.dmi (100%)
rename icons/obj/guns/{ => faction/zavodskoi_interstellar}/crew_laser.dmi (100%)
rename icons/obj/guns/{ => faction/zavodskoi_interstellar}/crew_rifle.dmi (100%)
create mode 100644 icons/obj/guns/faction/zavodskoi_interstellar/pistol.dmi
rename icons/obj/guns/{ => faction/zavodskoi_interstellar}/revolver.dmi (100%)
rename icons/obj/guns/{ => faction/zavodskoi_interstellar}/tranqsniper.dmi (100%)
rename icons/obj/guns/{ => faction/zavodskoi_interstellar}/w556.dmi (100%)
rename icons/obj/guns/{ => faction/zavodskoi_interstellar}/wt550.dmi (100%)
delete mode 100644 icons/obj/guns/leveraction.dmi
delete mode 100644 icons/obj/guns/moistnugget.dmi
delete mode 100644 icons/obj/guns/noisecannon.dmi
delete mode 100644 icons/obj/guns/oldenergy.dmi
delete mode 100644 icons/obj/guns/oldlaser.dmi
delete mode 100644 icons/obj/guns/pistol.dmi
delete mode 100644 icons/obj/guns/spikethrower.dmi
delete mode 100644 icons/obj/guns/suppressor.dmi
delete mode 100644 icons/obj/guns/taserold.dmi
delete mode 100644 icons/obj/guns/toxgun.dmi
rename icons/obj/guns/{ => unused}/energy.dmi (100%)
rename icons/obj/guns/{ => unused}/incinerator.dmi (100%)
rename icons/obj/guns/{ => unused}/m1911.dmi (100%)
rename icons/obj/guns/{ => unused}/p08.dmi (100%)
create mode 100644 sound/weapons/empty/dryfire_plastic_01.ogg
create mode 100644 sound/weapons/empty/dryfire_plastic_02.ogg
create mode 100644 sound/weapons/empty/dryfire_plastic_03.ogg
diff --git a/aurorastation.dme b/aurorastation.dme
index 21ea9ff4797..d6fde039da4 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -3398,7 +3398,6 @@
#include "code\modules\projectiles\ammunition\ammo_pile.dm"
#include "code\modules\projectiles\ammunition\boxes.dm"
#include "code\modules\projectiles\ammunition\bullets.dm"
-#include "code\modules\projectiles\guns\alien.dm"
#include "code\modules\projectiles\guns\bang.dm"
#include "code\modules\projectiles\guns\energy.dm"
#include "code\modules\projectiles\guns\launcher.dm"
diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm
index 4e8a7d8684d..33692f821ef 100644
--- a/code/__DEFINES/sound.dm
+++ b/code/__DEFINES/sound.dm
@@ -182,3 +182,4 @@
#define SFX_SWITCH "switch"
#define SFX_TRAY_HIT "tray_hit"
#define SFX_WIELD "wield"
+#define SFX_PLASTIC_DRY_FIRE "plastic_dry_fire"
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 7dba034d7f6..133cb294e36 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -435,7 +435,7 @@
visual.appearance = passed_appearance
visual.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
// I hate /area
- lies_to_children.vis_contents += visual
+ lies_to_children.add_vis_contents(visual)
QDEL_IN_CLIENT_TIME(visual, duration)
return visual
diff --git a/code/datums/outfits/ert/zenghu.dm b/code/datums/outfits/ert/zenghu.dm
index d833af273da..2baaeaf2307 100644
--- a/code/datums/outfits/ert/zenghu.dm
+++ b/code/datums/outfits/ert/zenghu.dm
@@ -15,7 +15,7 @@
suit_store = /obj/item/gun/energy/rifle
accessory = /obj/item/clothing/accessory/holster/hip
accessory_contents = list(
- /obj/item/gun/energy/toxgun = 1
+ /obj/item/gun/energy/pistol = 1
)
belt_contents = list(
/obj/item/shield/energy = 1,
@@ -44,7 +44,7 @@
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/shield/energy = 1,
- /obj/item/gun/energy/toxgun = 1
+ /obj/item/gun/energy/pistol = 1
)
belt_contents = list(
@@ -72,7 +72,7 @@
/obj/item/handcuffs/ziptie = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/clothing/glasses/welding/superior = 1,
- /obj/item/gun/energy/toxgun = 1
+ /obj/item/gun/energy/pistol = 1
)
belt_contents = null
diff --git a/code/datums/outfits/event/outfit_megacorps.dm b/code/datums/outfits/event/outfit_megacorps.dm
index 33c2baaed6c..c926a86f56b 100644
--- a/code/datums/outfits/event/outfit_megacorps.dm
+++ b/code/datums/outfits/event/outfit_megacorps.dm
@@ -7,7 +7,7 @@
shoes = /obj/item/clothing/shoes/magboots
belt = /obj/item/storage/belt/military
l_ear = /obj/item/radio/headset/syndicate
- suit_store = /obj/item/gun/energy/laser
+ suit_store = /obj/item/gun/energy/rifle/laser
suit = /obj/item/clothing/suit/space/void/hephaestus
head = /obj/item/clothing/head/helmet/space/void/hephaestus
id = /obj/item/card/id/syndicate
@@ -50,7 +50,7 @@
shoes = /obj/item/clothing/shoes/magboots
belt = /obj/item/storage/belt/military
l_ear = /obj/item/radio/headset/syndicate
- suit_store = /obj/item/gun/energy/laser
+ suit_store = /obj/item/gun/energy/rifle/laser
suit = /obj/item/clothing/suit/space/void/zenghu
head = /obj/item/clothing/head/helmet/space/void/zenghu
id = /obj/item/card/id/syndicate
@@ -60,7 +60,7 @@
r_pocket = /obj/item/crowbar/red
accessory = /obj/item/clothing/accessory/holster/hip/brown
- accessory_contents = list(/obj/item/gun/energy/toxgun = 1)
+ accessory_contents = list(/obj/item/gun/energy/pistol = 1)
belt_contents = list(
/obj/item/shield/energy = 1,
diff --git a/code/datums/trading/unique.dm b/code/datums/trading/unique.dm
index ec5e2fb0ec1..9e4d697a7b6 100644
--- a/code/datums/trading/unique.dm
+++ b/code/datums/trading/unique.dm
@@ -52,7 +52,7 @@
/obj/item/rig/light/stealth = TRADER_THIS_TYPE,
/obj/item/rig/light/hacker = TRADER_THIS_TYPE,
/obj/item/gun/launcher/grenade = TRADER_THIS_TYPE,
- /obj/item/gun/energy/sniperrifle = TRADER_THIS_TYPE,
+ /obj/item/gun/energy/rifle/laser/sniper = TRADER_THIS_TYPE,
/obj/item/gun/projectile/automatic = TRADER_SUBTYPES_ONLY,
/mob/living/heavy_vehicle/premade/combat = TRADER_THIS_TYPE
)
diff --git a/code/datums/uplink/highly visible and dangerous weapons.dm b/code/datums/uplink/highly visible and dangerous weapons.dm
index 3d398bf9ce6..ecb856ad214 100644
--- a/code/datums/uplink/highly visible and dangerous weapons.dm
+++ b/code/datums/uplink/highly visible and dangerous weapons.dm
@@ -253,7 +253,7 @@
/datum/uplink_item/item/visible_weapons/laser_cannon
name = "Laser Cannon"
telecrystal_cost = 12
- path = /obj/item/gun/energy/lasercannon
+ path = /obj/item/gun/energy/rifle/laser/heavy
/datum/uplink_item/item/visible_weapons/derringer
name = "Derringer"
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 77e1ad50c89..1d1a74d792a 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -694,7 +694,7 @@ GLOBAL_LIST_EMPTY(process_objectives)
target_amount = 4
loot = "four energy guns"
if(7)
- target = /obj/item/gun/energy/laser
+ target = /obj/item/gun/energy/rifle/laser
target_amount = 2
loot = "two laser guns"
if(8)
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index d8f792b2249..13c9b217112 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -159,7 +159,7 @@
lethal = 1
lethal_icon = 1
egun = 0
- installation = /obj/item/gun/energy/laser
+ installation = /obj/item/gun/energy/rifle/laser
sprite_set = "laser"
/obj/machinery/porta_turret/Initialize(mapload)
@@ -1172,7 +1172,7 @@
req_one_access = list(ACCESS_SYNDICATE)
/obj/machinery/porta_turret/sniper
- installation = /obj/item/gun/energy/sniperrifle
+ installation = /obj/item/gun/energy/rifle/laser/sniper
lethal = 1
lethal_icon = 1
egun = 0
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index d6234bddd7c..dc9df7b941a 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -287,10 +287,10 @@
foldable = null
chewable = FALSE
-/obj/item/storage/box/ammo/tungstenslugs
- name = "box of compact tungsten slugs"
- desc = "A box with several compact tungsten slugs, aimed for use in gauss carbines."
- starts_with = list(/obj/item/ammo_casing/gauss/carbine = 4)
+/obj/item/storage/box/ammo/duslugs
+ name = "box of depleted uranium slugs"
+ desc = "A box with several depleted uranium slugs, aimed for use in older gauss rifles."
+ starts_with = list(/obj/item/ammo_casing/gauss/old = 4)
/obj/item/storage/box/ammo/sniperammo
name = "box of 14.5mm shells"
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 50603433227..1c1792e17e9 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -101,7 +101,7 @@
name = "weapons lockbox"
desc = "A high security weapons lockbox"
req_access = list(ACCESS_ARMORY)
- starts_with = list(/obj/item/gun/energy/lawgiver = 1)
+ starts_with = list(/obj/item/gun/energy/acp = 1)
/obj/item/storage/lockbox/medal
name = "medal box"
diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm
index fc2e123e91b..93c8e4ede21 100644
--- a/code/game/objects/random/loot.dm
+++ b/code/game/objects/random/loot.dm
@@ -177,7 +177,7 @@
/obj/random/telecrystals = 0.1,
/obj/item/gun/projectile/automatic/rifle/shotgun = 0.1,
/obj/random/melee = 0.3,
- /obj/item/gun/energy/lawgiver = 0.1,
+ /obj/item/gun/energy/acp = 0.1,
/obj/item/gun/projectile/automatic/terminator = 0.1,
/obj/item/personal_shield = 0.4,
/obj/random/safe_rig = 0.4,
@@ -192,7 +192,7 @@
/obj/item/clothing/glasses/thermal = 0.5,
/obj/item/gun/projectile/automatic/rifle/shotgun = 0.5,
/obj/random/sword = 0.5,
- /obj/item/gun/energy/lawgiver = 0.5,
+ /obj/item/gun/energy/acp = 0.5,
/obj/item/melee/energy/axe = 0.5,
/obj/item/gun/projectile/automatic/terminator = 0.5,
/obj/item/rig/military = 0.5,
@@ -240,7 +240,7 @@
/obj/random/melee/highvalue = 0.3,
/obj/item/gun/energy/disruptorpistol/magnum = 0.3,
/obj/item/gun/projectile/shotgun/pump/combat = 0.2,
- /obj/item/gun/energy/lawgiver = 0.1,
+ /obj/item/gun/energy/acp = 0.1,
/obj/item/gun/projectile/automatic/terminator = 0.1,
/obj/item/gun/projectile/automatic/rifle/shotgun = 0.1
)
diff --git a/code/game/objects/random/weapon.dm b/code/game/objects/random/weapon.dm
index a73727f43d0..86089ce0de9 100644
--- a/code/game/objects/random/weapon.dm
+++ b/code/game/objects/random/weapon.dm
@@ -1,8 +1,7 @@
/obj/random/energy
name = "random energy weapon"
desc = "This is a random energy weapon."
- icon = 'icons/obj/guns/ecarbine.dmi'
- icon_state = "energykill100"
+ icon_state = "energy_gun"
problist = list(
/obj/item/gun/energy/rifle/laser = 2,
/obj/item/gun/energy/gun = 2,
@@ -12,8 +11,7 @@
/obj/random/projectile
name = "random projectile weapon"
desc = "This is a random projectile weapon."
- icon = 'icons/obj/guns/cshotgun.dmi'
- icon_state = "cshotgun"
+ icon_state = "rifle"
problist = list(
/obj/item/gun/projectile/shotgun/pump = 3,
/obj/item/gun/projectile/automatic/wt550 = 2,
@@ -23,8 +21,7 @@
/obj/random/handgun
name = "random handgun"
desc = "This is a random handgun."
- icon = 'icons/obj/guns/secgun.dmi'
- icon_state = "secgun"
+ icon_state = "pistol"
problist = list(
/obj/item/gun/projectile/sec = 3,
/obj/item/gun/projectile/sec/wood = 1
@@ -33,8 +30,7 @@
/obj/random/ammo
name = "random ammunition"
desc = "This is some random ammunition."
- icon = 'icons/obj/ammo.dmi'
- icon_state = "45-10"
+ icon_state = "needsprite"
problist = list(
/obj/item/storage/box/shells/beanbags = 6,
/obj/item/storage/box/shells/slugs = 2,
@@ -50,8 +46,7 @@
/obj/random/melee
name = "random melee weapon"
desc = "This is a random melee weapon."
- icon = 'icons/obj/weapons.dmi'
- icon_state = "baton"
+ icon_state = "melee"
spawnlist = list(
/obj/item/melee/telebaton,
/obj/item/melee/energy/sword,
@@ -75,8 +70,7 @@
/obj/random/melee/highvalue
name = "random high value melee weapon"
desc = "This is a random high value melee weapon."
- icon = 'icons/obj/weapons.dmi'
- icon_state = "baton"
+ icon_state = "melee"
spawnlist = list(
/obj/item/melee/energy/sword,
/obj/item/melee/energy/glaive,
@@ -88,15 +82,13 @@
/obj/random/energy_antag
name = "random energy weapon"
desc = "This is a random energy weapon."
- icon = 'icons/obj/guns/retro.dmi'
- icon_state = "retro100"
+ icon_state = "energy_gun"
spawnlist = list(
/obj/item/gun/energy/retro,
/obj/item/gun/energy/xray,
/obj/item/gun/energy/gun,
/obj/item/gun/energy/pistol,
/obj/item/gun/energy/mindflayer,
- /obj/item/gun/energy/toxgun,
/obj/item/gun/energy/vaurca/gatlinglaser,
/obj/item/gun/energy/vaurca/blaster,
/obj/item/gun/energy/crossbow/largecrossbow,
@@ -129,7 +121,6 @@
/obj/random/civgun
name = "random civilian handgun"
desc = "This is a random civilian gun."
- icon = 'icons/obj/random.dmi'
icon_state = "pistol"
has_postspawn = TRUE
spawnlist = list(
@@ -177,7 +168,6 @@
/obj/random/civgun/rifle
name = "random civilian longarm"
desc = "This is a random civilian long gun."
- icon = 'icons/obj/random.dmi'
icon_state = "rifle"
has_postspawn = TRUE
spawnlist = list(
@@ -194,7 +184,7 @@
/obj/item/gun/projectile/shotgun/pump/rifle/vintage,
/obj/item/gun/projectile/shotgun/pump/lever_action,
/obj/item/gun/projectile/gauss,
- /obj/item/gun/projectile/gauss/carbine,
+ /obj/item/gun/projectile/gauss/old,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/gun/projectile/shotgun/doublebarrel,
/obj/item/gun/projectile/shotgun/doublebarrel/sawn,
@@ -217,8 +207,7 @@
/obj/random/vault_weapon
name = "random vault weapon"
desc = "This is a random vault weapon."
- icon = 'icons/obj/guns/caplaser.dmi'
- icon_state = "caplaser"
+ icon_state = "needsprite"
spawnlist = list(
/obj/item/gun/custom_ka/frameA/prebuilt = 1,
/obj/item/gun/custom_ka/frameB/prebuilt = 0.5,
diff --git a/code/game/objects/random/weapon_and_ammo.dm b/code/game/objects/random/weapon_and_ammo.dm
index da222743277..74c489f5552 100644
--- a/code/game/objects/random/weapon_and_ammo.dm
+++ b/code/game/objects/random/weapon_and_ammo.dm
@@ -2,8 +2,8 @@
/obj/random/weapon_and_ammo
name = "random weapon and ammo"
desc = "Summons a random weapon, with ammo if applicable."
- icon = 'icons/obj/guns/xenoblaster.dmi'
- icon_state = "xenoblaster"
+ icon = 'icons/obj/random.dmi'
+ icon_state = "pistol"
var/chosen_rarity //Can be set to force certain rarity
var/concealable = FALSE //If the gun should fit in a backpack
has_postspawn = TRUE
@@ -11,7 +11,6 @@
var/list/Shoddy = list(
/obj/item/gun/energy/blaster = 1,
/obj/item/gun/energy/retro = 0.5,
- /obj/item/gun/energy/toxgun = 0.5,
/obj/item/gun/projectile/automatic/improvised = 1,
/obj/item/gun/projectile/contender = 0.5,
/obj/item/gun/projectile/leyon = 1,
@@ -25,7 +24,7 @@
var/list/Common = list(
/obj/item/gun/energy/blaster/carbine = 1,
/obj/item/gun/energy/crossbow/largecrossbow = 1,
- /obj/item/gun/energy/laser = 0.5,
+ /obj/item/gun/energy/rifle/laser = 0.5,
/obj/item/gun/energy/pistol = 1,
/obj/item/gun/energy/rifle = 1,
/obj/item/gun/projectile/automatic/c20r = 1,
@@ -57,7 +56,7 @@
/obj/item/gun/energy/rifle/ionrifle = 0.5,
/obj/item/gun/energy/vaurca/blaster = 1,
/obj/item/gun/energy/xray = 1,
- /obj/item/gun/energy/lasercannon = 1,
+ /obj/item/gun/energy/rifle/laser/heavy = 1,
/obj/item/gun/projectile/automatic/rifle/sts35 = 1,
/obj/item/gun/projectile/automatic/rifle/shorty = 1,
/obj/item/gun/projectile/automatic/rifle/carbine = 1,
@@ -81,7 +80,7 @@
/obj/item/gun/energy/decloner = 0.5,
/obj/item/gun/energy/rifle/laser/xray = 1,
/obj/item/gun/energy/rifle/laser/tachyon = 1,
- /obj/item/gun/energy/sniperrifle = 1,
+ /obj/item/gun/energy/rifle/laser/sniper = 1,
/obj/item/gun/energy/tesla = 1,
/obj/item/gun/energy/laser/shotgun = 1,
/obj/item/gun/energy/vaurca/gatlinglaser = 1,
@@ -95,7 +94,7 @@
)
var/list/Legendary = list(
- /obj/item/gun/energy/lawgiver = 1,
+ /obj/item/gun/energy/acp = 1,
/obj/item/gun/energy/pulse = 1,
/obj/item/gun/energy/pulse/pistol = 1,
/obj/item/gun/energy/rifle/pulse = 1,
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 663530c5baa..4e321df648c 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -85,9 +85,9 @@
new /obj/item/melee/energy/sword(src)
new /obj/item/melee/energy/sword(src)
new /obj/item/melee/energy/sword(src)
- new /obj/item/gun/energy/laser(src)
- new /obj/item/gun/energy/laser(src)
- new /obj/item/gun/energy/laser(src)
+ new /obj/item/gun/energy/rifle/laser(src)
+ new /obj/item/gun/energy/rifle/laser(src)
+ new /obj/item/gun/energy/rifle/laser(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
@@ -109,9 +109,9 @@
new /obj/item/melee/energy/sword(src)
new /obj/item/melee/energy/sword(src)
new /obj/item/melee/energy/sword(src)
- new /obj/item/gun/energy/laser(src)
- new /obj/item/gun/energy/laser(src)
- new /obj/item/gun/energy/laser(src)
+ new /obj/item/gun/energy/rifle/laser(src)
+ new /obj/item/gun/energy/rifle/laser(src)
+ new /obj/item/gun/energy/rifle/laser(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
diff --git a/code/game/sound/sound_keys/sound_keys.dm b/code/game/sound/sound_keys/sound_keys.dm
index a980eb9ee92..e5dc716c81d 100644
--- a/code/game/sound/sound_keys/sound_keys.dm
+++ b/code/game/sound/sound_keys/sound_keys.dm
@@ -419,6 +419,14 @@
'sound/weapons/empty/empty_shotgun1.ogg'
)
+/datum/sound_effect/plastic_dry_fire
+ key = SFX_PLASTIC_DRY_FIRE
+ file_paths = list(
+ 'sound/weapons/empty/dryfire_plastic_01.ogg',
+ 'sound/weapons/empty/dryfire_plastic_02.ogg',
+ 'sound/weapons/empty/dryfire_plastic_03.ogg'
+ )
+
/datum/sound_effect/metal_slide_reload
key = SFX_RELOAD_METAL_SLIDE
file_paths = list(
diff --git a/code/modules/cargo/items/weaponry.dm b/code/modules/cargo/items/weaponry.dm
index 5d759f30507..fceadb5b833 100644
--- a/code/modules/cargo/items/weaponry.dm
+++ b/code/modules/cargo/items/weaponry.dm
@@ -145,7 +145,7 @@
description = "The HI L.W.A.P. is an older design of Hephaestus Industries. A designated marksman rifle capable of shooting powerful ionized bolts."
price = 2100
items = list(
- /obj/item/gun/energy/sniperrifle
+ /obj/item/gun/energy/rifle/laser/sniper
)
access = ACCESS_ARMORY
container_type = "crate"
@@ -546,14 +546,14 @@
groupable = TRUE
spawn_amount = 1
-/singleton/cargo_item/compacttungstenslug
+/singleton/cargo_item/duslug
category = "weaponry"
- name = "compact tungsten gauss slugs"
+ name = "depleted uranium gauss slugs"
supplier = "virgo"
- description = "A box with several compact tungsten slugs, aimed for use in gauss carbines."
+ description = "A box with several depleted uranium slugs, aimed for use in older gauss rifles."
price = 125
items = list(
- /obj/item/storage/box/ammo/tungstenslugs
+ /obj/item/storage/box/ammo/duslugs
)
access = ACCESS_ARMORY
container_type = "crate"
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 1adedcdcf90..68ee686fc8e 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -479,9 +479,9 @@
//**Chameleon Gun**
//*****************
/obj/item/gun/energy/chameleon
- name = "desert eagle"
+ name = "\improper Desert Eagle pistol"
desc = null
- icon = 'icons/obj/guns/deagle.dmi'
+ icon = 'icons/obj/guns/faction/antique/deagle.dmi'
icon_state = "deagle"
w_class = WEIGHT_CLASS_NORMAL
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm
index 47792f336f8..0b298620152 100644
--- a/code/modules/clothing/spacesuits/rig/modules/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm
@@ -126,7 +126,7 @@
interface_name = "mounted laser cannon"
interface_desc = "A shoulder-mounted cell-powered laser cannon."
- var/gun_type = /obj/item/gun/energy/lasercannon/mounted
+ var/gun_type = /obj/item/gun/energy/rifle/laser/heavy/mounted
var/obj/item/gun/gun
/obj/item/rig_module/mounted/New()
diff --git a/code/modules/heavy_vehicle/equipment/combat.dm b/code/modules/heavy_vehicle/equipment/combat.dm
index 568d76cd05f..931219f1c8c 100644
--- a/code/modules/heavy_vehicle/equipment/combat.dm
+++ b/code/modules/heavy_vehicle/equipment/combat.dm
@@ -37,7 +37,7 @@
desc = "An exosuit-mounted laser rifle. Handle with care."
icon_state = "mecha_laser"
restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
- holding_type = /obj/item/gun/energy/laser/mounted/mech
+ holding_type = /obj/item/gun/energy/rifle/laser/mounted/mech
/obj/item/mecha_equipment/mounted_system/combat/smg
name = "mounted submachinegun"
@@ -107,7 +107,7 @@
name = "mounted riot submachine gun"
projectile_type = /obj/projectile/bullet/pistol/rubber
-/obj/item/gun/energy/laser/mounted/mech
+/obj/item/gun/energy/rifle/laser/mounted/mech
use_external_power = TRUE
self_recharge = TRUE
has_safety = FALSE
diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm
index 8fcc9df47ec..1f58d1aa3dc 100644
--- a/code/modules/item_worth/worths_list.dm
+++ b/code/modules/item_worth/worths_list.dm
@@ -32,12 +32,12 @@ var/list/worths = list(
/obj/item/gun/energy/gun = 70,
/obj/item/gun/energy/pistol = 55,
/obj/item/gun/energy/laser/shotgun = 480,
- /obj/item/gun/energy/laser/practice = 50,
- /obj/item/gun/energy/laser = 100,
+ /obj/item/gun/energy/rifle/laser/practice = 50,
+ /obj/item/gun/energy/rifle/laser = 100,
/obj/item/gun/energy/retro = 140,
/obj/item/gun/energy/captain = 850,
/obj/item/gun/energy/xray = 350,
- /obj/item/gun/energy/sniperrifle = 640,
+ /obj/item/gun/energy/rifle/laser/sniper = 640,
/obj/item/gun/energy/lasertag = 1,
/obj/item/gun/energy/pulse/pistol = 450,
/obj/item/gun/energy/pulse = 500,
@@ -45,10 +45,8 @@ var/list/worths = list(
/obj/item/gun/energy/decloner = 650,
/obj/item/gun/energy/floragun = 150,
/obj/item/gun/energy/mindflayer = 450,
- /obj/item/gun/energy/toxgun = 350,
/obj/item/gun/energy/mousegun = 200,
/obj/item/gun/energy/net = 350,
- /obj/item/gun/energy/vaurca/bfg = 2000,
/obj/item/gun/energy/vaurca/gatlinglaser = 600,
/obj/item/gun/energy/vaurca/blaster = 450,
/obj/item/gun/energy/vaurca/thermaldrill = 500,
@@ -57,7 +55,7 @@ var/list/worths = list(
/obj/item/gun/energy/crossbow/largecrossbow = 160,
/obj/item/gun/energy/crossbow = 75,
/obj/item/gun/energy/temperature = 300,
- /obj/item/gun/energy/lawgiver = 700,
+ /obj/item/gun/energy/acp = 700,
/obj/item/gun/custom_ka/frame01/prebuilt = 250,
/obj/item/gun/custom_ka/frame02/prebuilt = 350,
/obj/item/gun/custom_ka/frame03/prebuilt = 450,
@@ -69,7 +67,6 @@ var/list/worths = list(
/obj/item/gun/energy/gravity_gun = 450,
/obj/item/gun/energy = 210,
//LAUNCHERS,
- /obj/item/gun/launcher/spikethrower = 350,
/obj/item/gun/launcher/rocket = 800,
/obj/item/gun/launcher/crossbow = 12,
/obj/item/gun/launcher/pneumatic = 20,
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 7f3b4da951d..64f32b1e707 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -953,7 +953,7 @@ GLOBAL_LIST_INIT(robot_modules, list(
/obj/item/robot_module/military/Initialize()
. = ..()
- modules += new /obj/item/gun/energy/laser/mounted(src)
+ modules += new /obj/item/gun/energy/rifle/laser/mounted(src)
modules += new /obj/item/melee/hammer/powered(src)
modules += new /obj/item/borg/combat/shield(src)
modules += new /obj/item/borg/combat/mobility(src)
@@ -962,7 +962,7 @@ GLOBAL_LIST_INIT(robot_modules, list(
modules += new /obj/item/extinguisher(src) // For navigating space and/or low grav, and just being useful.
modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws.
modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to.
- emag = new /obj/item/gun/energy/lasercannon/mounted(src)
+ emag = new /obj/item/gun/energy/rifle/laser/heavy/mounted(src)
/obj/item/robot_module/drone
name = "drone module"
@@ -1216,7 +1216,7 @@ GLOBAL_LIST_INIT(robot_modules, list(
modules += new /obj/item/handcuffs/cyborg(src)
modules += new /obj/item/melee/baton/robot(src)
modules += new /obj/item/melee/hammer/powered(src)
- modules += new /obj/item/gun/energy/lasercannon/mounted/cyborg/overclocked(src)
+ modules += new /obj/item/gun/energy/rifle/laser/heavy/mounted/cyborg/overclocked(src)
modules += new /obj/item/borg/combat/shield(src)
modules += new /obj/item/borg/combat/mobility(src)
// BST
@@ -1347,7 +1347,7 @@ GLOBAL_LIST_INIT(robot_modules, list(
modules += new /obj/item/healthanalyzer(src)
modules += new /obj/item/borg/sight/thermal(src)
modules += new /obj/item/gun/energy/pulse/mounted(src)
- modules += new /obj/item/gun/energy/lasercannon/mounted/cyborg/overclocked(src)
+ modules += new /obj/item/gun/energy/rifle/laser/heavy/mounted/cyborg/overclocked(src)
modules += new /obj/item/handcuffs/cyborg(src)
modules += new /obj/item/melee/baton/robot(src)
modules += new /obj/item/tank/jetpack/carbondioxide(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index ea9417a4b7d..93191e6f1bc 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -46,7 +46,7 @@
rapid = 1
projectiletype = /obj/projectile/beam
corpse = /obj/effect/landmark/mobcorpse/pirate/ranged
- weapon1 = /obj/item/gun/energy/laser
+ weapon1 = /obj/item/gun/energy/rifle/laser
/mob/living/simple_animal/hostile/pirate/death()
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index cded65a7f2d..a761452cf30 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -151,7 +151,7 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_
/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 = 'icons/obj/guns/faction/dominian_empire/dominia_pistol.dmi'
icon_state = "dom_pistol_mag"
max_ammo = 11
@@ -445,7 +445,7 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_
/obj/item/ammo_magazine/a556/dlmg
name = "MPR-24/5 light machine gun magazine (5.56mm)"
max_ammo = 50
- icon = 'icons/obj/guns/dominia_lmg.dmi'
+ icon = 'icons/obj/guns/faction/dominian_empire/dominia_lmg.dmi'
icon_state = "dom_lmg_mag"
/obj/item/ammo_magazine/a65
@@ -524,7 +524,7 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_
/obj/item/ammo_magazine/c762/dominia
name = "mpr-24/5 carbine magazine (7.62mm)"
- icon = 'icons/obj/guns/dominia_carbine.dmi'
+ icon = 'icons/obj/guns/faction/dominian_empire/dominia_carbine.dmi'
icon_state = "dom_carbine_mag"
/obj/item/ammo_magazine/boltaction
@@ -648,7 +648,7 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_
/obj/item/ammo_magazine/xanan_shotgun
name = "magazine"
desc = "A magazine for the dNAC-12 combat shotgun."
- icon = 'icons/obj/guns/xanu_shotgun_mags.dmi'
+ icon = 'icons/obj/guns/faction/dna_defense/xanu_shotgun_mags.dmi'
icon_state = "xanu_shell_magazine"
caliber = "shotgun"
insert_sound = SFX_RELOAD_RIFLE_SLIDE
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
index 6058f16b269..6dfa5756749 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -407,9 +407,9 @@
projectile_type = /obj/projectile/bullet/gauss
max_stack = 2
-/obj/item/ammo_casing/gauss/carbine
- name = "compact tungsten slug"
- desc = "A heavy tungsten gauss slug. This one has a casing adapated for carbine models."
+/obj/item/ammo_casing/gauss/old
+ name = "depleted uranium slug"
+ desc = "A depleted uranium gauss slug. It seems quite old."
projectile_type = /obj/projectile/bullet/gauss/carbine
/obj/item/ammo_casing/gauss/emp
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index f951090e3ef..b349ca4511f 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -40,10 +40,10 @@
original_settings = null
/// Parent gun type. Guns are weapons that can be aimed at mobs and act over a distance.
-/obj/item/gun
+ABSTRACT_TYPE(/obj/item/gun)
name = "gun"
desc = "It's a gun. It's pretty terrible, though."
- icon = 'icons/obj/guns/pistol.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/pistol.dmi'
var/gun_gui_icons = 'icons/obj/guns/gun_gui.dmi'
icon_state = "pistol"
item_state = "pistol"
@@ -258,7 +258,7 @@
underlays.Cut()
if(bayonet)
var/image/I
- I = image(icon = 'icons/obj/guns/bayonet.dmi', icon_state = "bayonet")
+ I = image(icon = 'icons/obj/guns/attachments/bayonet.dmi', icon_state = "bayonet")
I.pixel_x = knife_x_offset
I.pixel_y = knife_y_offset
underlays += I
@@ -407,7 +407,9 @@
if(user.a_intent == I_HURT)
toggle_safety(user)
else
+ var/safety_cooldown = 5 // Half a second
handle_click_empty(user)
+ user.setClickCooldown(safety_cooldown)
return FALSE
if(!special_check(user))
@@ -762,6 +764,7 @@
return new_mode
/obj/item/gun/attack_self(mob/user)
+ . = ..()
if(is_wieldable)
toggle_wield(usr)
update_held_icon()
@@ -1012,7 +1015,7 @@
/obj/item/gun/proc/critical_fail(var/mob/user)
return
-/obj/item/gun/attackby(obj/item/attacking_item, mob/user)
+/obj/item/gun/attackby(obj/item/attacking_item, mob/user, params)
if(istype(attacking_item, /obj/item/material/knife/bayonet))
if(!can_bayonet)
balloon_alert(user, "doesn't fit!")
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
deleted file mode 100644
index c097d6da7fe..00000000000
--- a/code/modules/projectiles/guns/alien.dm
+++ /dev/null
@@ -1,107 +0,0 @@
-//Alien pinning weapon.
-/obj/item/gun/launcher/spikethrower
- name = "spike thrower"
- desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive."
- var/last_regen = 0
- var/spike_gen_time = 100
- var/max_spikes = 3
- var/spikes = 3
- release_force = 30
- slot_flags = SLOT_BELT|SLOT_BACK
- icon = 'icons/obj/guns/spikethrower.dmi'
- icon_state = "spikethrower3"
- item_state = "spikethrower"
- fire_sound_text = "a strange noise"
- fire_sound = 'sound/weapons/bladeslice.ogg'
- needspin = FALSE
-
-/obj/item/gun/launcher/spikethrower/feedback_hints(mob/user, distance, is_adjacent)
- . += ..()
- if(distance > 1)
- return
- . += "It has [spikes] spike\s remaining."
-
-/obj/item/gun/launcher/spikethrower/Initialize()
- . = ..()
- last_regen = world.time
-
-/obj/item/gun/launcher/spikethrower/Destroy()
- return ..()
-
-/obj/item/gun/launcher/spikethrower/process()
- if(spikes < max_spikes && world.time > last_regen + spike_gen_time)
- spikes++
- last_regen = world.time
- update_icon()
-
-/obj/item/gun/launcher/spikethrower/proc/regen_spike()
- spikes++
- update_icon()
- if (spikes < max_spikes)
- addtimer(CALLBACK(src, PROC_REF(regen_spike)), spike_gen_time, TIMER_UNIQUE)
-
-/obj/item/gun/launcher/spikethrower/update_icon()
- icon_state = "spikethrower[spikes]"
-
-/obj/item/gun/launcher/spikethrower/special_check(user)
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- if(H.species && H.species.name != SPECIES_VAURCA_WARRIOR || SPECIES_VAURCA_ATTENDANT)
- to_chat(user, SPAN_WARNING("\The [src] does not respond to you!"))
- return FALSE
- return ..()
-
-/obj/item/gun/launcher/spikethrower/update_release_force()
- return
-
-/obj/item/gun/launcher/spikethrower/consume_next_projectile()
- if(spikes < 1) return null
- spikes--
- addtimer(CALLBACK(src, PROC_REF(regen_spike)), spike_gen_time, TIMER_UNIQUE)
- return new /obj/item/spike(src)
-
-//This gun only functions for vaurca warriors. The on-sprite is too huge to render properly on other sprites.
-/obj/item/gun/energy/noisecannon
- name = "alien heavy cannon"
- desc = "It's some kind of enormous alien weapon, as long as a man is tall."
-
- icon = 'icons/obj/guns/noisecannon.dmi'
- icon_state = "noisecannon"
- item_state = "noisecannon"
- recoil = 1
-
- force = 15
- projectile_type = /obj/projectile/energy/sonic
- cell_type = /obj/item/cell/super
- fire_delay = 40
- fire_sound = 'sound/effects/basscannon.ogg'
- needspin = FALSE
-
- var/mode = 1
-
-/obj/item/gun/energy/noisecannon/attack_hand(mob/user as mob)
- if(loc != user)
- var/mob/living/carbon/human/H = user
- if(istype(H))
- if(H.species.name == SPECIES_VAURCA_WARRIOR || SPECIES_VAURCA_ATTENDANT)
- ..()
- return
- to_chat(user, SPAN_WARNING("\The [src] is far too large for you to pick up."))
- return
-
-/obj/item/gun/energy/noisecannon/update_icon()
- return
-
-//Projectile.
-/obj/projectile/energy/sonic
- name = "distortion"
- icon = 'icons/obj/machinery/particle_accelerator2.dmi'
- icon_state = "particle"
- damage = 60
- damage_type = DAMAGE_BRUTE
- check_armor = BULLET
- pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-
- embed = 0
- weaken = 5
- stun = 5
diff --git a/code/modules/projectiles/guns/bang.dm b/code/modules/projectiles/guns/bang.dm
index 3f86204de9b..b627ca54b0a 100644
--- a/code/modules/projectiles/guns/bang.dm
+++ b/code/modules/projectiles/guns/bang.dm
@@ -1,55 +1,145 @@
-/obj/item/gun/bang
- name = "some shitty-ass gun"
+#define FRAME_ANIM_TIME 3
+ABSTRACT_TYPE(/obj/item/gun/bang)
+ name = "flag gun"
desc = "This is a gun. Neat!"
- icon = 'icons/obj/guns/revolver.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/revolver.dmi'
icon_state = "revolver"
item_state = "revolver"
- fire_sound = 'sound/misc/sadtrombone.ogg'
+ fire_sound = 'sound/machines/crate_close.ogg'
+ suppressed_sound = 'sound/machines/crate_close.ogg'
+ var/empty_sound_flag = SFX_PLASTIC_DRY_FIRE
needspin = FALSE
var/fakecaliber = "357"
- var/image/bang_flag
- var/fired_gun = 0
- var/pixel_offset_x = -2
- var/pixel_offset_y = 13
+ var/fired_gun = FALSE
+ var/pixel_offset_x = 28
+ var/pixel_offset_y = 12
+ /// Caches offset matrix for use later
+ VAR_PRIVATE/matrix/TM
+ var/obj/effect/overlay/vis/bang_flag
+ ///Pixel offset for the suppressor overlay on the x axis.
+ var/suppressor_x_offset
+ ///Pixel offset for the suppressor overlay on the y axis.
+ var/suppressor_y_offset
+
+/obj/item/gun/bang/update_icon()
+ ..()
+ if(suppressed)
+ var/mutable_appearance/MA = mutable_appearance('icons/obj/guns/attachments/suppressor.dmi', "suppressor")
+ if(suppressor_x_offset)
+ MA.pixel_x = suppressor_x_offset
+ if(suppressor_y_offset)
+ MA.pixel_y = suppressor_y_offset
+ underlays += MA
/obj/item/gun/bang/mechanics_hints(mob/user, distance, is_adjacent)
. += ..()
- . += "This is a ballistic weapon. It fires [fakecaliber] ammunition. To reload most guns, click the gun with an empty hand to remove any spent casings or magazines, and then insert new ones."
+ if(!fired_gun)
+ . += "This is a ballistic weapon. It fires [fakecaliber] ammunition. To reload most guns, click the gun with an empty hand to remove any spent casings or magazines, and then insert new ones."
+ else
+ . += "This is a fake weapon. It won't do you much good. Click to retract the flag."
+
+/obj/item/gun/bang/feedback_hints(mob/user, distance, is_adjacent)
+ . = ..()
+ if(fired_gun)
+ . += SPAN_NOTICE("A flag is sticking out of the barrel!")
/obj/item/gun/bang/Initialize()
. = ..()
- bang_flag = image('icons/obj/bang_flag.dmi', "bang_flag")
- bang_flag.pixel_x = pixel_offset_x
- bang_flag.pixel_y = pixel_offset_y
+ TM = matrix()
+ TM.Translate(pixel_offset_x, pixel_offset_y)
-/obj/item/gun/bang/handle_click_empty(mob/user)
- if (user)
- to_chat(user, SPAN_DANGER("The flag is already out!"))
+// Doesn't send a signal
+/obj/item/gun/bang/proc/handle_click_empty_flag(mob/user)
+ playsound(loc, empty_sound_flag, 30, TRUE)
+ balloon_alert_to_viewers("*click*")
-/obj/item/gun/bang/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0)
- if(!user || !target) return
+/obj/item/gun/bang/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0, accuracy_decrease=0, is_offhand=0)
+ if(!fire_checks(target,user,clickparams,pointblank,reflex))
+ return FALSE
if(fired_gun)
- handle_click_empty(user)
- return
+ handle_click_empty_flag(user)
+ return FALSE
- add_fingerprint(user)
+ balloon_alert_to_viewers("*pop*")
if (user)
- user.visible_message(SPAN_DANGER("A flag pops out of the barrel!"))
+ user.visible_message(SPAN_NOTICE("A flag pops out of the barrel of \the [src.name]'s barrel!"), SPAN_WARNING("A flag pops out of the barrel!"))
else
- src.visible_message(SPAN_DANGER("A flag pops out of the barrel of \the [src.name]'s barrel!"))
- playsound(src, fire_sound, 20, 1)
- src.AddOverlays(bang_flag)
- fired_gun = 1
+ visible_message(SPAN_NOTICE("A flag pops out of the barrel of \the [src.name]'s barrel!"))
-/obj/item/gun/bang/attack_hand(mob/user as mob)
- if(user.get_inactive_hand() == src && fired_gun)
- src.CutOverlays(bang_flag)
+ appearance_flags &= KEEP_TOGETHER
+ play_fire_sound()
+ add_vis_contents(return_flag())
+ fired_gun = TRUE
+
+ addtimer(CALLBACK(src, PROC_REF(play_sad_sound)), 4) //4 deciseconds
+
+/obj/item/gun/bang/attack_self(mob/user)
+ . = ..()
+ if(fired_gun)
user.visible_message(SPAN_NOTICE("\The [user] pushes the flag back into the barrel of \the [src.name]."),
SPAN_NOTICE("You push the flag back into the barrel of \the [src.name]."))
-
+ bang_flag.icon_state = "bang_flag_rew"
+ addtimer(CALLBACK(src, PROC_REF(remove_flag)), FRAME_ANIM_TIME)
playsound(src.loc, 'sound/weapons/TargetOff.ogg', 50,1)
- fired_gun = 0
- else
- return ..()
+ return TRUE
+
+/obj/item/gun/bang/attackby(obj/item/attacking_item, mob/user, params)
+ . = ..()
+ if(astype(attacking_item, /obj/item/suppressor))
+ if(!can_suppress)
+ balloon_alert(user, "doesn't fit!")
+ return
+
+ if(suppressed)
+ balloon_alert(user, "already has a suppressor!")
+ return
+
+ if(user.l_hand != attacking_item && user.r_hand != attacking_item)
+ balloon_alert(user, "not in hand!")
+ return
+
+ user.drop_from_inventory(suppressor, src)
+ balloon_alert(user, "[attacking_item.name] attached")
+ install_suppressor(attacking_item)
+ return
+
+/obj/item/gun/bang/proc/return_flag()
+ PRIVATE_PROC(TRUE)
+ bang_flag = new(src)
+ bang_flag.icon = 'icons/obj/bang_flag.dmi'
+ bang_flag.icon_state = "bang_flag"
+ bang_flag.layer = FLOAT_LAYER
+ bang_flag.plane = FLOAT_PLANE
+ bang_flag.transform = TM
+ return bang_flag
+
+/obj/item/gun/bang/proc/remove_flag()
+ if(!(initial(appearance_flags) & KEEP_TOGETHER))
+ appearance_flags &= ~KEEP_TOGETHER
+ remove_vis_contents(bang_flag)
+ QDEL_NULL(bang_flag)
+ fired_gun = FALSE
+
+/obj/item/gun/bang/proc/play_sad_sound()
+ PRIVATE_PROC(TRUE)
+ playsound(src, 'sound/misc/sadtrombone.ogg', 20, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE)
+
+
+//This stuff only exists to avoid suppressors from revealing a fake gun. Eventually, we should add a base-level attachments system to replace this mess
+///Installs a new suppressor, assumes that the suppressor is already in the contents of src
+/obj/item/gun/bang/proc/install_suppressor(obj/item/suppressor/S)
+ suppressed = TRUE
+ w_class += S.w_class //Add our weight class to the item's weight class
+ suppressor = S
+ update_icon()
+
+/obj/item/gun/bang/clear_suppressor()
+ if(!can_unsuppress)
+ return
+ if(istype(suppressor))
+ w_class -= suppressor.w_class
+ return ..()
+
+#undef FRAME_ANIM_TIME
diff --git a/code/modules/projectiles/guns/bang/pistol.dm b/code/modules/projectiles/guns/bang/pistol.dm
index e2a8a3027d3..6eab65abb5d 100644
--- a/code/modules/projectiles/guns/bang/pistol.dm
+++ b/code/modules/projectiles/guns/bang/pistol.dm
@@ -1,93 +1,106 @@
/obj/item/gun/bang/colt
- name = "vintage .45 pistol"
- desc = "A cheap Martian knock-off of a Colt M1911. Uses .45 rounds."
- icon = 'icons/obj/guns/colt.dmi'
+ name = "\improper Pattern 5 combat pistol"
+ desc = "A robust metal-framed semi-automatic pistol chambered in .45 produced in the system of San Colette."
+ desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
+ The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
+ icon = 'icons/obj/guns/faction/caisc/pattern_5.dmi'
icon_state = "colt"
item_state = "colt"
- pixel_offset_x = 30
- pixel_offset_y = 18
+ pixel_offset_x = 29
+ pixel_offset_y = 12
fakecaliber = ".45"
/obj/item/gun/bang/sec
- name = "\improper .45 pistol"
- desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds."
- desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
- icon = 'icons/obj/guns/secgun.dmi'
+ name = "\improper Mk58 pistol"
+ desc = "A NanoTrasen-designed .45 sidearm, found among law enforcement and security forces."
+ desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/secgun.dmi'
icon_state = "secgun"
item_state = "secgun"
- pixel_offset_x = 28
- pixel_offset_y = 14
+ pixel_offset_x = 26
+ pixel_offset_y = 12
fakecaliber = ".45"
+
/obj/item/gun/bang/sec/flash
name = ".45 signal pistol"
fakecaliber = ".45 signal"
/obj/item/gun/bang/sec/wood
- name = "custom .45 pistol"
- desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds."
- desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a wooden grip. It uses .45 rounds."
- icon = 'icons/obj/guns/secgun_wood.dmi'
+ name = "custom Mk58 pistol"
+ desc = "A NanoTrasen-designed .45 sidearm, found among law enforcement and security forces. It has a wooden grip."
+ desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/secgun_wood.dmi'
icon_state = "secgunwood"
item_state = "secgunwood"
fakecaliber = ".45"
+
/obj/item/gun/bang/x9
- name = "automatic .45 pistol"
- desc = "The x9 tactical pistol is a lightweight fast firing handgun. Uses .45 rounds."
- icon = 'icons/obj/guns/x9.dmi'
- icon_state = "x9tactical"
- item_state = "x9"
- pixel_offset_x = 28
- pixel_offset_y = 13
+ name = "\improper Mk58-A machine pistol"
+ desc = "A NanoTrasen-designed .45 sidearm, modified for fully-automatic fire. Issued to select security and law enforcement groups."
+ desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security \
+ forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. \
+ A trademark of NanoTrasen security forces. This one has been modified for fully-automatic fire from the factory and sports a collapsible shoulder stock for better control. It uses .45 rounds."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/x9.dmi'
+ icon_state = "secgunauto"
+ item_state = "secgunauto"
+ pixel_offset_x = 32
+ pixel_offset_y = 14
fakecaliber = ".45"
/obj/item/gun/bang/tanto
- desc = "A crude-looking open-bolt machine pistol manufactured by a multitude of arms companies, or in some cases, particularly handy individuals. \
- Owing to their low cost and relative effectiveness, weapons like these are very common all across the Spur, from the tunnels of Oran to fringe colonies along the frontier. \
- This pistol is made almost entirely from sheet metal and has cloth wrappings around the grip for shooter comfort."
- name = "10mm pistol"
- icon = 'icons/obj/guns/c05r.dmi'
+ name = "\improper Mk1-A Tanto machine pistol"
+ desc = "An automatic variant of the NanoTrasen Mk1 Everyman handgun that has been built to accept detachable magazines, negating one of the original \
+ weapon's biggest shortcomings. It is marketed towards lower-echelon security companies as a machine pistol named the Tanto, and features a burst-fire selector \
+ and sturdier barrel with heatshield to better take advantage of the higher capacity."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/tanto.dmi'
icon_state = "c05r"
item_state = "c05r"
- pixel_offset_x = 31
- pixel_offset_y = 14
+ pixel_offset_x = 28
+ pixel_offset_y = 12
fakecaliber = "10mm"
/obj/item/gun/bang/silenced
- name = "silenced pistol"
- desc = "A small, quiet, easily concealable gun. Uses .45 rounds."
- icon = 'icons/obj/guns/silenced_pistol.dmi'
+ name = "\improper Mrrazhakulii suppressed pistol"
+ desc = "A small, quiet, easily concealable gun."
+ desc_extended = "Created as a disposable and concealable weapon, the Mrrazhakulii suppressed pistol is a firearm with a suppressor integrated as part of its barrel. \
+ Carried by guerrilla forces and spies, those guns are used in assassination and subterfuge operations. Due to using cheap and available materials, such as \
+ recycled iron and tires, countless of those pistols were distributed among cells and ALA soldiers."
+ icon = 'icons/obj/guns/faction/dpra/mrrazhakulii_suppressed_pistol.dmi'
icon_state = "silenced_pistol"
item_state = "silenced_pistol"
- pixel_offset_x = -4
- pixel_offset_y = 15
+ pixel_offset_x = 32
+ pixel_offset_y = 12
fakecaliber = ".45"
/obj/item/gun/bang/deagle
- name = ".50 magnum pistol"
- desc = "A robust handgun that uses .50 AE ammo."
- icon = 'icons/obj/guns/deagle.dmi'
+ name = "\improper Desert Eagle pistol"
+ desc = "An antique, usually impractical handgun firing .50 Action Express rounds. This one is still in good condition, if a bit rough around the edges."
+ icon = 'icons/obj/guns/faction/antique/deagle.dmi'
icon_state = "deagle"
item_state = "deagle"
- pixel_offset_x = -4
- pixel_offset_y = 16
+ pixel_offset_x = 28
+ pixel_offset_y = 12
fakecaliber = ".50"
/obj/item/gun/bang/pistol
- name = "9mm pistol"
- desc = "500 years since its creation and the Stechkin automatic pistol is still a common sight throughout the Frontier."
- icon = 'icons/obj/guns/pistol.dmi'
+ name = "\improper Moonlight pistol"
+ desc = "An extremely popular compact handgun, used throughout human space."
+ desc_extended = "The Zavodskoi Interstellar Moonlight 9mm can be found in the hands of just about anyone imaginable - special operatives, common criminals, police officers, the average Joe - on account of the time-tested design, low price point, reliability, and ease of concealment. Having a threaded barrel helps, too, and it isn't uncommon to see the Moonlight as a prop in spy films, suppressed."
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/pistol.dmi'
icon_state = "pistol"
item_state = "pistol"
- pixel_offset_x = 26
- pixel_offset_y = 14
+ pixel_offset_x = 28
+ pixel_offset_y = 13
fakecaliber = "9mm"
+ can_suppress = TRUE
+ suppressor_x_offset = 3
/obj/item/gun/bang/pirate
name = "zip gun"
desc = "Little more than a barrel, handle, and firing mechanism, cheap makeshift firearms like this one are not uncommon in frontier systems."
- icon = 'icons/obj/guns/zipgun.dmi'
+ icon = 'icons/obj/guns/faction/frontier/zipgun.dmi'
icon_state = "zipgun"
item_state = "zipgun"
- pixel_offset_x = 0
- pixel_offset_y = 12
+ pixel_offset_x = 32
+ pixel_offset_y = 10
fakecaliber = "7.62mm"
diff --git a/code/modules/projectiles/guns/bang/revolver.dm b/code/modules/projectiles/guns/bang/revolver.dm
index 6bc51d02632..5a7accbba77 100644
--- a/code/modules/projectiles/guns/bang/revolver.dm
+++ b/code/modules/projectiles/guns/bang/revolver.dm
@@ -1,4 +1,4 @@
/obj/item/gun/bang/revolver
- name = "revolver"
- desc = "The classic Zavodskoi Interstellar .357 revolver, for when you only want to shoot once."
+ name = "\improper Mark II revolver"
+ desc = "The revised Mark II Zavodskoi Interstellar revolver, utilizing a robust firing mechanism to deliver deadly rounds downrange. This is a monster of a hand cannon, with a beautiful cedar grip and a transparent plastic cover (so as to not splinter your hands while firing)."
fakecaliber = ".357"
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index d64cdf54a0a..641d839abda 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -1,7 +1,7 @@
-/obj/item/gun/energy
+ABSTRACT_TYPE(/obj/item/gun/energy)
name = "energy gun"
desc = "A basic energy-based gun."
- icon = 'icons/obj/guns/ecarbine.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/ecarbine.dmi'
icon_state = "energykill100"
item_state = "energykill100"
fire_sound = 'sound/weapons/Taser.ogg'
diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm
index b9c721e09b0..580c6321c6e 100644
--- a/code/modules/projectiles/guns/energy/blaster.dm
+++ b/code/modules/projectiles/guns/energy/blaster.dm
@@ -1,7 +1,7 @@
/obj/item/gun/energy/blaster
name = "blaster pistol"
desc = "A tiny energy pistol converted to fire off energy bolts rather than lasers beams."
- icon = 'icons/obj/guns/blaster_pistol.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/blaster_pistol.dmi'
icon_state = "blaster_pistol"
item_state = "blaster_pistol"
has_item_ratio = FALSE
@@ -48,7 +48,7 @@
/obj/item/gun/energy/blaster/revolver
name = "blaster revolver"
desc = "A robust eight-shot blaster."
- icon = 'icons/obj/guns/blaster_revolver.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/blaster_revolver.dmi'
icon_state = "blaster_revolver"
item_state = "blaster_revolver"
fire_sound = 'sound/weapons/laserstrong.ogg'
@@ -63,7 +63,7 @@
/obj/item/gun/energy/blaster/carbine
name = "blaster carbine"
desc = "A short-barreled blaster carbine meant for easy handling and comfort when in combat."
- icon = 'icons/obj/guns/blaster_carbine.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/blaster_carbine.dmi'
icon_state = "blaster_carbine"
item_state = "blaster_carbine"
max_shots = 16
@@ -76,7 +76,7 @@
/obj/item/gun/energy/blaster/rifle
name = "bolt slinger"
desc = "A blaster rifle which seems to work by accelerating particles and flinging them out in destructive bolts."
- icon = 'icons/obj/guns/blaster_rifle.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/blaster_rifle.dmi'
icon_state = "blaster_rifle"
item_state = "blaster_rifle"
max_shots = 20
@@ -110,10 +110,10 @@
to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
/obj/item/gun/energy/blaster/tcaf
- name = "blaster rifle"
- desc = "Developed by Zavodskoi Interstellar, the Z.I. Guardian is a burst-fire blaster rifle designed for the armed forces of the Republic of Biesel. Cheap, reliable and easy to mass-produce, these weapons can be seen across the branches of the TCAF."
+ name = "\improper Guardian blaster rifle"
+ desc = "Developed by Zavodskoi Interstellar, the Guardian is a burst-fire blaster rifle designed for the armed forces of the Republic of Biesel. Cheap, reliable and easy to mass-produce, these weapons can be seen across the branches of the TCAF."
desc_extended = "Released in early 2464, the Guardian is a modernisation of the outdated blasters previously used by the TCFL developed in conjunction with the Zo'ra Hive. Since its release, it has been widely adopted by Biesel, leading to a slight fall in NanoTrasen market share as Zavodskoi took their place as the main arms supplier of the TCAF."
- icon = 'icons/obj/guns/blaster_ar.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/blaster_ar.dmi'
icon_state = "blaster_ar"
item_state = "blaster_ar"
max_shots = 24
@@ -137,12 +137,12 @@
)
/obj/item/gun/energy/blaster/himeo
- name = "himean assault blaster"
+ name = "\improper Type-11 assault blaster"
desc = "The standard infantry blaster of the Himean Planetary Guard. 'TO RESIST EVIL BY FORCE' is stamped on the side."
desc_extended = "Originally developed in 2351, the Type-11 \"Guthrie\" is a descendant of the first Himean-made weapons; haphazardly overcharged mining equipment. If it ain't broke, don't fix it; variants \
of this rifle have served in the United Syndicates' arsenal for generations, although none have matched modern improvements 'borrowed' from Zavodskoi Interstellar. Waterproof, spaceproof, idiot-proof; it's here to stay, even as advanced Xanan ballistics \
creep their way into the market. Ironically, lend-lease aid to the now-defunct League of Independent Corporate-Free Systems have seen a great deal of these end up in the hands of pirates."
- icon = 'icons/obj/guns/himeo_blaster.dmi'
+ icon = 'icons/obj/guns/faction/himeo_free_consortium/himeo_blaster.dmi'
icon_state = "himeoblaster"
item_state = "himeoblaster"
projectile_type = /obj/projectile/energy/blaster/heavy
@@ -220,11 +220,11 @@
update_icon()
/obj/item/gun/energy/blaster/himeo/pistol
- name = "himean heavy blaster pistol"
+ name = "\improper Type-45 heavy blaster pistol"
desc = "The standard sidearm of the Himean Planetary Guard. For those revolutions you cannot fight with fists."
desc_extended = "A plasma cutter gave its life for the first Type-45 \"Sabo-Tabby\" pistol. Powered by the same hydrogen cells as the Type-11 \"Guthrie\" rifle, this robust model has earned the nickname of \
the 'One Big Handgun' in those foreign markets it has cropped up. What was initially seen as a flaw in the power converter led to its 'magnum'-sized blaster bolts."
- icon = 'icons/obj/guns/himeo_pistol.dmi'
+ icon = 'icons/obj/guns/faction/himeo_free_consortium/himeo_pistol.dmi'
icon_state = "himeopistol"
item_state = "himeopistol"
projectile_type = /obj/projectile/energy/blaster/heavy
diff --git a/code/modules/projectiles/guns/energy/crank.dm b/code/modules/projectiles/guns/energy/crank.dm
index c3774038fe0..b1d5b857442 100644
--- a/code/modules/projectiles/guns/energy/crank.dm
+++ b/code/modules/projectiles/guns/energy/crank.dm
@@ -1,7 +1,7 @@
/obj/item/gun/energy/rifle/icelance
- name = "icelance rifle"
+ name = "\improper Tui'ad icelance rifle"
desc = "A Tajaran made rifle, it houses a crank-chargable internal battery. It only holds three shots and each shot must be cranked manually."
- icon = 'icons/obj/guns/icelance.dmi'
+ icon = 'icons/obj/guns/faction/pra/icelance.dmi'
icon_state = "icelance"
item_state = "icelance"
has_item_ratio = FALSE
diff --git a/code/modules/projectiles/guns/energy/freezeray.dm b/code/modules/projectiles/guns/energy/freezeray.dm
index a1c384ca494..05ef2191e65 100644
--- a/code/modules/projectiles/guns/energy/freezeray.dm
+++ b/code/modules/projectiles/guns/energy/freezeray.dm
@@ -1,6 +1,6 @@
/obj/item/gun/energy/freeze
- name = "freeze ray gun"
- desc = "A portable freezing ray gun designated to quickly lower temperatures."
+ name = "freeze ray"
+ desc = "A portable freezing ray designed to quickly lower temperatures."
icon = 'icons/obj/guns/freezeray.dmi'
icon_state = "icer"
item_state = "icer"
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index b3a78ee530c..20fc2309ae6 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -1,43 +1,6 @@
-/obj/item/gun/energy/laser
- name = "laser carbine"
- desc = "A NanoTrasen G40E carbine, designed to kill with concentrated energy blasts."
- icon = 'icons/obj/guns/laserrifle.dmi'
- icon_state = "laserrifle100"
- item_state = "laserrifle100"
- has_item_ratio = FALSE // the back and suit slots have ratio sprites but the in-hands dont
- fire_sound = 'sound/weapons/laser1.ogg'
- slot_flags = SLOT_BELT|SLOT_BACK
- accuracy = 1
- w_class = WEIGHT_CLASS_NORMAL
- force = 20
- origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
- matter = list(DEFAULT_WALL_MATERIAL = 2000)
- projectile_type = /obj/projectile/beam/midlaser
- can_turret = TRUE
- turret_is_lethal = TRUE
- turret_sprite_set = "laser"
-
- modifystate = "laserrifle"
-
-/obj/item/gun/energy/laser/mounted
- name = "mounted laser carbine"
- has_safety = FALSE
- self_recharge = TRUE
- use_external_power = TRUE
- can_turret = FALSE
-
-/obj/item/gun/energy/laser/mounted/cyborg/overclocked
- max_shots = 15
- recharge_time = 1
-
-/obj/item/gun/energy/laser/practice
- name = "practice laser carbine"
- desc = "A modified version of the NT G40E, this one fires less concentrated energy bolts designed for target practice."
- projectile_type = /obj/projectile/beam/practice
-
/obj/item/gun/energy/retro
- name = "retro laser"
- icon = 'icons/obj/guns/retro.dmi'
+ name = "\improper L104 laser gun"
+ icon = 'icons/obj/guns/faction/antique/retro.dmi'
icon_state = "retro"
item_state = "retro"
has_item_ratio = FALSE
@@ -57,9 +20,9 @@
modifystate = "retro"
/obj/item/gun/energy/captain
- name = "antique laser gun"
- icon = 'icons/obj/guns/caplaser.dmi'
- desc = "This is an antique laser gun. All craftsmanship is of the highest quality. The object menaces with spikes of energy."
+ name = "\improper X-00 laser gun"
+ icon = 'icons/obj/guns/faction/antique/caplaser.dmi'
+ desc = "This is the X-00, an antique laser gun, out of production for decades and well beyond anyone's capacity to recreate. All craftsmanship is of the highest quality. The gun menaces with spikes of energy."
icon_state = "caplaser"
item_state = "caplaser"
has_item_ratio = FALSE
@@ -80,42 +43,11 @@
. += ..()
. += "Unlike most energy weapons, this weapon recharges itself."
-/obj/item/gun/energy/lasercannon
- name = "laser cannon"
- desc = "A NanoTrasen designed laser cannon capable of acting as a powerful support weapon."
- desc_extended = "The NT LC-4 is a laser cannon developed and produced by NanoTrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
- icon = 'icons/obj/guns/lasercannon.dmi'
- icon_state = "lasercannon100"
- item_state = "lasercannon100"
- fire_sound = 'sound/weapons/lasercannonfire.ogg'
- origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
- slot_flags = SLOT_BELT|SLOT_BACK
- projectile_type = /obj/projectile/beam/heavylaser
- charge_cost = 400
- max_shots = 5
- fire_delay = 20
- can_turret = TRUE
- turret_is_lethal = TRUE
- turret_sprite_set = "cannon"
-
- modifystate = "lasercannon"
-
-/obj/item/gun/energy/lasercannon/mounted
- name = "mounted laser cannon"
- self_recharge = TRUE
- use_external_power = TRUE
- recharge_time = 10
- can_turret = FALSE
-
-/obj/item/gun/energy/lasercannon/mounted/cyborg/overclocked
- recharge_time = 1
- max_shots = 15
-
/obj/item/gun/energy/xray
- name = "xray laser gun"
- desc = "A NanoTrasen designed high-power laser sidearm capable of expelling concentrated xray blasts."
- desc_extended = "The NT XG-1 is a laser sidearm developed and produced by NanoTrasen. A recent invention, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover. It is compact with relatively high capacity to other sidearms."
- icon = 'icons/obj/guns/xray.dmi'
+ name = "\improper XG-1 X-Ray laser pistol"
+ desc = "A NanoTrasen designed high-power laser sidearm capable of expelling concentrated X-Ray blasts."
+ desc_extended = "The XG-1 is a laser sidearm developed and produced by NanoTrasen. A recent invention, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover. It is compact with relatively high capacity to other sidearms."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/xray.dmi'
icon_state = "xray"
item_state = "xray"
has_item_ratio = FALSE
@@ -138,52 +70,11 @@
recharge_time = 5
can_turret = FALSE
-/obj/item/gun/energy/sniperrifle
- name = "marksman energy rifle"
- desc = "The HI L.W.A.P. is an older NanoTrasen design. A designated marksman rifle capable of shooting powerful ionized beams, this is a weapon to kill from a distance."
- icon = 'icons/obj/guns/sniper.dmi'
- icon_state = "sniper"
- item_state = "sniper"
- has_item_ratio = FALSE // same as the laserrifle
- fire_sound = 'sound/weapons/marauder.ogg'
- origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4)
- projectile_type = /obj/projectile/beam/sniper
- slot_flags = SLOT_BACK
- charge_cost = 400
- max_shots = 4
- fire_delay = 45
- force = 15
- w_class = WEIGHT_CLASS_BULKY
- accuracy = -3 //shooting at the hip
- scoped_accuracy = 4
- can_turret = TRUE
- turret_sprite_set = "sniper"
- turret_is_lethal = TRUE
-
- is_wieldable = TRUE
-
- fire_delay_wielded = 35
- accuracy_wielded = 0
-
-/obj/item/gun/energy/sniperrifle/mechanics_hints(mob/user, distance, is_adjacent)
- . += ..()
- . += "To use the scope, use the appropriate verb in the object tab."
-
-/obj/item/gun/energy/sniperrifle/verb/scope()
- set category = "Object.Held"
- set name = "Use Scope"
- set src in usr
-
- if(wielded)
- toggle_scope(2.0, usr)
- else
- to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
-
/obj/item/gun/energy/laser/shotgun
- name = "laser shotgun"
+ name = "\improper QB-2 laser shotgun"
desc = "A NanoTrasen designed laser weapon, designed to split a single amplified beam four times."
- desc_extended = "The NT QB-2 is a laser weapon developed and produced by NanoTrasen. Designed to fill in the niche that ballistic shotguns do, but in the form of laser weaponry. It is equipped with a special crystal lens that splits a single laser beam into four."
- icon = 'icons/obj/guns/lasershotgun.dmi'
+ desc_extended = "The QB-2 is a laser weapon developed and produced by NanoTrasen. Designed to fill in the niche that ballistic shotguns do, but in the form of laser weaponry. It is equipped with a special crystal lens that splits a single laser beam into four."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/lasershotgun.dmi'
icon_state = "lasershotgun"
item_state = "lasershotgun"
modifystate = null
@@ -209,13 +100,13 @@
turret_sprite_set = "laser"
/obj/item/gun/energy/laser/shotgun/research
- name = "expedition shotgun"
+ name = "\improper QB-2E laser shotgun"
desc = "A NanoTrasen designed laser weapon, designed to split a single amplified beam four times. This one is marked for expeditionary use."
pin = /obj/item/firing_pin/away_site
////////Laser Tag////////////////////
-/obj/item/gun/energy/lasertag
+ABSTRACT_TYPE(/obj/item/gun/energy/lasertag)
name = "laser tag gun"
desc = "A simple low-power laser gun, outfitted for use in laser tag arenas."
item_state = "laser"
@@ -249,16 +140,16 @@
pin = new pin_path(src)
switch(set_color)
if("red")
- icon = 'icons/obj/guns/redtag.dmi'
+ icon = 'icons/obj/guns/faction/toy/redtag.dmi'
if("blue")
- icon = 'icons/obj/guns/bluetag.dmi'
+ icon = 'icons/obj/guns/faction/toy/bluetag.dmi'
icon_state = "[set_color]tag"
item_state = icon_state
modifystate = item_state
update_held_icon()
/obj/item/gun/energy/lasertag/blue
- icon = 'icons/obj/guns/bluetag.dmi'
+ icon = 'icons/obj/guns/faction/toy/bluetag.dmi'
icon_state = "bluetag"
item_state = "bluetag"
projectile_type = /obj/projectile/beam/laser_tag/blue
@@ -266,6 +157,6 @@
turret_sprite_set = "blue"
/obj/item/gun/energy/lasertag/red
- icon = 'icons/obj/guns/redtag.dmi'
+ icon = 'icons/obj/guns/faction/toy/redtag.dmi'
icon_state = "redtag"
item_state = "redtag"
diff --git a/code/modules/projectiles/guns/energy/lawgiver.dm b/code/modules/projectiles/guns/energy/lawgiver.dm
index df0314627c9..b31c567f9d3 100644
--- a/code/modules/projectiles/guns/energy/lawgiver.dm
+++ b/code/modules/projectiles/guns/energy/lawgiver.dm
@@ -1,6 +1,6 @@
-/obj/item/gun/energy/lawgiver
- name = "advanced combi-pistol mk2"
- icon = 'icons/obj/guns/lawgiver.dmi'
+/obj/item/gun/energy/acp
+ name = "\improper ACP-2"
+ icon = 'icons/obj/guns/faction/stellar_corporate_conglomerate/combipistol.dmi'
icon_state = "lawgiver"
item_state = "lawgiver"
has_item_ratio = FALSE
@@ -86,17 +86,17 @@
)
)
-/obj/item/gun/energy/lawgiver/Initialize()
+/obj/item/gun/energy/acp/Initialize()
. = ..()
become_hearing_sensitive()
power_supply = new /obj/item/cell/device/variable(src, 2000)
var/datum/firemode/new_mode = firemodes[sel_mode]
new_mode.apply_to(src)
-/obj/item/gun/energy/lawgiver/Destroy()
+/obj/item/gun/energy/acp/Destroy()
return ..()
-/obj/item/gun/energy/lawgiver/proc/play_message()
+/obj/item/gun/energy/acp/proc/play_message()
while (message_enabled && !message_disable) //Shut down command issued. Inform user that boardcasting has been stopped
usr.audible_message(SPAN_WARNING("[usr]'s [src.name] broadcasts: [message]"),"")
playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
@@ -105,7 +105,7 @@
message_enabled = 0
message_disable = 0
-/obj/item/gun/energy/lawgiver/unique_action(mob/living/carbon/user) //can probably remove this in favor of the DNA locked firing pins. not touching that now though. edit: lol nevermind snowflake code of the year
+/obj/item/gun/energy/acp/unique_action(mob/living/carbon/user) //can probably remove this in favor of the DNA locked firing pins. not touching that now though. edit: lol nevermind snowflake code of the year
if(dna != null)
return
else
@@ -115,7 +115,7 @@
desc += "
Linked to: [user.real_name]"
return
-/obj/item/gun/energy/lawgiver/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, pointblank=0, reflex = 0)
+/obj/item/gun/energy/acp/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, pointblank=0, reflex = 0)
if(src.dna != user.dna.unique_enzymes && !emagged)
if(istype(user, /mob/living/carbon/human))
//Save the users active hand
@@ -136,18 +136,18 @@
return 0
..()
-/obj/item/gun/energy/lawgiver/proc/Emag(mob/user as mob)
+/obj/item/gun/energy/acp/proc/Emag(mob/user as mob)
to_chat(usr, SPAN_WARNING("You short out [src]'s id check"))
emagged = 1
return 1
-/obj/item/gun/energy/lawgiver/attackby(obj/item/attacking_item, mob/user)
+/obj/item/gun/energy/acp/attackby(obj/item/attacking_item, mob/user)
if (istype(attacking_item, /obj/item/card/emag) && !emagged)
Emag(user)
else
..()
-/obj/item/gun/energy/lawgiver/hear_talk(mob/living/M in range(0,src), msg)
+/obj/item/gun/energy/acp/hear_talk(mob/living/M in range(0,src), msg)
var/mob/living/carbon/human/H = M
if (!H || !istype(H))
return
@@ -155,7 +155,7 @@
hear(msg)
return
-/obj/item/gun/energy/lawgiver/proc/hear(var/msg)
+/obj/item/gun/energy/acp/proc/hear(var/msg)
var/datum/firemode/old_mode = firemodes[sel_mode]
var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = ""," " = "")
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 1e767485412..bd6dd6dcfa4 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -1,8 +1,8 @@
/obj/item/gun/energy/gun
- name = "energy carbine"
+ name = "\improper EC-4 energy carbine"
desc = "A NanoTrasen designed energy-based carbine with two settings: Stun and kill."
desc_extended = "The NT EC-4 is an energy carbine developed and produced by NanoTrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
- icon = 'icons/obj/guns/ecarbine.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/ecarbine.dmi'
icon_state = "energystun"
item_state = "energystun"
fire_sound = 'sound/weapons/Taser.ogg'
@@ -123,10 +123,10 @@
update_mode()
/obj/item/gun/energy/pistol
- name = "energy pistol"
+ name = "\improper EP-3 energy pistol"
desc = "A NanoTrasen energy-based pistol gun with two settings: Stun and kill."
- desc_extended = "The NT EP-3 is an energy sidearm developed and produced by NanoTrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
- icon = 'icons/obj/guns/epistol.dmi'
+ desc_extended = "The EP-3 is an energy sidearm developed and produced by NanoTrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/epistol.dmi'
icon_state = "epistolstun100"
item_state = "epistolstun100"
fire_sound = 'sound/weapons/Taser.ogg'
@@ -150,10 +150,10 @@
)
/obj/item/gun/energy/pistol/hegemony
- name = "hegemony energy pistol"
+ name = "\improper Zkrehk-Guild Beamgun"
desc = "An upgraded variant of the standard energy pistol with two settings: Incapacitate and Smite."
desc_extended = "This is the Zkrehk-Guild Beamgun, an energy-based sidearm designed and manufactured on Moghes. A special crystal used in its design allows it to penetrate armor with pinpoint accuracy."
- icon = 'icons/obj/guns/hegemony_pistol.dmi'
+ icon = 'icons/obj/guns/faction/izweski_hegemony/hegemony_pistol.dmi'
icon_state = "hegemony_pistol"
item_state = "hegemony_pistol"
has_item_ratio = FALSE
@@ -179,7 +179,7 @@
name = "golden deep ornate energy pistol"
desc = "An intricate golden energy pistol, engraved with a quality unlike no other. If you had to describe this pistol in one word, it would be expensive."
desc_extended = "Possessed by only the most affluent affiliates of the Golden Deep, this ornate energy pistol covered in gold is the result of a commission, which had the artistic quality of Ultra Maz combined with the scientific technology acquired by the Estriconian to produce a weapon that many outsiders see as a firearm more valuable than the assets it was made to protect."
- icon = 'icons/obj/guns/goldendeep_ornatepistol.dmi'
+ icon = 'icons/obj/guns/faction/golden_deep/goldendeep_ornatepistol.dmi'
icon_state = "ornatepistolstun100"
item_state = "ornatepistolstun100"
has_item_ratio = FALSE
@@ -202,10 +202,10 @@
)
/obj/item/gun/energy/repeater
- name = "energy repeater"
+ name = "\improper SCC-ER1 energy repeater"
desc = "A Stellar Corporate Conglomerate created energy repeater, extremely lightweight. It has three settings: Single, Three-Burst, and Full-Auto."
desc_extended = "The SCC-ER1 was designed to be a reliable yet concealable firearm, capable of defending SCC assets and agents from various attackers."
- icon = 'icons/obj/guns/erepeater.dmi'
+ icon = 'icons/obj/guns/faction/stellar_corporate_conglomerate/erepeater.dmi'
icon_state = "energysmg100"
item_state = "energysmg100"
modifystate = "energysmg"
@@ -227,10 +227,10 @@
)
/obj/item/gun/energy/repeater/pistol
- name = "Energy Pistol"
+ name = "\improper SCC-ER1-2 energy pistol"
desc = "A more compact and portable version of the Stellar Corporate Conglomerate Energy Repeater. It has two settings: Stun, and Lethal."
desc_extended = "The SCC-ER1-2 was designed to be a reliable yet more compact version of the SCC-ER1, capable of defending Staff and Assets."
- icon = 'icons/obj/guns/sccpistol.dmi'
+ icon = 'icons/obj/guns/faction/stellar_corporate_conglomerate/sccpistol.dmi'
icon_state = "sccpistolstun100"
item_state = "sccpistolstun"
has_item_ratio = FALSE
@@ -251,7 +251,7 @@
list(mode_name="lethal", projectile_type=/obj/projectile/beam/pistol/scc/weak, modifystate="sccpistolkill", fire_sound='sound/weapons/energy_repeater.ogg')
)
-/obj/item/gun/energy/gun/skrell
+ABSTRACT_TYPE(/obj/item/gun/energy/gun/skrell)
self_recharge = TRUE
fire_sound = 'sound/weapons/Laser2.ogg'
modifystate = null
@@ -266,7 +266,7 @@
/obj/item/gun/energy/gun/skrell/pistol
name = "nralakk particle pistol"
desc = "A Nralakk Federation particle-beam pistol with two settings: Disable and Lethal."
- icon = 'icons/obj/guns/nralakkpistol.dmi'
+ icon = 'icons/obj/guns/faction/nralakk_federation/nralakkpistol.dmi'
icon_state = "particlepistol"
item_state = "particlepistol"
slot_flags = SLOT_BELT|SLOT_HOLSTER
@@ -282,7 +282,7 @@
/obj/item/gun/energy/gun/skrell/smg
name = "nralakk particle submachinegun"
desc = "A Nralakk Federation particle-beam submachine gun with two settings: Disable and Lethal."
- icon = 'icons/obj/guns/nralakksmg.dmi'
+ icon = 'icons/obj/guns/faction/nralakk_federation/nralakksmg.dmi'
icon_state = "particlesmg"
item_state = "particlesmg"
slot_flags = SLOT_BELT|SLOT_HOLSTER|SLOT_BACK
@@ -297,7 +297,7 @@
)
/obj/item/gun/energy/gun/qukala
- name = "tqi-qop carbine"
+ name = "\improper Tqi-Qop carbine"
desc = "The Tqi-Qop Carbine is the main weapon of the Qukala. Its compact light frame and excellent ammo capacity make it a superb weapon for the Skrell."
desc_extended = ""
icon = 'icons/obj/item/gun/energy/gun/qukala.dmi'
@@ -329,7 +329,7 @@
can_turret = FALSE
/obj/item/gun/energy/fedpistol
- name = "nralakk energy pistol"
+ name = "\improper Xuqm-3 energy pistol"
desc = "A Skrell-made pistol that utilises a psionic control mechanism. It's made from a lightweight alloy."
desc_extended = "A sidearm usually seen in the hands of Nralakk Federation officials and law enforcement, the Xuqm-3 energy pistol has a psionically-linked firing pin that checks for a developed Zona Bovinae in its user before it can be fired. A wire can be attached to the user's wrist to allow for mode switching using psionics rather than changing it physically. For non-psionic users, a small dial for mode switching has been attached."
icon = 'icons/obj/guns/psi_pistol.dmi'
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 6f12ad5cd19..3adee8264e8 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -1,7 +1,45 @@
+/obj/item/gun/energy/rifle/pulse
+ name = "\improper PL-10 pulse rifle"
+ desc = "A top-of-the-line, heavy-duty, multifaceted energy rifle with three firing modes. The gold standard for NanoTrasen's heavier security specialists."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/pulse.dmi'
+ icon_state = "pulse"
+ item_state = "pulse"
+ fire_sound = 'sound/weapons/laser1.ogg'
+ projectile_type = /obj/projectile/beam
+ sel_mode = 2
+ origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNET = 4)
+ secondary_projectile_type = /obj/projectile/beam/pulse
+ secondary_fire_sound = 'sound/weapons/pulse.ogg'
+ can_switch_modes = FALSE
+ turret_sprite_set = "pulse"
+ turret_is_lethal = TRUE
+
+ modifystate = null
+
+ firemodes = list(
+ list(mode_name="stun", projectile_type=/obj/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
+ list(mode_name="lethal", projectile_type=/obj/projectile/beam, fire_sound='sound/weapons/laser1.ogg'),
+ list(mode_name="DESTROY", projectile_type=/obj/projectile/beam/pulse, fire_sound='sound/weapons/pulse.ogg')
+ )
+
+/obj/item/gun/energy/rifle/pulse/destroyer
+ name = "\improper PL-10D pulse destroyer"
+ desc = "A heavy-duty, pulse-based energy weapon. Because of its complexity and cost, it is rarely seen in use except by specialists."
+ fire_sound = 'sound/weapons/pulse.ogg'
+ projectile_type = /obj/projectile/beam/pulse
+ burst_delay = 5
+ burst = 3
+ max_shots = 30
+ secondary_projectile_type = null
+ secondary_fire_sound = null
+
+/obj/item/gun/energy/rifle/pulse/destroyer/toggle_firing_mode(mob/living/user)
+ to_chat(user, SPAN_WARNING("[src.name] has three settings, and they are all DESTROY."))
+
/obj/item/gun/energy/pulse
- name = "pulse carbine"
- desc = "A weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. Because of its complexity and cost, it is rarely seen in use except by specialists."
- icon = 'icons/obj/guns/pulse_carbine.dmi'
+ name = "\improper PL-4 pulse carbine"
+ desc = "A next-generation pulse weapon for NanoTrasen's security forces. High production costs and logistical issues have limited its deployment to specialist Loss Prevention and Emergency Response units."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/pulse_carbine.dmi'
icon_state = "pulse_carbine"
item_state = "pulse_carbine"
slot_flags = SLOT_BELT
@@ -33,10 +71,10 @@
can_turret = FALSE
/obj/item/gun/energy/pulse/pistol
- name = "pulse pistol"
+ name = "\improper PL-7 pulse pistol"
desc = "A weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. This one is a really compact model."
slot_flags = SLOT_BELT|SLOT_HOLSTER
- icon = 'icons/obj/guns/pulse_pistol.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/pulse_pistol.dmi'
icon_state = "pulse_pistol"
item_state = "pulse_pistol"
offhand_accuracy = 1
diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm
index 4a745a25930..d18ca6f72c7 100644
--- a/code/modules/projectiles/guns/energy/rifle.dm
+++ b/code/modules/projectiles/guns/energy/rifle.dm
@@ -1,8 +1,8 @@
/obj/item/gun/energy/rifle
- name = "energy rifle"
+ name = "\improper ER-2 energy rifle"
desc = "A NanoTrasen designed energy-based rifle with two settings: Stun and Kill."
- desc_extended = "The NT ER-2 is an energy rifle developed and produced by NanoTrasen. Widely produced and sold across the galaxy. Designed to both stun and kill with concentrated energy blasts of varying strengths based on the fire mode, focused through a crystal lens. Considered to be a dual-purpose rifle with prolonged combat capability."
- icon = 'icons/obj/guns/erifle.dmi'
+ desc_extended = "The ER-2 is an energy rifle developed and produced by NanoTrasen. Widely produced and sold across the galaxy. Designed to both stun and kill with concentrated energy blasts of varying strengths based on the fire mode, focused through a crystal lens. Considered to be a dual-purpose rifle with prolonged combat capability."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/erifle.dmi'
icon_state = "eriflestun"
item_state = "eriflestun"
fire_sound = 'sound/weapons/Taser.ogg'
@@ -38,10 +38,10 @@
)
/obj/item/gun/energy/rifle/laser
- name = "laser rifle"
+ name = "\improper LR-6 laser rifle"
desc = "A NanoTrasen designed laser weapon, designed to kill with concentrated energy blasts."
- desc_extended = "The NT LR-6 is a laser rifle developed and produced by NanoTrasen. Designed to kill with concentrated energy blasts focused through a crystal lens. It is considered to be the template of other standard laser weaponry."
- icon = 'icons/obj/guns/laserrifle.dmi'
+ desc_extended = "The LR-6 is a laser rifle developed and produced by NanoTrasen. Designed to kill with concentrated energy blasts focused through a crystal lens. It is considered to be the template of other standard laser weaponry."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/laserrifle.dmi'
icon_state = "laserrifle"
item_state = "laserrifle"
has_item_ratio = FALSE // the back and suit slots have ratio sprites but the in-hands dont
@@ -60,15 +60,68 @@
modifystate = null
/obj/item/gun/energy/rifle/laser/practice
- name = "practice laser rifle"
- desc = "A modified version of the NT LR-6. It fires less concentrated laser beams that are visible, but ultimately harmless, designed for target practice."
+ name = "\improper LR-6P practice laser rifle"
+ desc = "A modified version of the LR-6. It fires less concentrated laser beams that are visible, but ultimately harmless, designed for target practice."
projectile_type = /obj/projectile/beam/practice
+
+/obj/item/gun/energy/rifle/laser/mounted
+ name = "mounted laser rifle"
+ has_safety = FALSE
+ self_recharge = TRUE
+ use_external_power = TRUE
+ can_turret = FALSE
+
+/obj/item/gun/energy/rifle/laser/mounted/cyborg/overclocked
+ max_shots = 15
+ recharge_time = 1
+
+/obj/item/gun/energy/rifle/laser/sniper
+ name = "\improper HI L.W.A.P. marksman energy rifle"
+ desc = "The HI L.W.A.P. is an older NanoTrasen design. A designated marksman rifle capable of shooting powerful ionized beams, this is a weapon to kill from a distance."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/nt_laser_sniper.dmi'
+ icon_state = "sniper"
+ item_state = "sniper"
+ has_item_ratio = FALSE // same as the laserrifle
+ fire_sound = 'sound/weapons/marauder.ogg'
+ origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4)
+ projectile_type = /obj/projectile/beam/sniper
+ slot_flags = SLOT_BACK
+ charge_cost = 400
+ max_shots = 4
+ fire_delay = 45
+ force = 15
+ w_class = WEIGHT_CLASS_BULKY
+ accuracy = -3 //shooting at the hip
+ scoped_accuracy = 4
+ can_turret = TRUE
+ turret_sprite_set = "sniper"
+ turret_is_lethal = TRUE
+
+ is_wieldable = TRUE
+
+ fire_delay_wielded = 35
+ accuracy_wielded = 0
+
+/obj/item/gun/energy/rifle/laser/sniper/mechanics_hints(mob/user, distance, is_adjacent)
+ . += ..()
+ . += "To use the scope, use the appropriate verb in the object tab."
+
+/obj/item/gun/energy/rifle/laser/sniper/verb/scope()
+ set category = "Object.Held"
+ set name = "Use Scope"
+ set src in usr
+
+ if(wielded)
+ toggle_scope(2.0, usr)
+ else
+ to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
+
/obj/item/gun/energy/rifle/laser/noctiluca
- name = "combat laser rifle"
+ name = "\improper Noctiluca XM/24 combat laser rifle"
desc = "The Noctiluca XM/24 is a brand new model of laser rifle, developed entirely by Kumar Arms, a Zavodskoi Interstellar subsidiary. Easy to handle for users with minimal training, reliable and with a reasonable form factor, it is poised to become the new standard for laser weaponry."
desc_extended = "The Noctiluca XM/24 was unveiled at the tail end of 2463 in the SCC Future Firearms contest and was released by Zavodskoi in June 2464 after achieving a stunning victory over the other competitors. Zavodskoi installations are prioritized for acquisition of this new rifle, with along the SCCV Horizon. The Noctiluca's specialty lies in its revolutionary dual-function laser diffuser, which is able to modulate the laser into either a standard beam or an armor-piercing super-concentrated beam."
- icon = 'icons/obj/guns/crew_laser.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/crew_laser.dmi'
icon_state = "trilaser"
item_state = "trilaser"
max_shots = 15
@@ -90,10 +143,10 @@
it has a secondary armor-piercing mode, which does less damage but has extremely high armor piercing."
/obj/item/gun/energy/rifle/laser/heavy
- name = "laser cannon"
- desc = "A nanotrasen designed laser cannon capable of acting as a powerful support weapon."
- desc_extended = "The NT LC-4 is a laser cannon developed and produced by NanoTrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
- icon = 'icons/obj/guns/lasercannon.dmi'
+ name = "\improper LC-4 laser cannon"
+ desc = "A NanoTrasen designed laser cannon capable of acting as a powerful support weapon."
+ desc_extended = "The LC-4 is a laser cannon developed and produced by NanoTrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/lasercannon.dmi'
icon_state = "lasercannon100"
item_state = "lasercannon100"
has_item_ratio = TRUE
@@ -115,11 +168,22 @@
accuracy_wielded = 2
fire_delay_wielded = 20
+/obj/item/gun/energy/rifle/laser/heavy/mounted
+ name = "mounted laser cannon"
+ self_recharge = TRUE
+ use_external_power = TRUE
+ recharge_time = 10
+ can_turret = FALSE
+
+/obj/item/gun/energy/rifle/laser/heavy/mounted/cyborg/overclocked
+ recharge_time = 1
+ max_shots = 15
+
/obj/item/gun/energy/rifle/laser/xray
- name = "xray laser rifle"
- desc = "A NanoTrasen designed high-power laser rifle capable of expelling concentrated xray blasts."
- desc_extended = "The NT XR-1 is a laser firearm developed and produced by NanoTrasen. A recent innovation, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover, all the while having a large ammo capacity."
- icon = 'icons/obj/guns/xrifle.dmi'
+ name = "\improper XR-1 X-Ray laser rifle"
+ desc = "A NanoTrasen designed high-power laser rifle capable of expelling concentrated X-Ray blasts."
+ desc_extended = "The XR-1 is a laser firearm developed and produced by NanoTrasen. A recent innovation, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover, all the while having a large ammo capacity."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/xrifle.dmi'
icon_state = "xrifle"
item_state = "xrifle"
fire_sound = 'sound/weapons/laser3.ogg'
@@ -134,44 +198,6 @@
turret_sprite_set = "xray"
turret_is_lethal = TRUE
-/obj/item/gun/energy/rifle/pulse
- name = "pulse rifle"
- desc = "A weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. Because of its complexity and cost, it is rarely seen in use except by specialists."
- icon = 'icons/obj/guns/pulse.dmi'
- icon_state = "pulse"
- item_state = "pulse"
- fire_sound = 'sound/weapons/laser1.ogg'
- projectile_type = /obj/projectile/beam
- sel_mode = 2
- origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNET = 4)
- secondary_projectile_type = /obj/projectile/beam/pulse
- secondary_fire_sound = 'sound/weapons/pulse.ogg'
- can_switch_modes = FALSE
- turret_sprite_set = "pulse"
- turret_is_lethal = TRUE
-
- modifystate = null
-
- firemodes = list(
- list(mode_name="stun", projectile_type=/obj/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
- list(mode_name="lethal", projectile_type=/obj/projectile/beam, fire_sound='sound/weapons/laser1.ogg'),
- list(mode_name="DESTROY", projectile_type=/obj/projectile/beam/pulse, fire_sound='sound/weapons/pulse.ogg')
- )
-
-/obj/item/gun/energy/rifle/pulse/destroyer
- name = "pulse destroyer"
- desc = "A heavy-duty, pulse-based energy weapon. Because of its complexity and cost, it is rarely seen in use except by specialists."
- fire_sound = 'sound/weapons/pulse.ogg'
- projectile_type = /obj/projectile/beam/pulse
- burst_delay = 5
- burst = 3
- max_shots = 30
- secondary_projectile_type = null
- secondary_fire_sound = null
-
-/obj/item/gun/energy/rifle/pulse/destroyer/toggle_firing_mode(mob/living/user)
- to_chat(user, SPAN_WARNING("[src.name] has three settings, and they are all DESTROY."))
-
/obj/item/gun/energy/rifle/laser/tachyon
name = "tachyon rifle"
desc = "A Vaurcan rifle that fires a beam of concentrated faster than light particles, capable of passing through most forms of matter."
@@ -200,9 +226,9 @@
to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
/obj/item/gun/energy/rifle/ionrifle
- name = "ion rifle"
- desc = "The NT Mk70 EW Halicon is a man portable anti-armor weapon designed to disable mechanical threats, produced by NanoTrasen."
- icon = 'icons/obj/guns/ionrifle.dmi'
+ name = "\improper Mk70 EW ion rifle"
+ desc = "The Mk70 EW \"Halicon\" is a man portable anti-armor weapon designed to disable mechanical threats, produced by NanoTrasen."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/ionrifle.dmi'
icon_state = "ionrifle"
item_state = "ionrifle"
has_item_ratio = FALSE
@@ -242,10 +268,10 @@
projectile_type = /obj/projectile/beam/midlaser/skrell/heavy
/obj/item/gun/energy/rifle/hegemony
- name = "hegemony energy rifle"
+ name = "\improper Zkrehk-Guild heavy beamgun"
desc = "An upgraded variant of the standard laser rifle. It does not have a stun setting."
desc_extended = "The Zkrehk-Guild Heavy Beamgun, an energy-based rifle designed and manufactured on Moghes. A special crystal used in its design allows it to penetrate armor with pinpoint accuracy."
- icon = 'icons/obj/guns/hegemony_rifle.dmi'
+ icon = 'icons/obj/guns/faction/izweski_hegemony/hegemony_rifle.dmi'
icon_state = "hegemonyrifle"
item_state = "hegemonyrifle"
has_item_ratio = FALSE
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 4f138cf1756..08281747573 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -92,7 +92,7 @@
/obj/item/gun/energy/mindflayer
name = "mind flayer"
desc = "A custom-built weapon of some kind."
- icon = 'icons/obj/guns/xray.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/xray.dmi'
icon_state = "xray"
item_state = "xray"
has_item_ratio = FALSE
@@ -101,25 +101,10 @@
can_turret = TRUE
turret_sprite_set = "xray"
-/obj/item/gun/energy/toxgun
- name = "phoron pistol"
- desc = "A specialized firearm designed to fire lethal bolts of phoron."
- icon = 'icons/obj/guns/toxgun.dmi'
- icon_state = "toxgun"
- item_state = "toxgun"
- has_item_ratio = FALSE
- fire_sound = 'sound/effects/stealthoff.ogg'
- w_class = WEIGHT_CLASS_NORMAL
- origin_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
- projectile_type = /obj/projectile/energy/phoron
- can_turret = TRUE
- turret_is_lethal = FALSE
- turret_sprite_set = "net"
-
/obj/item/gun/energy/mousegun
- name = "pest gun"
+ name = "\improper Arodentia Pesti-Shock gun"
desc = "The NT \"Arodentia\" Pesti-Shock is a highly sophisticated and probably safe beamgun designed for rapid pest-control."
- icon = 'icons/obj/guns/pestishock.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/pestishock.dmi'
icon_state = "pestishock"
item_state = "pestishock"
has_item_ratio = FALSE
@@ -153,9 +138,9 @@
return TRUE
/obj/item/gun/energy/mousegun/xenofauna
- name = "xenofauna gun"
+ name = "\improper Xenovermino Zap-Blast xenofauna gun"
desc = "The NT \"Xenovermino\" Zap-Blast is a highly sophisticated and probably safe beamgun designed to deal with hostile xenofauna."
- icon = 'icons/obj/guns/xenogun.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/xenogun.dmi'
icon_state = "xenogun"
item_state = "xenogun"
projectile_type = /obj/projectile/beam/mousegun/xenofauna
@@ -193,32 +178,13 @@
desc = "Vaurcae weapons tend to be specialized and highly lethal. This one doesn't do much"
var/is_charging = 0 //special var for sanity checks in the three guns that currently use charging as a special_check
-/obj/item/gun/energy/vaurca/bfg
- name = "BFG 9000"
- desc = "'Bio-Force Gun'. Yeah, right."
- icon = 'icons/obj/guns/bfg.dmi'
- icon_state = "bfg"
- item_state = "bfg"
- has_item_ratio = FALSE
- charge_meter = 0
- w_class = WEIGHT_CLASS_BULKY
- fire_sound = 'sound/magic/LightningShock.ogg'
- force = 33
- projectile_type = /obj/projectile/energy/bfg
- slot_flags = SLOT_BACK
- max_shots = 3
- sel_mode = 1
- fire_delay = 10
- accuracy = 20
- muzzle_flash = 10
-
#define GATLINGLASER_DISPERSION_CONCENTRATED list(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
#define GATLINGLASER_DISPERSION_SPRAY list(0, 5, 5, 10, 10, 15, 15, 20, 20, 25, 25, 25, 30, 30, 35, 40)
/obj/item/gun/energy/vaurca/gatlinglaser
name = "gatling laser"
desc = "A highly sophisticated rapid fire laser weapon."
- icon = 'icons/obj/guns/gatling.dmi'
+ icon = 'icons/obj/guns/faction/vaurca_hives/gatling_laser.dmi'
icon_state = "gatling"
item_state = "gatling"
has_item_ratio = FALSE
@@ -274,7 +240,7 @@
name = "\improper thermic blaster"
desc = "An opulent Vaurceisan pistol, handcrafted for each wielder by the Court of Queen's master weaponsmiths. For those Ta and few notable Warriors who wield it, the Thermic Blaster is as much a badge of office as it is a fiercely deadly weapon."
desc_extended = "The Thermic Blaster is a weapon with a history dating back as far as the Vaurcesian Court of Queens, for since its founding, it has forged one of these blasters for every newborn Ta, bestowed as a coming-of-age gift. With every major advancement in technology, the Court's weaponsmiths have gathered together to upgrade the existing batch, resulting in many Thermic Blasters being millennia old, and many Ta add personal flourishes. This iteration of the firearm was developed after the Zo'rane arrival in the Spur and distributed as a celebration for the refounding of the Court of Queens. The Court may occasionally bestow this exceptionally expensive Blaster on an accomplished Warrior, but very few ever leave Vaurca hands and those that do are fiercely prized."
- icon = 'icons/obj/guns/blaster.dmi'
+ icon = 'icons/obj/guns/faction/vaurca_hives/thermic_blaster.dmi'
icon_state = "blaster"
item_state = "blaster"
has_item_ratio = FALSE
@@ -298,8 +264,8 @@
/obj/item/gun/energy/vaurca/typec
name = "thermal lance"
desc = "A powerful piece of Zo'rane energy artillery, converted to be portable...if you weigh a metric tonne, that is."
- icon = 'icons/obj/guns/megaglaive.dmi'
- sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/obj/guns/megaglaive.dmi')
+ icon = 'icons/obj/guns/faction/vaurca_hives/megaglaive.dmi'
+ sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/obj/guns/faction/vaurca_hives/megaglaive.dmi')
icon_state = "megaglaive0"
item_state = "megaglaive"
origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 8)
@@ -464,9 +430,9 @@
can_turret = FALSE
/obj/item/gun/energy/tesla
- name = "tesla gun"
+ name = "\improper Elektrotek Model anti-personnel rifle"
desc = "A gun that shoots a projectile that bounces from living thing to living thing. Keep your distance from whatever you are shooting at."
- icon = 'icons/obj/guns/tesla.dmi'
+ icon = 'icons/obj/guns/faction/pra/elektrotek.dmi'
icon_state = "tesla"
item_state = "tesla"
has_item_ratio = FALSE
@@ -511,7 +477,7 @@
/obj/item/laserpack
name = "galatean bioelectrical reactor backpack"
desc = "An ominously-thrumming backpack-mounted machine, powering an O61 Infantry Laser Rifle."
- icon = 'icons/obj/guns/galatea_laser.dmi'
+ icon = 'icons/obj/guns/faction/galatean_technocracy/galatea_laser.dmi'
icon_state = "laserpack_holstered"
item_state = "laserpack_holstered"
contained_sprite = 1
@@ -614,12 +580,12 @@
return ..()
/obj/item/gun/energy/galatea
- name = "galatean laser rifle"
+ name = "\improper O61-B laser rifle"
desc = "The Galatean O61-B, an export model of their advanced Mark 61 Infantry Rifle."
desc_extended = "Galatean soldiers are heavily bioaugmented, combining soldier and weapon into a cohesive unit. The Mark 61 Infantry Rifle is one such example, drawing on the bioelectricity of the human body \
through an implant with which to power the gun. Unaugmented users complained of headaches, lethargy, and impossible dreams; The O61B has integrated the bioaugments into the firing mechanism, preventing 'baselines' \
from even using it. Luckily, this is an export version, the O61-B, which allows foreign users a taste of advanced Technocracy weaponry for the low price of a single bioaugment."
- icon = 'icons/obj/guns/galatea_laser.dmi'
+ icon = 'icons/obj/guns/faction/galatean_technocracy/galatea_laser.dmi'
icon_state = "galatealaser"
item_state = "galatealaser"
slot_flags = 0
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 719bb290630..65a261a19e5 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -1,7 +1,7 @@
/obj/item/gun/energy/taser
- name = "taser gun"
- desc = "The NT Mk30 NL is a small, low capacity gun used for non-lethal takedowns."
- icon = 'icons/obj/guns/taser.dmi'
+ name = "\improper Mk30 NL stun pistol"
+ desc = "The Mk30 NL is a small, low capacity pistol produced by NanoTrasen used for non-lethal takedowns."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/stunpistol.dmi'
icon_state = "taser"
item_state = "taser"
fire_sound = 'sound/weapons/Taser.ogg'
@@ -13,16 +13,16 @@
turret_is_lethal = FALSE
/obj/item/gun/energy/taser/mounted
- name = "mounted taser gun"
+ name = "mounted stun gun"
self_recharge = TRUE
use_external_power = TRUE
can_turret = FALSE
/obj/item/gun/energy/stunrevolver
- name = "stun revolver"
+ name = "\improper ST-30 stun revolver"
desc = "A NanoTrasen designed high-tech revolver that fires rechargeable stun bolts."
desc_extended = "The ST-30 is a highly advanced sidearm produced by NanoTrasen. It is designed for self-defense in a less-than-lethal manner. While the weapon design itself is not groundbreaking, it fires high velocity energy bolts with rechargeable cartridges, possessing unusual high stopping power."
- icon = 'icons/obj/guns/stunrevolver.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/stunrevolver.dmi'
icon_state = "stunrevolver"
item_state = "stunrevolver"
has_item_ratio = FALSE
diff --git a/code/modules/projectiles/guns/launcher.dm b/code/modules/projectiles/guns/launcher.dm
index 65a875fedcc..a9a817f2c54 100644
--- a/code/modules/projectiles/guns/launcher.dm
+++ b/code/modules/projectiles/guns/launcher.dm
@@ -1,4 +1,4 @@
-/obj/item/gun/launcher
+ABSTRACT_TYPE(/obj/item/gun/launcher)
name = "launcher"
desc = "A device that launches things."
w_class = WEIGHT_CLASS_HUGE
diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm
index 528930a4604..cbc6deb9fbf 100644
--- a/code/modules/projectiles/guns/launcher/crossbow.dm
+++ b/code/modules/projectiles/guns/launcher/crossbow.dm
@@ -16,19 +16,6 @@
/obj/item/arrow/proc/removed() //Helper for metal rods falling apart.
return
-/obj/item/spike
- name = "alloy spike"
- desc = "It's about a foot of weird silver metal with a wicked point."
- sharp = TRUE
- edge = FALSE
- throwforce = 5
- w_class = WEIGHT_CLASS_SMALL
- icon = 'icons/obj/weapons.dmi'
- icon_state = "metal-rod"
- item_state = "bolt"
- drop_sound = 'sound/items/drop/sword.ogg'
- pickup_sound = SFX_PICKUP_SWORD
-
/obj/item/arrow/quill
name = "alien quill"
desc = "A wickedly barbed quill from some bizarre animal."
diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm
index fd2a31ced2a..1deb4304e6e 100644
--- a/code/modules/projectiles/guns/launcher/rocket.dm
+++ b/code/modules/projectiles/guns/launcher/rocket.dm
@@ -53,9 +53,9 @@
..()
/obj/item/gun/launcher/rocket/konyang
- name = "konyang rocket launcher"
+ name = "\improper KGM-701D rocket launcher"
desc = "An unguided rocket launcher often used by the armed forces of Konyang."
desc_extended = "The KGM-701 is a heavy anti-tank guided missile in use by the Konyang Army, another carryover from their old Solarian stockpiles. Capable of handling any tank that wouldn't get bogged down on Konyang's soft terrain, the KGM-701 is expected to soldier on for many years to come. This however, is not a KGM-701, but the KGM-701D, the unguided discount variation of the old Solarian ATGM, typically issued to colonial garrisons and not rated against any modern vehicles."
- icon = 'icons/obj/guns/konyang_weapons.dmi'
+ icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
icon_state = "kgm"
item_state = "kgm"
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 65a748abc67..e03cbfbf61c 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -1,4 +1,4 @@
-/obj/item/gun/projectile
+ABSTRACT_TYPE(/obj/item/gun/projectile)
name = "gun"
desc = "A gun that fires bullets."
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -71,7 +71,7 @@
/obj/item/gun/projectile/update_icon()
..()
if(suppressed)
- var/mutable_appearance/MA = mutable_appearance('icons/obj/guns/suppressor.dmi', "suppressor")
+ var/mutable_appearance/MA = mutable_appearance('icons/obj/guns/attachments/suppressor.dmi', "suppressor")
if(suppressor_x_offset)
MA.pixel_x = suppressor_x_offset
if(suppressor_y_offset)
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index c6bc54f437a..b614d1dbdc0 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -51,12 +51,12 @@
icon_state = (ammo_magazine)? "mini-uzi" : "mini-uzi-e"
/obj/item/gun/projectile/automatic/c20r
- name = "submachine gun"
+ name = "\improper CA-25E submachine gun"
desc = "A conventional bullpup submachine gun with an extendable stock."
desc_extended = "The Colettish Armaments Model 25 SMG is a typical product of the San Colette Interstellar Armaments Company (CAISC). Rejected by the Solarian military due to competition with the Zavodskoi M470-L, the CA-M25 was repurposed \
into the Colettish Armaments Model 25 Export (CA-25E) and has found reasonable success in mercenary groups across the Orion Spur. Recently many have found their ways into the hands of violent non-state actors in the Corporate Reconstruction Zone, where \
they contribute to the further destabilization of the region. Curiously, these models typically have a filed-off serial number or no serial number at all."
- icon = 'icons/obj/guns/c20r.dmi'
+ icon = 'icons/obj/guns/faction/caisc/ca-25e.dmi'
icon_state = "c20r"
item_state = "c20r"
w_class = WEIGHT_CLASS_NORMAL
@@ -83,10 +83,10 @@
return
/obj/item/gun/projectile/automatic/c20r/sol
- name = "solarian submachine gun"
+ name = "\improper M470-L submachine gun"
desc = "Designed by Zavodskoi as a scaled-down version of their M469, the M470-L is a personal defense weapon intended for use by second-line personnel from all branches of the Solarian military, such as support troops and Navy crewmen."
desc_extended = null
- icon = 'icons/obj/guns/sol_smg.dmi'
+ icon = 'icons/obj/guns/faction/sol_alliance/sol_smg.dmi'
icon_state = "vityaz"
item_state = "vityaz"
suppressor_x_offset = 10
@@ -96,9 +96,9 @@
icon_state = (ammo_magazine)? "vityaz" : "vityaz-empty"
/obj/item/gun/projectile/automatic/c20r/sol/siib
- name = "solarian SIIB submachine gun"
+ name = "\improper M470-SIIB submachine gun"
desc = "Based off the standard solarian M470-L, this SMG is used by SIIB Operatives during raids and specialist operations. Officially, this variant of the SMG does not exist."
- icon = 'icons/obj/guns/sol_smg.dmi'
+ icon = 'icons/obj/guns/faction/sol_alliance/sol_smg.dmi'
icon_state = "vityaz-siib"
item_state = "vityaz-siib"
@@ -107,12 +107,12 @@
icon_state = (ammo_magazine)? "vityaz-siib" : "vityaz-siib-empty"
/obj/item/gun/projectile/automatic/xanusmg
- name = "\improper Xanan submachine gun"
+ name = "dNAC-4.6 II submachine gun"
desc = "A sleek metal-framed submachine gun, produced by d.N.A Defense for the All-Xanu Armed Forces."
desc_extended = "The dNAC-4.6 II submachine gun is a custom-made submachine gun for the All-Xanu Armed Forces, designed to use the same 4.6mm rounds as the dNAC-4.6 pistol. It mainly sees use as a personal defensive weapon for pilots and drivers, but has also been used aboard the spacefleet's vessels for close quarters combat."
magazine_type = /obj/item/ammo_magazine/c46m/extended
allowed_magazines = list(/obj/item/ammo_magazine/c46m/extended)
- icon = 'icons/obj/guns/xanu_smg.dmi'
+ icon = 'icons/obj/guns/faction/dna_defense/xanu_smg.dmi'
icon_state = "xanu_smg"
item_state = "xanu_smg"
caliber = "4.6mm"
@@ -130,9 +130,9 @@
/obj/item/gun/projectile/automatic/wt550
- name = "machine pistol"
- desc = "The ZI 550 Saber is a cheap self-defense weapon, mass-produced by Zavodskoi Interstellar for paramilitary and private use."
- icon = 'icons/obj/guns/wt550.dmi'
+ name = "\improper 550 Saber machine pistol"
+ desc = "The 550 Saber is a cheap self-defense weapon, mass-produced by Zavodskoi Interstellar for paramilitary and private use."
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/wt550.dmi'
icon_state = "wt550"
item_state = "wt550"
w_class = WEIGHT_CLASS_NORMAL
@@ -189,10 +189,10 @@
//Ballistic rifles, go.
-/obj/item/gun/projectile/automatic/rifle
+ABSTRACT_TYPE(/obj/item/gun/projectile/automatic/rifle)
name = "automatic rifle"
desc = "A weapon firing an intermediate caliber round, or larger."
- icon = 'icons/obj/guns/arifle.dmi'
+ icon = 'icons/obj/guns/faction/frontier/arifle.dmi'
icon_state = "arifle"
item_state = "arifle"
w_class = WEIGHT_CLASS_BULKY
@@ -226,7 +226,7 @@
accuracy_wielded = 2
/obj/item/gun/projectile/automatic/rifle/sts35
- name = "assault rifle"
+ name = "\improper STS35 assault rifle"
desc = "A durable, rugged-looking automatic weapon of a make popular on the frontier worlds. It is unmarked."
desc_extended = "The STS35 is a durable, reliable and cheap to buy fully automatic assault rifle with many licensed manufacturers across \
the galaxy. It comes in different versions and calibres, this one uses 7.62 rounds. The manufacturer markings have been filed off."
@@ -239,7 +239,7 @@
icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
/obj/item/gun/projectile/automatic/rifle/shorty
- name = "short-barreled assault rifle"
+ name = "\improper STS35 short-barreled assault rifle"
desc = "A durable, rugged-looking automatic weapon that has been heavily modified. \
Key changes include significant shortening of the barrel and the addition of an improvised vertical foregrip, \
condensing heavy firepower into a relatively small and maneuverable package intended for close-in \
@@ -251,7 +251,7 @@
extensive experience fighting in claustrophobic environments aboard ships and stations, weapons like these are common among Coalition Rangers conducting high-risk boarding operations \
along the Frontier, who rely on its ability to rapidly gain fire superiority in the event of an ambush. While no formal name exists for it, \
and no two examples are quite alike, weapons of this type are commonly just referred to as the \"Shorty\"."
- icon = 'icons/obj/guns/shorty.dmi'
+ icon = 'icons/obj/guns/faction/frontier/shorty.dmi'
icon_state = "shorty"
item_state = "shorty"
can_bayonet = TRUE
@@ -269,12 +269,12 @@
icon_state = (ammo_magazine)? "shorty" : "shorty-empty"
/obj/item/gun/projectile/automatic/rifle/carbine
- name = "ballistic carbine"
+ name = "\improper ST24 carbine"
desc = "A durable, rugged-looking semi-automatic weapon of a make popular on the frontier worlds. Doesn't accept large-capacity magazines. It is unmarked."
desc_extended = "The ST24 is often considered the little brother of its larger and fully automatic counterpart, the STS35. It is a \
reliable and cheap to buy carbine with many licensed manufacturers across the galaxy. It comes in different versions and calibres, \
some even boasting select fire functionality. This one uses 5.56 rounds and is semi-automatic. The manufacturer markings have been filed off."
- icon = 'icons/obj/guns/bcarbine.dmi'
+ icon = 'icons/obj/guns/faction/frontier/bcarbine.dmi'
icon_state = "bcarbine"
item_state = "bcarbine"
caliber = "a556"
@@ -292,11 +292,11 @@
icon_state = (ammo_magazine)? "bcarbine" : "bcarbine-empty"
/obj/item/gun/projectile/automatic/rifle/carbine/civcarbine
- name = "bullpup carbine"
- desc = "A variant of the ZI Bulldog assault carbine, the ZI Terrier is a slimmer and lighter version, only capable of accepting smaller magazines. \
+ name = "\improper Terrier bullpup carbine"
+ desc = "A variant of the Bulldog assault carbine, the ZI Terrier is a slimmer and lighter version, only capable of accepting smaller magazines. \
It also lacks the integrated grenade launcher and burst fire of the Bulldog."
desc_extended = "It makes you feel like a corporate goon when you hold it."
- icon = 'icons/obj/guns/crew_rifle.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/crew_rifle.dmi'
magazine_type = /obj/item/ammo_magazine/a556/carbine/polymer
allowed_magazines = list(/obj/item/ammo_magazine/a556/carbine, /obj/item/ammo_magazine/a556/carbine/polymer)
icon_state = "civcarbine"
@@ -308,10 +308,10 @@
icon_state = (ammo_magazine)? "civcarbine" : "civcarbine-empty"
/obj/item/gun/projectile/automatic/rifle/sol
- name = "solarian assault rifle"
+ name = "\improper M469 assault rifle"
desc = "A reliable assault rifle manufactured by Zavodskoi Interstellar, the M469 is the standard service rifle of the Solarian Armed Forces, most commonly associated with its ground forces. \
Though the design is old, it continues to see widespread use in the Alliance and its breakaway states and likely will for years to come."
- icon = 'icons/obj/guns/sol_rifle.dmi'
+ icon = 'icons/obj/guns/faction/sol_alliance/sol_rifle.dmi'
icon_state = "battlerifle"
item_state = "battlerifle"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 3, TECH_ILLEGAL = 2)
@@ -331,12 +331,12 @@
var/use_launcher = 0
/obj/item/gun/projectile/automatic/rifle/dominia
- name = "dominian rifle"
+ name = "\improper MPR-24/5 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 = 'icons/obj/guns/faction/dominian_empire/dominia_rifle.dmi'
icon_state = "acr"
item_state = "acr"
caliber = "a556"
@@ -349,10 +349,10 @@
icon_state = (ammo_magazine)? "acr" : "acr-empty"
/obj/item/gun/projectile/automatic/rifle/z8
- name = "bullpup assault carbine"
- desc = "The ZI Bulldog bullpup assault carbine, Zavodskoi Industries' answer to any problem that can be solved by an assault rifle."
+ name = "\improper Bulldog bullpup assault carbine"
+ desc = "The Bulldog bullpup assault carbine, Zavodskoi Industries' answer to any problem that can be solved by an assault rifle."
desc_extended = "It makes you feel like a corporate commando when you hold it."
- icon = 'icons/obj/guns/carbine.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/carbine.dmi'
icon_state = "carbine"
item_state = "carbine"
w_class = WEIGHT_CLASS_BULKY
@@ -426,10 +426,10 @@
icon_state = "carbine-empty"
/obj/item/gun/projectile/automatic/rifle/jingya
- name = "burst rifle"
+ name = "\improper Jingya A-1 burst rifle"
desc = "The Jingya A-1 is the first of a new line of NanoTrasen rifles, developed in cooperation with Zavodskoi Interstellar's Kumar Arms subsidiary. Primarily made of high strength polymers, the rifle is designed to be cheap to mass produce while remaining reliable."
desc_extended = "The Jingya A-1 won a hard-fought victory in the ballistic side of the SCC Future Firearms contest hosted in 2463, which was also its first unveiling: this rifle is made to function where laser weaponry may be either too risky or not functional for the engagement at hand. It is slated to be deployed for trial usage by a select few special TCFL regiments in Mictlan."
- icon = 'icons/obj/guns/burst_rifle.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/burst_rifle.dmi'
icon_state = "arx"
item_state = "arx"
w_class = WEIGHT_CLASS_BULKY
@@ -460,11 +460,11 @@
icon_state = "arx-empty"
/obj/item/gun/projectile/automatic/rifle/l6_saw
- name = "light machine gun"
+ name = "\improper CA-75E LMG"
desc = "A squad machine gun with a clunky, outdated loading mechanism. Loads from 7.62mm ammunition boxes. Gentlemen, lock and load."
desc_extended = "Created by the San Colette Interstellar Armaments Company (CAISC) explicitly for export, the Colettish Armaments Model 75 Export machine gun is a cheap yet outdated method of providing large amounts of firepower to a squad. \
The CA-75E is not used by San Colette’s Civil Guard and is typically sold to mercenary groups or other Solarian systems. Since the Solarian Collapse more and more CA-75Es have found themselves in the hands of pirates and rebels in the Corporate Reconstruction Zone, and captured models curiously often have no serial number."
- icon = 'icons/obj/guns/l6.dmi'
+ icon = 'icons/obj/guns/faction/caisc/ca-75e.dmi'
icon_state = "l6closed100"
item_state = "l6closedmag"
w_class = WEIGHT_CLASS_BULKY
@@ -534,7 +534,7 @@
..()
/obj/item/gun/projectile/automatic/rifle/adhomian
- name = "adhomian automatic rifle"
+ name = "\improper Tsarrayut'yan assault rifle"
desc = "The Tsarrayut'yan rifle is a select-fire automatic rifle producted by the People's Republic of Adhomai."
icon = 'icons/obj/guns/tsarrayut.dmi'
icon_state = "tsarrayut"
@@ -575,10 +575,10 @@
..()
/obj/item/gun/projectile/automatic/rifle/dpra
- name = "adhomian assault rifle"
+ name = "\improper Mrrazhak Model-1 assault rifle"
desc = "The Mrrazhak Model-1 is the newest Al'mariist automatic rifle. The Mrrazhak is notorious for its simple and reliable design; it can be fabricated and assembled without the \
need of a specialized industry or a highly trained workforce."
- icon = 'icons/obj/guns/mrrazhak.dmi'
+ icon = 'icons/obj/guns/faction/dpra/mrrazhak.dmi'
icon_state = "mrrazhak"
item_state = "mrrazhak"
contained_sprite = TRUE
@@ -609,9 +609,9 @@
icon_state = (ammo_magazine)? "mrrazhak" : "mrrazhak_nomag"
/obj/item/gun/projectile/automatic/tommygun
- name = "submachine gun"
- desc = "An Adhomian-made submachine gun."
- icon = 'icons/obj/guns/tommygun.dmi'
+ name = "\improper Thompson submachine gun"
+ desc = "An antique submachine gun. Still working, if a bit rough around the edges."
+ icon = 'icons/obj/guns/faction/antique/tommygun.dmi'
icon_state = "tommygun"
item_state = "tommygun"
w_class = WEIGHT_CLASS_NORMAL
@@ -634,11 +634,11 @@
icon_state = (ammo_magazine)? "tommygun" : "tommygun-empty"
/obj/item/gun/projectile/automatic/tommygun/dom
- name = "dominian submachine gun"
+ name = "\improper MPMC-30 submachine gun"
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/dominia_smg.dmi'
+ icon = 'icons/obj/guns/faction/dominian_empire/dominia_smg.dmi'
icon_state = "owen"
item_state = "owen"
max_shells = 20
@@ -649,10 +649,10 @@
icon_state = (ammo_magazine)? "owen" : "owen-empty"
/obj/item/gun/projectile/automatic/tommygun/assassin
- name = "integrally suppressed machine pistol"
+ name = "\improper APCC RatAway machine pistol"
desc = "An Eridanian “rat hunting” gun manufactured by the Amon Pest Control Company. Commonly used by corporate assassins, uncommonly used by pest control workers. Chambered in 6mm."
- desc_extended = "The APCC RatAway SMG is manufactured by a shell company of Ringspire for use in corporate assassination duties. Extremely quiet and firing caseless ammunition, it is an ideal weapon for putting down those who dare to threaten megacorporate interests."
- icon = 'icons/obj/guns/assassin_smg.dmi'
+ desc_extended = "The APCC RatAway machine pistol is manufactured by a shell company of Ringspire for use in corporate assassination duties. Extremely quiet and firing caseless ammunition, it is an ideal weapon for putting down those who dare to threaten megacorporate interests."
+ icon = 'icons/obj/guns/faction/eridani_federation/assassin_smg.dmi'
icon_state = "assassin_smg"
item_state = "assassin_smg"
magazine_type = /obj/item/ammo_magazine/submachinemag/assassin
@@ -670,13 +670,13 @@
icon_state = (ammo_magazine) ? "assassin_smg" : "assassin_smg-empty"
/obj/item/gun/projectile/automatic/tommygun/konyang
- name = "konyang police submachine gun"
+ name = "\improper K45 police submachine gun"
desc = "A compact submachine gun made specifically for the Konyang National Police. Takes .45 ammo."
desc_extended = "Produced by one of Einstein Engines' local subsidiaries on Konyang, the K45 \"Pogpung\" submachine gun is Taepung Arms' entry into the submachine gun market. \
The National Police purchased a large number of K45s for their patrol units due to reports that service revolvers were inadequate at stopping rampant IPCs. The K45-P variant \
specially designed for the police forces is chambered in the organization's preferred .45 caliber and is limited to 3-round bursts due to the relatively limited firearms training of \
National Police officers."
- icon = 'icons/obj/guns/konyang_weapons.dmi'
+ icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
icon_state = "k45carbine"
item_state = "k45carbine"
w_class = WEIGHT_CLASS_NORMAL
@@ -697,7 +697,7 @@
/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 = 'icons/obj/guns/faction/dna_defense/xanu_rifle.dmi'
icon_state = "xanu_rifle"
item_state = "xanu_rifle"
magazine_type = /obj/item/ammo_magazine/a65
@@ -787,10 +787,10 @@
to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
/obj/item/gun/projectile/automatic/rifle/konyang/k556
- name = "konyang assault rifle"
+ name = "\improper K556 assault rifle"
desc = "The K556 is the standard assault rifle of the Konyang Armed Forces. Sturdy and reliable."
- desc_extended = "The K556 assault rifle is a new design in use by elements of the Konyang Armed Forces, designed in-house by the military in partnership with Einstein Engines'local subsidiaries. It has yet to see widespread service as the government is reluctant to spend money on new small arms when they already possess large stockpiles from the colonial period. This has not stopped the Aerospace Forces from making the transition to the new weapon however, as its compact design, light weight, and accuracy make it ideal for use aboard a spacecraft."
- icon = 'icons/obj/guns/konyang_weapons.dmi'
+ desc_extended = "The K556 assault rifle is a new design in use by elements of the Konyang Armed Forces, designed in-house by the military in partnership with Einstein Engines' local subsidiaries. It has yet to see widespread service as the government is reluctant to spend money on new small arms when they already possess large stockpiles from the colonial period. This has not stopped the Aerospace Forces from making the transition to the new weapon however, as its compact design, light weight, and accuracy make it ideal for use aboard a spacecraft."
+ icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
icon_state = "k556rifle"
item_state = "k556rifle"
slot_flags = SLOT_BACK|SLOT_OCLOTHING
@@ -807,10 +807,10 @@
icon_state = (ammo_magazine)? "k556rifle" : "k556rifle-e"
/obj/item/gun/projectile/automatic/rifle/konyang/konyang47
- name = "konyang assault carbine"
+ name = "\improper Dering-K1 assault carbine"
desc = "The Dering-K1 is the carbine version of the K556. Intended to be used by vehicle crews, second line infantry, support crew and staff or when you have limited space to work with."
desc_extended = "The Dering K1 battle rifle is a standard Solarian M469 given a service extension package by Zavodskoi Interstellar. Many of the rifles bear Konyanger proof marks right next to old Solarian ones, indicating their heritage. Its more robust design is tailored for naval and swamp warfare, while still maintaining the firepower needed for frontline combat operations."
- icon = 'icons/obj/guns/konyang_weapons.dmi'
+ icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
icon_state = "k47"
item_state = "k47"
slot_flags = SLOT_BACK|SLOT_OCLOTHING
@@ -829,7 +829,7 @@
/obj/item/gun/projectile/automatic/rifle/konyang/pirate_rifle
name = "re-bored rifle"
desc = "A wooden rifle, repaired and re-bored to actually work again. Fires eight rounds of .308 in semi-auto."
- icon = 'icons/obj/guns/konyang_weapons.dmi'
+ icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
icon_state = "poacher"
item_state = "poacher"
slot_flags = SLOT_BACK|SLOT_OCLOTHING
@@ -842,11 +842,11 @@
max_shells = 8
/obj/item/gun/projectile/automatic/rifle/dominia_carbine
- name = "dominian carbine"
+ name = "\improper MPC-24/5 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 = 'icons/obj/guns/faction/dominian_empire/dominia_carbine.dmi'
icon_state = "dom_carbine"
item_state = "dom_carbine"
slot_flags = SLOT_BACK|SLOT_OCLOTHING
@@ -863,12 +863,12 @@
icon_state = (ammo_magazine)? "dom_carbine" : "dom_carbine-empty"
/obj/item/gun/projectile/automatic/rifle/dominia_lmg
- name = "dominian light machine gun"
+ name = "\improper MPMG-24/5 platoon 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 = 'icons/obj/guns/faction/dominian_empire/dominia_lmg.dmi'
icon_state = "dom_lmg"
item_state = "dom_lmg"
caliber = "a556"
@@ -885,9 +885,9 @@
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."
- icon = 'icons/obj/guns/assaultshotgun.dmi'
+ name = "Mastiff assault shotgun"
+ desc = "Designed by Zavodskoi Interstellar to be the end-all-be-all for boarding attempts, the Mastiff wasn't as successful as outlooks claimed."
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/assaultshotgun.dmi'
icon_state = "assaultshotgun"
item_state = "assaultshotgun"
w_class = WEIGHT_CLASS_BULKY
@@ -921,7 +921,7 @@
name = "dNAC-12 combat shotgun"
desc = "A magazine-fed semi-automatic combat shotgun, designed by d.N.A Defense on Xanu Prime."
desc_extended = "The dNAC-12 combat shotgun was designed for the All-Xanu Grand Army and the All-Xanu National Militia for its law enforcement duties and military police. Due to its reliability, ease of use, and flexibility however, it has been adopted by the Air Corps and Spacefleet as well for defensive purposes."
- icon = 'icons/obj/guns/xanu_shotgun.dmi'
+ icon = 'icons/obj/guns/faction/dna_defense/xanu_shotgun.dmi'
icon_state = "xanu_shotgun"
item_state = "xanu_shotgun"
magazine_type = /obj/item/ammo_magazine/xanan_shotgun/shells
@@ -937,7 +937,7 @@
)
/obj/item/gun/projectile/automatic/rifle/shotgun/konyang
- name = "magazine-fed shotgun"
+ name = "\improper RCG-1 shotgun"
desc = "A compact semi-automatic shotgun, fed by a magazine. Unsuspectic, but powerful and not to be underestimated. Takes standard 12g shotgun ammo."
desc_extended = "The RCG-1, locally produced on Konyang, also nicknamed \"The Showstopper\" for its wide variety of applications. It uses a compact design with a newly developed type of double spring mechanism in the magazine \
to eradicate all kinds of feeding malfunctions, as well as groundbreaking caseless shotgun ammunition. Favoured by the Commandos of Konyang's Special Forces."
@@ -964,11 +964,11 @@
icon_state = (ammo_magazine)? "mshotgun" : "mshotgun-empty"
/obj/item/gun/projectile/automatic/rifle/hook_mg
- name = "unathi hook machine gun"
+ name = "\improper Hook machine gun"
desc = "A ballistic machine gun of Unathi manufacture, often used by the forces of the Traditionalist Coalition during the Contact War."
desc_extended = "The Hook Machinegun is a heavy automatic machinegun of Moghesian manufacture. Though the name of the creators of this weapon was lost to the destruction of the nuclear exchange, the Hook was known to be found in the hands of some of the better-equipped forces of the Traditionalist Coalition during the Contact War. \
This machine gun is carried on one's shoulder and thus can be used with a single hand. Though it can fire heavy cartridges, it is quite lacking in accuracy."
- icon = 'icons/obj/guns/unathi_ballistics.dmi'
+ icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi'
icon_state = "hookmg"
item_state = "hookmg"
caliber = "5.8mm"
@@ -989,11 +989,11 @@
icon_state = (ammo_magazine)? "hookmg" : "hookmg-empty"
/obj/item/gun/projectile/automatic/tempestsmg
- name = "tempest submachine gun"
- desc = "The tempest sub-machine gun is a Hegemonic design dating back to the 2350s, though still produced in ample numbers to this day. While rather large and heavy for a weapon of its class, its simplicity and reliability have made it a popular weapon among Unathi for over a century, and the aging weapon was even used as the basis for future designs."
+ name = "\improper Tempest submachine gun"
+ desc = "The Tempest sub-machine gun is a Hegemonic design dating back to the 2350s, though still produced in ample numbers to this day. While rather large and heavy for a weapon of its class, its simplicity and reliability have made it a popular weapon among Unathi for over a century, and the aging weapon was even used as the basis for future designs."
magazine_type = /obj/item/ammo_magazine/tempestsmg
allowed_magazines = list(/obj/item/ammo_magazine/tempestsmg)
- icon = 'icons/obj/guns/unathi_ballistics.dmi'
+ icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi'
icon_state = "tempestsmg"
item_state = "tempestsmg"
caliber = "11.6mm"
diff --git a/code/modules/projectiles/guns/projectile/cannon.dm b/code/modules/projectiles/guns/projectile/cannon.dm
index e4654d32c84..c30b00ceb25 100644
--- a/code/modules/projectiles/guns/projectile/cannon.dm
+++ b/code/modules/projectiles/guns/projectile/cannon.dm
@@ -1,7 +1,7 @@
/obj/item/gun/projectile/cannon
- name = "hand cannon"
+ name = "culverin"
desc = "An amalgamation of ancient and modern tajaran technology. This old naval cannon was turned into a portable firearm."
- icon = 'icons/obj/guns/cannon.dmi'
+ icon = 'icons/obj/guns/faction/nka/cannon.dmi'
icon_state = "cannon"
item_state = "cannon"
caliber = "cannon"
@@ -29,9 +29,9 @@
return ..()
/obj/item/gun/projectile/nuke
- name = "nuclear launcher"
+ name = "\improper Mai'Dhaztha Model anti-material nuclear warhead launcher"
desc = "A launcher weapon designated to fire miniaturized nuclear warheads."
- icon = 'icons/obj/guns/blockbuster.dmi' // hoh
+ icon = 'icons/obj/guns/faction/pra/maidhaztha.dmi'
icon_state = "blockbuster"
item_state = "blockbuster"
caliber = "nuke"
@@ -69,7 +69,7 @@
/obj/item/gun/projectile/recoilless_rifle
name = "adhomian recoilless rifle"
desc = "An inexpensive, one use anti-tank weapon used extensively by the Tajaran armed forces."
- icon = 'icons/obj/guns/recoilless_rifle.dmi'
+ icon = 'icons/obj/guns/faction/dpra/recoilless_rifle.dmi'
icon_state = "recoilless_rifle"
item_state = "recoilless_rifle"
caliber = "recoilless_rifle"
@@ -110,9 +110,9 @@
return FALSE
/obj/item/gun/projectile/peac
- name = "point entry anti-materiel cannon"
+ name = "\improper SCC-PEAC-1 anti-materiel cannon"
desc = "An SCC-designed, man-portable cannon meant to neutralize mechanized threats. The disgustingly large accelerator capacitors make room for only one shot, so make it count."
- icon = 'icons/obj/guns/peac.dmi'
+ icon = 'icons/obj/guns/faction/stellar_corporate_conglomerate/peac.dmi'
icon_state = "peac"
item_state = "peac"
caliber = "peac"
diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm
index 8f591bf36b1..5eac6ccf0c0 100644
--- a/code/modules/projectiles/guns/projectile/improvised.dm
+++ b/code/modules/projectiles/guns/projectile/improvised.dm
@@ -3,7 +3,7 @@
/obj/item/gun/projectile/shotgun/improvised //similar to the double barrel, but without the option to fire both barrels
name = "improvised shotgun"
desc = "An improvised pipe assembly that can fire shotgun shells."
- icon = 'icons/obj/guns/ishotgun.dmi'
+ icon = 'icons/obj/guns/faction/improvised/ishotgun.dmi'
icon_state = "ishotgun"
item_state = "ishotgun"
max_shells = 2
@@ -164,7 +164,7 @@
accuracy = -1
offhand_accuracy = 1
fire_delay = ROF_PISTOL
- icon = 'icons/obj/guns/ipistol.dmi'
+ icon = 'icons/obj/guns/faction/improvised/ipistol.dmi'
icon_state = "ipistol"
item_state = "ipistol"
caliber = ".45"
@@ -231,7 +231,7 @@
/obj/item/gun/projectile/automatic/improvised
name = "improvised machine pistol"
desc = "An improvised automatic handgun."
- icon = 'icons/obj/guns/ismg.dmi'
+ icon = 'icons/obj/guns/faction/improvised/ismg.dmi'
icon_state = "ismg"
item_state = "ismg"
load_method = MAGAZINE
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index f01546d4dc5..1d20f2036c4 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -1,11 +1,11 @@
/obj/item/gun/projectile/colt
- name = ".45 combat pistol"
- desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette."
+ name = "\improper Pattern 5 pistol"
+ desc = "A robust metal-framed semi-automatic pistol chambered in .45 produced in the system of San Colette."
desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
magazine_type = /obj/item/ammo_magazine/c45m
allowed_magazines = list(/obj/item/ammo_magazine/c45m)
- icon = 'icons/obj/guns/colt.dmi'
+ icon = 'icons/obj/guns/faction/caisc/pattern_5.dmi'
icon_state = "colt"
item_state = "colt"
caliber = ".45"
@@ -46,12 +46,12 @@
return 1
/obj/item/gun/projectile/colt/super
- name = "ornamental .45 combat pistol"
- desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette. This example sports a short slide, wood-paneled grips, and few signs of use, likely belonging to someone of higher stature."
+ name = "ornamental Pattern 5 pistol"
+ desc = "A robust metal-framed semi-automatic pistol chambered in .45 produced in the system of San Colette. This example sports a short slide, wood-paneled grips, and few signs of use, likely belonging to someone of higher stature."
desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
magazine_type = /obj/item/ammo_magazine/c45m/stendo
- icon = 'icons/obj/guns/coltsuper.dmi'
+ icon = 'icons/obj/guns/faction/caisc/ornamental_pattern_5.dmi'
icon_state = "coltsuper"
item_state = "coltsuper"
@@ -63,12 +63,12 @@
icon_state = "coltsuper-e"
/obj/item/gun/projectile/automatic/lebman
- name = "automatic .45 combat pistol"
- desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette. This example has been modified to allow fully-automatic fire, and sports a prominent vertical grip and muzzle compensator to aid in control."
+ name = "automatic Pattern 5 pistol"
+ desc = "A robust metal-framed semi-automatic pistol chambered in .45 produced in the system of San Colette. This example has been modified to allow fully-automatic fire, and sports a prominent vertical grip and muzzle compensator to aid in control."
desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
magazine_type = /obj/item/ammo_magazine/c45m/lebman
- icon = 'icons/obj/guns/coltauto.dmi'
+ icon = 'icons/obj/guns/faction/caisc/pattern_5_auto.dmi'
icon_state = "coltauto"
item_state = "coltauto"
w_class = WEIGHT_CLASS_NORMAL
@@ -90,10 +90,10 @@
icon_state = "coltauto-e"
/obj/item/gun/projectile/sec
- name = "\improper .45 pistol"
- desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces."
- desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
- icon = 'icons/obj/guns/secgun.dmi'
+ name = "\improper Mk58 pistol"
+ desc = "A NanoTrasen-designed .45 sidearm, found among law enforcement and security forces."
+ desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/secgun.dmi'
icon_state = "secgun"
item_state = "secgun"
magazine_type = /obj/item/ammo_magazine/c45m/rubber
@@ -124,10 +124,10 @@
magazine_type = /obj/item/ammo_magazine/c45m/flash
/obj/item/gun/projectile/sec/wood
- name = "custom .45 pistol"
- desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip."
- desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
- icon = 'icons/obj/guns/secgun_wood.dmi'
+ name = "custom Mk58 pistol"
+ desc = "A NanoTrasen-designed .45 sidearm, found among law enforcement and security forces. It has a wooden grip."
+ desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/secgun_wood.dmi'
icon_state = "secgunwood"
item_state = "secgunwood"
@@ -139,12 +139,12 @@
icon_state = "secgunwood-e"
/obj/item/gun/projectile/automatic/x9
- name = "automatic .45 pistol"
- desc = "A NanoTrasen-designed sidearm, modified for fully-automatic fire. Issued to select security and law enforcement groups."
- desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security \
+ name = "\improper Mk58-A machine pistol"
+ desc = "A NanoTrasen-designed .45 sidearm, modified for fully-automatic fire. Issued to select security and law enforcement groups."
+ desc_extended = "The Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security \
forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. \
A trademark of NanoTrasen security forces. This one has been modified for fully-automatic fire from the factory and sports a collapsible shoulder stock for better control. It uses .45 rounds."
- icon = 'icons/obj/guns/x9.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/x9.dmi'
icon_state = "secgunauto"
item_state = "secgunauto"
w_class = WEIGHT_CLASS_NORMAL
@@ -170,11 +170,11 @@
icon_state = "secgunauto-e"
/obj/item/gun/projectile/tanto
+ name = "\improper Mk1-A Tanto machine pistol"
desc = "An automatic variant of the NanoTrasen Mk1 Everyman handgun that has been built to accept detachable magazines, negating one of the original \
weapon's biggest shortcomings. It is marketed towards lower-echelon security companies as a machine pistol named the Tanto, and features a burst-fire selector \
and sturdier barrel with heatshield to better take advantage of the higher capacity."
- name = "10mm auto-pistol"
- icon = 'icons/obj/guns/c05r.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/tanto.dmi'
icon_state = "c05r"
item_state = "c05r"
magazine_type = /obj/item/ammo_magazine/mc10mm
@@ -201,12 +201,12 @@
icon_state = "c05r-e"
/obj/item/gun/projectile/silenced
- name = "suppressed pistol"
+ name = "\improper Mrrazhakulii suppressed pistol"
desc = "A small, quiet, easily concealable gun."
desc_extended = "Created as a disposable and concealable weapon, the Mrrazhakulii suppressed pistol is a firearm with a suppressor integrated as part of its barrel. \
Carried by guerrilla forces and spies, those guns are used in assassination and subterfuge operations. Due to using cheap and available materials, such as \
recycled iron and tires, countless of those pistols were distributed among cells and ALA soldiers."
- icon = 'icons/obj/guns/silenced_pistol.dmi'
+ icon = 'icons/obj/guns/faction/dpra/mrrazhakulii_suppressed_pistol.dmi'
icon_state = "silenced_pistol"
item_state = "silenced_pistol"
fire_sound = 'sound/weapons/gunshot/gunshot_suppressed.ogg'
@@ -230,9 +230,9 @@
icon_state = "[initial(icon_state)]-e"
/obj/item/gun/projectile/deagle
- name = ".50 magnum pistol"
- desc = "A very robust handgun."
- icon = 'icons/obj/guns/deagle.dmi'
+ name = "\improper Desert Eagle pistol"
+ desc = "An antique, usually impractical handgun firing .50 Action Express rounds. This one is still in good condition, if a bit rough around the edges."
+ icon = 'icons/obj/guns/faction/antique/deagle.dmi'
icon_state = "deagle"
item_state = "deagle"
force = 15
@@ -253,9 +253,9 @@
icon_state = "[initial(icon_state)]-e"
/obj/item/gun/projectile/deagle/adhomai
- name = "adhomian heavy pistol"
+ name = "\improper Nal'tor heavy pistol"
desc = "A bulky handgun used by republican commissars and high-ranking members of the Hadiist Party."
- icon = 'icons/obj/guns/adhomian_heavy_pistol.dmi'
+ icon = 'icons/obj/guns/faction/pra/naltor_heavy_pistol.dmi'
icon_state = "adhomian_heavy_pistol"
item_state = "adhomian_heavy_pistol"
desc_extended = "Given to Republican Commissars and high ranking Party members, the Nal'tor Model Pistol is notable for its large caliber. Unlike the Adar'Mazy pistol, only a \
@@ -289,10 +289,10 @@
icon_state = "gyropistol"
/obj/item/gun/projectile/pistol
- name = "9mm pistol"
+ name = "\improper Moonlight pistol"
desc = "An extremely popular compact handgun, used throughout human space."
desc_extended = "The Zavodskoi Interstellar Moonlight 9mm can be found in the hands of just about anyone imaginable - special operatives, common criminals, police officers, the average Joe - on account of the time-tested design, low price point, reliability, and ease of concealment. Having a threaded barrel helps, too, and it isn't uncommon to see the Moonlight as a prop in spy films, suppressed."
- icon = 'icons/obj/guns/pistol.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/pistol.dmi'
icon_state = "pistol"
item_state = "pistol"
w_class = WEIGHT_CLASS_SMALL
@@ -307,18 +307,18 @@
magazine_type = /obj/item/ammo_magazine/mc9mm
allowed_magazines = list(/obj/item/ammo_magazine/mc9mm)
fire_delay = ROF_PISTOL
- suppressor_x_offset = 5
+ suppressor_x_offset = 3
/obj/item/gun/projectile/pistol/flash
name = "9mm signal pistol"
magazine_type = /obj/item/ammo_magazine/mc9mm/flash
/obj/item/gun/projectile/pistol/detective
+ name = "\improper Mk21 Blackjack pistol"
desc = "A compact NanoTrasen designed sidearm, popular with law enforcement personnel for concealed carry purposes. It has a faux wooden grip."
- desc_extended = "The NT Mk21 Blackjack is a ballistic sidearm developed and produced by NanoTrasen. Unlike the related Mk58, the Blackjack is a rather high quality piece - typically issued to higher ranking law enforcement personnel, the Mk21 is compact and chambered in 9mm caliber. With all the bells and whistles of a modern, quality police pistol, the Blackjack's main drawback is the notoriously nippy recoil - 9mm in such a small package can be unpleasant for the average shooter."
- name = "compact 9mm pistol"
+ desc_extended = "The Mk21 Blackjack is a ballistic sidearm developed and produced by NanoTrasen. Unlike the related Mk58, the Blackjack is a rather high quality piece - typically issued to higher ranking law enforcement personnel, the Mk21 is compact and chambered in 9mm caliber. With all the bells and whistles of a modern, quality police pistol, the Blackjack's main drawback is the notoriously nippy recoil - 9mm in such a small package can be unpleasant for the average shooter."
magazine_type = /obj/item/ammo_magazine/mc9mm
- icon = 'icons/obj/guns/detgun.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/detgun.dmi'
icon_state = "detgun"
item_state = "detgun"
can_suppress = FALSE
@@ -353,7 +353,7 @@
/obj/item/gun/projectile/pirate
name = "zip gun"
desc = "Little more than a barrel, handle, and firing mechanism, cheap makeshift firearms like this one are not uncommon in frontier systems."
- icon = 'icons/obj/guns/zipgun.dmi'
+ icon = 'icons/obj/guns/faction/frontier/zipgun.dmi'
icon_state = "zipgun"
item_state = "zipgun"
handle_casings = CYCLE_CASINGS //player has to take the old casing out manually before reloading
@@ -379,11 +379,11 @@
. = ..()
/obj/item/gun/projectile/leyon
- name = "10mm pistol"
+ name = "\improper Mk1 Everyman pistol"
desc = "NanoTrasen's first marketed firearm design, the Mk1, better known as the Everyman, was an instant hit - though it is a crude, \
stripper clip-fed design with a very small capacity, the Everyman is absurdly inexpensive and famously reliable, and is now one of the most \
common weapons found in the Orion Spur."
- icon = 'icons/obj/guns/leyon.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/everyman.dmi'
icon_state = "leyon"
item_state = "leyon"
caliber = "10mm"
@@ -404,14 +404,14 @@
icon_state = "leyon-e"
/obj/item/gun/projectile/pistol/sol
- name = "solarian service pistol"
+ name = "\improper M8 pistol"
desc = "Manufactured by Zavodskoi Interstellar and based off of a full-sized variant of their 9mm design, the compact M8 is the standard service pistol of the Solarian Armed Forces."
- icon = 'icons/obj/guns/sol_pistol.dmi'
+ icon = 'icons/obj/guns/faction/sol_alliance/sol_pistol.dmi'
icon_state = "m8"
item_state = "m8"
can_suppress = TRUE
- suppressor_x_offset = 9
- suppressor_y_offset = 3
+ suppressor_x_offset = 3
+ suppressor_y_offset = -2
/obj/item/gun/projectile/pistol/sol/update_icon()
..()
@@ -421,9 +421,8 @@
icon_state = "m8-empty"
/obj/item/gun/projectile/pistol/sol/siib
- name = "solarian SIIB silenced pistol"
+ name = "\improper M8-SIIB suppressed pistol"
desc = "A variant of the M8 solarian service pistol, this paticular variant comes with an integrated recoil compensator and are used by SIIB agents and operatives. Officially, this pistol does not exist."
- icon = 'icons/obj/guns/sol_pistol.dmi'
icon_state = "m8-siib"
item_state = "m8-siib"
suppressed = FALSE
@@ -437,10 +436,10 @@
icon_state = "m8-siib-empty"
/obj/item/gun/projectile/pistol/sol/konyang
- name = "konyang service pistol"
+ name = "\improper K8 pistol"
desc = "The compact M8, redesignated as the K8, is the standard service pistol of the Konyanger Armed Forces. Inherited from the Solarian military, Zavodskoi has since given these handguns \
a service extension package, including laser sights and replacement of worn-out parts."
- icon = 'icons/obj/guns/konyang_weapons.dmi'
+ icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
icon_state = "k8"
item_state = "k8"
@@ -452,9 +451,9 @@
icon_state = "k8-empty"
/obj/item/gun/projectile/pistol/adhomai
- name = "adhomian service pistol"
+ name = "\improper Adar'Mazy pistol"
desc = "The Adar'Mazy pistol is an Adhomian firearm commonly issued to People's Republic officers, government officials and low-ranking Party members."
- icon = 'icons/obj/guns/adhomian_pistol.dmi'
+ icon = 'icons/obj/guns/faction/pra/adhomian_pistol.dmi'
icon_state = "adhomian_pistol"
item_state = "adhomian_pistol"
can_suppress = FALSE
@@ -469,7 +468,7 @@
icon_state = "adhomian_pistol-e"
/obj/item/gun/projectile/pistol/super_heavy
- name = "super-heavy pistol"
+ name = "\improper Kumar Arms 2557 super-heavy pistol"
desc = "A big, bulky, and extremely powerful pistol, intended to pierce even your strongest enemy. You should wield this thing with two hands, if you want your wrists to stay intact."
desc_extended = "The Kumar Arms 2557 is a newly designed type of \"super-heavy\" pistol. \
It features a light-weight polymer pistol grip, a bulky plasteel frame and an extra long barrel. \
@@ -536,12 +535,12 @@
RH.take_damage(30)
/obj/item/gun/projectile/xanupistol
- name = "\improper Xanan service pistol"
+ name = "dNAC-4.6 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, /obj/item/ammo_magazine/c46m/extended)
- icon = 'icons/obj/guns/xanu_pistol.dmi'
+ icon = 'icons/obj/guns/faction/dna_defense/xanu_pistol.dmi'
icon_state = "xanu_pistol"
item_state = "xanu_pistol"
caliber = "4.6mm"
@@ -567,13 +566,13 @@
icon_state = "xanu_pistol-e"
/obj/item/gun/projectile/pistol/dominia
- name = "dominian service pistol"
+ name = "\improper MPP-50 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 = 'icons/obj/guns/faction/dominian_empire/dominia_pistol.dmi'
icon_state = "dom_pistol"
item_state = "dom_pistol"
caliber = ".45"
@@ -589,13 +588,13 @@
icon_state = "dom_pistol-e"
/obj/item/gun/projectile/pistol/spitter
- name = "unathi spitter pistol"
+ name = "\improper Relzi-5 Spitter pistol"
desc = "The venerable 'spitter' pistol is an Unathi design nearly three centuries old. Though no longer in use by the Hegemony's forces, these guns are still commonplace in the hands of criminals, Wastelanders, and former Traditionalists."
desc_extended = "The Relzi-5 pistol, colloquially referred to as the 'spitter' was a common Unathi sidearm for centuries, though the design was already being phased out of Izweski use by the start of the Contact War due to superior-quality energy weapons becoming available.\
In the modern day, they are no longer produced, but the sheer volume of them in service means they can be found all over Moghes, and even in the wider Orion Spur."
magazine_type = /obj/item/ammo_magazine/spitterpistol
allowed_magazines = list(/obj/item/ammo_magazine/spitterpistol)
- icon = 'icons/obj/guns/unathi_ballistics.dmi'
+ icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi'
icon_state = "spitterpistol"
item_state = "spitterpistol"
caliber = "11.6mm"
diff --git a/code/modules/projectiles/guns/projectile/plasma.dm b/code/modules/projectiles/guns/projectile/plasma.dm
index 2ddcc53e45a..fba32a7aa45 100644
--- a/code/modules/projectiles/guns/projectile/plasma.dm
+++ b/code/modules/projectiles/guns/projectile/plasma.dm
@@ -1,7 +1,7 @@
/obj/item/gun/projectile/plasma
- name = "plasma shotgun"
+ name = "OEI-2 plasma shotgun"
desc = "A marvel of Elyran weapons technology which utilizes superheated plasma to pierce thick armor with gruesome results."
- icon = 'icons/obj/guns/slammer.dmi'
+ icon = 'icons/obj/guns/faction/elyran_republic/slammer.dmi'
icon_state = "slammer"
item_state = "slammer"
w_class = WEIGHT_CLASS_BULKY
@@ -23,9 +23,9 @@
icon_state = "[initial(icon_state)]-empty"
/obj/item/gun/projectile/plasma/bolter
- name = "plasma bolter"
+ name = "\improper OEI-2M plasma bolter"
desc = "A miniaturized, less efficient version of the infamous plasma slammer. Sacrifices much of its power for a more compact frame."
- icon = 'icons/obj/guns/bolter.dmi'
+ icon = 'icons/obj/guns/faction/elyran_republic/bolter.dmi'
icon_state = "bolter"
item_state = "bolter"
w_class = WEIGHT_CLASS_NORMAL
@@ -37,7 +37,7 @@
fire_delay = ROF_RIFLE
/obj/item/gun/energy/mountedplasma
- name = "plasma cannon"
+ name = "mounted plasma cannon"
fire_sound = 'sound/weapons/gunshot/slammer.ogg'
burst = 2
burst_delay = 3
@@ -48,9 +48,9 @@
projectile_type = /obj/projectile/plasma
/obj/item/gun/projectile/plasma/bolter/pistol
- name = "plasma pistol"
+ name = "\improper OEI-7 plasma pistol"
desc = "An Elyran designed firearm, used for diplomatic protection and high-value escort, which fires super heated bolts of plasma. Rare outside of Elyra due to the maintenance and production costs."
- icon = 'icons/obj/guns/plasma_pistol.dmi'
+ icon = 'icons/obj/guns/faction/elyran_republic/plasma_pistol.dmi'
icon_state = "plasma"
item_state = "plasma"
magazine_type = /obj/item/ammo_magazine/plasma/light/pistol
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 4d23742b93d..c0117cc58c0 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -1,7 +1,7 @@
/obj/item/gun/projectile/revolver
- name = "revolver"
- desc = "The revised Mark II Zavodskoi Interstellar revolver, utilizing a robust firing mechanism to deliver deadly rounds downrange. This is a monster of a hand cannon, with a beautiful cedar grip and a transparent plastic cover(so as to not splinter your hands while firing)."
- icon = 'icons/obj/guns/revolver.dmi'
+ name = "\improper Mark II revolver"
+ desc = "The revised Mark II Zavodskoi Interstellar revolver, utilizing a robust firing mechanism to deliver deadly rounds downrange. This is a monster of a hand cannon, with a beautiful cedar grip and a transparent plastic cover (so as to not splinter your hands while firing)."
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/revolver.dmi'
icon_state = "revolver"
item_state = "revolver"
accuracy = 1
@@ -44,9 +44,9 @@
return ..()
/obj/item/gun/projectile/revolver/mateba
- name = "automatic revolver"
+ name = "\improper Hammerhead autorevolver"
desc = "The Hammerhead .454 autorevolver, a very rare weapon typical of special ops teams and mercenary teams. It packs quite the punch."
- icon = 'icons/obj/guns/autorevolver.dmi'
+ icon = 'icons/obj/guns/faction/eridani_federation/autorevolver.dmi'
icon_state = "autorevolver"
item_state = "autorevolver"
max_shells = 7
@@ -58,13 +58,13 @@
magazine_type = /obj/item/ammo_magazine/a454
/obj/item/gun/projectile/revolver/mateba/captain
- name = "\improper SCC command autorevolver"
+ name = "\improper Protektor autorevolver"
desc = "A ludicrously powerful .454 autorevolver with equally ludicrous recoil which is issued by the SCC to the administrators of critical facilities and vessels. While revolvers may be a thing of the past, the stopping power displayed by this weapon is second to none."
desc_extended = "A Zavodskoi Interstellar design from the mid 2450s intended for export to the Eridani Corporate Federation and the Republic of Biesel, the Protektor \
revolver was never designed with practicality in mind. The .454 rounds fired from this weapon are liable to snap the wrist of an unprepared shooter and \
any following shots will be difficult to place onto a human-sized target due to the recoil, let alone a skrell. But nobody buys a Protektor for the purpose of \
practicality: they buy it due to having too much money and wanting a revolver large enough for their ego."
- icon = 'icons/obj/guns/captain_revolver.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/captain_revolver.dmi'
icon_state = "captain_revolver"
item_state = "captain_revolver"
is_wieldable = TRUE
@@ -96,7 +96,7 @@
/obj/item/gun/projectile/revolver/detective
name = "antique revolver"
desc = "An old, obsolete revolver. It has no identifying marks, and is chambered in an equally antiquated caliber."
- icon = 'icons/obj/guns/detective.dmi'
+ icon = 'icons/obj/guns/faction/antique/detective.dmi'
icon_state = "detective"
item_state = "detective"
max_shells = 6
@@ -130,7 +130,7 @@
/obj/item/gun/projectile/revolver/derringer
name = "derringer"
desc = "A small pocket pistol, easily concealed."
- icon = 'icons/obj/guns/derringer.dmi'
+ icon = 'icons/obj/guns/faction/frontier/derringer.dmi'
icon_state = "derringer"
item_state = "derringer"
accuracy = -1
@@ -160,7 +160,7 @@
if(attacking_item.tool_behaviour != TOOL_WIRECUTTER || icon_state == "revolver")
return ..()
to_chat(user, SPAN_NOTICE("You snip off the toy markings off the [src]."))
- icon = 'icons/obj/guns/revolver.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/revolver.dmi'
name = "revolver"
icon_state = "revolver"
item_state = "revolvers"
@@ -168,9 +168,9 @@
return 1
/obj/item/gun/projectile/revolver/lemat
- name = "grapeshot revolver"
- desc = "A six shot revolver, with a secondary firing barrel for loading shotgun shells."
- icon = 'icons/obj/guns/lemat.dmi'
+ name = "\improper P100 Mako revolver"
+ desc = "The P100 Mako is a 6-shot .38 Special revolver with a secondary firing barrel that can load shotgun shells."
+ icon = 'icons/obj/guns/faction/frontier/lemat.dmi'
icon_state = "lemat"
item_state = "lemat"
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -267,9 +267,9 @@
. += "\The [src] has a secondary barrel that is empty."
/obj/item/gun/projectile/revolver/adhomian
- name = "adhomian service revolver"
- desc = "The Royal Firearms Service Revolver is a simple and reliable design, favored by the nobility of the New Kingdom of Adhomai."
- icon = 'icons/obj/guns/adhomian_revolver.dmi'
+ name = "\improper Royal Firearms Model 1 revolver"
+ desc = "The Royal Firearms Model 1 service Revolver is a simple and reliable design, favored by the nobility of the New Kingdom of Adhomai."
+ icon = 'icons/obj/guns/faction/nka/adhomian_revolver.dmi'
icon_state = "adhomian_revolver"
item_state = "adhomian_revolver"
caliber = "38"
@@ -312,7 +312,7 @@
name = "reclaimed revolver"
desc = "A revolver, made out of cheap scrap metal. Often used by Konyang's pirates."
desc_extended = "A six-shot revolver, crudely hacked together out of different kinds of scrap metal and wood. Made working by the ingenuity Konyang's pirates often need to show. Chambered in .38 ammo."
- icon = 'icons/obj/guns/konyang_weapons.dmi'
+ icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
icon_state = "38_revolver"
item_state = "38_revolver"
caliber = "38"
@@ -328,12 +328,12 @@
icon_state = "38_revolver-e"
/obj/item/gun/projectile/revolver/konyang/police
- name = "police service revolver"
+ name = "\improper Nam-Kawada revolver"
desc = "A compact and reliable .45 caliber revolver. This one has Konyang National Police markings as well as a lanyard attached to it."
desc_extended = "The Nam-Kawada model .45 caliber revolver, named after its two inventors, is an adaptation of an old Zavodskoi design designed to be easily made from colony ship autolathes. \
The original design was first introduced in 2307 due to a growing need to arm the nascent Konyang National Police (then known as the Suwon Colonial Constabulary) in the face of both wildlife and the occasional criminal activity.\
The lack of a need for an upgrade, as well as institutional attachment to the design, has led to its continued use for almost two centuries."
- icon = 'icons/obj/guns/konyang_weapons.dmi'
+ icon = 'icons/obj/guns/faction/konyang/konyang_weapons.dmi'
icon_state = "police_gun"
item_state = "police_gun"
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm
index 15103c5d1f9..1c07238494f 100644
--- a/code/modules/projectiles/guns/projectile/rifle.dm
+++ b/code/modules/projectiles/guns/projectile/rifle.dm
@@ -1,7 +1,7 @@
/obj/item/gun/projectile/shotgun/pump/rifle
- name = "bolt action rifle"
+ name = "\improper Harrzhak pattern bolt action rifle"
desc = "A cheap ballistic rifle, often found in the hands of Tajaran conscripts."
- icon = 'icons/obj/guns/moistnugget.dmi'
+ icon = 'icons/obj/guns/faction/pra/bolt.dmi'
icon_state = "moistnugget"
item_state = "moistnugget"
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -40,9 +40,9 @@
ammo_type = /obj/item/ammo_casing/a68/blank
/obj/item/gun/projectile/shotgun/pump/rifle/scope
- name = "sniper bolt action rifle"
+ name = "scoped Harrzhak pattern bolt action rifle"
desc = "A cheap ballistic rifle, often found in the hands of Tajaran conscripts. This one has a telescopic sight attached to it."
- icon = 'icons/obj/guns/bolt_scope.dmi'
+ icon = 'icons/obj/guns/faction/pra/bolt_scope.dmi'
/obj/item/gun/projectile/shotgun/pump/rifle/scope/verb/scope()
set category = "Object.Held"
@@ -135,11 +135,11 @@
jam_chance = min(jam_chance + 5, 100)
/obj/item/gun/projectile/shotgun/pump/rifle/dominia
- name = "dominian sniper rifle"
+ name = "\improper MPMR-08/2 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 = 'icons/obj/guns/faction/dominian_empire/dominia_bolt_action.dmi'
icon_state = "dom_bolt_action"
item_state = "dom_bolt_action"
caliber = "a762"
@@ -158,9 +158,9 @@
to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
/obj/item/gun/projectile/contender
- name = "pocket rifle"
+ name = "\improper H-H Gram 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."
- icon = 'icons/obj/guns/pockrifle.dmi'
+ icon = 'icons/obj/guns/faction/frontier/pockrifle.dmi'
icon_state = "pockrifle"
item_state = "pockrifle"
caliber = "a556"
@@ -224,9 +224,9 @@
..()
/obj/item/gun/projectile/shotgun/pump/rifle/vintage
- name = "vintage bolt action rifle"
+ name = "\improper M1903 Springfield rifle"
desc = "An extremely old-looking rifle. Words you can't read are stamped on the gun. Doesn't look like it'll take any modern rounds."
- icon = 'icons/obj/guns/springfield.dmi'
+ icon = 'icons/obj/guns/faction/antique/springfield.dmi'
icon_state = "springfield"
item_state = "springfield"
origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 3)
@@ -321,13 +321,20 @@
..()
/obj/item/gun/projectile/gauss
- name = "gauss thumper"
- desc = "An outdated gauss weapon which sees sparing use in modern times."
+ name = "\improper NGS-01 gauss thumper"
+ desc = "An outdated model of gauss weapon which sees sparing use in modern times."
+ desc_extended = "Designed by NanoTrasen in 2398, the NGS-01 was an offshoot of the venerable HeS-05 gauss rifle. After purchasing \
+ the defunct Henricus company’s designs, work began on an upgrade. Trading in the depleted uranium rounds for tungsten that was more \
+ common in the Solarian core worlds, the power equipment was also made more compact thanks to the usage of phoron components pioneered by NT. \
+ This allowed for a magazine-based ammo loading system, no longer requiring the simple break-action that isolated the ammo from the hot temperatures. \
+ The result was the “Thumper” model of gauss gun. Its popularity quickly established NanoTrasen as a new player in the firearms \
+ industry. While at this point obsolete compared to newer models, its cheapness led it to be established as the official weapon of the \
+ then-recently established Tau Ceti Foreign Legion in 2459, providing it a new lease of life despite its obvious shortcomings due to its age."
w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_BACK
magazine_type = /obj/item/ammo_magazine/gauss
allowed_magazines = list(/obj/item/ammo_magazine/gauss)
- icon = 'icons/obj/guns/gauss_thumper.dmi'
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/gauss_thumper.dmi'
icon_state = "gauss_thumper"
item_state = "gauss_thumper"
caliber = "gauss"
@@ -356,7 +363,8 @@
/obj/item/gun/energy/gauss/mounted/mech
name = "heavy gauss cannon"
desc = "An outdated and power hungry gauss cannon, modified to deliver high explosive rounds at high velocities."
- icon = 'icons/obj/guns/gauss_thumper.dmi'
+ desc_extended = null
+ icon = 'icons/obj/guns/faction/nanotrasen_corporation/gauss_thumper.dmi' //TODO: Needs a proper sprite
icon_state = "gauss_thumper"
fire_sound = SFX_SHOOT_GAUSS
fire_delay = ROF_UNWIELDY
@@ -369,15 +377,20 @@
recharge_time = 12
needspin = FALSE
-/obj/item/gun/projectile/gauss/carbine
- name = "gauss carbine"
- desc = "A simple gun utilizing the gauss technology. It is still reliable and cheap despite being outdated."
- icon = 'icons/obj/guns/gauss_carbine.dmi'
+/obj/item/gun/projectile/gauss/old
+ name = "\improper Henricus HeS-05 gauss rifle"
+ desc = "A simple break-action gun utilizing gauss technology. It is still reliable and cheap despite being an out of date model."
+ desc_extended = "The Henricus company was de Namur Defense Systems’s chief rival throughout the 23rd and 24th centuries. While de Namur primarily \
+ focused on projectile weapons and armor, the Henricus company was known for its innovative at the time gauss weaponry. While popular throughout the \
+ Coalition, competition by megacorporations allowed in by the Solarian Reproachment chipped at their market share as the weapons became \
+ considered dated, and upgrades were slow to come. The Henricus company eventually shuttered its doors in 2391, its last production facilities \
+ being sold to de Namur."
+ icon = 'icons/obj/guns/faction/frontier/gauss_carbine.dmi'
icon_state = "gauss_carbine"
item_state = "gauss_carbine"
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
- ammo_type = /obj/item/ammo_casing/gauss/carbine
+ ammo_type = /obj/item/ammo_casing/gauss/old
load_method = SINGLE_CASING
handle_casings = HOLD_CASINGS
max_shells = 1
@@ -385,23 +398,27 @@
fire_delay_wielded = ROF_INTERMEDIATE
accuracy_wielded = 1
-/obj/item/gun/projectile/gauss/carbine/update_icon()
+/obj/item/gun/projectile/gauss/old/update_icon()
..()
if(loaded.len)
icon_state = "gauss_carbine"
else
icon_state = "gauss_carbine-e"
-/obj/item/gun/projectile/gauss/carbine/special_check(mob/user)
+/obj/item/gun/projectile/gauss/old/special_check(mob/user)
if(!wielded)
to_chat(user, SPAN_WARNING("You can't fire without stabilizing \the [src]!"))
return 0
return ..()
/obj/item/gun/projectile/shotgun/pump/lever_action
- name = "lever action rifle"
- desc = "A lever action rifle with a side-loading port, these are still popular with frontiersmen for hunting and self-defense purposes."
- icon = 'icons/obj/guns/leveraction.dmi'
+ name = "\improper Harrier-Elrond Zalen lever action rifle"
+ desc = "A lever action rifle from the frontier with a side-loading port, the Zalen is popular with frontiersmen for hunting and self-defense purposes."
+ desc_extended = "The Harrier-Elrond company is not well-known outside of the human frontier, and the outskirts of the Coalition. Mostly providing cheap \
+ firearms for those not readily served by the mega-corporations, a single factory is able to provide for an entire standard years’ demand. \
+ Despite this, the nearly century of business the company have been in have allowed for numerous copies to be found throughout the human frontier, \
+ and in many cases even beyond."
+ icon = 'icons/obj/guns/faction/frontier/leveraction.dmi'
icon_state = "leveraction"
item_state = "leveraction"
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -420,12 +437,12 @@
can_sawoff = FALSE
/obj/item/gun/projectile/shotgun/pump/rifle/magazine_fed/crackrifle
- name = "crack rifle"
+ name = "\improper Azarak-96 crack rifle"
desc = "A heavy bolt-action rifle of Moghesian manufacture."
desc_extended = "Manufactured by the Azarak Kingdom in 2350, the Azarak-96 'Crack Rifle' is a bolt-action rifle of Moghesian manufacture, easily recognizable by its long bayonet and large magazine wrapped around its trigger guard.\
This heavy but powerful weapon is mostly known for its use by the common warrior of the Traditionalist Coalition during the Contact War.\
Many of these rifles survived the ravages of the Contact War, a testament to their reliability."
- icon = 'icons/obj/guns/unathi_ballistics.dmi'
+ icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi'
icon_state = "crackrifle"
item_state = "crackrifle"
caliber = "5.8mm"
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 5bf1d8f1b4e..40e1bbafe99 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -1,4 +1,4 @@
-/obj/item/gun/projectile/shotgun
+ABSTRACT_TYPE(/obj/item/gun/projectile/shotgun)
name = "strange shotgun"
desc = DESC_PARENT
accuracy = -1
@@ -48,7 +48,7 @@
/obj/item/gun/projectile/shotgun/pump
name = "pump shotgun"
desc = "An ubiquitous unbranded shotgun. Useful for sweeping alleys."
- icon = 'icons/obj/guns/shotgun.dmi'
+ icon = 'icons/obj/guns/faction/frontier/shotgun.dmi'
icon_state = "shotgun"
item_state = "shotgun"
max_shells = 7 // max of 8
@@ -114,9 +114,9 @@
ammo_type = null
/obj/item/gun/projectile/shotgun/pump/combat
- name = "combat shotgun"
+ name = "\improper KS-40 combat shotgun"
desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders."
- icon = 'icons/obj/guns/cshotgun.dmi'
+ icon = 'icons/obj/guns/faction/hephaestus_industries/cshotgun.dmi'
icon_state = "cshotgun"
item_state = "cshotgun"
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
@@ -127,9 +127,9 @@
cycle_anim = FALSE
/obj/item/gun/projectile/shotgun/pump/combat/sol
- name = "solarian combat shotgun"
+ name = "\improper M63 combat shotgun"
desc = "A compact combat shotgun manufactured by Zavodskoi Interstellar for the Solarian Armed Forces, the M63 is most frequently employed by assaulters fighting in close-quarters environments, though it is also uncommonly used as a defensive weapon by Navy crewmen. Chambered in 12 gauge."
- icon = 'icons/obj/guns/sol_shotgun.dmi'
+ icon = 'icons/obj/guns/faction/sol_alliance/sol_shotgun.dmi'
icon_state = "malella"
item_state = "malella"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 3, TECH_ILLEGAL = 2)
@@ -216,11 +216,11 @@
force = 11
/obj/item/gun/projectile/shotgun/doublebarrel/nitro
- name = "gauss express rifle"
+ name = "\improper Pattern Nine gauss express rifle"
desc = "A Galatean nitro express rifle. Loaded with tungsten slugs."
desc_extended = "While Galatea almost universally uses lasers for their weapons, gauss weapons see some use in the hands of expeditionary forces and military specialist units. The Pattern Nine is a single-barrel, double-shot \
rifle designed for intermediate range anti-infantry specialists just as much as it is for Tsukuyomian game wardens."
- icon = 'icons/obj/guns/galatea_nitro.dmi'
+ icon = 'icons/obj/guns/faction/galatean_technocracy/galatea_nitro.dmi'
icon_state = "nitrorifle"
item_state = "nitrorifle"
//SPEEDLOADER because rapid unloading.
@@ -245,7 +245,7 @@
/obj/item/gun/projectile/shotgun/foldable
name = "foldable shotgun"
desc = "A single-shot shotgun that can be folded for easy concealment."
- icon = 'icons/obj/guns/overunder.dmi'
+ icon = 'icons/obj/guns/faction/frontier/overunder.dmi'
icon_state = "overunder"
item_state = "overunder"
accuracy = 0
@@ -316,7 +316,7 @@
name = "wall gun"
desc = "A small yet powerful shotgun of Unathi make."
desc_extended = "The Moghesian wall gun, a classic Hegemonic weapon that saw plenty of service before and during the Contact War. This small-sized, break-action shotgun manages to pack a serious punch despite being barely larger than a pistol, however, it comes at the cost of extremely limited capacity. The wall gun is still produced and distributed nowadays, generally given to vehicle and ship crews and law enforcers."
- icon = 'icons/obj/guns/unathi_ballistics.dmi'
+ icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi'
icon_state = "wallgun"
item_state = "wallgun"
accuracy = 0
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index 6dc0db9206c..01ce484b856 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -1,10 +1,10 @@
/obj/item/gun/projectile/heavysniper
- name = "anti-materiel rifle"
+ name = "\improper PTR-7 anti-materiel rifle"
desc = "The PTR-7 is man-portable anti-armor rifle fitted with a high-powered scope, capable of penetrating through most windows, airlocks, and non-reinforced walls with ease."
desc_extended = "A single-shot, bolt-action anachronism in an age of energy weapons, the PTR-7 was originally developed to combat exosuits, either by disabling critical systems \
or killing the pilot. Firing a high-velocity 14.5mm cartridge designed to defeat heavy armor, the PTR-7 boasts penetrative power unmatched by most in its class, though recent advancements \
in composites have rendered the weapon less effective at its intended purpose. Nonetheless, it still sees use among some groups as a general-purpose anti-materiel rifle."
- icon = 'icons/obj/guns/heavysniper.dmi'
+ icon = 'icons/obj/guns/faction/frontier/heavysniper.dmi'
icon_state = "heavysniper"
item_state = "heavysniper"
w_class = WEIGHT_CLASS_BULKY
@@ -100,7 +100,7 @@
/obj/item/gun/projectile/heavysniper/unathi
name = "hegemony slugger"
desc = "An incredibly large firearm, produced by an Ouerean Guild. Uses custom slugger rounds."
- icon = 'icons/obj/guns/unathi_slugger.dmi'
+ icon = 'icons/obj/guns/faction/izweski_hegemony/unathi_slugger.dmi'
icon_state = "slugger"
item_state = "slugger"
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 4)
@@ -146,7 +146,7 @@
desc_extended = "Designed and sold by Zeng-Hu Pharmaceuticals and produced on contract by Zavodskoi's Kumar Arms subsidiary, the rifle has quietly become ubiquitous among xenobiological researchers. \
While the weapon platform itself is expensive for a dart gun, users have come to adore it thanks to the benefit of its conditionally cheap ammo. Pricey off the shelf, facilities often pay a fraction \
of the cost thanks to rebates and bulk order discounts."
- icon = 'icons/obj/guns/tranqsniper.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/tranqsniper.dmi'
icon_state = "tranqsniper"
item_state = "tranqsniper"
w_class = WEIGHT_CLASS_BULKY
@@ -176,9 +176,9 @@
icon_state = "tranqsniper"
/obj/item/gun/projectile/dragunov
- name = "adhomian marksman rifle"
+ name = "\improper Ho'taki marksman rifle"
desc = "A semi-automatic marksman rifle."
- icon = 'icons/obj/guns/dragunov.dmi'
+ icon = 'icons/obj/guns/faction/pra/hotaki.dmi'
icon_state = "dragunov"
item_state = "dragunov"
@@ -231,11 +231,11 @@
to_chat(usr, SPAN_WARNING("You can't look through the scope without stabilizing the rifle!"))
/obj/item/gun/projectile/automatic/rifle/w556
- name = "scout rifle"
- desc = "The ZI Greyhound, the designated marksman rifle variant of Zavodskoi's ZI Bulldog carbine. Features a longer, heavier barrel \
+ name = "\improper Greyhound marksman rifle"
+ desc = "The Greyhound, the designated marksman rifle variant of Zavodskoi's Bulldog carbine. Features a longer, heavier barrel \
with a low-power fixed-magnification optic. A vertical grip has been attached under the forend, to help offset the change in balance \
and improve handling."
- icon = 'icons/obj/guns/w556.dmi'
+ icon = 'icons/obj/guns/faction/zavodskoi_interstellar/w556.dmi'
icon_state = "w556rifle"
item_state = "w556rifle"
w_class = WEIGHT_CLASS_BULKY
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 10e9be42194..46a575ed569 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -46,7 +46,7 @@
impact_type = /obj/effect/projectile/impact/laser/scc
/obj/projectile/beam/pistol/hegemony
- icon = 'icons/obj/guns/hegemony_pistol.dmi'
+ icon = 'icons/obj/guns/faction/izweski_hegemony/hegemony_pistol.dmi'
icon_state = "hegemony_pistol"
damage = 30
diff --git a/code/modules/projectiles/suppressor.dm b/code/modules/projectiles/suppressor.dm
index 46c07c56c61..3711e8aac08 100644
--- a/code/modules/projectiles/suppressor.dm
+++ b/code/modules/projectiles/suppressor.dm
@@ -1,7 +1,7 @@
/obj/item/suppressor
name = "suppressor"
desc = "A suppressor"
- icon = 'icons/obj/guns/suppressor.dmi'
+ icon = 'icons/obj/guns/attachments/suppressor.dmi'
icon_state = "suppressor_item"
origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 3)
w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm
index b42d908acd5..182f6c3772c 100644
--- a/code/modules/random_map/drop/drop_types.dm
+++ b/code/modules/random_map/drop/drop_types.dm
@@ -31,9 +31,9 @@ GLOBAL_LIST_INIT_TYPED(supply_drop, /datum/supply_drop_loot, null)
/datum/supply_drop_loot/lasers/New()
..()
contents = list(
- /obj/item/gun/energy/laser,
- /obj/item/gun/energy/laser,
- /obj/item/gun/energy/sniperrifle,
+ /obj/item/gun/energy/rifle/laser,
+ /obj/item/gun/energy/rifle/laser,
+ /obj/item/gun/energy/rifle/laser/sniper,
/obj/item/gun/energy/rifle/ionrifle)
/datum/supply_drop_loot/ballistics
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 3e7c0dc357e..5ffd9f589b8 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -261,7 +261,7 @@
/obj/item/reagent_containers/spray/chemsprayer/xenobiology
name = "xenoblaster"
desc = "A child's plastic watergun repurposed for the use in pacifying slimes. Has an adjustable nozzle that controls precision as well as strength."
- icon = 'icons/obj/guns/xenoblaster.dmi'
+ icon = 'icons/obj/guns/faction/toy/xenoblaster.dmi'
icon_state = "xenoblaster"
item_state = "xenoblaster"
contained_sprite = TRUE
diff --git a/config/example/custom_items.json b/config/example/custom_items.json
index 8184d32b8f6..81ab8a396be 100644
--- a/config/example/custom_items.json
+++ b/config/example/custom_items.json
@@ -28,7 +28,7 @@
{
"ckey": "arrow768",
"character_name": "John Doe",
- "item_path": "/obj/item/gun/energy/lawgiver",
+ "item_path": "/obj/item/gun/energy/acp",
"item_name": "Executioner",
"item_desc": "When you really need to motivate your crew."
}
diff --git a/html/changelogs/GeneralCamo - Gun Organization.yml b/html/changelogs/GeneralCamo - Gun Organization.yml
new file mode 100644
index 00000000000..c69c64bce50
--- /dev/null
+++ b/html/changelogs/GeneralCamo - Gun Organization.yml
@@ -0,0 +1,63 @@
+################################
+# 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
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: GeneralCamo
+
+# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - code_imp: "Repathed, reorganized, and cleaned up the guns."
+ - refactor: "Removed redundant guns, and marked abstract weapons as such."
+ - rscadd: "Fake guns now use new sprites, and updated code."
+ - rscadd: "All guns are now referred to by their model, in addition to a basic descriptor."
+ - rscdel: "Removed the spike thrower, sonic gun, and phoron pistol."
+ - qol: "Retooled a few existing gun sprites to better match their intended descriptions."
diff --git a/icons/obj/bang_flag.dmi b/icons/obj/bang_flag.dmi
index 9cdd6fe026006d3849a4d458b61c93a758b5e0c8..00c45eae37f55a202fe7105e3e0a84b1ee08ebdb 100644
GIT binary patch
delta 693
zcmV;m0!saW0`CQXiBL{Q4GJ0x0000DNk~Le0002M0002M2m=5B0A&K4H2?qrMNmvs
zMZmzoYa=P9A}D2OCssKgGaL!e&r8hAO2x%T*Vj(aG&IFAG1}Ts(ls^G(oE3MOWoa2
z)ipKY;ZfH%Hss_}*)}%W*-q4=EL;Ep00DGTPE!Ct=GbNg0001@kxfW{Nr{UyC9|j)
z$TZ~QOe;#vO@*-G3X&4@(&N)|64P<0v;YdH<|I}E*#>%sI>cZjAZdXW15M7!&o98?
zg7~7;avZKOM|Op=4t7kO>p&RU9m)!>elFm!1pusWRm!QUtvLVy0jfzvK~#90?cM8c
zft
z?p!wTShUOf{ohLXznRN^yPYn@8Kp=lMM5bON|m6vZvX%Q0001g004maDlxyVL_#GJ
zDv?l$gi0mUqJdf@)FPo43AIS5RRRD200000008f&=I`%`k6wz)`FrZ|o7K8muZ(!R
z={Btq@3+miH{;#Tj?44SxYX{Oz16_s*c}f>{B&;4Co|r)cHBNcSift`D?Aiv7I3*X
z*NYkNKCJlc=5BC*aiI++Pc;Yt00000fPW`+KL1>NzV(I0=lhY?2h`|J&FAM{A5iNP
za(FuTd|$0EsP&29`Mf$`U7+CMZSn;w$rq?3U!anFfdBvi0001pEXw>|><=XN7ZUpu
z$^C;O%`(O6-a_jC0{{R3000000K}xm?`pUxt!Ce9G%gERLtq!mDzg&9aThNK?{Qv3lvA+84w9MIL({r{ig
zzp?TE|7poLGEV@d7)yfuf*Bm1-ADs+awj%>WNT^~>f74ssvE|3b{ng1ULm28cH-#F
zuqiWUb0unP@A$Q|p_h$eTd4FLXI|bIpe8j>7sn8diOC5Ptj;1FTwDvdG_eukTAW;zSx}OhpU1#ZF(){zps4iw
zm*9erU!Q1s>uQ}lb3S-OsKG_!2aj~l`)HnIDC+6mVPPC(eA(DbVa}sTM<#_R1h3q&
zWx)cCtvf9Cdvtait8QK)p^l9Eb=()<+JE*vDr)%WF
ztLItY_%lQ}y8lh^Umpl`%}P%f$B>BDw>J#=nhkhZFDz-=Td41FmwU?-CLWmu-scW|
z<#uw+Ra7f#iTEci5O&5tVPlISL%q)Dy&4Z5)mFdbTvNPGgW-WlXjuD&(9+$E$?p1V
zyt6kZ*NX!Uw{ZAg8qZx@y6A`GLr1QPeDT^<>8dK+K#7j0FII6Y$eXTu-hNx?LkKHN
zRGeca(*x^a~OlAPSrBZ`Xdzf_~Ev0pt%g5u6{1-
HoD!M8S36F)B(tE;P%lanVWCnF;x7Y_#r2nZV+8*y=Q
zJ3BjXZ*OX9YIt~fb8~ZlQ!i*}W?5NTiima5fKp=6Aup!
z3vF#}CL|stA{!ziB1lL`5DW<&8yXQ25C#SYH8nLVCm$IU4-^y>5f2U*5D60v2Z3En
zwg3PC0d!JMQvg8b*k%9#0Caj(Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1ygzQ!15cTS+U;%GfaGvsrDyG#5zX?yB1BudA{$(jQ~2;NXDr;u1I@
zlfiOP!8j)?3a-eKBq{UDx?vbuMCjKqXa&FEOOW+KhT^6S`|F0L$p{4ptgONV(14k$
zQc7t7k1HF4IbcPngx?a6f1wS=z)k(@I6@H*sOa;>dbk65i|6|np<;b
z5e-5RVc&yoi?XxZXpRmx8?cp3i8_6(x=SFWfAKs4d;6_ct8Lqsbx=F>R*oG8u_fy6
zi~H~uE@0SBuakH_z<8J-8!zMB109t%l
zJFqOsJ}36E)fWJ#eMEhL3{FJKL0Iu9bc=uK&TyQIbI%q(QVzn3
zy*xcS=%I|zy=RLLlmm7#10=k^dA9g*HoQ19kua002ovPDHLkV1g%C*e?J8
diff --git a/icons/obj/guns/colt.dmi b/icons/obj/guns/colt.dmi
deleted file mode 100644
index 63370405e63137eaef50080200f367e7a927a9c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 691
zcmV;k0!;mhP)?AkJ;1=g5`{pX00001
zbW%=J06^y0W&i*HdU{k?bVOxyV{&P5bZKvH004NLQ&w5~VCYCj+6*1dqBRoa&SnT>V_Yo&f-ctUIxo?#P+|00FB>L_t(&f$f;x
zmV+P+giYd#m2ThvaW{&mTa|zy>&?z*FRY`?1b@y6T?YUF0pi0U=2Kz=ggO!-BI%WR
zhlH6$cq8(BY%4Z`g{3Fm_)Fpb4Q<4Q4^gOL0$R3Sl%C#5Ql!3F0OH_5OJ(!mD@n28
z40OU#PU~0E8hLPT42AJ${ipN>33zx6gIfzdj-1mQBzO#3Ba`0N=)~sq%Q!7?7~BzE2r=APhS{dF3{Oy=k!Q|?HtViQknDyhZ(NackcSzCYYXj=-W;Z
z3bY^YoSsWCJ-tuPKYO83H)KtG#H(J=Mn)jx{)BVXRv-;|K<||
z00000005|=w7G6hqPaFZ|KcTq6#M4-Q!%pnSK*34U4qH-pNjnFbJG*%;|bO__voem
z>Hd2=`n*!`sz}hte_cPwCOC{|w)w%okbHtOnKD8qLGe}Q1$8e#)7J(7000000B{et
zEE^=+eE+&5fZgYpb>LSL7)t|p_%F?OJV8|l+%UmS{%eXzg1Qd8K0#!0;6{IR?g0EV
ZegGA^4#f18x9R`@002ovPDHLkV1ft3FlGP%
diff --git a/icons/obj/guns/caplaser.dmi b/icons/obj/guns/faction/antique/caplaser.dmi
similarity index 100%
rename from icons/obj/guns/caplaser.dmi
rename to icons/obj/guns/faction/antique/caplaser.dmi
diff --git a/icons/obj/guns/deagle.dmi b/icons/obj/guns/faction/antique/deagle.dmi
similarity index 100%
rename from icons/obj/guns/deagle.dmi
rename to icons/obj/guns/faction/antique/deagle.dmi
diff --git a/icons/obj/guns/detective.dmi b/icons/obj/guns/faction/antique/detective.dmi
similarity index 100%
rename from icons/obj/guns/detective.dmi
rename to icons/obj/guns/faction/antique/detective.dmi
diff --git a/icons/obj/guns/retro.dmi b/icons/obj/guns/faction/antique/retro.dmi
similarity index 100%
rename from icons/obj/guns/retro.dmi
rename to icons/obj/guns/faction/antique/retro.dmi
diff --git a/icons/obj/guns/springfield.dmi b/icons/obj/guns/faction/antique/springfield.dmi
similarity index 100%
rename from icons/obj/guns/springfield.dmi
rename to icons/obj/guns/faction/antique/springfield.dmi
diff --git a/icons/obj/guns/tommygun.dmi b/icons/obj/guns/faction/antique/tommygun.dmi
similarity index 100%
rename from icons/obj/guns/tommygun.dmi
rename to icons/obj/guns/faction/antique/tommygun.dmi
diff --git a/icons/obj/guns/c20r.dmi b/icons/obj/guns/faction/caisc/ca-25e.dmi
similarity index 100%
rename from icons/obj/guns/c20r.dmi
rename to icons/obj/guns/faction/caisc/ca-25e.dmi
diff --git a/icons/obj/guns/l6.dmi b/icons/obj/guns/faction/caisc/ca-75e.dmi
similarity index 100%
rename from icons/obj/guns/l6.dmi
rename to icons/obj/guns/faction/caisc/ca-75e.dmi
diff --git a/icons/obj/guns/coltsuper.dmi b/icons/obj/guns/faction/caisc/ornamental_pattern_5.dmi
similarity index 100%
rename from icons/obj/guns/coltsuper.dmi
rename to icons/obj/guns/faction/caisc/ornamental_pattern_5.dmi
diff --git a/icons/obj/guns/faction/caisc/pattern_5.dmi b/icons/obj/guns/faction/caisc/pattern_5.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..5077bba73d9053050803b38a03c2c2fcd82e7e62
GIT binary patch
literal 722
zcmV;@0xkWCP)?AkJ;1=g)%SrW00001bW%=J06^y0W&i*H
zdU{k?bVOxyV{&P5bZKvH004NLQ&w5~VCY
zCj+6*1dqBRoa&SnT>V_Yo&f-ctUIxo?#P+|00GuXL_t(oh3%F*a)U4!gayo?)-<_1fKm7ayUA?r2oa5
zP1GwtG0z+&Ska8+<(3e^WP&nJ63SSnHe6U4_#%(vhv%oVVTCv^ibuxQjVdxL2Tm#7
z%A7Q8ke_8)E@jau8e17e${;QaLZy@&@JARMX1_BuYGRL2l>^;cnu3KPFtTWY9rOB-B0lG-Xf_ZMB1f
zjDLb}mk2vlY5ToYH!yV{0M*C#NBE9Ev?FQ>wAYmrI{Nx5+(me;jRdv^sEZJuDq}ZO
ziw-p>G(n@_y5HyqOkZ*)#e_i@-3)-#H*5FDcQ_ml$8TcyQvfFDZ*Bkpc$}S)&kBPu
z493sRQxv^!;@{&gLm3|CD@bQE8|WOgW#Zefy2CEYaEHK`kMEZR67q9(sT*EiYj~lt
z^c?t!=TQu7BSU@
z*O|<_sKqqfhd3&hN}>Xo!I1{JIkwg6J2C%##Ym_n%AHti{@bz-Yj0v#+}f>p$g8GY
zzWWCLi;@*e!4sAM00ZMmL_t(|ob8(nQ>!o(gn8If6s*?Ns%R;#_y7OJo6zDNG08~|
zLGZetW2c49W=S8TnQasS00000%#m1kFiFx`DdRXzl30?)eUf-aN|imny1Gi@WU*{n
zq-mO@>Ly91R%Q!DmPui@?5-tUwnrCBb&Z|Rw92SUpQ$^G^FpU-mVFq^M0vR;m0zA(
zB*~X2WG2dP@zqb3N|o-tI7F!)yDKAO&a+mkvP^2^3)d{ggNUUsfh
ziOtK|Q?^=L(2J0ooTF@KcUDr`QK2u2D-Mg#)ajH9>O(r=f&u^l00000003YDR=M$1
zz6$L)#QWMfWR+k0nh}nJyl
z_kHav!f_1ceQS9X!ZEBj0000000000@GDt=r@`9#(8}GJd-=P`^M{8#iiB_++6_0H
zZ+)a=zPU`$*Y@X*Y;)gBw%hIIakty7*LnUV3W<2uX`jEkY}I(ZR@$gL`Fg$C?H)IB
zlD@V#w>o5;yW>R-s8+94Rf)1J#G6j^=D5^nZBe#6U$3i5g?ypsR`-o_e?q2|w|j*?
z=-wl!a`|WKICo^68vpRx)ei$R!6zDP?ut8$m%G&7V1(A4Okr=
zPz!Y^hK8$-4y=U|#ZX$|I{%n;OBaRf{9&q_{G_Ok0ssI20000003)EOc7|`7dONDt
zW^QYGD!PNFx~Rs}+8*`nk6xOdg?P#>O;1JJ_WYX1&@`pnqu%||w&^LVs-l~o8ca=7
z=k}<3f3$6Ss;Z}B)AKW?rm0_h6#Y>E0002A)T4~@cO^&sl%RF(@lB-UgA}k}{F%3>a*zT5007|s!v3!i
zXIFt9!`iF(DM5vGlk&jXrXt7Gb>Z(y{1-e*Q09sboHWcB8UzhZ^Fx9*M=B_1E0t0(
z-b_d8sXzICNv~-f-u2!ePtB3~!1oO*pMZMk7Z7!})NWaQS020!)y;_;$Kp!{6=ihr
zF;q8G1dRk^MMrq*>5Wpsn3dY1vb0001-_zO$TPPxxBz!d-h002ovPDHLkV1jnCc$WYG
literal 0
HcmV?d00001
diff --git a/icons/obj/guns/overunder.dmi b/icons/obj/guns/faction/frontier/overunder.dmi
similarity index 100%
rename from icons/obj/guns/overunder.dmi
rename to icons/obj/guns/faction/frontier/overunder.dmi
diff --git a/icons/obj/guns/pockrifle.dmi b/icons/obj/guns/faction/frontier/pockrifle.dmi
similarity index 100%
rename from icons/obj/guns/pockrifle.dmi
rename to icons/obj/guns/faction/frontier/pockrifle.dmi
diff --git a/icons/obj/guns/shorty.dmi b/icons/obj/guns/faction/frontier/shorty.dmi
similarity index 100%
rename from icons/obj/guns/shorty.dmi
rename to icons/obj/guns/faction/frontier/shorty.dmi
diff --git a/icons/obj/guns/shotgun.dmi b/icons/obj/guns/faction/frontier/shotgun.dmi
similarity index 100%
rename from icons/obj/guns/shotgun.dmi
rename to icons/obj/guns/faction/frontier/shotgun.dmi
diff --git a/icons/obj/guns/zipgun.dmi b/icons/obj/guns/faction/frontier/zipgun.dmi
similarity index 100%
rename from icons/obj/guns/zipgun.dmi
rename to icons/obj/guns/faction/frontier/zipgun.dmi
diff --git a/icons/obj/guns/galatea_laser.dmi b/icons/obj/guns/faction/galatean_technocracy/galatea_laser.dmi
similarity index 100%
rename from icons/obj/guns/galatea_laser.dmi
rename to icons/obj/guns/faction/galatean_technocracy/galatea_laser.dmi
diff --git a/icons/obj/guns/galatea_nitro.dmi b/icons/obj/guns/faction/galatean_technocracy/galatea_nitro.dmi
similarity index 100%
rename from icons/obj/guns/galatea_nitro.dmi
rename to icons/obj/guns/faction/galatean_technocracy/galatea_nitro.dmi
diff --git a/icons/obj/guns/goldendeep_ornatepistol.dmi b/icons/obj/guns/faction/golden_deep/goldendeep_ornatepistol.dmi
similarity index 100%
rename from icons/obj/guns/goldendeep_ornatepistol.dmi
rename to icons/obj/guns/faction/golden_deep/goldendeep_ornatepistol.dmi
diff --git a/icons/obj/guns/cshotgun.dmi b/icons/obj/guns/faction/hephaestus_industries/cshotgun.dmi
similarity index 100%
rename from icons/obj/guns/cshotgun.dmi
rename to icons/obj/guns/faction/hephaestus_industries/cshotgun.dmi
diff --git a/icons/obj/guns/himeo_blaster.dmi b/icons/obj/guns/faction/himeo_free_consortium/himeo_blaster.dmi
similarity index 100%
rename from icons/obj/guns/himeo_blaster.dmi
rename to icons/obj/guns/faction/himeo_free_consortium/himeo_blaster.dmi
diff --git a/icons/obj/guns/himeo_pistol.dmi b/icons/obj/guns/faction/himeo_free_consortium/himeo_pistol.dmi
similarity index 100%
rename from icons/obj/guns/himeo_pistol.dmi
rename to icons/obj/guns/faction/himeo_free_consortium/himeo_pistol.dmi
diff --git a/icons/obj/guns/ipistol.dmi b/icons/obj/guns/faction/improvised/ipistol.dmi
similarity index 100%
rename from icons/obj/guns/ipistol.dmi
rename to icons/obj/guns/faction/improvised/ipistol.dmi
diff --git a/icons/obj/guns/ishotgun.dmi b/icons/obj/guns/faction/improvised/ishotgun.dmi
similarity index 100%
rename from icons/obj/guns/ishotgun.dmi
rename to icons/obj/guns/faction/improvised/ishotgun.dmi
diff --git a/icons/obj/guns/ismg.dmi b/icons/obj/guns/faction/improvised/ismg.dmi
similarity index 100%
rename from icons/obj/guns/ismg.dmi
rename to icons/obj/guns/faction/improvised/ismg.dmi
diff --git a/icons/obj/guns/hegemony_pistol.dmi b/icons/obj/guns/faction/izweski_hegemony/hegemony_pistol.dmi
similarity index 100%
rename from icons/obj/guns/hegemony_pistol.dmi
rename to icons/obj/guns/faction/izweski_hegemony/hegemony_pistol.dmi
diff --git a/icons/obj/guns/hegemony_rifle.dmi b/icons/obj/guns/faction/izweski_hegemony/hegemony_rifle.dmi
similarity index 100%
rename from icons/obj/guns/hegemony_rifle.dmi
rename to icons/obj/guns/faction/izweski_hegemony/hegemony_rifle.dmi
diff --git a/icons/obj/guns/unathi_ballistics.dmi b/icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi
similarity index 100%
rename from icons/obj/guns/unathi_ballistics.dmi
rename to icons/obj/guns/faction/izweski_hegemony/unathi_ballistics.dmi
diff --git a/icons/obj/guns/unathi_slugger.dmi b/icons/obj/guns/faction/izweski_hegemony/unathi_slugger.dmi
similarity index 100%
rename from icons/obj/guns/unathi_slugger.dmi
rename to icons/obj/guns/faction/izweski_hegemony/unathi_slugger.dmi
diff --git a/icons/obj/guns/konyang_weapons.dmi b/icons/obj/guns/faction/konyang/konyang_weapons.dmi
similarity index 100%
rename from icons/obj/guns/konyang_weapons.dmi
rename to icons/obj/guns/faction/konyang/konyang_weapons.dmi
diff --git a/icons/obj/guns/blaster_carbine.dmi b/icons/obj/guns/faction/nanotrasen_corporation/blaster_carbine.dmi
similarity index 100%
rename from icons/obj/guns/blaster_carbine.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/blaster_carbine.dmi
diff --git a/icons/obj/guns/blaster_pistol.dmi b/icons/obj/guns/faction/nanotrasen_corporation/blaster_pistol.dmi
similarity index 100%
rename from icons/obj/guns/blaster_pistol.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/blaster_pistol.dmi
diff --git a/icons/obj/guns/blaster_revolver.dmi b/icons/obj/guns/faction/nanotrasen_corporation/blaster_revolver.dmi
similarity index 100%
rename from icons/obj/guns/blaster_revolver.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/blaster_revolver.dmi
diff --git a/icons/obj/guns/blaster_rifle.dmi b/icons/obj/guns/faction/nanotrasen_corporation/blaster_rifle.dmi
similarity index 100%
rename from icons/obj/guns/blaster_rifle.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/blaster_rifle.dmi
diff --git a/icons/obj/guns/burst_rifle.dmi b/icons/obj/guns/faction/nanotrasen_corporation/burst_rifle.dmi
similarity index 100%
rename from icons/obj/guns/burst_rifle.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/burst_rifle.dmi
diff --git a/icons/obj/guns/detgun.dmi b/icons/obj/guns/faction/nanotrasen_corporation/detgun.dmi
similarity index 100%
rename from icons/obj/guns/detgun.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/detgun.dmi
diff --git a/icons/obj/guns/ecarbine.dmi b/icons/obj/guns/faction/nanotrasen_corporation/ecarbine.dmi
similarity index 100%
rename from icons/obj/guns/ecarbine.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/ecarbine.dmi
diff --git a/icons/obj/guns/epistol.dmi b/icons/obj/guns/faction/nanotrasen_corporation/epistol.dmi
similarity index 100%
rename from icons/obj/guns/epistol.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/epistol.dmi
diff --git a/icons/obj/guns/erifle.dmi b/icons/obj/guns/faction/nanotrasen_corporation/erifle.dmi
similarity index 100%
rename from icons/obj/guns/erifle.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/erifle.dmi
diff --git a/icons/obj/guns/leyon.dmi b/icons/obj/guns/faction/nanotrasen_corporation/everyman.dmi
similarity index 100%
rename from icons/obj/guns/leyon.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/everyman.dmi
diff --git a/icons/obj/guns/gauss_thumper.dmi b/icons/obj/guns/faction/nanotrasen_corporation/gauss_thumper.dmi
similarity index 100%
rename from icons/obj/guns/gauss_thumper.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/gauss_thumper.dmi
diff --git a/icons/obj/guns/ionrifle.dmi b/icons/obj/guns/faction/nanotrasen_corporation/ionrifle.dmi
similarity index 100%
rename from icons/obj/guns/ionrifle.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/ionrifle.dmi
diff --git a/icons/obj/guns/lasercannon.dmi b/icons/obj/guns/faction/nanotrasen_corporation/lasercannon.dmi
similarity index 100%
rename from icons/obj/guns/lasercannon.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/lasercannon.dmi
diff --git a/icons/obj/guns/laserrifle.dmi b/icons/obj/guns/faction/nanotrasen_corporation/laserrifle.dmi
similarity index 100%
rename from icons/obj/guns/laserrifle.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/laserrifle.dmi
diff --git a/icons/obj/guns/lasershotgun.dmi b/icons/obj/guns/faction/nanotrasen_corporation/lasershotgun.dmi
similarity index 100%
rename from icons/obj/guns/lasershotgun.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/lasershotgun.dmi
diff --git a/icons/obj/guns/sniper.dmi b/icons/obj/guns/faction/nanotrasen_corporation/nt_laser_sniper.dmi
similarity index 100%
rename from icons/obj/guns/sniper.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/nt_laser_sniper.dmi
diff --git a/icons/obj/guns/pestishock.dmi b/icons/obj/guns/faction/nanotrasen_corporation/pestishock.dmi
similarity index 100%
rename from icons/obj/guns/pestishock.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/pestishock.dmi
diff --git a/icons/obj/guns/pulse.dmi b/icons/obj/guns/faction/nanotrasen_corporation/pulse.dmi
similarity index 100%
rename from icons/obj/guns/pulse.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/pulse.dmi
diff --git a/icons/obj/guns/pulse_carbine.dmi b/icons/obj/guns/faction/nanotrasen_corporation/pulse_carbine.dmi
similarity index 100%
rename from icons/obj/guns/pulse_carbine.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/pulse_carbine.dmi
diff --git a/icons/obj/guns/pulse_pistol.dmi b/icons/obj/guns/faction/nanotrasen_corporation/pulse_pistol.dmi
similarity index 100%
rename from icons/obj/guns/pulse_pistol.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/pulse_pistol.dmi
diff --git a/icons/obj/guns/secgun.dmi b/icons/obj/guns/faction/nanotrasen_corporation/secgun.dmi
similarity index 100%
rename from icons/obj/guns/secgun.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/secgun.dmi
diff --git a/icons/obj/guns/secgun_wood.dmi b/icons/obj/guns/faction/nanotrasen_corporation/secgun_wood.dmi
similarity index 100%
rename from icons/obj/guns/secgun_wood.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/secgun_wood.dmi
diff --git a/icons/obj/guns/taser.dmi b/icons/obj/guns/faction/nanotrasen_corporation/stunpistol.dmi
similarity index 100%
rename from icons/obj/guns/taser.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/stunpistol.dmi
diff --git a/icons/obj/guns/stunrevolver.dmi b/icons/obj/guns/faction/nanotrasen_corporation/stunrevolver.dmi
similarity index 100%
rename from icons/obj/guns/stunrevolver.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/stunrevolver.dmi
diff --git a/icons/obj/guns/c05r.dmi b/icons/obj/guns/faction/nanotrasen_corporation/tanto.dmi
similarity index 100%
rename from icons/obj/guns/c05r.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/tanto.dmi
diff --git a/icons/obj/guns/x9.dmi b/icons/obj/guns/faction/nanotrasen_corporation/x9.dmi
similarity index 100%
rename from icons/obj/guns/x9.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/x9.dmi
diff --git a/icons/obj/guns/xenogun.dmi b/icons/obj/guns/faction/nanotrasen_corporation/xenogun.dmi
similarity index 100%
rename from icons/obj/guns/xenogun.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/xenogun.dmi
diff --git a/icons/obj/guns/xray.dmi b/icons/obj/guns/faction/nanotrasen_corporation/xray.dmi
similarity index 100%
rename from icons/obj/guns/xray.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/xray.dmi
diff --git a/icons/obj/guns/xrifle.dmi b/icons/obj/guns/faction/nanotrasen_corporation/xrifle.dmi
similarity index 100%
rename from icons/obj/guns/xrifle.dmi
rename to icons/obj/guns/faction/nanotrasen_corporation/xrifle.dmi
diff --git a/icons/obj/guns/adhomian_revolver.dmi b/icons/obj/guns/faction/nka/adhomian_revolver.dmi
similarity index 100%
rename from icons/obj/guns/adhomian_revolver.dmi
rename to icons/obj/guns/faction/nka/adhomian_revolver.dmi
diff --git a/icons/obj/guns/cannon.dmi b/icons/obj/guns/faction/nka/cannon.dmi
similarity index 100%
rename from icons/obj/guns/cannon.dmi
rename to icons/obj/guns/faction/nka/cannon.dmi
diff --git a/icons/obj/guns/nralakkpistol.dmi b/icons/obj/guns/faction/nralakk_federation/nralakkpistol.dmi
similarity index 100%
rename from icons/obj/guns/nralakkpistol.dmi
rename to icons/obj/guns/faction/nralakk_federation/nralakkpistol.dmi
diff --git a/icons/obj/guns/nralakksmg.dmi b/icons/obj/guns/faction/nralakk_federation/nralakksmg.dmi
similarity index 100%
rename from icons/obj/guns/nralakksmg.dmi
rename to icons/obj/guns/faction/nralakk_federation/nralakksmg.dmi
diff --git a/icons/obj/guns/adhomian_pistol.dmi b/icons/obj/guns/faction/pra/adhomian_pistol.dmi
similarity index 100%
rename from icons/obj/guns/adhomian_pistol.dmi
rename to icons/obj/guns/faction/pra/adhomian_pistol.dmi
diff --git a/icons/obj/guns/faction/pra/bolt.dmi b/icons/obj/guns/faction/pra/bolt.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..a14c4790a933afc0533104f3e14dea0bc7999a62
GIT binary patch
literal 1577
zcmV+^2G;qBP)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`
zEh^5;&r`5fFwryM;w;ZhDainFjJP;6QZv&tN`M?=Bd+3-#FA7XQz#Q*%;MQ%JN0u8lO?;*%0d
zQeIq)OS!UwtDg%v8UPb0dLgB;>kj|`1pY}xK~#90?VOF0qaYB3jUkx$@B6>(0&Yy)
zAkzc5CcE?1)uk?u<20Z-X{9IxK@bE%5Cq|~IF;vfc`ogrXUumgS(VCFUj*glR9?!{
zxxB0}-z6kfx;jqN^>(@4>f7zsTpRmQH>a6%LN6Ib6{0DlY*T$*H_f$ZjE1tQ?LX`0
zdTko}rJt6O-*%GL3_0C=YeN>r*6z8?*wFQi5B-^G!X&w$kenZphX*Z>X^^)
zXuH!JMG>d6>g>K`Sk+RRkQTin+7q-hUDy&97;jH*x2l-i=NOv#F7O%oBb)tBil`oc67
z=^00xhKlj_WsVj-4sTy(Y0=|A`ce=CK@bE%5Cq{}In*}V1(kcU=5SP1?WT!N+pa#4
z`*(7#U0KU$H%U}pt#xbYErS8Mr>Fb_UFohzwu`dpQ
z&GM}~)ctNlWt(#Wn>M2S1EUDa^9*gXEM{1sx!jgn5%2K9d1;rEm(N1lERY$dmcN(;
z{Da;eHpVieZHpF}#Lw@W#Crz^SVuoA@D`Bdh5**lzCYeR{~*x~`CaSC!>fOg?1pSx
zX1}87)j!DKhHP18`OUDc0@nUP4mZSaneAYP{USb_<+IH&FCT7(34$O9f*=TjAP9#N
zdrP_L@{GRi#L=Aet&5)>CDGtj$P?+
zX8TG=5pa2I!oGV7Sa$MB`Wfszq>W%(*kg9g=H2p_#`Po`^{(6eN?6F{8K1W~F@c%K
zb+FUF6|BA`KYauGOC2H!a(R{@WHR;900BwVn^0SOc0mhCZ4IITuqPF?kch&9dBZ!#
z7)*JB|K8IUf*=TjAPBC?;iA2Ik$rp&zoR%*xPn=W0e;(y>nz@S9Z8
zl8(J)BFgjd_LBJHUUkGiee|t*9(wL#IEAVxNe3=IWoV-$1!r8_gC&`P$A0=5=q3I$
z)p=nqZ3PazLp8A_5i|X575%VyE_jmE|CPiVczIl-2Rli^Q|5Aw?&%^Vh2NoRHA7NX
z*XSF*q>fsJOjo$ckl8g_Wrb_#e)>l*=nDV&-o-WI4m+}wSPLHR;u`U;wf0ORV>oW^
z-mVdlj_xF$q&I**m3S*{z5$BjyQ
z2Rj#Wt`S-%;PJq5uo)EP8liO-fFW`RkObaQMOiFxot)6mkwkes3sf9z21U6>c%AfA
z`yDb4c21%!7PwB@<5{5MU^6JrH3I8&^I4dBa|4>Qmw2ubUZ=~7g(6RWGY1~7iBacl
zbWl_64n$ImO5$29j5_m60#BwLB`G*`2TAOK2VKREl?25)*piTS(ySz6O3j)(
z$br}C0A{8ONRl;!urfKW(E?VdgPxe4%b=^(6{v~h8ZCfzx=?WCCP)*uXj0VVJ!6F_
zjfMhY;Mo*4c@Njg3Z-*lBX4g>8J7&RCleC)HUkeyh2`3P;N=^4@PDskT%*6XzONt%
bf>3+`fATkuB3~+@00000NkvXXu0mjff=}0g
literal 0
HcmV?d00001
diff --git a/icons/obj/guns/bolt_scope.dmi b/icons/obj/guns/faction/pra/bolt_scope.dmi
similarity index 100%
rename from icons/obj/guns/bolt_scope.dmi
rename to icons/obj/guns/faction/pra/bolt_scope.dmi
diff --git a/icons/obj/guns/tesla.dmi b/icons/obj/guns/faction/pra/elektrotek.dmi
similarity index 100%
rename from icons/obj/guns/tesla.dmi
rename to icons/obj/guns/faction/pra/elektrotek.dmi
diff --git a/icons/obj/guns/dragunov.dmi b/icons/obj/guns/faction/pra/hotaki.dmi
similarity index 100%
rename from icons/obj/guns/dragunov.dmi
rename to icons/obj/guns/faction/pra/hotaki.dmi
diff --git a/icons/obj/guns/icelance.dmi b/icons/obj/guns/faction/pra/icelance.dmi
similarity index 100%
rename from icons/obj/guns/icelance.dmi
rename to icons/obj/guns/faction/pra/icelance.dmi
diff --git a/icons/obj/guns/blockbuster.dmi b/icons/obj/guns/faction/pra/maidhaztha.dmi
similarity index 100%
rename from icons/obj/guns/blockbuster.dmi
rename to icons/obj/guns/faction/pra/maidhaztha.dmi
diff --git a/icons/obj/guns/adhomian_heavy_pistol.dmi b/icons/obj/guns/faction/pra/naltor_heavy_pistol.dmi
similarity index 100%
rename from icons/obj/guns/adhomian_heavy_pistol.dmi
rename to icons/obj/guns/faction/pra/naltor_heavy_pistol.dmi
diff --git a/icons/obj/guns/sol_pistol.dmi b/icons/obj/guns/faction/sol_alliance/sol_pistol.dmi
similarity index 100%
rename from icons/obj/guns/sol_pistol.dmi
rename to icons/obj/guns/faction/sol_alliance/sol_pistol.dmi
diff --git a/icons/obj/guns/sol_rifle.dmi b/icons/obj/guns/faction/sol_alliance/sol_rifle.dmi
similarity index 100%
rename from icons/obj/guns/sol_rifle.dmi
rename to icons/obj/guns/faction/sol_alliance/sol_rifle.dmi
diff --git a/icons/obj/guns/sol_shotgun.dmi b/icons/obj/guns/faction/sol_alliance/sol_shotgun.dmi
similarity index 100%
rename from icons/obj/guns/sol_shotgun.dmi
rename to icons/obj/guns/faction/sol_alliance/sol_shotgun.dmi
diff --git a/icons/obj/guns/sol_smg.dmi b/icons/obj/guns/faction/sol_alliance/sol_smg.dmi
similarity index 100%
rename from icons/obj/guns/sol_smg.dmi
rename to icons/obj/guns/faction/sol_alliance/sol_smg.dmi
diff --git a/icons/obj/guns/lawgiver.dmi b/icons/obj/guns/faction/stellar_corporate_conglomerate/combipistol.dmi
similarity index 100%
rename from icons/obj/guns/lawgiver.dmi
rename to icons/obj/guns/faction/stellar_corporate_conglomerate/combipistol.dmi
diff --git a/icons/obj/guns/erepeater.dmi b/icons/obj/guns/faction/stellar_corporate_conglomerate/erepeater.dmi
similarity index 100%
rename from icons/obj/guns/erepeater.dmi
rename to icons/obj/guns/faction/stellar_corporate_conglomerate/erepeater.dmi
diff --git a/icons/obj/guns/peac.dmi b/icons/obj/guns/faction/stellar_corporate_conglomerate/peac.dmi
similarity index 100%
rename from icons/obj/guns/peac.dmi
rename to icons/obj/guns/faction/stellar_corporate_conglomerate/peac.dmi
diff --git a/icons/obj/guns/sccpistol.dmi b/icons/obj/guns/faction/stellar_corporate_conglomerate/sccpistol.dmi
similarity index 100%
rename from icons/obj/guns/sccpistol.dmi
rename to icons/obj/guns/faction/stellar_corporate_conglomerate/sccpistol.dmi
diff --git a/icons/obj/guns/bluetag.dmi b/icons/obj/guns/faction/toy/bluetag.dmi
similarity index 100%
rename from icons/obj/guns/bluetag.dmi
rename to icons/obj/guns/faction/toy/bluetag.dmi
diff --git a/icons/obj/guns/redtag.dmi b/icons/obj/guns/faction/toy/redtag.dmi
similarity index 100%
rename from icons/obj/guns/redtag.dmi
rename to icons/obj/guns/faction/toy/redtag.dmi
diff --git a/icons/obj/guns/xenoblaster.dmi b/icons/obj/guns/faction/toy/xenoblaster.dmi
similarity index 100%
rename from icons/obj/guns/xenoblaster.dmi
rename to icons/obj/guns/faction/toy/xenoblaster.dmi
diff --git a/icons/obj/guns/gatling.dmi b/icons/obj/guns/faction/vaurca_hives/gatling_laser.dmi
similarity index 100%
rename from icons/obj/guns/gatling.dmi
rename to icons/obj/guns/faction/vaurca_hives/gatling_laser.dmi
diff --git a/icons/obj/guns/megaglaive.dmi b/icons/obj/guns/faction/vaurca_hives/megaglaive.dmi
similarity index 100%
rename from icons/obj/guns/megaglaive.dmi
rename to icons/obj/guns/faction/vaurca_hives/megaglaive.dmi
diff --git a/icons/obj/guns/blaster.dmi b/icons/obj/guns/faction/vaurca_hives/thermic_blaster.dmi
similarity index 100%
rename from icons/obj/guns/blaster.dmi
rename to icons/obj/guns/faction/vaurca_hives/thermic_blaster.dmi
diff --git a/icons/obj/guns/assaultshotgun.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/assaultshotgun.dmi
similarity index 100%
rename from icons/obj/guns/assaultshotgun.dmi
rename to icons/obj/guns/faction/zavodskoi_interstellar/assaultshotgun.dmi
diff --git a/icons/obj/guns/blaster_ar.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/blaster_ar.dmi
similarity index 100%
rename from icons/obj/guns/blaster_ar.dmi
rename to icons/obj/guns/faction/zavodskoi_interstellar/blaster_ar.dmi
diff --git a/icons/obj/guns/captain_revolver.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/captain_revolver.dmi
similarity index 100%
rename from icons/obj/guns/captain_revolver.dmi
rename to icons/obj/guns/faction/zavodskoi_interstellar/captain_revolver.dmi
diff --git a/icons/obj/guns/carbine.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/carbine.dmi
similarity index 100%
rename from icons/obj/guns/carbine.dmi
rename to icons/obj/guns/faction/zavodskoi_interstellar/carbine.dmi
diff --git a/icons/obj/guns/crew_laser.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/crew_laser.dmi
similarity index 100%
rename from icons/obj/guns/crew_laser.dmi
rename to icons/obj/guns/faction/zavodskoi_interstellar/crew_laser.dmi
diff --git a/icons/obj/guns/crew_rifle.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/crew_rifle.dmi
similarity index 100%
rename from icons/obj/guns/crew_rifle.dmi
rename to icons/obj/guns/faction/zavodskoi_interstellar/crew_rifle.dmi
diff --git a/icons/obj/guns/faction/zavodskoi_interstellar/pistol.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/pistol.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..1b7e42f4a2429ea8d3ff9cb8c5bdf6d653fa7a4c
GIT binary patch
literal 1070
zcmV+}1kwA6P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS
z%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sUWksBtJ)qi!&v&s2C_<
z$iV_Y=>-48X00RO^L_t(|ob8*9a;qQ^g#jg+k~HuCwgvUJ
zqU_4g8gD!2%S=0Q**y!GbmmZ%0ssI2JlYteb=UWOrzfn{Y|z+%smxX?$`|N=s&7Mi
zWBWkYX*Ou*Ug!ZvGubA}Z^!E1FH`5WI%B)()qfXH2UjbY9-wJD4VoEdfabFGPrd{=y)Ol}LB5bfdTWSX5FbsDU
zGsjVrS=6Jh#73Gr><=LP}zFBUrHAP=gqgS{Mcca3qC@7Kt@nQD;Yn>cR
z>yP6-tWa8?42tACm$-v0vjdOE=E4v({7ssK4T|LZ9S99if82k5FcWZ37fX!G8YT6)
zpiF-9Gt7R7-80&QNrPNKE+~_)rrT==HTE;ybkPj%!$51WL7Dtgb~Er_SpzA-24(VV
z@H5!T(1SC+lUwu4amPad0000000000004;Cn%lol|4F-IJLkS(RE>Tf8*@8~WYx|b
zR-hj)d^S~>%j7n;Ezqj}c=~*oU%{nk;QMzOo$USnR{dGHU(rqUO;{i$)GF#qTPLD~P;*XZvCrpM701pBYj-$NauP!Xno
zS8;w2RH);!+=IM|2q9Q?e&7@}Z8~xa4PtcaTW0_O0000000000@YlK8-*0!$+3KhJ
z`@DWe>5KjSG6%ji{|)|rd;eU43V%NpP)CmrRCC~fSNZ$tKsr+8z_0UJ2mE}0ztVwU
o=kw8%{rz*za`^iI0PvUj0%M;k!`lkCYybcN07*qoM6N<$f`ke2{r~^~
literal 0
HcmV?d00001
diff --git a/icons/obj/guns/revolver.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/revolver.dmi
similarity index 100%
rename from icons/obj/guns/revolver.dmi
rename to icons/obj/guns/faction/zavodskoi_interstellar/revolver.dmi
diff --git a/icons/obj/guns/tranqsniper.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/tranqsniper.dmi
similarity index 100%
rename from icons/obj/guns/tranqsniper.dmi
rename to icons/obj/guns/faction/zavodskoi_interstellar/tranqsniper.dmi
diff --git a/icons/obj/guns/w556.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/w556.dmi
similarity index 100%
rename from icons/obj/guns/w556.dmi
rename to icons/obj/guns/faction/zavodskoi_interstellar/w556.dmi
diff --git a/icons/obj/guns/wt550.dmi b/icons/obj/guns/faction/zavodskoi_interstellar/wt550.dmi
similarity index 100%
rename from icons/obj/guns/wt550.dmi
rename to icons/obj/guns/faction/zavodskoi_interstellar/wt550.dmi
diff --git a/icons/obj/guns/leveraction.dmi b/icons/obj/guns/leveraction.dmi
deleted file mode 100644
index da4583fb91eafb389f4cfaf6c503881e74f483df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1447
zcmV;Y1z7rtP)C;)gc
z0C{1j7zz)f~%hkI7R`p
z369L7D6Dq?00bjRL_t(|ob8*9cA_v4h54zX713JSQe2B@_x)dS6VUFdhDki~Z>dU-}6nP!=9-J>w9CQyQ
zH&O=cF6XbvCRQiOwD+G2L*pAMVc;`X%J+YaqCsuc`9A8>d|C0&HXG`uh)y0&1Ny1rRi&y
z3$iz}0^U25uhMt36vi2CbAL!##p<&timWX2Y-?7)pCDIPu*$_b4xJf!xrH9F-AN23
ziQMIv;_z3=RMeT#Np4dV6^LFPXLOd^kjo16SDBO1Wo}LdE_&_CaW6#x0000000000
z002B1Hg?WT`_e!2;AG}>oNrv6eJ%!gPUrGr3nB40000000000
zfRUpxo^JM{?rCO8Pbt;;P?Gb(E;CD!Q|oPA;b583iMMuj(QB&lp(KqLbzQmAi!$-H
zu5h=^sPUn)q9|w|N`cyovhcS4<8GNz<3mX!%Fu`UjoOQ{^|o4uu*}Fk16XF{9{a#R9Nn(_!8-FuB=u?t)3rbS<%`8QUy**=pcgVi)DT%Sx$o~D2<@c0i
zz1E1sj+B(U{~Q^wHDa;LiRDBY6~M({tq~7@k_@r`OMLg2sF)1s8OA>sJE~$b00000
z0N}ppCki;TO>~={=O!OdQl_Z
zw;UJHlCm<`+a#2mVM_`!#whuHzT7~PeNxJf=@)XCNV`aZUrD5aMA}6PJWHZr_zX4U
zD%=y&TTwNEB*##_Gu)t|8%PW@2>uZO008hH`~yM#P|-Pd9!~%O002ovPDHLkV1lF<
Bgb)A#
diff --git a/icons/obj/guns/moistnugget.dmi b/icons/obj/guns/moistnugget.dmi
deleted file mode 100644
index ed17a79327836592ecff72c9c98d1b9dc134e216..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1457
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
CAx2LC
diff --git a/icons/obj/guns/oldlaser.dmi b/icons/obj/guns/oldlaser.dmi
deleted file mode 100644
index 471ab78b6e34136e63a82977a62fe507d2e54668..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5432
zcmcJTXH-+$w#PTUiBSPTDG?9nfJZP`=p}FjK>O6$R4+~It>6q&{tqaQXKlES-x_DE*%)>bJ13QQRv8^i_t;hVE_=HfB(ZXY2u!3
z$+K=nbG9R=hpY}Y-MgBpe(Bntz$$NLr=Z1&xVInFgYqWi1>CK*SI@+)*aW5&nupjY
zwO_f+d8>5^lclOvF8V8pQ`Og}=~tkmrM2LF`K12NdrELQt(kl0i`&Ux+N8;``?L<~
ze^t~fhYe%w-%crieyE@vghzb|L7IrMgO-r&jyHe!{F(Y(`QH0o(nWh0_TD&WYp-)E
z_R4c3?zM*>(sf=Ob)<~-3s3~s;cx(uKYZNE(m6hVc`7_aB?cqGpogdg3Qx?)IEbY#
z`+7Dwc!zGikx>2}^XSi&t_`u~^31M%>#g$%vn9$ADeq*wj+{m@gqgLHjW>(qN9yOD
z%XY$BI}o*%mybJFc0WBohYSkj1@u~;sNFtxHZ`!-Byo0E!iY%=YlT##3bq$12B3@B
zITU&he*&MSR3l@rhWP1XNvhOY2I>4jtj>GE-w%DZvh@PRY(DhJVZMH@JJKC
zY!Lir3bjV2=dQtx)Y250^t7}Y9AGM0-4-gii(`TjzM`W5PpF>75`!;MlyYa
zbEHuedUR##RRa3}Ff;gz4FiS8Z%id}0RR^<|GQd*ZS7(hS&6%{S}aU|*MUX|nUr))
zeHm_KV^_t#Z(=(^dRLX}Drc6MHxk~4Q9u|Dfy!?Bv8sq#aCQIY%&TpdUzV0XU?e+V)a#0+DkH#ouG>@eI?IFko^=MKE3
z7~j-Nb_}1ih&uCWyp%N5-|sFg+(FS(?Jf}!Id)1|Usc@Se`LqScUWW+{oo|~tUPeh
zF-K(3*!ZP0j>WjZYdgv(6G_a83{_&dP03h565rf#tx`~k?qMJX1Dn+1o56&BrpHI~
z(c6M)3?H{4-Qg-2p|k}z2y#Ak(!jF=;3HcWQX+}Z9F+xL#V+qwyYzXxy`v+V(mq$#
zU*pku)7+o(WFTz%&GJN}P_@?yqc+?^e@?Ny-%mMglTL!oj5h>t@YV)|fYCaX&5_+*
zb8~xFCY!Ewby;g4I50O-<8k9yiD4q=#n9N;jqdJaK*#-xec0Hw-(sf|5Mh+|^uqxp
zTbA_$OcB$qh&ffF_3lBE^o6@8_*eFnCgpEWKejp^TvwwrbKlkLATZO1AXuT%zid@A
zy>S~Uc(q`XUp>ItJ6dM5`4+CXWIw4^qy%6_`0tgln>Umgk9V!+ytbO+0qD}g-iOhoaPBZceu3>
zARm5t>K39skT%^m@k!qIXXr*ZiP8x!ot)|}`96Z%4h}F;QI$Tg-TVyt&`(!E3&#k>>HMo+4
z-c#mKKaFy8>trsCR(S|5;mwyutxm}wJtdE(k_zIz2h{rg@$uSfJ$bn!cW6t&V@kpb
zI2rE%&#hz~1VV&CjVplOBNR>!wFoyIIEj}S|E%G4LgV7*JB1^9db>nKM1m1KJuzSg
z+c-4P1x5!;ObJ3BkWB%Wb6!t)*Bpl-d$MRnjtdAk{xh7VScsV^0C
zG~LuVnQy2rv<2AvcoikOcZZTlvaL7t>#u{r4bg63&);Ggdm!?t#p7Ue%l+1e5@$}9
zqHp(l`hy}%LR@y_Q+G2S%
zxmfF1u=c`61mSY$fO|vvx>BEbvUZ=5=RkFI+4GO}adFWySo^Gj94h~uqrCO0v?wZR7l%==-WNHnS)<+8U0(?K
zs6f<(cQH2idDjHRhSh$Js(Ge_!C-W&m-K4z`NL)(WbvTay^HU=1pzNVfY&37oU_{Q
zTI!@1+0aw2cD!~J_D;*l*m-T3HmR~Q!SvW*e2mwqt1MJ`luJv`A3lPm-ZoZoe2qb?
z&aZz#%{n5|OI%&5lC<^6xA^Y6C0~NTi01UT8y^`Pq|&>4#EtY#EpWr{Ee9F1=?cwd
znC8GL{j88&*!x-h(@|TE<~?K|)b~xji_y`}kr-y<`JBSPCdsKUo*vJcz2I6WOiR$!
z(_3CRn$V3YK3`bac`iURS5KDH6s3SnVA^*Z-cftKY3174mt?_5Y;NxVbU2=XmvhJ!
zPmCWMzW1Eo>HC%wZidib!VL!Mx;=>c^ZBTfJ!~2JU&boVex{9m7XAWS*lPCDwPLOA
z>9&N3@=`H0ls*-eo9Yh4v9Ym?KjBgHYQBmK5nNViPt_faA4PF<&Kg@;smm@60e#){
zhkOy$a!74Ha_r;fGKAL~Sr==J%#wD%yjnItu2s6i)ngggDW%gFS?lQX%az5)s-dCF
zZx8eR`7%Xwi*VBnh=RXl^$s!j7bR}x+?JEFH}1EjRPIPfw*O5ocfE0p{Y5iXw6=Oh
zMqFH6Wz?spt)@m5DKj{3w@&zM+$Xi9W=K8(ju!6GJX3+Sv5^40lP*A+pQkQV&elW%
zzK3@80vB7Gc9E}%0TwnkDba`SSAOk@^<(XcelIb?{xXo8_pH7hVVHA5p)Iq(zI03Q
zvW&V%LaM-|7N4(6|0}Cz9k<+@_@d-!t`b}V(ALqp5D_F5?tJ%=LL^Eu6+#19&Vvd7l{g9>|N7tndo3-0T@=ddhT4qk;n(%T#
z4oADc2qxHj`uVsjd+^q=D-q^ARxS)49AxR5v&m3?23|{GBo)iZsITCH?PN%(R>_7p
z?egb^E<(@c!H|u;*mx5bAs)8#k77-2t>E$8#^nvQ&0I(pm
z6by#Uh5t0~SZKh5q?aGT20)S<5=}~pdr8K|+l`Hq1SS*JptXTes;vso<8KD^|6B@x
zaLsZ!0Bk$;FYD30wd={AKP*n&I}b7R#R2P6kvEG!V~xd+o_dJ_9>@Zu6xbAYBi{%v
zSZRu)uJ~V1p}%{MZ5;2(@-r%1%DKN1_G^Gr)mo>lNc+}zPV&D}cHgr0r!L(5_OjdO
zZed~JjoKw6w+CiY!VqVO&FwxcN@GJF)zfQ~+1ez**qgljU1H|i>`?=_xsMw9N~k$@
zIQ(GDe5RUOQ;=S*Z~-GzcL<-OCk+xV_73ITc!n96xA;9P?z>`|sGU`!<{
z(kyRKiFV-yCa$Y4KQQ{O9Q?IvoP+SYp5oai4P`_Te>7%FY3PWCvB^OrGm(x>u@AD=
zC7lqdIGJsR!3RvW*Jfc2FTAV!Rn||0OkSbsXTv}d7tc$5s?3GE
zds6?4fxdUgzp&au0bAEtY8%;6V=Y~AGXp65Z=Z|
zQ!E{_#^)n^@#M?RUQ@~1uY@I+eoD!o^6=pfsqOV
z-@5k|*BkTTj1SC|PH-`p9=T3vyC~EfuY%fiiVMB++Ef|J!U8gtI8aBw1<~nuOpIyH
zi7zz`1B$h6wM9IOUV$CNwwqpheYC&I_>Dzz5X!K1O}iM64|vNY*AE<{V&emTT_7r&
zRosq^w!Pp5!OJz8XSv)7VJ8jM{Nij}Z%-SdS<2RGuAJLvviJMe|BrqoyGm%=`j$=1
z_UlrAc5pRDVO0zHCiX8>x@S6P1+pB
zjnai|cWBsVMxV8_8S<^8XZb<-qHCs?iVvcH^T1D(Y1SE%(i$DM*EY9TR*uyLWf!&z
z1MQ@zb=Nd%1OrJrvU=pDgv2V4`)L~52l;0SMxE!YVf;89KzgBDS$s$8fh|u{G|aMA
z`M-Nd{yC24Y{gHg=9!roxH3~8Ej342e7ZQDvdIV|kAZ8c2UKifmIJ<6f^>F%E~~oz
zOnCmQLGUUxUCfc}#3XE7qYsw5su?l+TH>o6YoTG?$>H$C{tNHZ!j0nJHgJ;q!y1oe
zd1z+4m8=x;c9sc{QL`dEW3o&XnCO<$28Io@OAIX6Da>%8>LTG*_H_9@&ukk=o=~5&
z-NmJH#7JjH@>b`Qu*>sWI>v7V-8yIxe*%3#fY60QXNQTIwdU>TZaz!eH
zMo?xNETt>=s5*nnlUUvT{J(~CmSHsVmG%35Py?fDbm(%t>B{E*`gyu~NR$A!IFV(7!O%iu|?H>l=b#wx?XJ!a=U*ZntJ>t;G2w^w;d&1~s8tt`d
z@;CpN5}uUXRHT}9->1aM
za0v(Oe~7^lp5&RmKy10jM=3rPv=}RIJ68n5owXxM2AcC$rdk-`U{WuhGeTpP8D~7m
zhoP1vwG(7JS|DYhK_aBnT0oza;wWkgpRVGZ#7`6q8N-u4ltH&6zJcBye0K2u^Z!}2jSBWG+b!)?vX6YZ9$6wZ9z(@JL$AGJJl_4?eQv^>VXmrmb^Awr8tC*
zH+TjP%T$7e{JqLzOktlhgy_6={|XQV-9~nB2mRs<_zd51Jyt1?LjeDlnAH_T}9gt
zaf>E4BJiL!yw0Xp?8lg>2y^U@a#pN$X>IizYdGd8xJJbMrrGzL?s$3Roc*`O#kGevu81YeDWM4V7P6FKLSm=LbN
zh?`>fHSCAHK*&FUyx2F0JN`3S>zNcLXKPyo%}$5U&Z;Wu%wHg)UNM9?!jKNnCL;YC
z^Yqf7f)S#ZHaIxw#C!479$Z@x&>8cFDjZZ)VjTv*EO6*ZUz?o}DTL9F@!$J5wnR*x
zO^3$l58dg{bBF=?8uc7L(rFCrTz9f^8NLB$i{^7s!F&gd+|BlTbKlG$x9SRA=H-g0
z#Fh$YP;QA!-*o@^$nuB0)21yiK4UjHm9vdIxCp4P#a`-)t`fx3(hJHc9+Bo){*dG!
zseE>*XV?&>w(Z#~jNF|YzvGv~gm;{Z|F;b(3sfx5WbQc`kN$BmdffV?RqY?%m;V85
C2adY{
diff --git a/icons/obj/guns/pistol.dmi b/icons/obj/guns/pistol.dmi
deleted file mode 100644
index 7cb919f1b9b4bf5004b6d221bc27a4f40f9cb2b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1055
zcmV+)1mOFLP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS
z%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sUWksBtJ)qi!&v&s2C_<
z$iV_Y=>-48X00Q$#L_t(|ob8)|a_S%uMS%npi`M`D+d`tx
zpe$JyFnyhSoN31_yLW+TXD*FW0001hHpXZ@jN>@y1#9(Q+}MB-W-Il~Z_xiz+=kl5
zj)7s&dvUw=LPU+uXPak!Jywr?jRr3?7&|Plaa%bZf2?3Ss>gh`zu0UC{DwZ($SbT%
z5ZdRzM-pSVY{00+HCwsq3htSTtvxXh7%WlFn+vSrLc68m?SRo&;%WgG;d77rP
z3IeHp?HyN-@1%%=Y0jsUmry<&9b9}`lpvHcOo9;P-^E71zddCICGw|P6Q?7pRxDY>sNFzJAcU*+q
z9|8aX0000000000K*VK#$nVy_(yrKrRh&0UqR(S%ZofuYwVA^T^uvYkstRivZeyjB&{wiFs07m-RRDzj-hY`*-`3yHm*Lefwdq^?`?)gA{$(vR
z^7nB}0000000000008jca`a;bEHXAdWjXIAHqz%o`}BDSyz)e$uukxS=_3fqqXX=N
z2eE#XADsTwxKKF%=m0_4|JO_O-v*|~(G?o@FVcU9Iz*u&nf{&N{2-`M$7S4uJVAsI
z6rCS9MNONIbfH3wPW|W%00000000000090vNBjHr&Uv>gKS3uzJrvhs4(E%|#4!FqQPY2QwkpsWY&pP1!{e7VWzs=7_JNx^6&2sqr008ip
Z`2l#YDZ_t2eIft=002ovPDHLkV1i>JNI*DPSRgnsNDzov5TKhoby)xa00DGTPE!Ct
z=GbNc004=4R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM
z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSxF9n-wIrh`zdW_bK#7YpC9|j)C~nBb
znO2mTn+joLRc%O;Y9o?V8GCML5+fE4cc(fCCZ$W-nz!$2^lr00079
zNklc#16#an~I$kWRO=rnEfNS{zX>^9(py&-cbEJqG@F-bJMoC5ik5!rO
z1&r)Lk;9atu`vF*3SRBF~T?IifI)~4KU=lg;-7Jn{KYBfP
z!Z^Nl-?^^K9p|3L-=E~*xN+=7^C*fu&kMaBzxh1>`sJJ8HzzqjdvA%@(jp;V1i(B`U2_XJuMny6G7ZHmujr%Pz1_SH`S
zG+*Jv6C*4tnn7LdGzeq(sT-h#rIm6(w8(4yS`Z!-qElMjgL!3}0n5}q&@!)KqZq+2sc*Be%3VtC!V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+
z(=$pSoZ^zil2jm5skpSDpeVJtIKN1Vi!&v&s2C_{$iOJ@$TTz__%HEs)9p0000<
KMNUMnLSTY@OQ$ga
diff --git a/icons/obj/guns/taserold.dmi b/icons/obj/guns/taserold.dmi
deleted file mode 100644
index 4ce4c34678b446d1f6cc3416da964d6de2a6f717..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1462
zcmYk6X;4#F6o6kui$W1xsT2souvALO6l0Va5-C^$ma3pYWmC!~g&;d=HfeDKagz(91i2^8mk8g1cDv_=9p-60bplmw|)C|M@L5s3yaPy|;g25`|7LkSa*(gF}
zW4to&_>?=d0UM_ss7ty`ajJN^M;`yDM}==aiAj7!G$~Vgm$vTysG93L
zbEy~r)>A0nhk~*zXGf9($FZN~jd{D)73XDSJ+@!e>!o+<@_uz>P;QwQtF2-yQ8=fr
zCdI|TdKf;8tNg8MZ0u2vynA5n_3LObwXi~IZAHb%cQs<<$gGFd2Jgo7@`j3%h+Uap
z2dZNf(kW}a<9t>$#go*RPk`F;?wmeXAo
zd(mr$bp6RZh}QXrI4haK5oVtZ)B9=02B`32ClaSrXNQwEy;eb|dV=rcr{1`mJFB6I
zUzog!X#uJ56(^NN4xS^Ne->vO#`ar$>lmQ0ZDS8-ty8VJLbItO)lR*V?nbSH|A^p}
z%e{BAa#=Vuw+#!@{h9S)&0tS8!=1~fT>(vwFsUSEcUBb{C%{j-w1zcHtY?M&|G|APb5VhCXsM_
zCTmhNpn@&6%it}JQrXQ})Z|_l;F{juJ-Fqn&j=Emp;Ihp!0CaY)2hAqhr_TBsL#@7`T}h0^=`cqzqXP_iNsUCnKYm!PBf$cH>&a
zq18{OCnlNV=Kh*EOYiQ+_cv}Pi;GBY9A!gIpOTf?ZYj;mXAo}5M@Jx(mL9jEDpHdb
zLqE-oJQtBQAJDJLk!yJ4n&FPtofZ$_@~f7zlFdAqGcZx5YoD79*M(%zk*QSjFf+mf
z`4LS@jqiKUD~w*V4HXiFqpt6~Id;A*+#c2w@llFB{HvlfYc_4O|xuCi?$}
zC0000{P)t-sz`(#R
zEiEHyE-$)XV`F0$78b9XgNTTTBSkJRb3VVnzY7Zsr*1_eAt66MKhtU@X=!Qyk0qf{
z8&gwLP*6}QDJd!`DIg#qcXxNdz`(%3z(dr+g8%>k0d!JMQvg8b*k%9#0F8Q7Sad{X
zb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1V_YArAl*)NW$qW=vK900GiTL_t(|ob8%X
zbAm7sgp)R@tua?yErI|4N1KSlNZ^7H0`1IxKImi*ZVmXbhe7}Vz@I?Mm)G_smC{oqEKMTJKae4dt~X3k(R#6Qh$p|>!IXwq1#3B71o}Ow%h8yfb>-eO~yz%8?%S5
z#nl&t5McDl-Bn*AO?G~u?_$L0001XC*=2#-uZmrs+^wP
zKjin2-uZmrs$9O$B|G2elAZ6f4P@v0Tvo{U*%os1eZGObd>>OS=%1DEBb=-I3-x$i
zuR%_}kEvbLUufKP{|tRV)%3TZPWNBmfWHSG_rQPuDt%iN$@gyXVPl-@zwhN>zy1IK
z00000fd331<2YsRJRr>=-FMVX%;DBqCgufky6-EM06KOkbN~PV
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/unused/energy.dmi
similarity index 100%
rename from icons/obj/guns/energy.dmi
rename to icons/obj/guns/unused/energy.dmi
diff --git a/icons/obj/guns/incinerator.dmi b/icons/obj/guns/unused/incinerator.dmi
similarity index 100%
rename from icons/obj/guns/incinerator.dmi
rename to icons/obj/guns/unused/incinerator.dmi
diff --git a/icons/obj/guns/m1911.dmi b/icons/obj/guns/unused/m1911.dmi
similarity index 100%
rename from icons/obj/guns/m1911.dmi
rename to icons/obj/guns/unused/m1911.dmi
diff --git a/icons/obj/guns/p08.dmi b/icons/obj/guns/unused/p08.dmi
similarity index 100%
rename from icons/obj/guns/p08.dmi
rename to icons/obj/guns/unused/p08.dmi
diff --git a/icons/obj/random.dmi b/icons/obj/random.dmi
index d744fa29581627a68ccee8970dddc2a093abc564..b88489452d0f565a4859d59e023f00b4611a04b0 100644
GIT binary patch
literal 64634
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