Overhaul a lot of visible_message messages to use grammar helpers

code/_onclick/other_mobs.dm

@@ -31,10 +31,7 @@
 	if(!LAZYLEN(climbers) || (user in climbers) || !user.check_dexterity(DEXTERITY_HOLD_ITEM, silent = TRUE))
 		return FALSE
 
-	user.visible_message(
-		SPAN_DANGER("\The [user] shakes \the [src]!"),
-		SPAN_DANGER("You shake \the [src]!")
-	)
+	user.visible_action_message("shake", "\the [src]!", dangerous = ACTION_DANGER_ALL)
 
 	object_shaken()
 	return TRUE

code/datums/extensions/cell/cell.dm

@@ -136,10 +136,7 @@
 		return TRUE // technically a valid interaction.
 
 	// Unload the cell.
-	user.visible_message(
-		SPAN_NOTICE("\The [user] removes \the [existing_cell] from \the [holder]."),
-		SPAN_NOTICE("You remove \the [existing_cell] from \the [holder].")
-	)
+	user.visible_action_message("remove", "\the [existing_cell] from \the [holder].")
 	existing_cell.dropInto(get_turf(holder))
 	user.put_in_active_hand(existing_cell)
 	holder_item.update_icon()

code/datums/extensions/holster/holster.dm

@@ -52,7 +52,7 @@
 		if(isobj(storage?.holder))
 			var/obj/obj_holder = storage.holder
 			obj_holder.w_class = max(obj_holder.w_class, holstered.w_class)
-		user.visible_message("<span class='notice'>\The [user] holsters \the [holstered].</span>", "<span class='notice'>You holster \the [holstered].</span>")
+		user.visible_action_message("holster", "\the [holstered].")
 		atom_holder.SetName("occupied [initial(atom_holder.name)]")
 		atom_holder.update_icon()
 		events_repository.register(/decl/observ/moved, holstered, src, PROC_REF(check_holster))
@@ -82,15 +82,9 @@
 				G.check_accidents(user)
 				if(G.safety() && !user.skill_fail_prob(SKILL_WEAPONS, 100, SKILL_EXPERT, 0.5)) //Experienced shooter will disable safety before shooting.
 					G.toggle_safety(user)
-			user.visible_message(
-				"<span class='danger'>\The [user] draws \the [holstered], ready to go!</span>",
-				"<span class='warning'>You draw \the [holstered], ready to go!</span>"
-				)
+			user.visible_action_message("draw", "\the [holstered], ready to go!", dangerous = ACTION_DANGER_OTHERS)
 		else
-			user.visible_message(
-				"<span class='notice'>\The [user] draws \the [holstered], pointing it at the ground.</span>",
-				"<span class='notice'>You draw \the [holstered], pointing it at the ground.</span>"
-				)
+			user.visible_action_message("draw", "\the [holstered], pointing it at the ground.")
 		if(sound_out)
 			playsound(get_turf(atom_holder), sound_out, sound_vol)
 		holstered.add_fingerprint(user)

code/datums/extensions/label.dm

@@ -43,8 +43,8 @@
 		return
 
 	if(user)
-		user.visible_message(SPAN_NOTICE("\The [user] removes a label from \the [atom_holder]."), \
-							 SPAN_NOTICE("You remove a label, '[label]', from \the [atom_holder]."))
+		// The infix usage here is a little clunky but I'm not sure how else to make it work
+		user.visible_action_message("remove", "from \the [atom_holder]", ACTION_DANGER_NONE, self_infix = "a label, '[label]'", other_infix = "a label")
 
 	var/old_name = atom_holder.name
 	// We find and replace the first instance, since that's the one we removed from the list

code/datums/extensions/milkable/milkable.dm

@@ -94,15 +94,9 @@
 		handle_milking_failure(user, critter)
 		return TRUE
 
-	user.visible_message(
-		SPAN_NOTICE("\The [user] starts milking \the [critter] into \the [container]."),
-		SPAN_NOTICE("You start milking \the [critter] into \the [container].")
-	)
+	user.visible_action_message("start", "milking \the [critter] into \the [container].")
 	if(!user.do_skilled(4 SECONDS, milking_skill, target = critter, check_holding = TRUE))
