diff --git a/code/game/verbs/advanced_who.dm b/code/game/verbs/advanced_who.dm
index eff1f02636..75af174d46 100644
--- a/code/game/verbs/advanced_who.dm
+++ b/code/game/verbs/advanced_who.dm
@@ -86,6 +86,7 @@
 				entry += " - <span class='blue'>In Lobby</span><br>"
 			else
 				entry += " - <span class='green'>Playing</span><br>"
+
 			Lines += entry
 
 	msg += "<table>"
@@ -94,5 +95,11 @@
 	msg += "</table>"
 	msg += "<b>Total Players: [length(Lines)]</b>"
 	msg = "<span class='filter_info'>" + msg + "</span>"
+<<<<<<< HEAD
 	to_chat(src, msg)
-YW EDIT STOP*/
\ No newline at end of file
+YW EDIT STOP*/
+||||||| parent of 7ea7566f26... Merge pull request #9799 from VOREStation/upstream-merge-7920
+	to_chat(src, msg)
+=======
+	to_chat(src, msg)
+>>>>>>> 7ea7566f26... Merge pull request #9799 from VOREStation/upstream-merge-7920
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index be062aef6f..6cec049ed2 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -1,4 +1,3 @@
-
 /client/verb/who()
 	set name = "Who"
 	set category = "OOC"
@@ -206,3 +205,4 @@
 	msg += "\n<span class='info'>Adminhelps are also sent to Discord. If no admins are available in game try anyway and an admin on Discord may see it and respond.</span>"
 
 	return msg
+
diff --git a/code/modules/client/verbs/ping.dm b/code/modules/client/verbs/ping.dm
new file mode 100644
index 0000000000..8213daa750
--- /dev/null
+++ b/code/modules/client/verbs/ping.dm
@@ -0,0 +1,12 @@
+/client/proc/pingfromtime(time)
+	return ((world.time+world.tick_lag*world.tick_usage/100)-time)*100
+
+/client/verb/display_ping(time as num)
+	set instant = TRUE
+	set name = ".display_ping"
+	to_chat(src, "<span class='notice'>Round trip ping took [round(pingfromtime(time),1)]ms</span>")
+
+/client/verb/ping()
+	set name = "Ping"
+	set category = "OOC"
+	winset(src, null, "command=.display_ping+[world.time+world.tick_lag*world.tick_usage/100]") 
\ No newline at end of file