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

# Conflicts:
#	code/modules/mob/mob.dm

code/_onclick/ai.dm

@@ -39,7 +39,7 @@
 	if(pixel_turf)
 		turf_visible = cameranet.checkTurfVis(pixel_turf)
 		if(!turf_visible)
-			if(istype(loc, /obj/item/device/aicard) && (pixel_turf in view(client.view, loc)))
+			if(istype(loc, /obj/item/aicard) && (pixel_turf in view(client.view, loc)))
 				turf_visible = TRUE
 			else
 				if(pixel_turf.obscured)

code/_onclick/hud/alert.dm

@@ -433,7 +433,7 @@ so as to remain in compliance with the most up-to-date laws."
 	desc = "Someone is trying to capture your soul in a soul stone. Click to allow it."
 	icon_state = "template"
 	timeout = 10 SECONDS
-	var/obj/item/device/soulstone/stone = null
+	var/obj/item/soulstone/stone = null
 	var/stoner = null
 
 /obj/screen/alert/notify_soulstone/Click()

code/_onclick/item_attack.dm

@@ -14,10 +14,10 @@
 
 // No comment
 /atom/proc/attackby(obj/item/W, mob/user, params)
-	return
+	return SendSignal(COMSIG_PARENT_ATTACKBY, W, user, params)
 
 /obj/attackby(obj/item/I, mob/living/user, params)
-	return I.attack_obj(src, user)
+	return ..() || I.attack_obj(src, user)
 
 /mob/living/attackby(obj/item/I, mob/living/user, params)
 	user.changeNext_move(CLICK_CD_MELEE)
@@ -66,7 +66,7 @@
 		user.do_attack_animation(M)
 	M.attacked_by(src, user, def_zone)
 
-	add_logs(user, M, "attacked", name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", print_attack_log = (force > 0))//print it if stuff deals damage
+	add_attack_logs(user, M, "Attacked with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", admin_notify = (force > 0 && damtype != STAMINA))
 	add_fingerprint(user)
 
 

code/_onclick/rig.dm

@@ -54,10 +54,10 @@
 	return 1
 
 /mob/living/carbon/brain/can_use_rig()
-	return istype(loc, /obj/item/device/mmi)
+	return istype(loc, /obj/item/mmi)
 
 /mob/living/silicon/ai/can_use_rig()
-	return istype(loc, /obj/item/device/aicard)
+	return istype(loc, /obj/item/aicard)
 
 /mob/living/silicon/pai/can_use_rig()
 	return loc == card
@@ -69,7 +69,7 @@
 	if(istype(rig) && !rig.offline && rig.selected_module)
 		if(src != rig.wearer)
 			if(rig.ai_can_move_suit(src, check_user_module = 1))
-				message_admins("[key_name_admin(src, include_name = 1)] is trying to force \the [key_name_admin(rig.wearer, include_name = 1)] to use a hardsuit module.")
+				message_admins("[key_name_admin(src)] is trying to force \the [key_name_admin(rig.wearer)] to use a hardsuit module.")
 			else
 				return 0
 		rig.selected_module.engage(A, alert_ai)