Href tokens

code/game/objects/effects/effect_system/effects_smoke.dm

@@ -283,13 +283,13 @@
 		var/area/A = get_area(location)
 
 		var/where = "[A.name] | [location.x], [location.y]"
-		var/whereLink = "<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[location.x];Y=[location.y];Z=[location.z]'>[where]</a>"
+		var/whereLink = "<A HREF='?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[location.x];Y=[location.y];Z=[location.z]'>[where]</a>"
 
 		if(carry.my_atom.fingerprintslast)
 			var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast)
 			var/more = ""
 			if(M)
-				more = "(<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>?</a>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</A>) "
+				more = "(<A HREF='?_src_=holder;[HrefToken()];adminmoreinfo=\ref[M]'>?</a>) (<A HREF='?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[M]'>FLW</A>) "
 			message_admins("Smoke: ([whereLink])[contained]. Key: [carry.my_atom.fingerprintslast][more].", 0, 1)
 			log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].")
 		else

code/game/objects/items/devices/powersink.dm

@@ -138,7 +138,7 @@
 	if(power_drained > max_power * 0.98)
 		if (!admins_warned)
 			admins_warned = TRUE
-			message_admins("Power sink at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>) is 95% full. Explosion imminent.")
+			message_admins("Power sink at ([x],[y],[z] - <A HREF='?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>) is 95% full. Explosion imminent.")
 		playsound(src, 'sound/effects/screech.ogg', 100, 1, 1)
 
 	if(power_drained >= max_power)

code/game/objects/items/devices/transfer_valve.dm

@@ -159,6 +159,7 @@
 /obj/item/device/transfer_valve/proc/toggle_valve()
 	if(!valve_open && tank_one && tank_two)
 		valve_open = TRUE
+<<<<<<< HEAD
 		var/turf/bombturf = get_turf(src)
 		var/area/A = get_area(bombturf)
 
@@ -204,6 +205,53 @@
 
 	else if(valve_open && tank_one && tank_two)
 		split_gases()
+=======
+		var/turf/bombturf = get_turf(src)
+		var/area/A = get_area(bombturf)
+
+		var/attachment = "no device"
+		if(attached_device)
+			if(istype(attached_device, /obj/item/device/assembly/signaler))
+				attachment = "<A HREF='?_src_=holder;[HrefToken()];secrets=list_signalers'>[attached_device]</A>"
+			else
+				attachment = attached_device
+
+		var/attacher_name = ""
+		if(!attacher)
+			attacher_name = "Unknown"
+		else
+			attacher_name = "[key_name_admin(attacher)]"
+
+		var/log_str1 = "Bomb valve opened in "
+		var/log_str2 = "with [attachment] attacher: [attacher_name]"
+
+		var/log_attacher = ""
+		if(attacher)
+			log_attacher = "[ADMIN_QUE(attacher)] [ADMIN_FLW(attacher)]"
+
+		var/mob/mob = get_mob_by_key(src.fingerprintslast)
+		var/last_touch_info = ""
+		if(mob)
+			last_touch_info = "[ADMIN_QUE(mob)] [ADMIN_FLW(mob)]"
+
+		var/log_str3 = " Last touched by: [key_name_admin(mob)]"
+
+		var/bomb_message = "[log_str1] [A.name][ADMIN_JMP(bombturf)] [log_str2][log_attacher] [log_str3][last_touch_info]"
+
+		GLOB.bombers += bomb_message
+
+		message_admins(bomb_message, 0, 1)
+		log_game("[log_str1] [A.name][COORD(bombturf)] [log_str2] [log_str3]")
+		merge_gases()
+		spawn(20) // In case one tank bursts
+			for (var/i=0,i<5,i++)
+				src.update_icon()
+				sleep(10)
+			src.update_icon()
+
+	else if(valve_open && tank_one && tank_two)
+		split_gases()
+>>>>>>> 28d725e... Merge pull request #30975 from ShizCalev/href-tokens
 		valve_open = FALSE
 		src.update_icon()
 

code/game/objects/items/grenades/chem_grenade.dm

@@ -292,7 +292,7 @@
 		var/mob/last = get_mob_by_ckey(nadeassembly.fingerprintslast)
 		var/turf/T = get_turf(src)
 		var/area/A = get_area(T)
-		message_admins("grenade primed by an assembly, attached by [key_name_admin(M)]<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>(?)</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</A>) and last touched by [key_name_admin(last)]<A HREF='?_src_=holder;adminmoreinfo=\ref[last]'>(?)</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[last]'>FLW</A>) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>[A.name] (JMP)</a>.")
+		message_admins("grenade primed by an assembly, attached by [key_name_admin(M)]<A HREF='?_src_=holder;[HrefToken()];adminmoreinfo=\ref[M]'>(?)</A> (<A HREF='?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[M]'>FLW</A>) and last touched by [key_name_admin(last)]<A HREF='?_src_=holder;[HrefToken()];adminmoreinfo=\ref[last]'>(?)</A> (<A HREF='?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[last]'>FLW</A>) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at <A HREF='?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>[A.name] (JMP)</a>.")
 		log_game("grenade primed by an assembly, attached by [key_name(M)] and last touched by [key_name(last)] ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] ([T.x], [T.y], [T.z])")
 	else
 		addtimer(CALLBACK(src, .proc/prime), det_time)