diff --git a/code/modules/admin/verbs/freeze.dm b/code/modules/admin/verbs/freeze.dm index bb100fab76e..494d0f575e8 100644 --- a/code/modules/admin/verbs/freeze.dm +++ b/code/modules/admin/verbs/freeze.dm @@ -23,15 +23,6 @@ GLOBAL_LIST_EMPTY(frozen_atom_list) // A list of admin-frozen atoms. return ///mob freeze procs - -/mob/living - /// Used for preventing attacks on admin-frozen mobs. - var/frozen = null - /// Used for keeping track of previous sleeping value with admin freeze. - var/admin_prev_sleeping = 0 - /// Flag to enable these making trees semi-transparent if behind them - flags_2 = CRITICAL_ATOM_2 - /mob/living/admin_Freeze(client/admin, skip_overlays = FALSE, mech = null) if(!istype(admin)) return diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 8ecf6583613..b85d79fe466 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -64,9 +64,6 @@ return -//Mob procs and vars for scooping up -/mob/living/var/holder_type - /mob/living/proc/get_scooped(mob/living/carbon/grabber, has_variant = FALSE) if(!holder_type) return diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm index f6c9c3abc0e..f6536f03fd0 100644 --- a/code/modules/mob/living/default_language.dm +++ b/code/modules/mob/living/default_language.dm @@ -1,6 +1,3 @@ -/mob/living - var/datum/language/default_language - /mob/living/verb/set_default_language(language as null|anything in languages) set name = "Set Default Language" set category = "IC" diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index d1ecfe64e20..d46d69b08af 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -7,6 +7,9 @@ move_force = null pull_force = null + /// Flag to enable these making trees semi-transparent if behind them + flags_2 = CRITICAL_ATOM_2 + //Health and life related vars var/maxHealth = 100 //Maximum health that should be possible. var/health = 100 //A mob's health @@ -79,3 +82,14 @@ var/body_position = STANDING_UP var/mobility_flags = MOBILITY_FLAGS_DEFAULT + /// Used for preventing attacks on admin-frozen mobs. + var/frozen = null + /// Used for keeping track of previous sleeping value with admin freeze. + var/admin_prev_sleeping = 0 + + /// the type of holder that will be created when a mob gets scooped up + var/holder_type + + var/datum/language/default_language + +