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

This commit is contained in:
Leo
2018-02-16 16:17:51 -02:00
committed by CitadelStationBot
parent 61b5191f90
commit a5650cccc4
17 changed files with 175 additions and 193 deletions
+1 -5
View File
@@ -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()
+1 -4
View File
@@ -67,12 +67,10 @@
return INITIALIZE_HINT_QDEL
Reset()
#define PULSE_MEDAL "Jackpot"
/obj/machinery/computer/arcade/proc/prizevend()
if(prob(0.0001)) //1 in a million
new /obj/item/gun/energy/pulse/prize(src)
UnlockMedal(PULSE_MEDAL,usr.client)
SSmedals.UnlockMedal(MEDAL_PULSE, usr.client)
if(!contents.len)
var/prizeselect = pickweight(prizes)
@@ -82,7 +80,6 @@
visible_message("<span class='notice'>[src] dispenses [prize]!</span>", "<span class='notice'>You hear a chime and a clunk.</span>")
prize.forceMove(get_turf(src))
#undef PULSE_MEDAL
/obj/machinery/computer/arcade/emp_act(severity)
..(severity)