diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 3fe2c278f9d..8b9aee368d0 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -270,7 +270,8 @@ var/global/BSACooldown = 0 message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [job]", 1) jobban_fullban(M, job, reason) href_list["jobban2"] = 1 // lets it fall through and refresh - + if(config.appeal_address) + M << "\red You may try to appeal this at [config.appeal_address]" if (href_list["boot2"]) if ((src.rank in list( "Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) @@ -320,10 +321,10 @@ var/global/BSACooldown = 0 M << "\redYou have been banned by [usr.client.ckey].\nReason: [reason]." M << "\red This is a temporary ban, it will be removed in [mins] minutes." feedback_inc("ban_tmp",1) - if(config.banappeals) - M << "\red To try to resolve this matter head to [config.banappeals]" + if(config.appeal_address) + M << "\red You may try to appeal this at [config.appeal_address]" else - M << "\red No ban appeals URL has been set." + M << "\red No ban appeal URL has been set." log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") @@ -336,10 +337,10 @@ var/global/BSACooldown = 0 AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0) M << "\redYou have been banned by [usr.client.ckey].\nReason: [reason]." M << "\red This is a permanent ban." - if(config.banappeals) - M << "\red To try to resolve this matter head to [config.banappeals]" + if(config.appeal_address) + M << "\red You may try to appeal this at [config.appeal_address]" else - M << "\red No ban appeals URL has been set." + M << "\red No ban appeal URL has been set." ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.") log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") diff --git a/code/modules/clothing/head/helmets.dm b/code/modules/clothing/head/helmets.dm index 069d8dba8ed..f8fc311472e 100644 --- a/code/modules/clothing/head/helmets.dm +++ b/code/modules/clothing/head/helmets.dm @@ -11,8 +11,8 @@ /obj/item/clothing/head/helmet/warden name = "Warden Hat" - desc = "A special helmet issued to the Warden of a securiy force. Protects the head from impacts." - icon_state = "policehelm" + desc = "A special helmet issued to the Warden of a security force. Protects the head from impacts." + icon_state = "wardencap" flags_inv = 0 /obj/item/clothing/head/helmet/swat diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 58b66560cc9..e6f331a80a2 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -739,7 +739,7 @@ if (isbanned) log_access("Failed Login: [src] - Banned") message_admins("\blue Failed Login: [src] - Banned") - alert(src,"You have been banned.\nReason : [isbanned][config.appeal_address ? "\nYou may appeal this at [config.appeal_address]" : ""]","Ban","Ok") + alert(src,"You have been banned.\nReason : [isbanned][config.appeal_address ? "\nYou may try to appeal this at [config.appeal_address]" : ""]","Ban","Ok") del(src) /* diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 80efbc4dcc1..a9145c63541 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 3a0c0715d39..0388df7fbbb 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