From 5f2df7ea2fbcc4d91fc117953ba12badebaea8e3 Mon Sep 17 00:00:00 2001 From: Dalekfodder Date: Tue, 20 May 2014 18:28:26 +0300 Subject: [PATCH] Revert "dont touch" This reverts commit c585038d9ed60b8bcb726fe7efb6705579599716. --- code/game/verbs/ooc.dm | 2 +- code/modules/admin/admin_verbs.dm | 1 - code/modules/mob/living/carbon/human/examine.dm | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index cc749be5..1c23f9b9 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -21,7 +21,7 @@ var/global/normal_ooc_colour = "#002eb8" src << "\red You have OOC muted." return - if(!holder && holder.rights & R_DEV) + if(!holder) if(!ooc_allowed) src << "\red OOC is globally muted" return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 80999117..2247d315 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -105,7 +105,6 @@ var/list/admin_verbs_fun = list( /client/proc/editappear ) var/list/admin_verbs_dev = list( - /client/proc/dsay, /client/proc/togglebuildmodeself, /datum/admins/proc/restart, /datum/admins/proc/delay, diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index e8179c4a..b1919d82 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -245,10 +245,7 @@ if(!key && brain_op_stage != 4 && stat != DEAD) msg += "[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely\n" else if(!client && brain_op_stage != 4 && stat != DEAD) - if(species == "Machine" || species == "machine") - msg += "Unit appears to be inactive.\n" - else - msg += "[t_He] [t_has] suddenly fallen asleep.\n" + msg += "[t_He] [t_has] suddenly fallen asleep.\n" var/list/wound_flavor_text = list() var/list/is_destroyed = list()