Overhaul a lot of visible_message messages to use grammar helpers

Author: out-of-phaze

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)