Merge remote-tracking branch 'citadel/master' into combat_rework

code/datums/components/crafting/guncrafting.dm

@@ -1,14 +1,7 @@
-//Gun crafting parts til they can be moved elsewhere
-
-// PARTS //
+k// PARTS //
 /obj/item/weaponcrafting
 	icon = 'icons/obj/improvised.dmi'
 
-/obj/item/weaponcrafting/receiver
-	name = "modular receiver"
-	desc = "A prototype modular receiver and trigger assembly for a firearm."
-	icon_state = "receiver"
-
 /obj/item/weaponcrafting/stock
 	name = "rifle stock"
 	desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood."
@@ -19,3 +12,53 @@
 	name = "durathread string"
 	desc = "A long piece of durathread with some resemblance to cable coil."
 	icon_state = "durastring"
+
+////////////////////////////////
+// KAT IMPROVISED WEAPON PARTS//
+////////////////////////////////
+
+/obj/item/weaponcrafting/improvised_parts
+	name = "Eerie bunch of coloured dots."
+	desc = "You feel the urge to report to Central that the parent type of guncrafting, which should never appear in this reality, has appeared. Whatever that means."
+	icon = 'icons/obj/guns/gun_parts.dmi'
+	icon_state = "palette"
+
+// BARRELS
+
+/obj/item/weaponcrafting/improvised_parts/barrel_rifle
+	name = "rifle barrel"
+	desc = "A pipe with a diameter just the right size to fire 7.62 rounds out of."
+	icon_state = "barrel_rifle"
+
+/obj/item/weaponcrafting/improvised_parts/barrel_shotgun
+	name = "shotgun barrel"
+	desc = "A twenty bore shotgun barrel."
+	icon_state = "barrel_shotgun"
+
+// RECEIVERS
+
+/obj/item/weaponcrafting/improvised_parts/rifle_receiver
+	name = "bolt action receiver"
+	desc = "A crudely constructed receiver to create an improvised bolt-action breechloaded rifle."
+	icon_state = "receiver_rifle"
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/weaponcrafting/improvised_parts/shotgun_receiver
+	name = "break-action assembly"
+	desc = "An improvised receiver to create a break-action breechloaded shotgun."
+	icon_state = "receiver_shotgun"
+	w_class = WEIGHT_CLASS_SMALL
+
+// MISC
+
+/obj/item/weaponcrafting/improvised_parts/trigger_assembly
+	name = "firearm trigger assembly"
+	desc = "A modular trigger assembly with a firing pin, this can be used to make a whole bunch of improvised firearss."
+	icon_state = "trigger_assembly"
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/weaponcrafting/improvised_parts/wooden_body
+	name = "wooden firearm body"
+	desc = "A crudely fashioned wooden body to help keep higher calibre improvised weapons from blowing themselves apart."
+	icon_state = "wooden_body"
+

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -251,8 +251,10 @@
 /datum/crafting_recipe/ishotgun
 	name = "Improvised Shotgun"
 	result = /obj/item/gun/ballistic/revolver/doublebarrel/improvised
