diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
index 9c3e4c090eb6..12fdf42c7d44 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
@@ -193,7 +193,7 @@
pixel_x = 6;
pixel_y = -6
},
-/obj/item/gun/ballistic/automatic/pistol/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{
name = "bible gun";
pixel_x = -7;
pixel_y = -8;
diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
index 2b04f2a3edb1..f5214804dbbd 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -5613,7 +5613,7 @@
/obj/structure/closet,
/obj/item/clothing/suit/armor/ngr/captain,
/obj/item/clothing/under/syndicate/ngr/officer,
-/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/turf/open/floor/wood{
@@ -5787,7 +5787,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"Nh" = (
/obj/structure/filingcabinet,
-/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/turf/open/floor/mineral/plastitanium,
diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
index e8f075b9005d..fce0a7d6904d 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -3173,7 +3173,7 @@
/obj/structure/closet/cabinet,
/obj/item/hatchet/wooden,
/obj/item/ammo_box/a357,
-/obj/item/gun/ballistic/revolver,
+/obj/item/gun/ballistic/revolver/syndicate,
/turf/open/floor/wood,
/area/ship/bridge)
"VM" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
index 6418550c8e7e..ce83713f82bb 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
@@ -1108,7 +1108,7 @@
"Il" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort)
"Iv" = (
diff --git a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
index 3585b4dcc1e3..d728c3de53f5 100644
--- a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
+++ b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -601,7 +601,7 @@
/area/ruin/space/has_grav/corporatemine/crewquarters)
"nN" = (
/obj/structure/closet/cabinet,
-/obj/item/gun/ballistic/automatic/pistol/suppressed,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/clothing/under/syndicate/donk,
/obj/item/clothing/suit/hazardvest/donk/qm,
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index b37a44a0c8f6..ff8c37d19e96 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -1084,11 +1084,11 @@
/area/centcom/control)
"apm" = (
/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
pixel_x = 1;
pixel_y = 4
},
-/obj/item/gun/ballistic/automatic/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
pixel_x = -4;
pixel_y = -2
},
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
index d5ed70873819..870a12949973 100644
--- a/_maps/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -3429,7 +3429,7 @@
/obj/item/ammo_box/magazine/gal{
pixel_x = 5
},
-/obj/item/gun/ballistic/automatic/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
pixel_x = -8;
pixel_y = 3
},
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 6a4cf55d36b7..7c323e43dbe0 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -2725,8 +2725,8 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering)
"yH" = (
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/item/gun/ballistic/automatic/pistol{
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/gun/ballistic/automatic/pistol/syndicate{
pixel_y = 3
},
/obj/effect/turf_decal/industrial/fire{
@@ -2875,7 +2875,7 @@
/obj/effect/turf_decal/borderfloor{
dir = 1
},
-/obj/item/gun/ballistic/automatic/pistol{
+/obj/item/gun/ballistic/automatic/pistol/syndicate{
pixel_y = 3
},
/obj/item/ammo_box/magazine/m10mm,
@@ -3124,7 +3124,7 @@
},
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
/obj/item/clothing/glasses/thermal/eyepatch,
-/obj/item/gun/ballistic/revolver,
+/obj/item/gun/ballistic/revolver/syndicate,
/obj/item/clothing/under/syndicate/sniper,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
diff --git a/_maps/shuttles/syndicate/syndicate_litieguai.dmm b/_maps/shuttles/syndicate/syndicate_litieguai.dmm
index a7e6bb4dbcf5..c2e92f15f167 100644
--- a/_maps/shuttles/syndicate/syndicate_litieguai.dmm
+++ b/_maps/shuttles/syndicate/syndicate_litieguai.dmm
@@ -1038,9 +1038,9 @@
/obj/item/ammo_box/magazine/m10mm/ap,
/obj/item/ammo_box/magazine/m10mm/ap,
/obj/item/ammo_box/magazine/m10mm/ap,
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/machinery/light/small/directional/east,
/turf/open/floor/plasteel/tech,
/area/ship/crew)
@@ -1500,7 +1500,7 @@
/obj/item/gun/syringe,
/obj/item/reagent_containers/glass/bottle/sodium_thiopental,
/obj/item/clothing/glasses/hud/health/night,
-/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/clothing/gloves/color/latex/nitrile/evil,
/obj/item/clothing/suit/toggle/labcoat/raincoat,
/obj/item/clothing/shoes/combat,
@@ -2849,7 +2849,7 @@
name = "captain's closet";
req_access_txt = "20"
},
-/obj/item/gun/ballistic/revolver,
+/obj/item/gun/ballistic/revolver/syndicate,
/obj/item/clothing/suit/armor/vest/capcarapace/cybersun,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/head/HoS/cybersun,
diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index 885275c10d50..9967d69f6d07 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -906,7 +906,7 @@
},
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/head/helmet/operator,
-/obj/item/gun/ballistic/automatic/pistol/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/storage/belt/security/webbing{
@@ -1826,7 +1826,7 @@
"kH" = (
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/head/helmet/operator,
-/obj/item/gun/ballistic/automatic/pistol/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/storage/belt/security/webbing{
@@ -2766,7 +2766,7 @@
},
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/head/helmet/operator,
-/obj/item/gun/ballistic/automatic/pistol/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/storage/belt/security/webbing{
@@ -4641,7 +4641,7 @@
},
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/head/helmet/operator,
-/obj/item/gun/ballistic/automatic/pistol/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/storage/belt/security/webbing{
@@ -4672,7 +4672,7 @@
pixel_x = 6;
pixel_y = 1
},
-/obj/item/gun/ballistic/automatic/sniper_rifle/syndicate/no_mag{
+/obj/item/gun/ballistic/automatic/marksman/sniper_rifle/no_mag{
pixel_x = -3;
pixel_y = 6
},
@@ -5622,11 +5622,11 @@
/obj/item/ammo_box/magazine/ebr{
pixel_y = -2
},
-/obj/item/gun/ballistic/automatic/ebr/no_mag{
+/obj/item/gun/ballistic/automatic/marksman/ebr/no_mag{
pixel_x = -7;
pixel_y = 4
},
-/obj/item/gun/ballistic/automatic/ebr/no_mag,
+/obj/item/gun/ballistic/automatic/marksman/ebr/no_mag,
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
"Gn" = (
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index ce224d44e4e5..32a74c843b01 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -143,7 +143,7 @@
original_parent = parent
. = ..()
can_hold = typecacheof(list(
- /obj/item/gun/ballistic/automatic/pistol,
+ /obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 992f97ba700b..85ab6ee64a14 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -118,7 +118,7 @@
ears = /obj/item/radio/headset/syndicate/alt
l_pocket = /obj/item/modular_computer/tablet/nukeops
id = /obj/item/card/id/syndicate
- belt = /obj/item/gun/ballistic/automatic/pistol
+ belt = /obj/item/gun/ballistic/automatic/pistol/syndicate
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/kitchen/knife/combat/survival)
@@ -168,7 +168,7 @@
r_hand = /obj/item/gun/ballistic/shotgun/bulldog
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/tank/jetpack/oxygen/harness=1,\
- /obj/item/gun/ballistic/automatic/pistol=1,\
+ /obj/item/gun/ballistic/automatic/pistol/syndicate=1,\
/obj/item/kitchen/knife/combat/survival)
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 08d1514f7bbe..db99d0c4e4d8 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -50,14 +50,14 @@
lootdoubles = FALSE
loot = list(
- /obj/item/gun/ballistic/automatic/pistol = 8,
+ /obj/item/gun/ballistic/automatic/pistol/syndicate = 8,
/obj/item/gun/ballistic/shotgun/automatic/combat = 5,
/obj/item/gun/ballistic/automatic/pistol/deagle,
/obj/item/gun/ballistic/revolver/mateba
)
/obj/effect/spawner/lootdrop/armory_contraband/metastation
- loot = list(/obj/item/gun/ballistic/automatic/pistol = 5,
+ loot = list(/obj/item/gun/ballistic/automatic/pistol/syndicate = 5,
/obj/item/gun/ballistic/shotgun/automatic/combat = 5,
/obj/item/gun/ballistic/automatic/pistol/deagle,
/obj/item/storage/box/syndie_kit/throwing_weapons = 3,
@@ -115,7 +115,6 @@
/obj/effect/spawner/lootdrop/gambling
name = "gambling valuables spawner"
loot = list(
- /obj/item/gun/ballistic/revolver/russian = 5,
/obj/item/clothing/head/trapper = 3,
/obj/item/storage/box/syndie_kit/throwing_weapons,
/obj/item/coin/gold,
diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm
index 895b94acf574..f55613dd4d21 100644
--- a/code/game/objects/items/storage/briefcase.dm
+++ b/code/game/objects/items/storage/briefcase.dm
@@ -42,7 +42,7 @@
/obj/item/storage/briefcase/sniperbundle/PopulateContents()
..() // in case you need any paperwork done after your rampage
- new /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate(src)
+ new /obj/item/gun/ballistic/automatic/marksman/sniper_rifle(src)
new /obj/item/clothing/neck/tie/red(src)
new /obj/item/clothing/under/syndicate/sniper(src)
new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm
index d3b0c468b4b4..d4dd2896ace9 100644
--- a/code/game/objects/items/storage/guncases.dm
+++ b/code/game/objects/items/storage/guncases.dm
@@ -117,7 +117,7 @@
/obj/item/storage/pistolcase/stechkin
/obj/item/storage/pistolcase/stechkin/PopulateContents()
- new /obj/item/gun/ballistic/automatic/pistol/no_mag(src)
+ new /obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag(src)
new /obj/item/ammo_box/magazine/m10mm/empty(src)
new /obj/item/ammo_box/magazine/m10mm/empty(src)
diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm
index 35e4899b090b..9000d5e4dbd0 100644
--- a/code/game/objects/items/storage/holsters.dm
+++ b/code/game/objects/items/storage/holsters.dm
@@ -24,7 +24,7 @@
STR.max_items = 1
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.set_holdable(list(
- /obj/item/gun/ballistic/automatic/pistol,
+ /obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
@@ -90,7 +90,7 @@
STR.max_items = 2
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.set_holdable(list(
- /obj/item/gun/ballistic/automatic/pistol,
+ /obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index 6f744646d8f2..238e39ce9318 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -200,7 +200,7 @@
/obj/item/storage/secure/safe/intel/stechkin/PopulateContents()
. = ..()
- new /obj/item/gun/ballistic/automatic/pistol/suppressed(src)
+ new /obj/item/gun/ballistic/automatic/pistol/syndicate(src)
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/ammo_box/magazine/m10mm(src)
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 87497a2a7562..88eb493626d2 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -299,7 +299,7 @@
/obj/item/clothing/gloves/color/latex/nitrile/infiltrator,
/obj/item/clothing/mask/infiltrator,
/obj/item/clothing/shoes/combat/sneakboots,
- /obj/item/gun/ballistic/automatic/pistol,
+ /obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box
))
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 702416e4202e..bfbc4679af88 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -38,7 +38,7 @@
new /obj/item/jammer(src)
if("guns")
- new /obj/item/gun/ballistic/revolver(src)
+ new /obj/item/gun/ballistic/revolver/syndicate(src)
new /obj/item/ammo_box/a357(src)
new /obj/item/ammo_box/a357(src)
new /obj/item/card/emag(src)
@@ -99,7 +99,7 @@
new /obj/item/storage/box/syndie_kit/emp(src)
if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks
- new /obj/item/gun/ballistic/automatic/sniper_rifle(src) // 12 tc
+ new /obj/item/gun/ballistic/automatic/marksman/sniper_rifle(src) // 12 tc
new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
new /obj/item/clothing/gloves/color/latex/nitrile(src)
@@ -119,7 +119,7 @@
/obj/item/storage/box/syndicate/bundle_B/PopulateContents()
switch (pickweight(list( "bond" = 2, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "bee" = 1, "mr_freeze" = 2, "made_man"= 1)))
if("bond")
- new /obj/item/gun/ballistic/automatic/pistol(src)
+ new /obj/item/gun/ballistic/automatic/pistol/syndicate(src)
new /obj/item/suppressor(src)
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/ammo_box/magazine/m10mm(src)
diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm
index 93cdfcaa9a23..4bb23877462b 100644
--- a/code/game/objects/structures/icemoon/cave_entrance.dm
+++ b/code/game/objects/structures/icemoon/cave_entrance.dm
@@ -379,7 +379,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
new /obj/item/clothing/shoes/magboots/syndie(loc)
new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
if(prob(25))
- new /obj/item/gun/ballistic/automatic/pistol/suppressed(loc)
+ new /obj/item/gun/ballistic/automatic/pistol/syndicate(loc)
new /obj/item/ammo_box/magazine/
new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc)
if(prob(25))
diff --git a/code/game/objects/structures/salvaging.dm b/code/game/objects/structures/salvaging.dm
index 061b5efef57b..ebefc58e5c01 100644
--- a/code/game/objects/structures/salvaging.dm
+++ b/code/game/objects/structures/salvaging.dm
@@ -683,7 +683,7 @@
/obj/effect/spawner/lootdrop/destructive_anal_loot //what do people usually put in these things anayways
loot = list(
/obj/item/storage/toolbox/syndicate/empty = 650,
- /obj/item/gun/ballistic/automatic/pistol = 500,
+ /obj/item/gun/ballistic/automatic/pistol/syndicate = 500,
/obj/item/camera_bug = 500,
/obj/item/clothing/gloves/combat = 200,
/obj/item/clothing/head/chameleon = 200,
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index b64a2abf02de..f2dbb91f3f0f 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -579,7 +579,7 @@
uniform = /obj/item/clothing/under/syndicate/coldres
shoes = /obj/item/clothing/shoes/combat/coldres
ears = /obj/item/radio/headset/syndicate/alt
- r_pocket = /obj/item/gun/ballistic/automatic/pistol
+ r_pocket = /obj/item/gun/ballistic/automatic/pistol/syndicate
id = /obj/item/card/id/syndicate
implants = list(/obj/item/implant/exile)
diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm
index 472983e890db..29da95448ee4 100644
--- a/code/modules/clothing/outfits/ert/syndicate_ert.dm
+++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm
@@ -27,7 +27,7 @@
head = /obj/item/clothing/head/HoS/beret/syndicate
ears = /obj/item/radio/headset/syndicate/captain
- backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol=1, /obj/item/ammo_box/magazine/m10mm=2, /obj/item/radio=1)
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/syndicate=1, /obj/item/ammo_box/magazine/m10mm=2, /obj/item/radio=1)
// gorlex loyalist/2nd battlegroup
@@ -58,7 +58,7 @@
belt = /obj/item/storage/belt/medical/webbing/paramedic
glasses = /obj/item/clothing/glasses/hud/health/sunglasses
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
- suit_store = /obj/item/gun/ballistic/automatic/pistol
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/syndicate
l_pocket = /obj/item/radio
@@ -73,7 +73,7 @@
gloves = /obj/item/clothing/gloves/fingerless
suit = /obj/item/clothing/suit/armor/vest
belt = /obj/item/storage/belt/security
- suit_store = /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate
+ suit_store = /obj/item/gun/ballistic/automatic/marksman/sniper_rifle
r_pocket = /obj/item/kitchen/knife/combat/survival
l_pocket = /obj/item/binoculars
diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm
index 1d12eb25c4e9..5c038b05f181 100644
--- a/code/modules/clothing/outfits/factions/minutemen.dm
+++ b/code/modules/clothing/outfits/factions/minutemen.dm
@@ -560,7 +560,7 @@
/datum/outfit/job/clip/minutemen/grunt/dressed/armed/f4 //f4 is rename of GAL, don't wanna repath upon adding the clip guns though, if i forget to remove this during then, fucking yell at me
name = "CLIP Minutemen - Minuteman (Armed - CM-GAL)"
- suit_store = /obj/item/gun/ballistic/automatic/gal
+ suit_store = /obj/item/gun/ballistic/automatic/marksman/gal
belt = /obj/item/storage/belt/military/clip/gal
/datum/outfit/job/clip/minutemen/grunt/dressed/armed/cm5
diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm
index b425175cb853..4dbbe0826e21 100644
--- a/code/modules/clothing/outfits/factions/syndicate.dm
+++ b/code/modules/clothing/outfits/factions/syndicate.dm
@@ -587,7 +587,7 @@
suit = /obj/item/clothing/suit/armor/hardliners/sergeant
id = /obj/item/card/id/syndicate_command/crew_id
shoes = /obj/item/clothing/shoes/combat
- suit_store = /obj/item/gun/ballistic/automatic/pistol
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/syndicate
/datum/outfit/job/syndicate/hos/ngr
name = "Syndicate - Lieutenant (New Gorlex Republic)"
@@ -598,7 +598,7 @@
suit = /obj/item/clothing/suit/armor/ngr/lieutenant
id = /obj/item/card/id/syndicate_command/crew_id
shoes = /obj/item/clothing/shoes/combat
- suit_store = /obj/item/gun/ballistic/automatic/pistol
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/syndicate
/datum/outfit/job/syndicate/hos/twink
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 85c9996489e2..2283e6a45b07 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -206,7 +206,7 @@
head = /obj/item/clothing/head/helmet/space/syndicate/surplus
mask = /obj/item/clothing/mask/breath
shoes = /obj/item/clothing/shoes/laceup
- r_hand = /obj/item/gun/ballistic/automatic/ebr
+ r_hand = /obj/item/gun/ballistic/automatic/marksman/ebr
gloves = null
l_pocket = /obj/item/pinpointer/nuke/syndicate
r_pocket = /obj/item/ammo_box/magazine/ebr
diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm
index d5b0c0ff6638..4c2586b7dd4b 100644
--- a/code/modules/holiday/halloween.dm
+++ b/code/modules/holiday/halloween.dm
@@ -250,13 +250,6 @@
// Spooky Uplink Items //
/////////////////////////
-/datum/uplink_item/dangerous/crossbow/candy
- name = "Candy Corn Crossbow"
- desc = "A standard miniature energy crossbow that uses a hard-light projector to transform bolts into candy corn. Happy Halloween!"
- category = "Holiday"
- item = /obj/item/gun/energy/kinetic_accelerator/crossbow/halloween
- surplus = 0
-
/datum/uplink_item/device_tools/emag/hack_o_lantern
name = "Hack-o'-Lantern"
desc = "An emag fitted to support the Halloween season. Candle not included."
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index f614533d2fd5..73a322ce81ae 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -163,7 +163,7 @@
name = "gatfruit"
desc = "It smells like burning."
icon_state = "gatfruit"
- trash = /obj/item/gun/ballistic/revolver
+ trash = /obj/item/gun/ballistic/revolver/syndicate
bitesize_mod = 2
foodtype = FRUIT
tastes = list("gunpowder" = 1)
diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm
index 8293c2bd663b..60c8ab9672b4 100644
--- a/code/modules/jobs/job_types/janitor.dm
+++ b/code/modules/jobs/job_types/janitor.dm
@@ -22,5 +22,5 @@
/datum/outfit/job/janitor/pre_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(GARBAGEDAY in SSevents.holidays)
- l_pocket = /obj/item/gun/ballistic/revolver
+ l_pocket = /obj/item/gun/ballistic/revolver/syndicate
r_pocket = /obj/item/ammo_box/a357
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index beecda12b083..0f3ab70e4034 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -435,17 +435,42 @@ There are several things that need to be remembered:
if(s_store)
var/obj/item/I = s_store
- var/mutable_appearance/s_store_overlay
update_hud_s_store(I)
- var/t_state = I.item_state
- if(!t_state)
- t_state = I.icon_state
- s_store_overlay = I.build_worn_icon(default_layer = -SUIT_STORE_LAYER, default_icon_file = 'icons/mob/clothing/belt_mirror.dmi', override_state = t_state)
+ ///The final thing we overlay. Set on build_worn_icon.
+ var/mutable_appearance/suit_store_overlay
- if(!s_store_overlay)
- return
- overlays_standing[SUIT_STORE_LAYER] = s_store_overlay
- apply_overlay(SUIT_STORE_LAYER)
+ ///icon file of the clothing
+ var/icon_file = I.mob_overlay_icon
+
+ /// Does this clothing need to be generated via greyscale
+ var/handled_by_bodytype = FALSE
+
+ if(!suit_store_overlay)
+ if(dna.species.bodytype & BODYTYPE_VOX)
+ if(I.supports_variations & VOX_VARIATION)
+ icon_file = VOX_BACK_PATH
+ else
+ handled_by_bodytype = TRUE
+
+ else if(dna.species.bodytype & BODYTYPE_KEPORI)
+// if(I.supports_variations & KEPORI_VARIATION)
+// icon_file = KEPORI_BACK_PATH
+// else
+ handled_by_bodytype = TRUE
+
+ if(!icon_exists(icon_file, RESOLVE_ICON_STATE(I)))
+ icon_file = DEFAULT_BACK_PATH
+ handled_by_bodytype = TRUE
+
+ var/use_autogen = handled_by_bodytype ? dna.species : null
+ suit_store_overlay = I.build_worn_icon(default_layer = -SUIT_STORE_LAYER, default_icon_file = icon_file, override_file = icon_file, isinhands = FALSE, override_file = icon_file, mob_species = use_autogen)
+
+ if(!suit_store_overlay)
+ return
+ overlays_standing[SUIT_STORE_LAYER] = suit_store_overlay
+
+ if(suit_store_overlay)
+ apply_overlay(SUIT_STORE_LAYER)
/mob/living/carbon/human/update_inv_head()
diff --git a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
index 040b6b26ae2a..4d38e1c5f87f 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
@@ -16,7 +16,7 @@
icon_state = "frontiersmanranged"
icon_living = "frontiersmanranged"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
- /obj/item/gun/ballistic/revolver)
+ /obj/item/gun/ballistic/revolver/syndicate)
ranged = 1
retreat_distance = 5
minimum_distance = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
index 0dca4c21dade..09d85a664e86 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
@@ -46,8 +46,8 @@
belt = pickweight(list(
/obj/item/gun/ballistic/automatic/pistol/candor = 2,
/obj/item/gun/ballistic/automatic/pistol/commander = 1,
- /obj/item/gun/ballistic/automatic/pistol = 1,
- /obj/item/gun/ballistic/revolver = 1,
+ /obj/item/gun/ballistic/automatic/pistol/syndicate = 1,
+ /obj/item/gun/ballistic/revolver/syndicate = 1,
/obj/item/gun/ballistic/revolver/firebrand = 1,
)
)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 3edfd1382cf4..b92b79e0009f 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -2,7 +2,7 @@
name = "gun"
desc = "It's a gun. It's pretty terrible, though."
icon = 'icons/obj/guns/projectile.dmi'
- icon_state = "detective"
+ icon_state = "flatgun"
item_state = "gun"
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
@@ -192,6 +192,7 @@
/obj/item/gun/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
wielded_fully = FALSE
+ zoom(user, forced_zoom = FALSE)
user.remove_movespeed_modifier(/datum/movespeed_modifier/gun)
/obj/item/gun/Destroy()
@@ -1021,7 +1022,11 @@
return
if(isnull(forced_zoom))
- zoomed = !zoomed
+ if((!zoomed && wielded_fully) || zoomed)
+ zoomed = !zoomed
+ else
+ to_chat(user, "You can't look down the scope without wielding [src]!")
+ zoomed = FALSE
else
zoomed = forced_zoom
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 32a0e4451879..a4247898d59d 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -8,7 +8,6 @@
/obj/item/gun/ballistic
desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason."
name = "projectile gun"
- icon_state = "pistol"
w_class = WEIGHT_CLASS_NORMAL
has_safety = TRUE
diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
index cceda8a28b77..3f649994827e 100644
--- a/code/modules/projectiles/guns/ballistic/assault.dm
+++ b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -35,7 +35,11 @@
/obj/item/gun/ballistic/automatic/assault/skm
name = "\improper SKM-24"
desc = "An obsolete model of assault rifle once used by CLIP. Legendary for its durability and low cost, surplus rifles are commonplace on the Frontier, and the design has been widely copied. Chambered in 7.62x40mm CLIP."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/frontier_import/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/frontier_import/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi'
+
fire_sound = 'sound/weapons/gun/rifle/skm.ogg'
rack_sound = 'sound/weapons/gun/rifle/skm_cocked.ogg'
@@ -74,6 +78,11 @@
name = "\improper SKM-44"
desc = "An obsolete model of assault rifle once used by CLIP. Most of these were seized from Frontiersmen armories or purchased in CLIP, then modified to IRMG standards. Chambered in 7.62x40mm CLIP."
+ icon = 'icons/obj/guns/manufacturer/inteq/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/inteq/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/inteq/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/inteq/onmob.dmi'
+
icon_state = "skm_inteq"
item_state = "skm_inteq"
manufacturer = MANUFACTURER_INTEQ
@@ -106,13 +115,20 @@
/obj/item/gun/ballistic/automatic/assault/p16/minutemen
name = "\improper CM-16"
desc = "The standard-issue rifle of CLIP and an extensively modified reproduction of the P-16. Chambered in 5.56mm."
+ icon = 'icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi'
icon_state = "cm16"
item_state = "cm16"
/obj/item/gun/ballistic/automatic/assault/swiss_cheese
name = "\improper Swiss Cheese"
desc = "An ancient longarm famous for its boxy, modular design. Mass produced by the Terran Confederation in ages past, these often mutiple century old designs have survied due to their sheer ruggedness. The DMA on this unit is sadly broken, but these rifles are known for their excellent burst fire. Uses 5.56mm ammunition for Matter mode."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
fire_sound = 'sound/weapons/gun/rifle/swiss.ogg'
icon_state = "swiss"
item_state = "swiss"
@@ -141,7 +157,10 @@
/obj/item/gun/ballistic/automatic/assault/e40
name = "\improper E-40 Hybrid Rifle"
desc = "A Hybrid Assault Rifle, best known for being having a dual ballistic/laser system along with an advanced ammo counter. Once an icon for bounty hunters, age has broken most down, so these end up in collector's hands or as shoddy Frontiersmen laser SMG conversions when in their inheritted stockpiles. But if one were to find one in working condition, it would be just as formidable as back then. Chambered in .229 Eoehoma caseless, and uses energy for lasers."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/eoehoma/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/eoehoma/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/eoehoma/onmob.dmi'
icon_state = "e40"
item_state = "e40"
mag_type = /obj/item/ammo_box/magazine/e40
@@ -291,10 +310,14 @@
//techinically a battle rifle, i'm putting it here for organisation sake
-/obj/item/gun/ballistic/automatic/vickland //weapon designed by Apogee-dev
+/obj/item/gun/ballistic/automatic/marksman/vickland //weapon designed by Apogee-dev
name = "\improper Vickland"
desc = "The pride of the Saint-Roumain Militia, the Vickland is a rare semi-automatic battle rifle produced by Hunter's Pride exclusively for SRM use. It is unusual in its class for its internal rotary magazine, which must be reloaded using stripper clips. Chambered in .308."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'
icon_state = "vickland"
item_state = "vickland"
@@ -303,8 +326,9 @@
internal_magazine = TRUE
mag_type = /obj/item/ammo_box/magazine/internal/vickland
fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'
- actions_types = list()
+
manufacturer = MANUFACTURER_HUNTERSPRIDE
+ zoomable = FALSE //no scope on it
rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg'
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index c0ccf71d513e..2fea717c28a0 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -22,48 +22,6 @@
recoil_unwielded = 4
wield_slowdown = 0.35
-
-// SNIPER //
-
-/obj/item/gun/ballistic/automatic/sniper_rifle
- name = "sniper rifle"
- desc = "An anti-material rifle chambered in .50 BMG with a scope mounted on it. Its prodigious bulk requires both hands to use."
- icon_state = "sniper"
- item_state = "sniper"
- fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
- fire_sound_volume = 90
- vary_fire_sound = FALSE
- load_sound = 'sound/weapons/gun/sniper/mag_insert.ogg'
- rack_sound = 'sound/weapons/gun/sniper/rack.ogg'
- suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
- recoil = 2
- weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/sniper_rounds
- burst_size = 1
- w_class = WEIGHT_CLASS_NORMAL
- zoomable = TRUE
- zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
- zoom_out_amt = 5
- slot_flags = ITEM_SLOT_BACK
- actions_types = list()
- show_magazine_on_sprite = TRUE
- manufacturer = MANUFACTURER_SCARBOROUGH
-
- spread = -5
- spread_unwielded = 20
- recoil = 5
- recoil_unwielded = 50
- wield_slowdown = 1
- wield_delay = 1.3 SECONDS
-
-/obj/item/gun/ballistic/automatic/sniper_rifle/syndicate
- name = "syndicate sniper rifle"
- desc = "A heavily-modified .50 BMG anti-material rifle utilized by Syndicate agents. Requires both hands to fire."
- can_suppress = TRUE
- can_unsuppress = TRUE
-
-EMPTY_GUN_HELPER(automatic/sniper_rifle/syndicate)
-
// Old Semi-Auto Rifle //
/obj/item/gun/ballistic/automatic/surplus //TODO: NEEDS TO BE REPLACED WITH PISTOL CARBINES OR LOWCAL SEMI-AUTO RIFLES
@@ -95,56 +53,6 @@ EMPTY_GUN_HELPER(automatic/sniper_rifle/syndicate)
fire_sound = 'sound/weapons/laser.ogg'
casing_ejector = FALSE
-/obj/item/gun/ballistic/automatic/ebr //fuck this gun, its getting wiped soon enough
- name = "\improper M514 EBR"
- desc = "A reliable, high-powered battle rifle often found in the hands of Syndicate personnel and remnants, chambered in .308. Effective against personnel and armor alike."
- icon = 'icons/obj/guns/48x32guns.dmi'
- lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
- righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
- icon_state = "ebr"
- item_state = "ebr"
- zoomable = TRUE
- show_magazine_on_sprite = TRUE
- weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_BULKY
- mag_type = /obj/item/ammo_box/magazine/ebr
- fire_sound = 'sound/weapons/gun/rifle/shot_alt2.ogg'
- burst_size = 0
- manufacturer = MANUFACTURER_SCARBOROUGH
-
- wield_slowdown = 2
- spread = -4
-
-EMPTY_GUN_HELPER(automatic/ebr)
-
-/obj/item/gun/ballistic/automatic/gal
- name = "\improper CM-GAL-S"
- desc = "The standard issue DMR of CLIP. Dates back to the Xenofauna War, this particular model is in a carbine configuration, and, as such, is shorter than the standard model. Chambered in .308."
- icon = 'icons/obj/guns/48x32guns.dmi'
- fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
- icon_state = "gal"
- item_state = "gal"
- zoomable = TRUE
- show_magazine_on_sprite = TRUE
- weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_BULKY
- mag_type = /obj/item/ammo_box/magazine/gal
- fire_sound = 'sound/weapons/gun/rifle/gal.ogg'
- burst_size = 0
- actions_types = list()
- manufacturer = MANUFACTURER_MINUTEMAN
-
- wield_slowdown = 2
- spread = -4
- fire_select_icon_state_prefix = "clip_"
- adjust_fire_select_icon_state_on_safety = TRUE
-
-/obj/item/gun/ballistic/automatic/gal/inteq
- name = "\improper SsG-04"
- desc = "A marksman rifle purchased from CLIP and modified to suit IRMG's needs. Chambered in .308."
- icon_state = "gal-inteq"
- item_state = "gal-inteq"
-
/obj/item/gun/ballistic/automatic/zip_pistol
name = "makeshift pistol"
desc = "A makeshift zip gun cobbled together from various scrap bits and chambered in 9mm. It's a miracle it even works."
diff --git a/code/modules/projectiles/guns/ballistic/gauss.dm b/code/modules/projectiles/guns/ballistic/gauss.dm
index 11de497c874d..12264a3ccd8f 100644
--- a/code/modules/projectiles/guns/ballistic/gauss.dm
+++ b/code/modules/projectiles/guns/ballistic/gauss.dm
@@ -1,6 +1,10 @@
/obj/item/gun/ballistic/automatic/powered/gauss
name = "prototype gauss rifle"
desc = "An experimental Nanotrasen rifle with a high capacity. Useful for putting down crowds. Chambered in ferromagnetic pellets."
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "gauss"
item_state = "arg"
slot_flags = 0
@@ -31,6 +35,10 @@
name = "Model H"
desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor."
mag_type = /obj/item/ammo_box/magazine/modelh
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
icon_state = "model-h"
item_state = "model-h"
fire_sound = 'sound/weapons/gun/gauss/modelh.ogg'
@@ -61,7 +69,10 @@
name = "Claris"
desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended."
mag_type = /obj/item/ammo_box/magazine/internal/claris
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
icon_state = "claris"
item_state = "claris"
fire_sound = 'sound/weapons/gun/gauss/claris.ogg'
@@ -84,7 +95,10 @@
name = "Solar 'GAR' Carbine"
desc = "A Solarian carbine, unusually modern for its producers. Launches ferromagnetic lances at alarming speeds."
mag_type = /obj/item/ammo_box/magazine/gar
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
icon_state = "gar"
item_state = "gar"
fire_sound = 'sound/weapons/gun/gauss/gar.ogg'
diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm
index afa111c6bbf8..79977249dd31 100644
--- a/code/modules/projectiles/guns/ballistic/hmg.dm
+++ b/code/modules/projectiles/guns/ballistic/hmg.dm
@@ -154,9 +154,14 @@
/obj/item/gun/ballistic/automatic/hmg/l6_saw
name = "\improper L6 SAW"
desc = "A heavy machine gun, designated 'L6 SAW'. Chambered in 7.12x82mm."
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
icon_state = "l6"
item_state = "l6closedmag"
base_icon_state = "l6"
+
mag_type = /obj/item/ammo_box/magazine/mm712x82
can_suppress = FALSE
spread = 7
@@ -216,9 +221,14 @@
/obj/item/gun/ballistic/automatic/hmg/solar //This thing fires a 5.56 equivalent, that's an LMG, not an HMG, get out
name = "\improper Solar"
desc = "A TerraGov LMG-169 designed in 169 FS, nicknamed 'Solar.' A inscription reads: 'PROPERTY OF TERRAGOV', with 'TERRAGOV' poorly scribbled out, and replaced by 'SOLAR ARMORIES'. Chambered in 4.73×33mm caseless ammunition."
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+
icon_state = "solar"
+
fire_sound = 'sound/weapons/gun/l6/shot.ogg'
- item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/rifle47x33mm
spread = 7
@@ -236,7 +246,11 @@
name = "\improper SKM-24u"
desc = "What appears to be a standard SKM-24 at first glance is actually a light machine gun conversion, with an extended, heavy barrel and overhauled internals. Its weight, bulk, and robust fire rate make it difficult to handle without using the bipod in a prone position or against appropriate cover such as a table. Chambered in 7.62x40mm CLIP."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/frontier_import/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/frontier_import/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi'
+
icon_state = "skm_lmg"
item_state = "skm_lmg"
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index 5619b039d488..d82f2dbd1250 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -4,9 +4,6 @@
/obj/item/gun/ballistic/revolver/grenadelauncher//this is only used for underbarrel grenade launchers at the moment, but admins can still spawn it if they feel like being assholes
desc = "A break-action, single-shot grenade launcher. A compact way to deliver a big boom."
name = "grenade launcher"
- icon = 'icons/obj/guns/48x32guns.dmi'
- icon_state = "dshotgun_sawn"
- item_state = "gun"
mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg'
w_class = WEIGHT_CLASS_NORMAL
@@ -46,6 +43,12 @@
/obj/item/gun/ballistic/rocketlauncher
name = "\improper PML-9"
desc = "A reusable rocket-propelled grenade launcher. The words \"NT this way\" and an arrow have been written near the barrel."
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
icon_state = "rocketlauncher"
item_state = "rocketlauncher"
mag_type = /obj/item/ammo_box/magazine/internal/rocketlauncher
@@ -74,7 +77,12 @@
/obj/item/gun/ballistic/rocketlauncher/solgov
name = "Panzerfaust XII"
desc = "The standard recoiless rifle of the Solarian Confederation. Barely varies from previous models."
- icon = 'icons/obj/guns/48x32guns.dmi'
+
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+
icon_state = "panzerfaust"
item_state = "panzerfaust"
manufacturer = MANUFACTURER_SOLARARMORIES
diff --git a/code/modules/projectiles/guns/ballistic/marksman.dm b/code/modules/projectiles/guns/ballistic/marksman.dm
new file mode 100644
index 000000000000..46a9e2466290
--- /dev/null
+++ b/code/modules/projectiles/guns/ballistic/marksman.dm
@@ -0,0 +1,102 @@
+
+/obj/item/gun/ballistic/automatic/marksman
+ burst_size = 1
+ zoomable = TRUE //this var as true without setting anything else produces a 2x zoom
+ wield_slowdown = 2
+ wield_delay = 1 SECONDS
+
+// SNIPER //
+
+/obj/item/gun/ballistic/automatic/marksman/sniper_rifle
+ name = "sniper rifle"
+ desc = "An anti-material rifle chambered in .50 BMG with a scope mounted on it. Its prodigious bulk requires both hands to use."
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+ icon_state = "sniper"
+ item_state = "sniper"
+ fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
+ fire_sound_volume = 90
+ vary_fire_sound = FALSE
+ load_sound = 'sound/weapons/gun/sniper/mag_insert.ogg'
+ rack_sound = 'sound/weapons/gun/sniper/rack.ogg'
+ suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
+ weapon_weight = WEAPON_HEAVY
+ mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+ w_class = WEIGHT_CLASS_BULKY
+ zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
+ zoom_out_amt = 5
+ slot_flags = ITEM_SLOT_BACK
+ actions_types = list()
+ show_magazine_on_sprite = TRUE
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+ spread = -5
+ spread_unwielded = 40
+ recoil = 5
+ recoil_unwielded = 50
+
+ wield_delay = 1.3 SECONDS
+
+EMPTY_GUN_HELPER(automatic/marksman/sniper_rifle)
+
+/obj/item/gun/ballistic/automatic/marksman/ebr //fuck this gun, its getting wiped soon enough
+ name = "\improper M514 EBR"
+ desc = "A reliable, high-powered battle rifle often found in the hands of Syndicate personnel and remnants, chambered in .308. Effective against personnel and armor alike."
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
+ icon_state = "ebr"
+ item_state = "ebr"
+ zoomable = TRUE
+ show_magazine_on_sprite = TRUE
+ weapon_weight = WEAPON_MEDIUM
+ w_class = WEIGHT_CLASS_BULKY
+ mag_type = /obj/item/ammo_box/magazine/ebr
+ fire_sound = 'sound/weapons/gun/rifle/shot_alt2.ogg'
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+ wield_slowdown = 2
+ spread = -4
+
+EMPTY_GUN_HELPER(automatic/marksman/ebr)
+
+/obj/item/gun/ballistic/automatic/marksman/gal
+ name = "\improper CM-GAL-S"
+ desc = "The standard issue DMR of CLIP. Dates back to the Xenofauna War, this particular model is in a carbine configuration, and, as such, is shorter than the standard model. Chambered in .308."
+
+ icon = 'icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi'
+
+ fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
+ icon_state = "gal"
+ item_state = "gal"
+ show_magazine_on_sprite = TRUE
+ weapon_weight = WEAPON_MEDIUM
+ w_class = WEIGHT_CLASS_BULKY
+ mag_type = /obj/item/ammo_box/magazine/gal
+ fire_sound = 'sound/weapons/gun/rifle/gal.ogg'
+ burst_size = 0
+ actions_types = list()
+ manufacturer = MANUFACTURER_MINUTEMAN
+
+ wield_slowdown = 2
+ spread = -4
+ fire_select_icon_state_prefix = "clip_"
+ adjust_fire_select_icon_state_on_safety = TRUE
+
+/obj/item/gun/ballistic/automatic/marksman/gal/inteq
+ name = "\improper SsG-04"
+ desc = "A marksman rifle purchased from CLIP and modified to suit IRMG's needs. Chambered in .308."
+ icon = 'icons/obj/guns/manufacturer/inteq/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/inteq/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/inteq/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/inteq/onmob.dmi'
+ icon_state = "gal-inteq"
+ item_state = "gal-inteq"
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index a2843000cbc6..347f4950382e 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -1,28 +1,12 @@
/obj/item/gun/ballistic/automatic/pistol
- name = "Stechkin"
- desc = "A small, easily concealable 10mm handgun that bears Scarborough Arms stamps. Has a threaded barrel for suppressors."
- icon_state = "pistol"
- w_class = WEIGHT_CLASS_SMALL
- mag_type = /obj/item/ammo_box/magazine/m10mm
can_suppress = TRUE
- actions_types = list()
bolt_type = BOLT_TYPE_LOCKING
- fire_sound = 'sound/weapons/gun/pistol/shot.ogg'
- dry_fire_sound = 'sound/weapons/gun/pistol/dry_fire.ogg'
- suppressed_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg'
- load_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
- eject_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+
vary_fire_sound = FALSE
- rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
- lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
- bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
fire_sound_volume = 90
bolt_wording = "slide"
weapon_weight = WEAPON_LIGHT
pickup_sound = 'sound/items/handling/gun_pickup.ogg'
- manufacturer = MANUFACTURER_SCARBOROUGH
recoil = 0.5 // apogee wants bloom, this is a placeholder until then to simulate the same concept.
recoil_unwielded = 3
@@ -36,14 +20,39 @@
muzzleflash_iconstate = "muzzle_flash_light"
-EMPTY_GUN_HELPER(automatic/pistol)
+/obj/item/gun/ballistic/automatic/pistol/syndicate
+ name = "Stechkin"
+ desc = "A small, easily concealable 10mm handgun that bears Scarborough Arms stamps. Has a threaded barrel for suppressors."
+ icon_state = "pistol"
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
-/obj/item/gun/ballistic/automatic/pistol/suppressed/Initialize(mapload)
- . = ..()
- var/obj/item/suppressor/S = new(src)
- install_suppressor(S)
+ w_class = WEIGHT_CLASS_SMALL
+ mag_type = /obj/item/ammo_box/magazine/m10mm
+ fire_sound = 'sound/weapons/gun/pistol/shot.ogg'
+ dry_fire_sound = 'sound/weapons/gun/pistol/dry_fire.ogg'
+ suppressed_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg'
+
+ load_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ load_empty_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ eject_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+ eject_empty_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+
+ rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
-/obj/item/gun/ballistic/automatic/pistol/suns
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+ spread = 6 //becuase its compact, spread is slightly worse
+ spread_unwielded = 9
+ recoil_unwielded = 2
+
+EMPTY_GUN_HELPER(automatic/pistol/syndicate)
+
+/obj/item/gun/ballistic/automatic/pistol/syndicate/suns
desc = "A small, easily concealable 10mm handgun that bears Scarborough Arms stamps. It is painted in the colors of SUNS."
icon_state = "pistol_suns"
@@ -52,7 +61,11 @@ EMPTY_GUN_HELPER(automatic/pistol)
desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. Chambered in .45."
icon_state = "candor"
item_state = "hp_generic"
- w_class = WEIGHT_CLASS_NORMAL
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
mag_type = /obj/item/ammo_box/magazine/m45
can_suppress = FALSE
fire_sound = 'sound/weapons/gun/pistol/candor.ogg'
@@ -68,7 +81,7 @@ EMPTY_GUN_HELPER(automatic/pistol)
EMPTY_GUN_HELPER(automatic/pistol/candor)
/obj/item/gun/ballistic/automatic/pistol/candor/factory //also give this to the srm, their candors should probably look factory fresh from how well taken care of they are
- desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. This example has been kept in especially good shape, and may as well be fresh out of the workshop. Chambered in .45."
+ desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of 'Hunter's Pride Arms and Ammunition'. This example has been kept in especially good shape, and may as well be fresh out of the workshop. Chambered in .45."
item_state = "hp_generic_fresh"
EMPTY_GUN_HELPER(automatic/pistol/candor/factory)
@@ -86,6 +99,10 @@ EMPTY_GUN_HELPER(automatic/pistol/candor/factory)
/obj/item/gun/ballistic/automatic/pistol/deagle
name = "\improper Desert Eagle"
desc = "An oversized handgun chambered in .50 AE. A true hand cannon."
+ icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/frontier_import/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/frontier_import/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi'
icon_state = "deagle"
force = 14
mag_type = /obj/item/ammo_box/magazine/m50
@@ -122,9 +139,27 @@ EMPTY_GUN_HELPER(automatic/pistol/candor/factory)
name = "stechkin APS pistol"
desc = "A burst-fire machine pistol based on the stechkin model. Utilizes specialized 9mm magazines."
icon_state = "aps"
- w_class = WEIGHT_CLASS_SMALL
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
+
mag_type = /obj/item/ammo_box/magazine/pistolm9mm
- can_suppress = FALSE
+
+ fire_sound = 'sound/weapons/gun/pistol/shot.ogg'
+ dry_fire_sound = 'sound/weapons/gun/pistol/dry_fire.ogg'
+ suppressed_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg'
+
+ load_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ load_empty_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ eject_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+ eject_empty_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+
+ rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
+
burst_size = 3
burst_delay = 0.1 SECONDS
fire_delay = 0.4 SECONDS
@@ -136,6 +171,11 @@ EMPTY_GUN_HELPER(automatic/pistol/candor/factory)
name = "\improper Commander"
desc = "A classic handgun in a tasteful black and stainless steel color scheme. An enamel Nanotrasen logo is set into the grips. Chambered in 9mm."
icon_state = "commander"
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
+
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/co9mm
can_suppress = FALSE
@@ -146,11 +186,19 @@ EMPTY_GUN_HELPER(automatic/pistol/candor/factory)
eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
+ rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
+
EMPTY_GUN_HELPER(automatic/pistol/commander)
/obj/item/gun/ballistic/automatic/pistol/commander/inteq
name = "\improper Commissioner"
desc = "A handgun seized from Nanotrasen armories by deserting troopers and modified to IRMG's standards. A yellow IRMG shield is set into the grips. Chambered in 9mm."
+ icon = 'icons/obj/guns/manufacturer/inteq/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/inteq/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/inteq/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/inteq/onmob.dmi'
icon_state = "commander-inteq"
item_state = "commander-inteq"
manufacturer = MANUFACTURER_INTEQ
@@ -161,6 +209,11 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
name = "\improper Commissar"
desc = "A Nanotrasen-issue handgun, modified with a voice box to further enhance its effectiveness in troop discipline."
icon_state = "commander"
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
+
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/co9mm
can_suppress = FALSE
@@ -171,6 +224,10 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
+ rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
+
/obj/item/gun/ballistic/automatic/pistol/commissar/equipped(mob/living/user, slot)
..()
if(slot == ITEM_SLOT_HANDS && funnysounds) // We do this instead of equip_sound as we only want this to play when it's wielded
@@ -215,6 +272,11 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
name = "\improper Pistole C"
desc = "A favorite of the Terran Regency that is despised by the Solarian bureaucracy. Shifted out of military service centuries ago, though still popular among civilians. Chambered in 5.56mm caseless."
icon_state = "pistole-c"
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+
weapon_weight = WEAPON_LIGHT
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/pistol556mm
@@ -225,15 +287,24 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
+ rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
+
fire_select_icon_state_prefix = "caseless_"
/obj/item/gun/ballistic/automatic/pistol/solgov/old
icon_state = "pistole-c-old"
-/obj/item/gun/ballistic/automatic/pistol/tec9
+/obj/item/gun/ballistic/automatic/pistol/tec9 //fucking kill this gun already my god
name = "\improper TEC-9 machine pistol"
desc = "A crude machine pistol designed to vomit 9mm ammunition at a truly eye-watering rate of fire."
icon_state = "tec9"
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
fire_delay = 0.15 SECONDS
weapon_weight = WEAPON_LIGHT
w_class = WEIGHT_CLASS_NORMAL
@@ -251,7 +322,8 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
name = "disposable gun"
desc = "An exceedingly flimsy plastic gun that is extremely cheap to produce. You get what you pay for."
fire_sound = 'sound/weapons/gun/pistol/himehabu.ogg'
- icon_state = "disposable" //credit to discord user any% for the sprite
+
+ icon_state = "disposable" //credit to discord user 20nypercent for the sprite
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/disposable
custom_materials = list(/datum/material/plastic=2000)
@@ -273,6 +345,12 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
name = ".38 Derringer"
desc = "An easily concealable derringer. Uses .38 special ammo."
icon_state = "derringer"
+
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
mag_type = /obj/item/ammo_box/magazine/internal/derr38
fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
load_sound = 'sound/weapons/gun/revolver/load_bullet.ogg'
@@ -301,6 +379,12 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
/obj/item/gun/ballistic/derringer/traitor
name = "\improper .357 Syndicate Derringer"
desc = "An easily concealable derriger, if not for the bright red-and-black. Uses .357 ammo."
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
icon_state = "derringer_syndie"
mag_type = /obj/item/ammo_box/magazine/internal/derr357
fire_sound_volume = 50 //Tactical stealth firing
@@ -318,11 +402,26 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
name = "\improper Himehabu"
desc = "A very small .22 LR pistol. The long awaited successor to the Stechkin; It has become a favorite among syndicate spies. Chambered in .22 LR."
icon_state = "himehabu"
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
+
w_class = WEIGHT_CLASS_TINY
mag_type = /obj/item/ammo_box/magazine/m22lr
can_suppress = FALSE
fire_sound = 'sound/weapons/gun/pistol/himehabu.ogg'
+ load_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ load_empty_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ eject_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+ eject_empty_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+
+ rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
+
recoil = -2
recoil_unwielded = -2
spread_unwielded = 0
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 1807f2c4ab03..416ab364ea78 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -7,8 +7,8 @@
#define REVOLVER_FLIP "flip the revolver by the trigger"
/obj/item/gun/ballistic/revolver
- name = "\improper .357 revolver"
- desc = "A weighty revolver with a Scarborough Arms logo engraved on the barrel. Uses .357 ammo." //usually used by syndicates
+ name = "i demand"
+ desc = "You feel as if you should make a 'adminhelp' if you see one of these, along with a 'github' report. You don't really understand what this means though."
icon_state = "revolver"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder
fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
@@ -192,8 +192,6 @@
to_chat(user, "You load the [cartridge_wording] into [src].")
return TRUE
-
-
/obj/item/gun/ballistic/revolver/attackby(obj/item/attacking_obj, mob/user, params)
if (istype(attacking_obj, /obj/item/ammo_casing) || istype(attacking_obj, /obj/item/ammo_box))
if(istype(attacking_obj, /obj/item/ammo_casing))
@@ -470,11 +468,25 @@
playsound(src, 'sound/items/handling/ammobox_pickup.ogg', 20, FALSE)
return
+/obj/item/gun/ballistic/revolver/syndicate //mystery tool that we can use later
+ name = "\improper syndicate revolver"
+ desc = "A weighty revolver with a Scarborough Arms logo engraved on the barrel. Uses .357 ammo." //usually used by syndicates
+ icon_state = "revolver"
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
/obj/item/gun/ballistic/revolver/detective
name = "\improper HP Detective Special"
desc = "A small law enforcement firearm. Originally commissioned by Nanotrasen for their Private Investigation division, it has become extremely popular among independent civilians as a cheap, compact sidearm. Uses .38 Special rounds."
fire_sound = 'sound/weapons/gun/revolver/shot_light.ogg'
icon_state = "detective"
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
obj_flags = UNIQUE_RENAME
semi_auto = TRUE //double action
@@ -551,6 +563,10 @@ EMPTY_GUN_HELPER(revolver/detective)
/obj/item/gun/ballistic/revolver/mateba
name = "\improper Unica 6 auto-revolver"
desc = "A high-powered revolver with a unique auto-reloading system. Uses .357 ammo."
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "mateba"
manufacturer = MANUFACTURER_NONE
semi_auto = TRUE
@@ -569,7 +585,11 @@ EMPTY_GUN_HELPER(revolver/detective)
/obj/item/gun/ballistic/revolver/montagne
name = "\improper HP Montagne"
desc = "An ornate break-open revolver issued to high-ranking members of the Saint-Roumain Militia. Chambered in .44."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
icon_state = "montagne"
manufacturer = MANUFACTURER_HUNTERSPRIDE
spread_unwielded = 15
@@ -587,7 +607,11 @@ EMPTY_GUN_HELPER(revolver/detective)
/obj/item/gun/ballistic/revolver/ashhand
name = "HP Ashhand"
desc = "A massive, long-barreled revolver often used by the Saint-Roumain Militia as protection against big game. Can only be reloaded one cartridge at a time due to its reinforced frame. Uses .45-70 ammo."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
icon_state = "ashhand"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev4570
fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
@@ -604,93 +628,16 @@ EMPTY_GUN_HELPER(revolver/detective)
. = ..()
AddComponent(/datum/component/ammo_hud/revolver)
-// A gun to play Russian Roulette!
-// You can spin the chamber to randomize the position of the bullet.
-
-//TODO: this is stupid, but used in ONE fucking ruin. Remember to remove when you aren't afraid to do a ton of path changes.
-
-/obj/item/gun/ballistic/revolver/russian
- name = "\improper Russian revolver"
- desc = "A Solarian revolver for particularly lethal drinking games. It has a mechanism requiring you to spin the chamber before each trigger pull. Uses .357 ammo."
- icon_state = "russianrevolver"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357
- var/spun = FALSE
- manufacturer = MANUFACTURER_NONE
-
-/obj/item/gun/ballistic/revolver/russian/do_spin()
- . = ..()
- if(.)
- spun = TRUE
-
-/obj/item/gun/ballistic/revolver/russian/attackby(obj/item/A, mob/user, params)
- ..()
- if(get_ammo() > 0)
- spin()
- update_appearance()
- A.update_appearance()
- return
-
-/obj/item/gun/ballistic/revolver/russian/attack_self(mob/user)
- if(!spun)
- spin()
- spun = TRUE
- return
- ..()
-
-/obj/item/gun/ballistic/revolver/russian/afterattack(atom/target, mob/living/user, flag, params)
- . = ..(null, user, flag, params)
-
- if(flag)
- if(!(target in user.contents) && ismob(target))
- if(user.a_intent == INTENT_HARM) // Flogging action
- return
-
- if(isliving(user))
- if(!can_trigger_gun(user))
- return
- if(target != user)
- if(ismob(target))
- to_chat(user, "A mechanism prevents you from shooting anyone but yourself!")
- return
-
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- if(!spun)
- to_chat(user, "You need to spin \the [src]'s chamber first!")
- return
-
- spun = FALSE
-
- if(chambered)
- var/obj/item/ammo_casing/AC = chambered
- if(AC.fire_casing(user, user))
- playsound(user, fire_sound, fire_sound_volume, vary_fire_sound)
- var/zone = check_zone(user.zone_selected)
- var/obj/item/bodypart/affecting = H.get_bodypart(zone)
- if(zone == BODY_ZONE_HEAD || zone == BODY_ZONE_PRECISE_EYES || zone == BODY_ZONE_PRECISE_MOUTH)
- shoot_self(user, affecting)
- else
- user.visible_message("[user.name] cowardly fires [src] at [user.p_their()] [affecting.name]!", "You cowardly fire [src] at your [affecting.name]!", "You hear a gunshot!")
- chambered = null
- return
-
- user.visible_message("*click*")
- playsound(src, dry_fire_sound, 30, TRUE)
-
-/obj/item/gun/ballistic/revolver/russian/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
- add_fingerprint(user)
- playsound(src, dry_fire_sound, 30, TRUE)
- user.visible_message("[user.name] tries to fire \the [src] at the same time, but only succeeds at looking like an idiot.", "\The [src]'s anti-combat mechanism prevents you from firing it at the same time!")
-
-/obj/item/gun/ballistic/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = BODY_ZONE_HEAD)
- user.apply_damage(300, BRUTE, affecting)
- user.visible_message("[user.name] fires [src] at [user.p_their()] head!", "You fire [src] at your head!", "You hear a gunshot!")
-
/obj/item/gun/ballistic/revolver/firebrand
name = "\improper HP Firebrand"
desc = "An archaic precursor to revolver-type firearms, this gun was rendered completely obsolete millennia ago. While fast to fire, it is extremely inaccurate. Uses .357 ammo."
icon_state = "pepperbox"
item_state = "hp_generic_fresh"
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/pepperbox
spread = 20
manufacturer = MANUFACTURER_HUNTERSPRIDE
@@ -707,8 +654,13 @@ EMPTY_GUN_HELPER(revolver/detective)
name = "\improper HP Shadow"
desc = "A mid-size revolver. Despite the antiquated design, it is cheap, reliable, and stylish, making it a favorite among fast-drawing spacers and the officers of various militaries, as well as small-time police units. Chambered in .44."
fire_sound = 'sound/weapons/gun/revolver/cattleman.ogg'
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
icon_state = "shadow"
+ item_state = "hp_generic"
+
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
manufacturer = MANUFACTURER_HUNTERSPRIDE
obj_flags = UNIQUE_RENAME
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index bf8866ebe07f..4cf82a445fb3 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -73,11 +73,17 @@
/obj/item/gun/ballistic/rifle/illestren
name = "\improper HP Illestren"
desc = "A sturdy and conventional bolt-action rifle. One of Hunter's Pride's most successful firearms, the Illestren is popular among colonists, pirates, snipers, and countless others. Chambered in 8x50mmR."
+ icon_state = "illestren"
+ item_state = "illestren"
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
sawn_desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
eject_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
eject_empty_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
- icon_state = "illestren"
- item_state = "illestren"
+
internal_magazine = FALSE
mag_type = /obj/item/ammo_box/magazine/illestren_a850r
empty_autoeject = TRUE
@@ -130,6 +136,11 @@
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/solgov
icon_state = "ssg669c"
item_state = "ssg669c"
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+
fire_sound = 'sound/weapons/gun/rifle/ssg669c.ogg'
can_be_sawn_off = FALSE
@@ -148,13 +159,19 @@
/obj/item/gun/ballistic/rifle/scout
name = "HP Scout"
desc = "A powerful bolt-action rifle usually given to mercenary hunters of the Saint-Roumain Militia, equally suited for taking down big game or two-legged game. Chambered in .300 Magnum."
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+ icon_state = "scout"
+ item_state = "scout"
+
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/smile
fire_sound = 'sound/weapons/gun/rifle/scout.ogg'
rack_sound = 'sound/weapons/gun/rifle/scout_bolt_out.ogg'
bolt_drop_sound = 'sound/weapons/gun/rifle/scout_bolt_in.ogg'
- icon_state = "scout"
- item_state = "scout"
+
can_be_sawn_off = FALSE
zoomable = TRUE
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index f646e4cf36de..9dba3399fcbd 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -62,7 +62,11 @@
desc = "A simple and sturdy pump-action shotgun sporting a 5-round capacity, manufactured by Hunter's Pride. Found widely throughout the Frontier in the hands of hunters, pirates, police, and countless others. Chambered in 12g."
sawn_desc = "A stockless and shortened pump-action shotgun. The worsened recoil and accuracy make it a poor sidearm anywhere beyond punching distance."
fire_sound = 'sound/weapons/gun/shotgun/brimstone.ogg'
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
icon_state = "brimstone"
item_state = "brimstone"
@@ -98,9 +102,13 @@
/obj/item/gun/ballistic/shotgun/hellfire
name = "HP Hellfire"
desc = "A hefty pump-action riot shotgun with a seven-round tube, manufactured by Hunter's Pride. Especially popular among the Frontier's police forces. Chambered in 12g."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
icon_state = "hellfire"
item_state = "hellfire"
+
mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
sawn_desc = "Come with me if you want to live."
can_be_sawn_off = TRUE
@@ -165,7 +173,14 @@
/obj/item/gun/ballistic/shotgun/automatic/dual_tube
name = "cycler shotgun"
desc = "An advanced shotgun with two separate magazine tubes, allowing you to quickly toggle between ammo types."
+
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
+
icon_state = "cycler"
+
mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
w_class = WEIGHT_CLASS_HUGE
var/toggled = FALSE
@@ -208,13 +223,13 @@
/obj/item/gun/ballistic/shotgun/bulldog //TODO: REPATH TO LIKE /obj/item/gun/ballistic/shotgun/automatic/bulldog
name = "\improper Bulldog Shotgun"
desc = "A semi-automatic, magazine-fed shotgun designed for combat in tight quarters, manufactured by Scarborough Arms. A historical favorite of various Syndicate factions, especially the Gorlex Marauders."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
icon_state = "bulldog"
item_state = "bulldog"
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
- inhand_x_dimension = 32
- inhand_y_dimension = 32
+
weapon_weight = WEAPON_MEDIUM
mag_type = /obj/item/ammo_box/magazine/m12g
can_suppress = FALSE
@@ -267,7 +282,11 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
/obj/item/gun/ballistic/shotgun/bulldog/minutemen //TODO: REPATH
name = "\improper CM-15"
desc = "A standard-issue shotgun of CLIP, most often used by boarding crews. Only compatible with specialized 8-round magazines."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi'
+
mag_type = /obj/item/ammo_box/magazine/cm15_mag
icon_state = "cm15"
item_state = "cm15"
@@ -287,8 +306,11 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
desc = "A classic break action shotgun, hand-made in a Hunter's Pride workshop. Both barrels can be fired in quick succession or even simultaneously. Guns like this have been popular with hunters, sporters, and criminals for millennia. Chambered in 12g."
sawn_desc = "A break action shotgun cut down to the size of a sidearm. While the recoil is even harsher, it offers a lot of power in a very small package. Chambered in 12g."
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
- icon = 'icons/obj/guns/48x32guns.dmi'
base_icon_state = "dshotgun"
icon_state = "dshotgun"
@@ -316,6 +338,11 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
manufacturer = MANUFACTURER_HUNTERSPRIDE
bolt_wording = "barrel"
+ burst_delay = 0.05 SECONDS
+ burst_size = 2
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST)
+ default_firemode = FIREMODE_SEMIAUTO
+
/obj/item/gun/ballistic/shotgun/doublebarrel/unique_action(mob/living/user)
if (bolt_locked == FALSE)
to_chat(user, "You snap open the [bolt_wording] of \the [src].")
@@ -425,6 +452,10 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
name = "improvised shotgun"
desc = "A length of pipe and miscellaneous bits of scrap fashioned into a rudimentary single-shot shotgun."
icon = 'icons/obj/guns/projectile.dmi'
+ lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ mob_overlay_icon = null
+
base_icon_state = "ishotgun"
icon_state = "ishotgun"
item_state = "ishotgun"
@@ -436,6 +467,9 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
unique_reskin = null
var/slung = FALSE
+ gun_firemodes = list(FIREMODE_SEMIAUTO)
+ default_firemode = FIREMODE_SEMIAUTO
+
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
..()
if(istype(A, /obj/item/stack/cable_coil) && !sawn_off)
@@ -540,7 +574,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
attack_verb = list("bludgeoned", "smashed")
mag_type = /obj/item/ammo_box/magazine/internal/shot/sex
burst_size = 6
- fire_delay = 0.08 SECONDS //?? very weird number
+ burst_delay = 0.04 SECONDS //?? very weird number
pb_knockback = 12
unique_reskin = null
recoil = 10
@@ -553,6 +587,8 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
rack_sound_volume = 50
can_be_sawn_off = FALSE
manufacturer = MANUFACTURER_BRAZIL
+ gun_firemodes = list(FIREMODE_BURST)
+ default_firemode = FIREMODE_BURST
/obj/item/gun/ballistic/shotgun/doublebarrel/brazil/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
if(prob(0 + (magazine.ammo_count() * 10)))
@@ -577,6 +613,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
pb_knockback = 40
recoil = 100
recoil_unwielded = 200
+ recoil_backtime_multiplier = 1
fire_sound_volume = 100
mag_type = /obj/item/ammo_box/magazine/internal/shot/hundred
@@ -588,10 +625,10 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
base_icon_state = "flamingarrow"
icon_state = "flamingarrow"
item_state = "flamingarrow"
- icon = 'icons/obj/guns/48x32guns.dmi'
- mob_overlay_icon = 'icons/mob/clothing/back.dmi'
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
inhand_x_dimension = 32
inhand_y_dimension = 32
mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester
@@ -687,9 +724,10 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
/obj/item/gun/ballistic/shotgun/doublebarrel/twobore
name = "HP Huntsman"
desc = "A comically huge double-barreled rifle replete with brass inlays depicting flames and naturalistic scenes, clearly meant for the nastiest monsters the Frontier has to offer. If you want an intact trophy, don't aim for the head. Chambered in two-bore."
- icon = 'icons/obj/guns/48x32guns.dmi'
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
inhand_x_dimension = 32
inhand_y_dimension = 32
base_icon_state = "huntsman"
@@ -711,6 +749,9 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
rack_sound_volume = 50
manufacturer = MANUFACTURER_HUNTERSPRIDE
+ gun_firemodes = list(FIREMODE_SEMIAUTO) //no dual burst for you
+ default_firemode = FIREMODE_SEMIAUTO
+
//Break-Action Rifle
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon
name = "HP Beacon"
@@ -720,8 +761,6 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
icon_state = "beacon"
item_state = "beacon"
unique_reskin = null
- icon = 'icons/obj/guns/48x32guns.dmi'
- mob_overlay_icon = 'icons/mob/clothing/back.dmi'
inhand_x_dimension = 32
inhand_y_dimension = 32
mag_type = /obj/item/ammo_box/magazine/internal/shot/beacon
@@ -742,6 +781,9 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
recoil = 0
recoil_unwielded = 5
+ gun_firemodes = list(FIREMODE_SEMIAUTO)
+ default_firemode = FIREMODE_SEMIAUTO
+
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/sawoff(mob/user)
. = ..()
if(.)
diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
index dcfd4bd5c164..96d4e7d922db 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -42,8 +42,13 @@
/obj/item/gun/ballistic/automatic/smg/c20r
name = "\improper C-20r SMG"
desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.'"
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
icon_state = "c20r"
item_state = "c20r"
+
mag_type = /obj/item/ammo_box/magazine/smgm45
can_bayonet = TRUE
can_suppress = FALSE
@@ -78,6 +83,10 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
/obj/item/gun/ballistic/automatic/smg/wt550
name = "\improper WT-550 Automatic Rifle"
desc = "An outdated PDW, used centuries ago by Nanotrasen security elements. Uses 4.6x30mm rounds."
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "wt550"
item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/wt550m9
@@ -98,7 +107,13 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
/obj/item/gun/ballistic/automatic/smg/mini_uzi
name = "\improper Type U3 Uzi"
desc = "A lightweight submachine gun, for when you really want someone dead. Uses 9mm rounds."
+
+ icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/frontier_import/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/frontier_import/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi'
icon_state = "uzi"
+
mag_type = /obj/item/ammo_box/magazine/uzim9mm
bolt_type = BOLT_TYPE_OPEN
show_magazine_on_sprite = TRUE
@@ -120,6 +135,10 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
/obj/item/gun/ballistic/automatic/smg/vector
name = "\improper Vector carbine"
desc = "A police carbine based on a pre-Night of Fire SMG design. Most of the complex workings have been removed for reliability. Chambered in 9mm."
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "vector"
item_state = "vector"
mag_type = /obj/item/ammo_box/magazine/smgm9mm //you guys remember when the autorifle was chambered in 9mm
@@ -131,8 +150,13 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
/obj/item/gun/ballistic/automatic/smg/m90
name = "\improper M-90gl Carbine"
desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
icon_state = "m90"
item_state = "m90"
+
mag_type = /obj/item/ammo_box/magazine/m556
can_suppress = FALSE
gun_firenames = list(FIREMODE_SEMIAUTO = "single", FIREMODE_BURST = "burst fire", FIREMODE_FULLAUTO = "full auto", FIREMODE_OTHER = "underbarrel grenade launcher")
@@ -209,7 +233,11 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
/obj/item/gun/ballistic/automatic/smg/firestorm //weapon designed by Apogee-dev
name = "HP Firestorm"
desc = "An unconventional submachinegun, rarely issued to Saint-Roumain Militia mercenary hunters for outstanding situations where normal hunting weapons fall short. Chambered in .45."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
icon_state = "firestorm"
item_state = "firestorm"
mag_type = /obj/item/ammo_box/magazine/c45_firestorm_mag
@@ -237,8 +265,14 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
/obj/item/gun/ballistic/automatic/smg/cm5
name = "\improper CM-5"
desc = "The standard issue SMG of CLIP. One of the few firearm designs that were left mostly intact from the designs found on the UNSV Lichtenstein. Chambered in 9mm."
+ icon = 'icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi'
+
icon_state = "cm5"
item_state = "cm5"
+
mag_type = /obj/item/ammo_box/magazine/smgm9mm
weapon_weight = WEAPON_LIGHT
fire_sound = 'sound/weapons/gun/smg/smg_heavy.ogg'
@@ -369,6 +403,10 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq
name = "\improper SKM-44v Mongrel"
desc = "An SKM-44, further modified into a sub-machine gun by Inteq artificers with a new magazine well, collapsing stock, and shortened barrel. Faced with a surplus of SKM-44s and a shortage of other firearms, IRMG has made the most of their available materiel with conversions such as this. Chambered in 10mm."
+ icon = 'icons/obj/guns/manufacturer/inteq/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/inteq/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/inteq/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/inteq/onmob.dmi'
icon_state = "skm_inteqsmg"
item_state = "skm_inteqsmg"
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 796a62dd9427..160569d3f86c 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -22,7 +22,10 @@
/obj/item/gun/ballistic/automatic/toy/pistol
name = "foam force pistol"
desc = "A small, easily concealable toy handgun. Ages 8 and up."
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
icon_state = "pistol" // WS edit - Fix various startup runtimes
bolt_type = BOLT_TYPE_LOCKING
w_class = WEIGHT_CLASS_SMALL
@@ -44,6 +47,7 @@
/obj/item/gun/ballistic/shotgun/toy
name = "foam force shotgun"
desc = "A toy shotgun with wood furniture and a four-shell capacity underneath. Ages 8 and up."
+ icon_state = "shotgun"
force = 0
throwforce = 0
mag_type = /obj/item/ammo_box/magazine/internal/shot/toy
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index fb0970321308..0341c04f2c06 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -1,8 +1,8 @@
/obj/item/gun/energy
- icon_state = "energy"
name = "energy gun"
desc = "A basic energy-based gun."
icon = 'icons/obj/guns/energy.dmi'
+ icon_state = "laser"
muzzleflash_iconstate = "muzzle_flash_laser"
muzzle_flash_color = COLOR_SOFT_RED
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 12df6fd4a352..6988f1f6cb72 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -1,6 +1,10 @@
/obj/item/gun/energy/e_gun
name = "energy rifle"
desc = "A basic hybrid energy gun with two settings: disable and kill."
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "energy"
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
@@ -47,7 +51,6 @@
/obj/item/gun/energy/e_gun/hades
name = "SL AL-655 'Hades' energy rifle"
desc = "The standard issue rifle of Nanotrasen's Security Forces. Most have been put in long term storage following the ICW, and usually aren't issued to low ranking security divisions."
- icon = 'icons/obj/guns/48x32guns.dmi'
icon_state = "energytac"
ammo_x_offset = 2
charge_sections = 5
@@ -75,12 +78,6 @@
ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/electrode/old)
manufacturer = MANUFACTURER_NANOTRASEN_OLD
-/obj/item/gun/energy/e_gun/mini/practice_phaser
- name = "practice phaser"
- desc = "A modified version of the basic phaser gun, this one fires less concentrated energy bolts designed for target practice."
- ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser/practice)
- icon_state = "decloner"
-
/obj/item/gun/energy/e_gun/hos
name = "\improper X-01 MultiPhase Energy Gun"
desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
@@ -254,6 +251,10 @@
/obj/item/gun/energy/e_gun/e11
name = "E-11 hybrid energy rifle"
desc = "A hybrid energy gun fondly remembered as one of the worst weapons ever made. It hurts, but that's only if it manages to hit its target."
+ icon = 'icons/obj/guns/manufacturer/eoehoma/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/eoehoma/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/eoehoma/onmob.dmi'
icon_state = "e11"
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser/eoehoma)
can_flashlight = TRUE
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 92193ed89bdb..c564ae32b4da 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -1,6 +1,7 @@
/obj/item/gun/energy/laser
name = "SL L-204 laser gun"
desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
+
icon_state = "laser"
item_state = "laser"
w_class = WEIGHT_CLASS_NORMAL
@@ -25,13 +26,22 @@
/obj/item/gun/energy/laser/retro
name ="SL L-104 retro laser gun"
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "retro"
desc = "An antiquated model of the basic lasergun, no longer used or sold by Sharplite. Nevertheless, the sheer popularity of this model makes it a somewhat common sight to this day."
ammo_x_offset = 3
manufacturer = MANUFACTURER_SHARPLITE
+
/obj/item/gun/energy/laser/captain
name = "antique laser gun"
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "caplaser"
item_state = null
desc = "This is the SL 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. It is decorated with ashdrake leather and chrome. The gun menaces with spikes of energy. On the item is an image of a space station. The station is exploding."
@@ -49,8 +59,6 @@
/obj/item/gun/energy/laser/captain/scattershot
name = "scatter shot laser rifle"
- icon_state = "lasercannon"
- item_state = "laser"
desc = "An industrial-grade heavy-duty laser rifle with a modified laser lens to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theoretically infinite use."
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
shaded_charge = FALSE
@@ -153,6 +161,9 @@
/obj/item/gun/energy/laser/iot
name = "\improper SL E-255 Ultimate"
desc = "An energy shotgun with an integrated computer system for surveillance and statistics tracking."
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
+
lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
inhand_x_dimension = 64
@@ -184,6 +195,10 @@
/obj/item/gun/energy/laser/hitscanpistol
name = "experimental laser gun"
desc = "A highly experimental laser gun, with unknown inner workings. It has no markings besides a \"GROUP A\" inscription on the barrel."
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "hitscangun"
item_state = "gun"
ammo_x_offset = 2
@@ -203,6 +218,10 @@
/obj/item/gun/energy/laser/e10
name = "E-10 laser pistol"
desc = "A very old laser weapon. Despite the extreme age of some of these weapons, they are sometimes preferred to newer, mass-produced Nanotrasen laser weapons."
+ icon = 'icons/obj/guns/manufacturer/eoehoma/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/eoehoma/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/eoehoma/onmob.dmi'
icon_state = "e10"
w_class = WEIGHT_CLASS_SMALL
@@ -219,8 +238,12 @@
name = "E-50 energy emitter"
desc = "A heavy and extremely powerful laser. Sets targets on fire and kicks ass, but it uses a massive amount of energy per shot and is generally awkward to handle."
- icon = 'icons/obj/guns/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/eoehoma/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/eoehoma/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/eoehoma/onmob.dmi'
icon_state = "e50"
+ item_state = "e50"
big_gun = TRUE
cell_type = /obj/item/stock_parts/cell/gun/large
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index f16cbbd98e8c..dfa23e26b468 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -1,7 +1,10 @@
/obj/item/gun/energy/pulse
name = "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/48x32guns.dmi'
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "pulse"
item_state = null
w_class = WEIGHT_CLASS_BULKY
@@ -27,7 +30,10 @@
/obj/item/gun/energy/pulse/carbine
name = "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/energy.dmi'
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
icon_state = "pulse_carbine"
@@ -58,7 +64,10 @@
/obj/item/gun/energy/pulse/pistol
name = "pulse pistol"
desc = "A pulse rifle in an easily concealed handgun package with low capacity."
- icon = 'icons/obj/guns/energy.dmi'
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_BELT
icon_state = "pulse_pistol"
@@ -75,10 +84,3 @@
/obj/item/gun/energy/pulse/destroyer/attack_self(mob/living/user)
to_chat(user, "[src.name] has three settings, and they are all DESTROY.")
-
-/obj/item/gun/energy/pulse/pistol/m1911
- name = "\improper Candor-P"
- desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people."
- icon_state = "m1911"
- item_state = "gun"
- cell_type = /obj/item/stock_parts/cell/infinite
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 3233e9afff45..07f0aebaa9a0 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -102,13 +102,6 @@
max_mod_capacity = 0
manufacturer = MANUFACTURER_SCARBOROUGH
-/obj/item/gun/energy/kinetic_accelerator/crossbow/halloween
- name = "candy corn crossbow"
- desc = "A weapon favored by Syndicate trick-or-treaters."
- icon_state = "crossbow_halloween"
- item_state = "crossbow"
- ammo_type = list(/obj/item/ammo_casing/energy/bolt/halloween)
-
/obj/item/gun/energy/kinetic_accelerator/crossbow/large
name = "energy crossbow"
desc = "A reverse engineered weapon using syndicate technology."
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index fc11a632e039..168bbdc099dc 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 = "A low-capacity, energy-based stun gun used by security teams to subdue targets at range."
- icon_state = "taser"
+ icon_state = "advtaser"
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
ammo_x_offset = 3
@@ -29,6 +29,10 @@
/obj/item/gun/energy/disabler
name = "disabler"
desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse."
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "disabler"
item_state = null
ammo_type = list(/obj/item/ammo_casing/energy/disabler)
@@ -50,5 +54,9 @@
/obj/item/gun/energy/disabler/e60
name = "E-60"
desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse."
+ icon = 'icons/obj/guns/manufacturer/eoehoma/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/eoehoma/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/eoehoma/onmob.dmi'
icon_state = "e60"
manufacturer = MANUFACTURER_EOEHOMA
diff --git a/code/modules/projectiles/guns/faction/gezena/energy_gunsword.dm b/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm
similarity index 78%
rename from code/modules/projectiles/guns/faction/gezena/energy_gunsword.dm
rename to code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm
index 17cc5157ce78..4053b5f4d8a6 100644
--- a/code/modules/projectiles/guns/faction/gezena/energy_gunsword.dm
+++ b/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm
@@ -1,12 +1,12 @@
-/obj/item/gun/energy/kalix //blue //todo: fix up belt_mirror.dmi, it's incomprehensible
+/obj/item/gun/energy/kalix
name = "Etherbor BG-12"
- desc = "Brought to you by Etherbor Industries, proudly based within the PGF, is the BG-12 energy beam gun! The BG-12 is Etherbor's current newest civilian energy weapon model."
+ desc = "Etherbor Industries's current civilian energy weapon model. The BG-12 energy beam gun is identical to the military model, minus the removal of the full auto mode. Otherwise, it's no different from older hunting beams from Kalixcis's history."
icon_state = "kalixgun"
item_state = "kalixgun"
- icon = 'icons/obj/guns/faction/gezena/energy.dmi'
- lefthand_file = 'icons/obj/guns/faction/gezena/lefthand.dmi'
- righthand_file = 'icons/obj/guns/faction/gezena/righthand.dmi'
- mob_overlay_icon = 'icons/mob/clothing/faction/gezena/belt.dmi'
+ icon = 'icons/obj/guns/manufacturer/etherbor/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/etherbor/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/etherbor/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/etherbor/onmob.dmi'
w_class = WEIGHT_CLASS_BULKY
modifystate = TRUE
@@ -47,7 +47,7 @@
/obj/item/gun/energy/kalix/pgf
name = "Etherbor BG-16"
- desc = "An advanced variant of the BG-12, the BG-16 is the military-grade beam gun designed and manufactured by Etherbor Industries as the standard-issue close-range weapon of the PGF."
+ desc = "The BG-16 is the military-grade beam gun designed and manufactured by Etherbor Industries as the standard-issue close-range weapon of the PGF."
icon_state = "pgfgun"
item_state = "pgfgun"
w_class = WEIGHT_CLASS_NORMAL
@@ -69,9 +69,9 @@
fire_sound = 'sound/weapons/gun/energy/kalixsmg.ogg'
delay = 1
-/obj/item/gun/energy/kalix/pistol //blue //todo: fix up belt_mirror.dmi, it's incomprehensible
+/obj/item/gun/energy/kalix/pistol //blue
name = "Etherbor SG-8"
- desc = "Etherbor's current and sidearm offering. While intended for marines, it's also available for civillians"
+ desc = "Etherbor's current and sidearm offering. While marketed for the military, it's also available for civillians as an upgrade over older and obsolete beam pistols."
icon_state = "kalixpistol"
item_state = "kalixpistol"
w_class = WEIGHT_CLASS_NORMAL
@@ -99,11 +99,9 @@
/obj/item/gun/energy/kalix/pgf/heavy
name = "Etherbor HBG-7"
- desc = "The HBG-7 is the standard-issue rifle weapon of the PGF. If the stopping power and fire rate isn't enough, it comes with a DMR mode that has greater armor piercing for dealing with armored targets."
+ desc = "The HBG-7 is the standard-issue rifle weapon of the PGF. It comes with a special DMR mode that has greater armor piercing for dealing with armored targets."
icon_state = "pgfheavy"
item_state = "pgfheavy"
- icon = 'icons/obj/guns/faction/gezena/48x32.dmi'
- mob_overlay_icon = 'icons/mob/clothing/faction/gezena/back.dmi'
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
@@ -157,7 +155,7 @@
/obj/item/gun/energy/kalix/pgf/heavy/sniper
name = "Etherbor HBG-7L"
- desc = "HBG-7 with a longer barrel and scope. Intended to get the best use out of the DMR mode, it suffers if used normally from longer wield times and slowdown"
+ desc = "HBG-7 with a longer barrel and scope. Intended to get the best use out of the DMR mode, it suffers from longer wield times and slowdown, but it's longer barrel makes it ideal for accuracy."
icon_state = "pgfheavy_sniper"
item_state = "pgfheavy_sniper"
diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm
index cfca24920f91..55138a36c367 100644
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -9,12 +9,12 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/energy/e_gun,
/obj/item/gun/energy/e_gun/advtaser,
/obj/item/gun/energy/laser,
- /obj/item/gun/ballistic/revolver,
+ /obj/item/gun/ballistic/revolver/syndicate,
/obj/item/gun/ballistic/revolver/detective,
/obj/item/gun/ballistic/automatic/pistol/deagle/camo,
/obj/item/gun/ballistic/automatic/gyropistol,
/obj/item/gun/energy/pulse,
- /obj/item/gun/ballistic/automatic/pistol/suppressed,
+ /obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/gun/ballistic/shotgun/doublebarrel,
/obj/item/gun/ballistic/shotgun,
/obj/item/gun/ballistic/shotgun/automatic/combat,
@@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/ballistic/shotgun/bulldog,
/obj/item/gun/ballistic/revolver/grenadelauncher,
/obj/item/gun/ballistic/revolver/golden,
- /obj/item/gun/ballistic/automatic/sniper_rifle,
+ /obj/item/gun/ballistic/automatic/marksman/sniper_rifle,
/obj/item/gun/ballistic/rocketlauncher,
/obj/item/gun/medbeam,
/obj/item/gun/energy/laser/scatter,
diff --git a/code/modules/unit_tests/projectiles.dm b/code/modules/unit_tests/projectiles.dm
index e93d20910af0..5c8412d05aec 100644
--- a/code/modules/unit_tests/projectiles.dm
+++ b/code/modules/unit_tests/projectiles.dm
@@ -6,7 +6,7 @@
/datum/unit_test/gun_go_bang/Run()
// test is for a ballistic gun that starts loaded + chambered
- var/obj/item/gun/test_gun = allocate(/obj/item/gun/ballistic/automatic/pistol)
+ var/obj/item/gun/test_gun = allocate(/obj/item/gun/ballistic/automatic/pistol/candor)
var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human)
var/mob/living/carbon/human/gunner = allocate(/mob/living/carbon/human)
ADD_TRAIT(victim, TRAIT_PIERCEIMMUNE, INNATE_TRAIT) // So the human isn't randomly affected by shrapnel
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index eaa0a631ec5d..11eb6a4b49e6 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -485,7 +485,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/sniper
name = "Sniper Rifle"
desc = "Ranged fury, Syndicate style. Guaranteed to cause shock and awe or your TC back!"
- item = /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate
+ item = /obj/item/gun/ballistic/automatic/marksman/sniper_rifle
cost = 16
surplus = 25
include_modes = list(/datum/game_mode/nuclear)
@@ -494,7 +494,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Stechkin Pistol"
desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible \
with suppressors."
- item = /obj/item/gun/ballistic/automatic/pistol
+ item = /obj/item/gun/ballistic/automatic/pistol/syndicate
cost = 7
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -508,7 +508,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/revolver
name = "Syndicate Revolver"
desc = "A brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers."
- item = /obj/item/gun/ballistic/revolver
+ item = /obj/item/gun/ballistic/revolver/syndicate
cost = 13
surplus = 50
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -575,7 +575,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/ebr
name = "M514 EBR"
desc = "A cheap rifle with high stopping power and low capacity."
- item = /obj/item/gun/ballistic/automatic/ebr
+ item = /obj/item/gun/ballistic/automatic/marksman/ebr
cost = 8
surplus = 20
include_modes = list(/datum/game_mode/nuclear)
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
deleted file mode 100644
index cb16d19e5f19..000000000000
--- a/code/modules/vending/liberation.dm
+++ /dev/null
@@ -1,35 +0,0 @@
-/obj/machinery/vending/liberationstation
- name = "\improper Liberation Station"
- desc = "An overwhelming amount of ancient patriotism washes over you just by looking at the machine."
- icon_state = "liberationstation"
- product_slogans = "Liberation Station: Your one-stop shop for all things second amendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!"
- product_ads = "Float like an astronaut, sting like a bullet!;Express your second amendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?"
- vend_reply = "Remember the name: Liberation Station!"
- products = list(
- /obj/item/reagent_containers/food/snacks/burger/plain = 5, //O say can you see, by the dawn's early light
- /obj/item/reagent_containers/food/snacks/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming
- /obj/item/reagent_containers/food/snacks/fries = 5, //Whose broad stripes and bright stars through the perilous fight
- /obj/item/reagent_containers/food/drinks/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
- /obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
- /obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2,
- /obj/item/gun/ballistic/automatic/pistol/candor = 2,
- /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 2,
- /obj/item/gun/ballistic/shotgun/automatic/combat = 2,
- /obj/item/gun/ballistic/automatic/gyropistol = 1,
- /obj/item/gun/ballistic/shotgun = 2)
- premium = list(
- /obj/item/ammo_box/magazine/smgm9mm = 2,
- /obj/item/ammo_box/magazine/m50 = 4,
- /obj/item/ammo_box/magazine/m45 = 2,
- /obj/item/ammo_box/magazine/m75 = 2,
- /obj/item/reagent_containers/food/snacks/cheesyfries = 5,
- /obj/item/reagent_containers/food/snacks/burger/baconburger = 5) //Premium burgers for the premium section
- contraband = list(
- /obj/item/clothing/under/misc/patriotsuit = 3,
- /obj/item/bedsheet/patriot = 5,
- /obj/item/reagent_containers/food/snacks/burger/superbite = 3) //U S A
- armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
- resistance_flags = FIRE_PROOF
- default_price = 150
- extra_price = 500
- light_mask = "liberation-light-mask"
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 95afc6f2eb92..911eaed20652 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -131,7 +131,7 @@
)
voucher_items = list(
"M-90gl Carbine" = /obj/item/gun/ballistic/automatic/smg/m90,
- "sniper rifle" = /obj/item/gun/ballistic/automatic/sniper_rifle,
+ "sniper rifle" = /obj/item/gun/ballistic/automatic/marksman/sniper_rifle,
"C-20r SMG" = /obj/item/gun/ballistic/automatic/smg/c20r,
"Bulldog Shotgun" = /obj/item/gun/ballistic/shotgun/bulldog)
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index e8702376efce..5508bc67523c 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index f334af20104e..7568a1274d66 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi
deleted file mode 100644
index bc048fc920c9..000000000000
Binary files a/icons/mob/clothing/belt_mirror.dmi and /dev/null differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index e6dfaccf2671..ff71ba99e3c0 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index c42cf70ea894..c40ac3335e06 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/obj/guns/48x32guns.dmi b/icons/obj/guns/48x32guns.dmi
index 232ecdb35e02..cbc495275add 100644
Binary files a/icons/obj/guns/48x32guns.dmi and b/icons/obj/guns/48x32guns.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 3208083cd0bd..e02a7e288cc8 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/guns/faction/gezena/48x32.dmi b/icons/obj/guns/faction/gezena/48x32.dmi
deleted file mode 100644
index 29c89ec1edb1..000000000000
Binary files a/icons/obj/guns/faction/gezena/48x32.dmi and /dev/null differ
diff --git a/icons/obj/guns/faction/gezena/energy.dmi b/icons/obj/guns/faction/gezena/energy.dmi
deleted file mode 100644
index be3b5b2f71d6..000000000000
Binary files a/icons/obj/guns/faction/gezena/energy.dmi and /dev/null differ
diff --git a/icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi b/icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi
new file mode 100644
index 000000000000..d87a6f3c8433
Binary files /dev/null and b/icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi b/icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi
new file mode 100644
index 000000000000..7673c2f6d642
Binary files /dev/null and b/icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi b/icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi
new file mode 100644
index 000000000000..4f9158d2d36d
Binary files /dev/null and b/icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi b/icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi
new file mode 100644
index 000000000000..4549f30f4ff9
Binary files /dev/null and b/icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/eoehoma/48x32.dmi b/icons/obj/guns/manufacturer/eoehoma/48x32.dmi
new file mode 100644
index 000000000000..5ab3ee4a0cb0
Binary files /dev/null and b/icons/obj/guns/manufacturer/eoehoma/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/eoehoma/lefthand.dmi b/icons/obj/guns/manufacturer/eoehoma/lefthand.dmi
new file mode 100644
index 000000000000..9fd5086f4003
Binary files /dev/null and b/icons/obj/guns/manufacturer/eoehoma/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/eoehoma/onmob.dmi b/icons/obj/guns/manufacturer/eoehoma/onmob.dmi
new file mode 100644
index 000000000000..f4b14ced71a7
Binary files /dev/null and b/icons/obj/guns/manufacturer/eoehoma/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/eoehoma/righthand.dmi b/icons/obj/guns/manufacturer/eoehoma/righthand.dmi
new file mode 100644
index 000000000000..c1f9ccab3ff0
Binary files /dev/null and b/icons/obj/guns/manufacturer/eoehoma/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/etherbor/48x32.dmi b/icons/obj/guns/manufacturer/etherbor/48x32.dmi
new file mode 100644
index 000000000000..e5a9074f06c2
Binary files /dev/null and b/icons/obj/guns/manufacturer/etherbor/48x32.dmi differ
diff --git a/icons/obj/guns/faction/gezena/lefthand.dmi b/icons/obj/guns/manufacturer/etherbor/lefthand.dmi
similarity index 100%
rename from icons/obj/guns/faction/gezena/lefthand.dmi
rename to icons/obj/guns/manufacturer/etherbor/lefthand.dmi
diff --git a/icons/obj/guns/manufacturer/etherbor/onmob.dmi b/icons/obj/guns/manufacturer/etherbor/onmob.dmi
new file mode 100644
index 000000000000..43e539c557b8
Binary files /dev/null and b/icons/obj/guns/manufacturer/etherbor/onmob.dmi differ
diff --git a/icons/obj/guns/faction/gezena/righthand.dmi b/icons/obj/guns/manufacturer/etherbor/righthand.dmi
similarity index 100%
rename from icons/obj/guns/faction/gezena/righthand.dmi
rename to icons/obj/guns/manufacturer/etherbor/righthand.dmi
diff --git a/icons/obj/guns/manufacturer/frontier_import/48x32.dmi b/icons/obj/guns/manufacturer/frontier_import/48x32.dmi
new file mode 100644
index 000000000000..149793c43c38
Binary files /dev/null and b/icons/obj/guns/manufacturer/frontier_import/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi b/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi
new file mode 100644
index 000000000000..33b3381bdfe0
Binary files /dev/null and b/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/onmob.dmi b/icons/obj/guns/manufacturer/frontier_import/onmob.dmi
new file mode 100644
index 000000000000..a0706579ccb5
Binary files /dev/null and b/icons/obj/guns/manufacturer/frontier_import/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/righthand.dmi b/icons/obj/guns/manufacturer/frontier_import/righthand.dmi
new file mode 100644
index 000000000000..73945b8524df
Binary files /dev/null and b/icons/obj/guns/manufacturer/frontier_import/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/hunterspride/48x32.dmi b/icons/obj/guns/manufacturer/hunterspride/48x32.dmi
new file mode 100644
index 000000000000..19b4202da78a
Binary files /dev/null and b/icons/obj/guns/manufacturer/hunterspride/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/hunterspride/lefthand.dmi b/icons/obj/guns/manufacturer/hunterspride/lefthand.dmi
new file mode 100644
index 000000000000..4fb5eca5c011
Binary files /dev/null and b/icons/obj/guns/manufacturer/hunterspride/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/hunterspride/onmob.dmi b/icons/obj/guns/manufacturer/hunterspride/onmob.dmi
new file mode 100644
index 000000000000..8911c8fbb68f
Binary files /dev/null and b/icons/obj/guns/manufacturer/hunterspride/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/hunterspride/righthand.dmi b/icons/obj/guns/manufacturer/hunterspride/righthand.dmi
new file mode 100644
index 000000000000..043167735662
Binary files /dev/null and b/icons/obj/guns/manufacturer/hunterspride/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/inteq/48x32.dmi b/icons/obj/guns/manufacturer/inteq/48x32.dmi
new file mode 100644
index 000000000000..e7deb0f12ce0
Binary files /dev/null and b/icons/obj/guns/manufacturer/inteq/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/inteq/lefthand.dmi b/icons/obj/guns/manufacturer/inteq/lefthand.dmi
new file mode 100644
index 000000000000..19335eb44ff9
Binary files /dev/null and b/icons/obj/guns/manufacturer/inteq/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/inteq/onmob.dmi b/icons/obj/guns/manufacturer/inteq/onmob.dmi
new file mode 100644
index 000000000000..f402ffd24e2c
Binary files /dev/null and b/icons/obj/guns/manufacturer/inteq/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/inteq/righthand.dmi b/icons/obj/guns/manufacturer/inteq/righthand.dmi
new file mode 100644
index 000000000000..33d087f394f1
Binary files /dev/null and b/icons/obj/guns/manufacturer/inteq/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi b/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi
new file mode 100644
index 000000000000..bac0ccc8f210
Binary files /dev/null and b/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi b/icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi
new file mode 100644
index 000000000000..24ac86c3e0b5
Binary files /dev/null and b/icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi b/icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi
new file mode 100644
index 000000000000..8a1d7f06e561
Binary files /dev/null and b/icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi b/icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi
new file mode 100644
index 000000000000..b6831ec9696a
Binary files /dev/null and b/icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/scarborough/48x32.dmi b/icons/obj/guns/manufacturer/scarborough/48x32.dmi
new file mode 100644
index 000000000000..361448b49a35
Binary files /dev/null and b/icons/obj/guns/manufacturer/scarborough/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/scarborough/lefthand.dmi b/icons/obj/guns/manufacturer/scarborough/lefthand.dmi
new file mode 100644
index 000000000000..8d184d907db6
Binary files /dev/null and b/icons/obj/guns/manufacturer/scarborough/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/scarborough/onmob.dmi b/icons/obj/guns/manufacturer/scarborough/onmob.dmi
new file mode 100644
index 000000000000..5127ecfed566
Binary files /dev/null and b/icons/obj/guns/manufacturer/scarborough/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/scarborough/righthand.dmi b/icons/obj/guns/manufacturer/scarborough/righthand.dmi
new file mode 100644
index 000000000000..5dbfb0acfc25
Binary files /dev/null and b/icons/obj/guns/manufacturer/scarborough/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/solararmories/48x32.dmi b/icons/obj/guns/manufacturer/solararmories/48x32.dmi
new file mode 100644
index 000000000000..690fc5b54bdf
Binary files /dev/null and b/icons/obj/guns/manufacturer/solararmories/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/solararmories/lefthand.dmi b/icons/obj/guns/manufacturer/solararmories/lefthand.dmi
new file mode 100644
index 000000000000..b28e97e9a1db
Binary files /dev/null and b/icons/obj/guns/manufacturer/solararmories/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/solararmories/onmob.dmi b/icons/obj/guns/manufacturer/solararmories/onmob.dmi
new file mode 100644
index 000000000000..3e5b665f4fb0
Binary files /dev/null and b/icons/obj/guns/manufacturer/solararmories/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/solararmories/righthand.dmi b/icons/obj/guns/manufacturer/solararmories/righthand.dmi
new file mode 100644
index 000000000000..ab82dd742a66
Binary files /dev/null and b/icons/obj/guns/manufacturer/solararmories/righthand.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 2ccd5f8cead1..986c2f99692f 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 17389f325e20..4f6f1e910dc4 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -3043,6 +3043,7 @@
#include "code\modules\projectiles\guns\ballistic\gauss.dm"
#include "code\modules\projectiles\guns\ballistic\hmg.dm"
#include "code\modules\projectiles\guns\ballistic\launchers.dm"
+#include "code\modules\projectiles\guns\ballistic\marksman.dm"
#include "code\modules\projectiles\guns\ballistic\pistol.dm"
#include "code\modules\projectiles\guns\ballistic\revolver.dm"
#include "code\modules\projectiles\guns\ballistic\rifle.dm"
@@ -3058,7 +3059,7 @@
#include "code\modules\projectiles\guns\energy\pulse.dm"
#include "code\modules\projectiles\guns\energy\special.dm"
#include "code\modules\projectiles\guns\energy\stun.dm"
-#include "code\modules\projectiles\guns\faction\gezena\energy_gunsword.dm"
+#include "code\modules\projectiles\guns\manufacturer\etherbor\energy_gunsword.dm"
#include "code\modules\projectiles\guns\misc\beam_rifle.dm"
#include "code\modules\projectiles\guns\misc\blastcannon.dm"
#include "code\modules\projectiles\guns\misc\bow.dm"
@@ -3470,7 +3471,6 @@
#include "code\modules\vending\engineering.dm"
#include "code\modules\vending\engivend.dm"
#include "code\modules\vending\games.dm"
-#include "code\modules\vending\liberation.dm"
#include "code\modules\vending\liberation_toy.dm"
#include "code\modules\vending\medical.dm"
#include "code\modules\vending\medical_wall.dm"