diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 56e8b9b125e..7d21117c69a 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -298,6 +298,7 @@ var/global/datum/controller/gameticker/ticker if(player.mind.assigned_role == "Captain") captainless=0 if(player.mind.assigned_role != "MODE") + EquipRacialItems(player) job_master.EquipRank(player, player.mind.assigned_role, 0) EquipCustomItems(player) if(captainless) @@ -352,6 +353,17 @@ var/global/datum/controller/gameticker/ticker if(F.name == name) return F + proc/karmareminder() + for(var/mob/living/player in player_list) + + if(player.client) + if(player.client.karma_spent == 0) + var/dat + dat += {"Karma Reminder

Karma Reminder


+ You have not yet spent your karma for the round, surely there is a player who was worthy of receiving
+ your reward? Look under 'Special Verbs' for the 'Award Karma' button, and use it once a round for best results!"} + player << browse(dat, "window=karmareminder;size=400x300") + /datum/controller/gameticker/proc/declare_completion() @@ -404,4 +416,6 @@ var/global/datum/controller/gameticker/ticker for(var/i in total_antagonists) log_game("[i]s[total_antagonists[i]].") + karmareminder() + return 1 diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 1b55ca6b039..7002654710b 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -479,7 +479,7 @@ dat += "Show Objective" dat += "" - /* + if(ticker.mode.ninjas.len > 0) dat += "
" for(var/datum/mind/ninja in ticker.mode.ninjas) @@ -491,7 +491,7 @@ else dat += "" dat += "
Ninjas
Ninja not found!
" - */ + if(ticker.mode.cult.len) dat += "
" @@ -501,8 +501,8 @@ dat += "" dat += "" dat += "
Cultists
[M.real_name][M.client ? "" : " (logged out)"][M.stat == 2 ? " (DEAD)" : ""]PM
" - - /*if(istype(ticker.mode, /datum/game_mode/anti_revolution) && ticker.mode:heads.len) //comment out anti-revolution +/* + if(istype(ticker.mode, /datum/game_mode/anti_revolution) && ticker.mode:heads.len) //comment out anti-revolution dat += "
" for(var/datum/mind/N in ticker.mode:heads) var/mob/M = N.current
Corrupt Heads