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.
2018-02-17 20:44:57 +00:00
parent 4ea9eb1fa5 a0d6b9ad4f
commit f072def90e
17 changed files with 172 additions and 194 deletions
@@ -164,15 +164,11 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 /obj/effect/meteor/ex_act()
 	return

-#define METEOR_MEDAL "Your Life Before Your Eyes"
-
 /obj/effect/meteor/examine(mob/user)
 	if(!admin_spawned && isliving(user))
-		UnlockMedal(METEOR_MEDAL,user.client)
+		SSmedals.UnlockMedal(MEDAL_METEOR, user.client)
 	..()

-#undef METEOR_MEDAL
-
 /obj/effect/meteor/attackby(obj/item/I, mob/user, params)
 	if(I.tool_behaviour == TOOL_MINING)
 		make_debris()