-		user.visible_message(
-			SPAN_NOTICE("\The [user] stops milking \the [critter]."),
-			SPAN_NOTICE("You stop milking \the [critter].")
-		)
+		user.visible_action_message("stop", "milking \the [critter].")
 		return TRUE
 
 	if(critter.stat == DEAD)
@@ -120,10 +114,7 @@
 		to_chat(user, SPAN_WARNING("Wait for \the [critter] to stop moving before you try milking it."))
 		return TRUE
 
-	user.visible_message(
-		SPAN_NOTICE("\The [user] milks \the [critter] into \the [container]."),
-		SPAN_NOTICE("You milk \the [critter] into \the [container].")
-	)
+	user.visible_action_message("milk", "\the [critter] into \the [container].")
 	udder.trans_to(container, min(REAGENTS_FREE_SPACE(container.reagents), rand(15, 20)))
 	return TRUE
 

code/datums/extensions/resistable/resistable.dm

@@ -22,11 +22,7 @@
 	breakouttime = max(5, breakouttime * user.get_restraint_breakout_mod())
 	user.setClickCooldown(breakouttime)
 
-	user.visible_message(
-		SPAN_DANGER("\The [user] attempts to remove \the [restraint]!"),
-		SPAN_DANGER("You attempt to remove \the [restraint] (This will take around [ceil(breakouttime / (1 SECOND))] second\s and you need to stand still)."),
-		range = 2
-	)
+	user.visible_action_message("attempt", "to remove \the [restraint]!", ACTION_DANGER_ALL, range = 2, self_postfix = "(This will take around [ceil(breakouttime / (1 SECOND))] second\s and you need to stand still).")
 
 	var/static/resist_stages = 4
 	for(var/i = 1 to resist_stages)

code/datums/extensions/shearable/shearable.dm

@@ -62,15 +62,9 @@
 		handle_shearing_failure(user, critter)
 		return TRUE
 
-	user.visible_message(
-		SPAN_NOTICE("\The [user] starts shearing \the [critter]."),
-		SPAN_NOTICE("You start shearing \the [critter].")
-	)
+	user.visible_action_message("start", "shearing \the [critter].")
 	if(!user.do_skilled(4 SECONDS, shearing_skill))
-		user.visible_message(
-			SPAN_NOTICE("\The [user] stops shearing \the [critter]."),
-			SPAN_NOTICE("You stop shearing \the [critter].")
-		)
+		user.visible_action_message("stop", "shearing \the [critter].")
 		return TRUE
 
 	if(QDELETED(user) || QDELETED(critter) || QDELETED(shears) || user.get_active_held_item() != shears)

code/datums/storage/subtypes_misc.dm

@@ -55,10 +55,7 @@
 
 /datum/storage/med_pouch/open(mob/user)
 	if(!opened)
-		user.visible_message(
-			SPAN_NOTICE("\The [user] tears open \the [holder], breaking the vacuum seal!"),
-			SPAN_NOTICE("You tear open \the [holder], breaking the vacuum seal!")
-		)
+		user.visible_action_message("tear", "open \the [holder], breaking the vacuum seal!")
 	. = ..()
 
 /datum/storage/cigpapers

code/datums/uplink/services.dm

@@ -94,7 +94,7 @@
 		return
 	state = CURRENTLY_ACTIVE
 	update_icon()
-	user.visible_message("<span class='notice'>\The [user] activates \the [src].</span>", "<span class='notice'>You activate \the [src].</span>")
+	user.visible_action_message("activate", "\the [src].")
 	log_and_message_admins("has activated the service '[service_label]'", user)
 
 	if(service_duration)

code/game/machinery/OpTable.dm

@@ -99,9 +99,7 @@
 
 /obj/machinery/optable/proc/take_victim(mob/living/target, mob/living/user)
 	if (target == user)