-	reqs = list(/obj/item/weaponcrafting/receiver = 1,
-				/obj/item/pipe = 1,
+	reqs = list(/obj/item/weaponcrafting/improvised_parts/barrel_shotgun = 1,
+				/obj/item/weaponcrafting/improvised_parts/shotgun_receiver = 1,
+				/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 1,
+				/obj/item/weaponcrafting/improvised_parts/wooden_body = 1,
 				/obj/item/weaponcrafting/stock = 1,
 				/obj/item/stack/packageWrap = 5)
 	tools = list(TOOL_SCREWDRIVER)
@@ -261,10 +263,12 @@
 	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/irifle
-	name = "Improvised Rifle(7.62mm)"
+	name = "Improvised Rifle (7.62mm)"
 	result = /obj/item/gun/ballistic/shotgun/boltaction/improvised
-	reqs = list(/obj/item/weaponcrafting/receiver = 1,
-				/obj/item/pipe = 2,
+	reqs = list(/obj/item/weaponcrafting/improvised_parts/barrel_rifle = 1,
+				/obj/item/weaponcrafting/improvised_parts/rifle_receiver = 1,
+				/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 1,
+				/obj/item/weaponcrafting/improvised_parts/wooden_body = 1,
 				/obj/item/weaponcrafting/stock = 1,
 				/obj/item/stack/packageWrap = 5)
 	tools = list(TOOL_SCREWDRIVER)
@@ -394,3 +398,60 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
+
+////////////////////
+// PARTS CRAFTING //
+////////////////////
+
+// BARRELS
+
+/datum/crafting_recipe/rifle_barrel
+	name = "Improvised Rifle Barrel"
+	result = /obj/item/weaponcrafting/improvised_parts/barrel_rifle
+	reqs = list(/obj/item/pipe = 2)
+	tools = list(TOOL_WELDER,TOOL_SAW)
+	time = 150
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS
+
+/datum/crafting_recipe/shotgun_barrel
+	name = "Improvised Shotgun Barrel"
+	result = /obj/item/weaponcrafting/improvised_parts/barrel_shotgun
+	reqs = list(/obj/item/pipe = 2)
+	tools = list(TOOL_WELDER,TOOL_SAW)
+	time = 150
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS
+
+// RECEIVERS
+
+/datum/crafting_recipe/rifle_receiver
+	name = "Improvised Rifle Receiver"
+	result = /obj/item/weaponcrafting/improvised_parts/rifle_receiver
+	reqs = list(/obj/item/stack/sheet/metal = 20)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) // Rifle is the easiest to craft and can be made at an autolathe, this is a very light kick in the shin for dual-wielding ishotguns.
+	time = 50
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS
+
+/datum/crafting_recipe/shotgun_receiver
+	name = "Improvised Shotgun Receiver"
+	result = /obj/item/weaponcrafting/improvised_parts/shotgun_receiver
+	reqs = list(/obj/item/stack/sheet/metal = 10,
+				/obj/item/stack/sheet/plasteel = 1)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) // Increased cost is to stop dual-wield alpha striking. ishotgun is a rvolver and can be duel-wielded
+	time = 50
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS
+
+// MISC
+
+/datum/crafting_recipe/trigger_assembly
+	name = "Trigger Assembly"
+	result = /obj/item/weaponcrafting/improvised_parts/trigger_assembly
+	reqs = list(/obj/item/stack/sheet/metal = 3,
+				/obj/item/assembly/igniter = 1)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
+	time = 150
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS

code/datums/dna.dm

@@ -391,16 +391,6 @@
 
 /mob/living/carbon/human/proc/hardset_dna(ui, list/mutation_index, newreal_name, newblood_type, datum/species/mrace, newfeatures)
 
-	if(newfeatures)
-		var/old_size = dna.features["body_size"]
-		dna.features = newfeatures
-		dna.update_body_size(old_size)
-
-	if(mrace)
-		var/datum/species/newrace = new mrace.type
-		newrace.copy_properties_from(mrace)
-		set_species(newrace, icon_update=0)
-
 	if(newreal_name)
 		real_name = newreal_name
 		dna.generate_unique_enzymes()
@@ -410,7 +400,17 @@
 
 	if(ui)
 		dna.uni_identity = ui
-		updateappearance(icon_update=0)
+		updateappearance(icon_update=FALSE)
+
+	if(newfeatures)
+		var/old_size = dna.features["body_size"]
+		dna.features = newfeatures
+		dna.update_body_size(old_size)
+
+	if(mrace)
+		var/datum/species/newrace = new mrace.type
+		newrace.copy_properties_from(mrace)
+		set_species(newrace, icon_update=FALSE)
 
 	if(LAZYLEN(mutation_index))
 		dna.mutation_index = mutation_index.Copy()

code/datums/wires/apc.dm

@@ -30,6 +30,7 @@
 		if(WIRE_POWER1, WIRE_POWER2) // Short for a long while.
 			if(!A.shorted)
 				A.shorted = TRUE
+				A.update()
 				addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 1200)
 		if(WIRE_IDSCAN) // Unlock for a little while.
 			A.locked = FALSE
@@ -49,6 +50,7 @@
 			else
 				A.shorted = TRUE
 				A.shock(usr, 50)
+			A.update()
 		if(WIRE_AI) // Disable AI control.
 			if(mend)
 				A.aidisabled = FALSE