Merge remote-tracking branch 'upstream/master' into snaxi2

code/datums/action.dm

@@ -186,6 +186,8 @@
 
 /datum/action/item_action/New(Target)
 	..()
+	if(button_icon_state)
+		use_target_appearance = FALSE
 	var/obj/item/I = target
 	LAZYINITLIST(I.actions)
 	I.actions += src
@@ -345,6 +347,7 @@
 /datum/action/item_action/clock/quickbind
 	name = "Quickbind"
 	desc = "If you're seeing this, file a bug report."
+	use_target_appearance = FALSE
 	var/scripture_index = 0 //the index of the scripture we're associated with
 
 /datum/action/item_action/toggle_helmet_flashlight

code/datums/components/crafting/craft.dm

@@ -209,10 +209,9 @@
 						var/obj/item/reagent_containers/food/food_result = I
 						var/total_quality = 0
 						var/total_items = 0
-						for(var/obj/item/ingredient in parts)
-							var/obj/item/reagent_containers/food/food_ingredient = ingredient
+						for(var/obj/item/reagent_containers/food/ingredient in parts)
 							total_items += 1
-							total_quality += food_ingredient.food_quality
+							total_quality += ingredient.food_quality
 						if(total_items == 0)
 							food_result.adjust_food_quality(50)
 						else

code/datums/diseases/advance/symptoms/heal.dm

@@ -126,7 +126,7 @@
 		var/datum/reagent/R = E
 		M.reagents.remove_reagent(R.type, actual_power)
 		if(food_conversion)
-			M.nutrition += 0.3
+			M.adjust_nutrition(0.3)
 		if(prob(2))
 			to_chat(M, "<span class='notice'>You feel a mild warmth as your blood purifies itself.</span>")
 	return 1
@@ -164,7 +164,7 @@
 		C.reagents.metabolize(C, can_overdose=TRUE)
 	C.overeatduration = max(C.overeatduration - 2, 0)
 	var/lost_nutrition = 9 - (reduced_hunger * 5)
-	C.nutrition = max(C.nutrition - (lost_nutrition * HUNGER_FACTOR), 0) //Hunger depletes at 10x the normal speed
+	C.adjust_nutrition(-lost_nutrition * HUNGER_FACTOR) //Hunger depletes at 10x the normal speed
 	if(prob(2))
 		to_chat(C, "<span class='notice'>You feel an odd gurgle in your stomach, as if it was working much faster than normal.</span>")
 	return 1
@@ -454,7 +454,7 @@
 	"Transmission 6" = "Additionally heals cellular damage and toxin lovers.",
 	"Resistance 7" = "Increases healing speed.",
 	)
-	
+
 /datum/symptom/heal/radiation/Start(datum/disease/advance/A)
 	if(!..())
 		return

code/datums/diseases/advance/symptoms/weight.dm

@@ -50,4 +50,4 @@ Bonus
 		else
 			to_chat(M, "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>")
 			M.overeatduration = max(M.overeatduration - 100, 0)
-			M.nutrition = max(M.nutrition - 100, 0)
+			M.adjust_nutrition(-100)

code/datums/diseases/tuberculosis.dm

@@ -52,7 +52,7 @@
 			if(prob(3))
 				to_chat(affected_mob, "<span class='warning'><i>[pick("Your stomach silently rumbles...", "Your stomach seizes up and falls limp, muscles dead and lifeless.", "You could eat a crayon")]</i></span>")
 				affected_mob.overeatduration = max(affected_mob.overeatduration - 100, 0)
-				affected_mob.nutrition = max(affected_mob.nutrition - 100, 0)
+				affected_mob.adjust_nutrition(-100)
 			if(prob(15))
 				to_chat(affected_mob, "<span class='danger'>[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "You feel like taking off some clothes...")]</span>")
 				affected_mob.adjust_bodytemperature(40)

code/datums/dna.dm

@@ -152,10 +152,11 @@
 	return .
 
 /datum/dna/proc/generate_dna_blocks()
-	var/bonus
+	var/list/mutations_temp = GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations
 	if(species && species.inert_mutation)
-		bonus = GET_INITIALIZED_MUTATION(species.inert_mutation)
-	var/list/mutations_temp = GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations + bonus
+		var/bonus = GET_INITIALIZED_MUTATION(species.inert_mutation)
+		if(bonus)
+			mutations_temp += bonus
 	if(!LAZYLEN(mutations_temp))
 		return
 	mutation_index.Cut()

code/datums/wires/_wires.dm

@@ -142,7 +142,7 @@
 		if(level_diff > 0)
 			LAZYSET(current_users, user, TRUE)
 			to_chat(user, "<span class='notice'>You begin cutting [holder]'s [color] wire...</span>")
-			if(!do_after(user, 1.5 SECONDS * level_diff, target = holder) || !interactable(user))
+			if(!do_after(user, 0.75 SECONDS * level_diff, target = holder) || !interactable(user))
 				LAZYREMOVE(current_users, user)
 				return FALSE
 			LAZYREMOVE(current_users, user)