-		user.visible_message( \
-		SPAN_NOTICE("\The [user] climbs on \the [src]."), \
-		SPAN_NOTICE("You climb on \the [src]."))
+		user.visible_action_message("climb", "on \the [src].")
 	else
 		visible_message(SPAN_NOTICE("\The [target] has been laid on \the [src] by \the [user]."))
 	target.dropInto(loc)

code/game/machinery/Sleeper.dm

@@ -315,7 +315,7 @@
 			if(!user.try_unequip(used_item, src))
 				return TRUE
 			beaker = used_item
-			user.visible_message(SPAN_NOTICE("\The [user] adds \a [used_item] to \the [src]."), SPAN_NOTICE("You add \a [used_item] to \the [src]."))
+			user.visible_action_message("add", "\a [used_item] to \the [src].")
 		else
 			to_chat(user, SPAN_WARNING("\The [src] has a beaker already."))
 		return TRUE

code/game/machinery/_machines_base/machine_construction/wall_frame.dm

@@ -92,7 +92,7 @@
 	if(IS_WIRECUTTER(used_item))
 		TRANSFER_STATE(diconnected_state)
 		playsound(get_turf(machine), 'sound/items/Wirecutter.ogg', 50, 1)
-		user.visible_message(SPAN_WARNING("\The [user] has cut the wires inside \the [machine]!"), "You have cut the wires inside \the [machine].")
+		user.visible_action_message("cut", "the wires inside \the [machine]!", dangerous = ACTION_DANGER_WARNING)
 		new /obj/item/stack/cable_coil(get_turf(machine), 5)
 		machine.set_broken(TRUE, MACHINE_BROKEN_CONSTRUCT)
 		machine.queue_icon_update()
@@ -215,7 +215,7 @@
 		TRANSFER_STATE(diconnected_state)
 		user.try_unequip(board, machine)
 		machine.install_component(board)
-		user.visible_message(SPAN_NOTICE("\The [user] inserts \the [board] into \the [machine]!"), SPAN_NOTICE("You insert \the [board] into \the [machine]!"))
+		user.visible_action_message("insert", "\the [board] into \the [machine]!")
 		machine.queue_icon_update()
 		return TRUE
 

code/game/machinery/_machines_base/machinery_components.dm

@@ -312,7 +312,7 @@ Standard helpers for users interacting with machinery parts.
 	else
 		user.try_unequip(part, src)
 		install_component(part)
-	user.visible_message(SPAN_NOTICE("\The [user] installs \the [part] in \the [src]!"), SPAN_NOTICE("You install \the [part] in \the [src]!"))
+	user.visible_action_message("install", "\the [part] in \the [src]!")
 	return TRUE
 
 /obj/machinery/proc/part_removal(mob/user)
@@ -341,7 +341,7 @@ Standard helpers for users interacting with machinery parts.
 	var/obj/item/stock_parts/part = uninstall_component(get_component_of_type(path, TRUE))
 	if(part)
 		user.put_in_hands(part) // Already dropped at loc, so that's the fallback.
-		user.visible_message(SPAN_NOTICE("\The [user] removes \the [part] from \the [src]."), SPAN_NOTICE("You remove \the [part] from \the [src]."))
+		user.visible_action_message("remove", "\the [part] from \the [src].")
 
 /obj/machinery/proc/missing_parts(var/only_functional)
 	if(!construct_state)

code/game/machinery/doors/airlock.dm

@@ -677,31 +677,19 @@ About the new airlock wires panel:
 		return FALSE
 
 	if (src.lock_cut_state == BOLTS_FINE)
-		user.visible_message(
-			SPAN_NOTICE("\The [user] begins [cut_verb] through the bolt cover on [src]."),
-			SPAN_NOTICE("You begin [cut_verb] through the bolt cover.")
-			)
+		user.visible_action_message("begin", "[cut_verb] through the bolt cover on \the [src].")
 
 		playsound(src, cut_sound, 100, 1)
 		if (do_after(user, cut_delay, src))
