diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 28474518c3..d08823475b 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -61,10 +61,10 @@ var/guest_jobban = 1 var/usewhitelist = 0 var/kick_inactive = 0 //force disconnect for inactive players - var/show_mods - var/show_mentors - var/mods_can_tempban - var/mods_can_job_tempban + var/show_mods = 0 + var/show_mentors = 0 + var/mods_can_tempban = 0 + var/mods_can_job_tempban = 0 var/mod_tempban_max = 1440 var/mod_job_tempban_max = 1440 var/load_jobs_from_txt = 0 diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index e3004d7b41..19894adf35 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -660,9 +660,11 @@ //JOBBAN'S INNARDS else if(href_list["jobban3"]) - if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN)) return + if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN,0)) + usr << "You do not have the appropriate permissions to add job bans!" + return - if(check_rights(R_MOD,0) && !check_rights(R_ADMIN) && !config.mods_can_job_tempban) // If mod and tempban disabled + if(check_rights(R_MOD,0) && !check_rights(R_ADMIN,0) && !config.mods_can_job_tempban) // If mod and tempban disabled usr << "Mod jobbanning is disabled!" return @@ -739,14 +741,14 @@ if(notbannedlist.len) //at least 1 unbanned job exists in joblist so we have stuff to ban. switch(alert("Temporary Ban?",,"Yes","No", "Cancel")) if("Yes") - if(!check_rights(R_MOD,0) && !check_rights(R_BAN)) return + if(!check_rights(R_MOD,0) && !check_rights(R_BAN, 0)) return if(config.ban_legacy_system) usr << "\red Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban." return var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null if(!mins) return - if(check_rights(R_MOD, 0) && !check_rights(R_BAN) && mins > config.mod_job_tempban_max) + if(check_rights(R_MOD, 0) && !check_rights(R_BAN, 0) && mins > config.mod_job_tempban_max) usr << " Moderators can only job tempban up to [config.mod_job_tempban_max] minutes!" return var/reason = input(usr,"Reason?","Please State Reason","") as text|null @@ -857,9 +859,11 @@ DB_ban_unban(ckey(key), BANTYPE_JOB_PERMA, job) else if(href_list["newban"]) - if(!check_rights(R_MOD,0) && !check_rights(R_BAN)) return + if(!check_rights(R_MOD,0) && !check_rights(R_BAN, 0)) + usr << "You do not have the appropriate permissions to add bans!" + return - if(check_rights(R_MOD,0) && !check_rights(R_ADMIN) && !config.mods_can_job_tempban) // If mod and tempban disabled + if(check_rights(R_MOD,0) && !check_rights(R_ADMIN, 0) && !config.mods_can_job_tempban) // If mod and tempban disabled usr << "Mod jobbanning is disabled!" return @@ -873,7 +877,7 @@ var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null if(!mins) return - if(check_rights(R_MOD, 0) && !check_rights(R_BAN) && mins > config.mod_tempban_max) + if(check_rights(R_MOD, 0) && !check_rights(R_BAN, 0) && mins > config.mod_tempban_max) usr << "Moderators can only job tempban up to [config.mod_tempban_max] minutes!" return if(mins >= 525600) mins = 525599