Modular Weapon Implementation & Bugfixes (#233)

* implements modular bolt actions

* yea

* crafting accessibility

* forgor

* fixes gun part quality

* further does fixes

* fixes 1 of several runtimes related to modgun scopes

bottom text

* scope fix part 2

* sights and bayonets for other modguns

bottom text

* slight bayonet touchup

* fixes boltgun inhands

again
This fucking modgun code girl... this will kill me

* fixes bolt action inhands and bayonet sprites (sort of)

* fixes inhand change delay

* oops

* fixes blacklisting of deprecated boltguns

* oldification for modguns

enables proper oldify mechanics 4 modguns

* finishes deprecating old boltguns

* oops

* non-modgun weapon mods also have visuals on modguns

* fixes maxupgrade stuff on gun upgrades

* guh

* unblacklists the frames

bottom text

Author: Sun-Soaked

code/__DEFINES/items.dm

@@ -40,6 +40,7 @@
 #define PARTMOD_FOLDING_STOCK 1
 #define PARTMOD_SLIDE 2
 #define PARTMOD_FRAME_SPRITE 4 // Defines whether grips or frames determine the inhands, TODO: remove this when V3 comes
+#define PARTMOD_BAYONET 8
 
 //Weapon upgrade defines
 

code/datums/autolathe/guns.dm

@@ -163,7 +163,7 @@
 
 /datum/design/autolathe/gun/boltgun_fs
 	name = "FS BR .20 \"Kadmin\""
-	build_path = /obj/item/gun/projectile/boltgun/fs
+	build_path = /obj/item/gun/projectile/automatic/modular/bolt/fs
 
 /datum/design/autolathe/gun/boltgun_fs/ui_icon()
 	var/obj/build_type = build_path
@@ -184,15 +184,16 @@
 
 /datum/design/autolathe/gun/boltgun
 	name = "Excelsior .30 \"Kardashev-Mosin\""
-	build_path = /obj/item/gun/projectile/boltgun
+	build_path = /obj/item/gun/projectile/automatic/modular/bolt/excel
+	minimum_quality = 2
 
 /datum/design/autolathe/gun/boltgun/ui_icon()
 	var/obj/build_type = build_path
 	return icon(build_type::icon, "[build_type::icon_state]_closed")
 
 /datum/design/autolathe/gun/boltgun_serbian
 	name = "SA BR .30 \"Novakovic\""
-	build_path = /obj/item/gun/projectile/boltgun/serbian
+	build_path = /obj/item/gun/projectile/automatic/modular/bolt/serbian/finished
 
 /datum/design/autolathe/gun/boltgun_serbian/ui_icon()
 	var/obj/build_type = build_path
@@ -224,7 +225,7 @@
 
 /datum/design/autolathe/gun/heavysniper
 	name = "SA AMR .60 \"Hristov\""
-	build_path = /obj/item/gun/projectile/heavysniper
+	build_path = /obj/item/gun/projectile/automatic/modular/bolt/sniper/finished
 	minimum_quality = 2
 
 /datum/design/autolathe/gun/heavysniper/ui_icon()

code/datums/craft/craft_designs.dm

@@ -204,6 +204,27 @@ Based on /datum/design of \code\datums\autolathe\autolathe_datums.dm
 	build_path = /obj/item/part/gun/modular/mechanism/autorifle/marksman
 	minimum_quality = 2
 
+//bolt-action mechanisms
+
+/datum/design/makeshift/mechanism/boltaction/junk
+	name = "handmade manual-action mechanism"
+	category = "bolt-action mechanisms"
+	build_path = /obj/item/part/gun/modular/mechanism/boltgun/junk
+	minimum_quality = 0
+
+/datum/design/makeshift/mechanism/boltaction
+	name = "manual-action mechanism"
+	category = "bolt-action mechanisms"
+	build_path = /obj/item/part/gun/modular/mechanism/boltgun
+	minimum_quality = 2
+
+/datum/design/makeshift/mechanism/boltaction/heavy
+	name = "heavy manual-action mechanism"
+	category = "bolt-action mechanisms"
+	build_path = /obj/item/part/gun/modular/mechanism/boltgun/heavy
+	minimum_quality = 3
+
+
 // .35
 
 /datum/design/makeshift/mags_pistol
@@ -376,3 +397,28 @@ Based on /datum/design of \code\datums\autolathe\autolathe_datums.dm
 	minimum_quality = 0
 	// I dunno, it kinda meant to be affordable and a comodity since all amor you make with it is medicore.
 	// Probably could be changed to +1 but the average vaga would need to upgrade the lath at least with t2
+
+/datum/design/makeshift/bayonet_cheap
+	name = "cheap integrated bayonet"
+	build_path = /obj/item/part/gun/modular/bayonet/steel
+	quality = -1
+
+/datum/design/makeshift/bayonet
+	name = "integrated bayonet"
+	build_path = /obj/item/part/gun/modular/bayonet
+	minimum_quality = 0
+
+/datum/design/makeshift/scope
+	name = "small scope"
+	build_path = /obj/item/part/gun/modular/sights/scopesmall
+	minimum_quality = 1 //scopes have high skill input bc. they're challenging to make
+
+/datum/design/makeshift/scope/big
+	name = "large scope"
+	build_path = /obj/item/part/gun/modular/sights/scopebig
+	minimum_quality = 2
+
+/datum/design/makeshift/scope/custom
+	name = "adjustable sniper scope"
+	build_path = /obj/item/part/gun/modular/sights/customizable/scopeheavy
+	minimum_quality = 3

code/datums/craft/gun_parts.dm

@@ -80,7 +80,7 @@ semi accepts weird caliber - +1 points
 	// Bonuses from forging/type or maluses from printing
 	var/cheap = FALSE // Set this to true for cheap variants
 
-/obj/item/part/gun/modular/New(location)
+/obj/item/part/gun/modular/New(location, quality = 0)
 	..()
 	I = AddComponent(/datum/component/item_upgrade)
 	if(interactions)
@@ -94,6 +94,9 @@ semi accepts weird caliber - +1 points
 	I.removal_time = WORKTIME_SLOW
 	I.removal_difficulty = FAILCHANCE_NORMAL
 
+	if(quality)
+		set_quality(quality)
+
 /obj/item/part/gun/modular/set_quality(quality = 0)
 	old_quality = CLAMP(quality, -2, max_quality) // Some parts, such as One Star will permit +3 parts
 	price_tag = initial(price_tag) * (2 ** old_quality) // From a quarter of the price for junk, to quadruple the price for antag-grade parts.
@@ -306,7 +309,7 @@ semi accepts weird caliber - +1 points
 	part_itemstring = TRUE
 
 /obj/item/part/gun/modular/grip/New(location, quality = 0)
-	..(quality)
+	..(quality = quality)
 	I.weapon_upgrades[GUN_UPGRADE_DEFINE_GRIP] = type_of_grip
 	I.weapon_upgrades[GUN_UPGRADE_OFFSET] = -15 // Without a grip the gun shoots funny, players are legally allowed to not use a grip
 	I.gun_loc_tag = PART_GRIP
@@ -391,7 +394,7 @@ semi accepts weird caliber - +1 points
 
 
 /obj/item/part/gun/modular/mechanism/New(location, quality = 0)
-	..(quality)
+	..(quality = quality)
 	I.weapon_upgrades[GUN_UPGRADE_FIREMODES] = bonus_firemodes
 	I.weapon_upgrades[GUN_UPGRADE_DEFINE_MAG_WELL] = mag_well
 	I.weapon_upgrades[GUN_UPGRADE_DEFINE_OK_CALIBERS] = accepted_calibers
@@ -659,7 +662,7 @@ semi accepts weird caliber - +1 points
 	var/basemove
 
 /obj/item/part/gun/modular/barrel/New(location, quality = 0)
-	..(quality)
+	..(quality = quality)
 	I.weapon_upgrades[GUN_UPGRADE_DEFINE_CALIBER] = caliber
 	if(!isnull(speed))
 		I.weapon_upgrades[GUN_UPGRADE_STEPDELAY_MULT] = speed

code/datums/craft/recipes/guns.dm

@@ -25,7 +25,7 @@
 
 /datum/craft_recipe/gun/handmaderifle
 	name = "HM BR \"Riose\""
-	result = /obj/item/gun/projectile/boltgun/handmade
+	result = /obj/item/gun/projectile/automatic/modular/bolt/handmade/finished
 	steps = list(
 		list(CRAFT_MATERIAL, 13, MATERIAL_STEEL),
 		list(CRAFT_MATERIAL, 5, MATERIAL_WOOD),

code/game/machinery/autolathe/autolathe.dm

@@ -67,7 +67,7 @@
 		ERR_NOODDITY = "Catalyst not found.",
 		ERR_DISTANT = "User too far to operate machine.",
 		ERR_STOPPED = "User stopped operating machine.",
-		ERR_SKILL_ISSUE = "User cannot produce this design."
+		ERR_SKILL_ISSUE = "User is not skilled enough to produce this design."
 	)
 
 	var/tmp/datum/wires/autolathe/wires

code/game/machinery/crafting_station.dm

@@ -17,7 +17,7 @@ var/global/list/crafting_designs
 	var/warmed_up = FALSE
 	var/mob/living/Crafter
 	var/list/designs = list()
-	categories = list("firearm frames", "firearm grips", "firearm barrels", "pistol mechanisms", "revolver mechanisms", "pump-action mechanisms", "SMG mechanisms", "self-loading mechanisms", ".35 caliber", ".40 caliber", ".20 caliber", ".25 caliber", ".30 caliber", "shotgun shells", "special munitions", "miscellaneous")
+	categories = list("firearm frames", "firearm grips", "firearm barrels", "pistol mechanisms", "revolver mechanisms", "pump-action mechanisms", "SMG mechanisms", "self-loading mechanisms", "bolt-action mechanisms", ".35 caliber", ".40 caliber", ".20 caliber", ".25 caliber", ".30 caliber", "shotgun shells", "special munitions", "miscellaneous")
 
 /obj/machinery/autolathe/crafting_station/Initialize()
 	. = ..()
@@ -80,7 +80,7 @@ var/global/list/crafting_designs
 					icon_state = "[icon_state]_square"
 				if(".35 caliber", ".40 caliber", ".20 caliber", ".25 caliber", ".30 caliber", "shotgun shells", "special munitions")
 					icon_state = "[icon_state]_points"
-				if("firearm barrels", "pistol mechanisms", "revolver mechanisms", "pump-action mechanisms", "SMG mechanisms", "self-loading mechanisms")
+				if("firearm barrels", "pistol mechanisms", "revolver mechanisms", "pump-action mechanisms", "SMG mechanisms", "self-loading mechanisms", "bolt-action mechanisms")
 					icon_state = "[icon_state]_cut"
 	else if(warmed_up)
 		flick("craft_done", src)

code/game/machinery/vending.dm

@@ -1641,7 +1641,7 @@
 					/obj/item/storage/deferred/crate/uniform_light = 2,
 					/obj/item/gun/projectile/kovacs = 2,
 					/obj/item/ammo_magazine/lrifle = 6,
-					/obj/item/gun/projectile/boltgun/serbian = 10,
+					/obj/item/gun/projectile/automatic/modular/bolt/serbian/finished = 10,
 					/obj/item/ammo_magazine/sllrifle = 20,
 					/obj/item/ammo_magazine/ammobox/lrifle_small = 30,
 					/obj/item/storage/ration_pack = 10,
@@ -1661,7 +1661,7 @@
 					/obj/item/gun/projectile/kovacs = 3000,
 					/obj/item/ammo_magazine/ammobox/lrifle_small = 400,
 					/obj/item/ammo_magazine/srifle = 300,
-					/obj/item/gun/projectile/boltgun/serbian = 1000,
+					/obj/item/gun/projectile/automatic/modular/bolt/serbian/finished = 1000,
 					/obj/item/ammo_magazine/sllrifle = 100,
 					/obj/item/storage/ration_pack = 800,
 					/obj/item/clothing/mask/balaclava = 100,
@@ -1694,7 +1694,7 @@
 					/obj/item/gun/projectile/automatic/modular/ak/frozen_star = 4,
 					/obj/item/gun/projectile/automatic/z8 = 4,
 					/obj/item/gun/projectile/shotgun/pump/regulator = 4,
-					/obj/item/gun/projectile/boltgun/fs/civilian = 4,
+					/obj/item/gun/projectile/automatic/modular/bolt/fs/civilian = 4,
 					/obj/item/storage/deferred/crate/clown_crime = 2,
 					/obj/item/storage/deferred/crate/clown_crime/wolf = 2,
 					/obj/item/storage/deferred/crate/clown_crime/hoxton = 2,
@@ -1723,7 +1723,7 @@
 					/obj/item/gun/projectile/automatic/modular/ak/frozen_star = 3200,
 					/obj/item/gun/projectile/automatic/z8 = 3500,
 					/obj/item/gun/projectile/shotgun/pump/regulator = 2400,
-					/obj/item/gun/projectile/boltgun/fs/civilian = 2000,
+					/obj/item/gun/projectile/automatic/modular/bolt/fs/civilian = 2000,
 					/obj/item/storage/deferred/crate/clown_crime = 1800,
 					/obj/item/storage/deferred/crate/clown_crime/wolf = 1800,
 					/obj/item/storage/deferred/crate/clown_crime/hoxton = 1800,

code/game/objects/effects/spawners/ghostroles.dm

@@ -56,7 +56,7 @@
 	head = /obj/item/clothing/head/armor/steelpot
 	shoes = /obj/item/clothing/shoes/color/black
 	suit = /obj/item/clothing/suit/armor/flak/green
-	suit_store = /obj/item/gun/projectile/boltgun/serbian
+	suit_store = /obj/item/gun/projectile/automatic/modular/bolt/serbian/finished
 	back = /obj/item/storage/backpack/satchel
 	r_pocket = /obj/item/ammo_magazine/sllrifle
 	id_slot = slot_wear_id

code/game/objects/items.dm

@@ -142,6 +142,9 @@
 	var/list/item_upgrades = list()
 	var/max_upgrades = 3
 
+	///if set, this item should add the associated sprite id to a modgun's sprite when used as an upgrade
+	var/modular_overlay
+
 	var/can_use_lying = 0
 
 	var/chameleon_type