-			user.visible_message(
-				SPAN_NOTICE("\The [user] removes the bolt cover from [src]."),
-				SPAN_NOTICE("You remove the cover and expose the door bolts.")
-				)
+			user.visible_action_message("remove", "the bolt cover from \the [src]", self_postfix = "and expose$USER_S$ the door bolts.", other_postfix = ".")
 			src.lock_cut_state = BOLTS_EXPOSED
 		return TRUE
 
 	if (src.lock_cut_state == BOLTS_EXPOSED)
-		user.visible_message(
-			SPAN_NOTICE("\The [user] begins [cut_verb] through [src]'s bolts."),
-			SPAN_NOTICE("You begin [cut_verb] through the door bolts.")
-			)
+		user.visible_action_message("begin", "[cut_verb] through \the [src]'s bolts.")
 		playsound(src, cut_sound, 100, 1)
 		if (do_after(user, cut_delay, src))
-			user.visible_message(
-				SPAN_NOTICE("\The [user] severs the door bolts, unlocking [src]."),
-				SPAN_NOTICE("You sever the door bolts, unlocking the door.")
-				)
+			user.visible_action_message("sever", "the door bolts, unlocking \the [src].")
 			src.lock_cut_state = BOLTS_CUT
 			src.unlock(1) //force it
 		return TRUE
@@ -747,8 +735,7 @@ About the new airlock wires panel:
 			to_chat(user, SPAN_NOTICE("Your [welder.name] doesn't have enough fuel."))
 			return TRUE
 		playsound(src, 'sound/items/Welder.ogg', 50, 1)
-		user.visible_message(SPAN_WARNING("\The [user] begins welding \the [src] [welded ? "open" : "closed"]!"),
-							SPAN_NOTICE("You begin welding \the [src] [welded ? "open" : "closed"]."))
+		user.visible_action_message("begin", "welding \the [src] [welded ? "open" : "closed"].")
 		if(do_after(user, (rand(3,5)) SECONDS, src))
 			if(density && !operating && !repairing)
 				playsound(src, 'sound/items/Welder2.ogg', 50, 1)
@@ -825,11 +812,11 @@ About the new airlock wires panel:
 			playsound(src, 'sound/weapons/smash.ogg', 100, 1)
 			current_health -= F.expend_attack_force(user) * 2
 			if(current_health <= 0)
-				user.visible_message(SPAN_DANGER("[user] smashes \the [weapon] into the airlock's control panel! It explodes in a shower of sparks!"), SPAN_DANGER("You smash \the [weapon] into the airlock's control panel! It explodes in a shower of sparks!"))
+				user.visible_action_message("smash", "\the [weapon] into \the [src]'s control panel! It explodes in a shower of sparks!", dangerous = ACTION_DANGER_ALL)
 				current_health = 0
 				set_broken(TRUE)
 			else
-				user.visible_message(SPAN_DANGER("[user] smashes \the [weapon] into the airlock's control panel!"))
+				user.visible_action_message("smash", "\the [weapon] into \the [src]'s control panel!", dangerous = ACTION_DANGER_ALL)
 			return TRUE
 	return ..()
 

code/game/machinery/doors/airlock_subtypes.dm

@@ -158,8 +158,8 @@
 	if(panel_open && !arePowerSystemsOn())
 		if(IS_WRENCH(used_item))
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
-			user.visible_message(SPAN_WARNING("[user.name] starts frantically pumping the bolt override mechanism!"), SPAN_WARNING("You start frantically pumping the bolt override mechanism!"))
-			if(do_after(user, 160) && locked)
+			user.visible_action_message("start", "frantically pumping the bolt override mechanism!", dangerous = ACTION_DANGER_WARNING)
+			if(do_after(user, 16 SECONDS) && locked)
 				visible_message("\The [src] bolts disengage!")
 				locked = FALSE
 				return TRUE

code/game/machinery/flasher.dm

@@ -39,10 +39,7 @@
 	if(IS_WIRECUTTER(used_item))
 		add_fingerprint(user, 0, used_item)
 		src.disable = !src.disable
