[IDB IGNORE][MDB IGNORE] Reorganizes Guns Sprites and Repaths (shipte…

…st-ss13#3176)   ## About The Pull Request This reorganizes most of the gun spritesheets into separate files, making it not fucking agony to look through This also repaths pistols and revolvers, this is a mystery tool we will need later. This also take the liberty of removing belt_mirror.dmi because fuck that file, all suit storage slots will pull from either mob overlay icon or back.dmi as a fallback. ## Why It's Good For The Game Would be very helpful for the 5 million gun rewokrs that are done, but not implmented yet. While it is true i'm waiting on gun attachments, this is more pressing than that. ## Changelog :cl: add: Resprites the E-50 and gives it proper inhands now! fix: The Syndicate sniper rifle fires at a normal rate of fire and has the correct recoil now. /:cl: --------- Co-authored-by: retlaw34 <[email protected]>
CeladonSS13 · Jul 5, 2024 · b82879d · b82879d
1 parent da23e62
commit b82879d
Show file tree

Hide file tree

Showing 105 changed files with 644 additions and 411 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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