Merge pull request #5533 from Citadel-Station-13/upstream-merge-35673

[MIRROR] All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals.

code/modules/awaymissions/super_secret_room.dm

@@ -17,8 +17,6 @@
 	var/list/json = json_decode(file2text(json_file))
 	shenanigans = json["phrases"]
 
-#define TIMEWASTE_MEDAL "Overextended The Joke"
-
 /obj/structure/speaking_tile/interact(mob/user)
 	if(!isliving(user) || speaking)
 		return
@@ -81,16 +79,15 @@
 		if(1000)
 			SpeakPeace(list("The ends exists somewhere beyond meaningful milestones.", "There will be no more messages until then.", "You disgust me."))
 		if(5643)
-			UnlockMedal(TIMEWASTE_MEDAL,user.client)
+			SSmedals.UnlockMedal(MEDAL_TIMEWASTE, user.client)
 			var/obj/item/reagent_containers/food/drinks/trophy/gold_cup/never_ends = new(get_turf(user))
 			never_ends.name = "Overextending The Joke: First Place"
 			never_ends.desc = "And so we are left alone with our regrets."
 		else
 			y += 2
-
 	speaking = FALSE
 	times_spoken_to++
-#undef TIMEWASTE_MEDAL
+
 /obj/structure/speaking_tile/proc/SpeakPeace(list/statements)
 	for(var/i in 1 to statements.len)
 		say("<span class='deadsay'>[statements[i]]</span>")