-		if (src.disable)
-			user.visible_message("<span class='warning'>[user] has disconnected \the [src]'s flashbulb!</span>", "<span class='warning'>You disconnect \the [src]'s flashbulb!</span>")
-		if (!src.disable)
-			user.visible_message("<span class='warning'>[user] has connected \the [src]'s flashbulb!</span>", "<span class='warning'>You connect \the [src]'s flashbulb!</span>")
+		user.visible_action_message(disable ? "disconnect" : "connect", "\the [src]'s flashbulb!", dangerous = ACTION_DANGER_WARNING)
 		return TRUE
 	else
 		return ..()

code/game/machinery/igniter.dm

@@ -123,10 +123,7 @@
 	if(panel_open && IS_WIRECUTTER(used_item))
 		add_fingerprint(user)
 		disable = !disable
-		if(disable)
-			user.visible_message(SPAN_WARNING("[user] has disabled \the [src]!"), SPAN_WARNING("You disable the connection to \the [src]."))
-		else
-			user.visible_message(SPAN_WARNING("[user] has reconnected \the [src]!"), SPAN_WARNING("You fix the connection to \the [src]."))
+		user.visible_action_message(disable ? "disable" : "fix", "the connection to \the [src]!", dangerous = ACTION_DANGER_WARNING)
 		update_icon()
 		return TRUE
 	else

code/game/machinery/kitchen/microwave.dm

@@ -57,21 +57,15 @@
 /obj/machinery/microwave/attackby(var/obj/item/used_item, var/mob/user)
 	if(broken > 0)
 		if(broken == 2 && IS_SCREWDRIVER(used_item)) // If it's broken and they're using a screwdriver
-			user.visible_message(
-				SPAN_NOTICE("\The [user] starts to fix part of [src]."),
-				SPAN_NOTICE("You start to fix part of [src].")
-			)
+			user.visible_action_message("start", "to fix part of [src].")
 			if (do_after(user, 20, src))
 				user.visible_message(
 					SPAN_NOTICE("\The [user] fixes part of [src]."),
 					SPAN_NOTICE("You have fixed part of [src].")
 				)
 				broken = 1 // Fix it a bit
 		else if(broken == 1 && IS_WRENCH(used_item)) // If it's broken and they're doing the wrench
-			user.visible_message(
-				SPAN_NOTICE("\The [user] starts to fix part of [src]."),
-				SPAN_NOTICE("You start to fix part of [src].")
-			)
+			user.visible_action_message("start", "to fix part of [src].")
 			if (do_after(user, 20, src))
 				user.visible_message(
 					SPAN_NOTICE("\The [user] fixes [src]."),
@@ -89,10 +83,7 @@
 		return
 	else if(dirty==100) // The microwave is all dirty so can't be used!
 		if(istype(used_item, /obj/item/chems/spray/cleaner) || istype(used_item, /obj/item/chems/rag)) // If they're trying to clean it then let them
-			user.visible_message(
-				SPAN_NOTICE("\The [user] starts to clean [src]."),
-				SPAN_NOTICE("You start to clean [src].")
-			)
+			user.visible_action_message("start", "to clean [src].")
 			if (do_after(user, 20, src))
 				user.visible_message(
 					SPAN_NOTICE("\The [user] has cleaned [src]."),
@@ -293,7 +284,7 @@
 
 	START_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
 	addtimer(CALLBACK(src, PROC_REF(half_time_process)), cook_time / 2)
-	visible_message(SPAN_NOTICE("[src] turns on."), SPAN_NOTICE("You hear a microwave."))
+	visible_message(SPAN_NOTICE("[src] turns on."), null, SPAN_NOTICE("You hear a microwave."))
 
 	if(cook_dirty)
 		playsound(loc, 'sound/effects/splat.ogg', 50, 1) // Play a splat sound

code/game/machinery/newscaster.dm

@@ -755,7 +755,7 @@ var/global/list/allCasters = list() //Global list that will contain reference to
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "newspaper"
 	w_class = ITEM_SIZE_SMALL	//Let's make it fit in trashbags!
-	attack_verb = list("bapped","thwapped","smacked")
+	attack_verb = list("bap","thwap","smack")
 	_base_attack_force = 0
 	material = /decl/material/solid/organic/paper