Merge pull request NebulaSS13#2099 from SolatK/fixes

some fixes

code/modules/assembly/mousetrap.dm

@@ -53,18 +53,17 @@
 	pulse(0)
 
 /obj/item/assembly/mousetrap/proc/toggle_arming(var/mob/user)
-	if(!armed)
-		to_chat(user, SPAN_NOTICE("You arm [src]."))
-		return TRUE
-
 	if((MUTATION_CLUMSY in user.mutations) && prob(50))
 		var/which_hand = user.get_active_held_item_slot()
 		triggered(user, which_hand)
 		user.visible_message(SPAN_DANGER("\The [user] accidentally sets off [src], hurting their fingers."), \
 							 SPAN_DANGER("You accidentally trigger [src]!"))
 		return TRUE
-
-	to_chat(user, SPAN_NOTICE("You disarm [src]."))
+
+	if(!armed)
+		to_chat(user, SPAN_NOTICE("You arm [src]."))
+	else
+		to_chat(user, SPAN_NOTICE("You disarm [src]."))
 	armed = !armed
 	update_icon()
 	playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
@@ -73,9 +72,6 @@
 /obj/item/assembly/mousetrap/attack_self(mob/user)
 	. = toggle_arming(user) || ..()
 
-/obj/item/assembly/mousetrap/attack_hand(mob/user)
-	. = toggle_arming(user) || ..()
-
 /obj/item/assembly/mousetrap/Crossed(atom/movable/AM)
 	if(armed)
 		if(ishuman(AM))

code/modules/reagents/reactions/reaction_other.dm

@@ -62,6 +62,7 @@
 	mix_message = "The solution gives off the eye-watering reek of spilled fertilizer and petroleum."
 
 /datum/chemical_reaction/crystal_agent
+	name = "Crystallizing agent"
 	result = /decl/material/liquid/crystal_agent
 	required_reagents = list(/decl/material/solid/silicon = 1, /decl/material/solid/metal/tungsten = 1, /decl/material/liquid/acid/polyacid = 1)
 	minimum_temperature = 150 CELSIUS