Merge branch 'master' into development

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -33,6 +33,9 @@
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "chitin"
 
+/obj/item/organ/brain/xeno/gain_trauma()
+	return
+	
 /obj/item/organ/brain/Initialize(mapload)
 	. = ..()
 	health = config.default_brain_health

code/modules/mob/living/silicon/robot/emote.dm

@@ -196,7 +196,7 @@
 
 		if("halt")
 			if (istype(module,/obj/item/weapon/robot_module/security))
-				message = "<B>[src]</B>'s speakers skreech, \"Halt! Security!\"."
+				message = "'s speakers skreech, \"Halt! Security!\"."
 
 				playsound(src.loc, 'sound/voice/halt.ogg', 50, 0)
 				m_type = 2

code/modules/projectiles/guns/energy/magic.dm

@@ -18,6 +18,8 @@
 	charge_meter = 0
 	pin = /obj/item/device/firing_pin/magic
 
+/obj/item/weapon/gun/energy/staff/emp_act(severity) // to prevent it from breaking.
+	return
 
 obj/item/weapon/gun/energy/staff/special_check(var/mob/living/user)
 	if(HULK in user.mutations)

code/modules/projectiles/guns/energy/special.dm

@@ -453,6 +453,7 @@
 					)
 	is_charging = 1
 	if(!do_after(user, 40))
+		is_charging = FALSE
 		return 0
 	is_charging = 0
 	if(!istype(user.get_active_hand(), src))

code/modules/reagents/reagent_containers/dropper.dm

@@ -54,7 +54,7 @@
 
 					if(safe_thing)
 						trans = reagents.trans_to_obj(safe_thing, amount_per_transfer_from_this)
-						user.visible_message("<span class='warning'>[user] tries to squirt something into [target]'s eyes, but fails!</span>", "<span class='notice'>You transfer [trans] units of the solution.</span>")
+						user.visible_message("<span class='warning'>[user] tries to squirt something into [target]'s eyes, but fails!</span>", "<span class='warning'>You try to squirt something into [target]'s eyes, but fail!</span>")
 						return
 
 				trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_BLOOD)

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -210,6 +210,7 @@
 			new_box.max_w_class = pick(1,2,2,3,3,3,4,4)
 			var/storage_amount = 2**(new_box.max_w_class-1)
 			new_box.max_storage_space = rand(storage_amount, storage_amount * 10)
+			new_box.foldable = null
 			if(prob(30))
 				apply_image_decorations = 1
 		if(12)