diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 42ab856835c..de24f45198f 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -772,9 +772,6 @@ so as to remain in compliance with the most up-to-date laws." mymob.client.screen |= alert return TRUE -/mob - var/list/alerts // lazy list. contains /obj/screen/alert only // On /mob so clientless mobs will throw alerts properly - /obj/screen/alert/Click(location, control, params) if(!usr || !usr.client) return diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index aa4d3b8a42c..72117f4b326 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -1,6 +1,3 @@ -/mob - var/list/screens = list() - /mob/proc/overlay_fullscreen(category, type, severity) var/obj/screen/fullscreen/screen = screens[category] if (!screen || screen.type != type) diff --git a/code/modules/mob/living/simple_animal/slime/slime_life.dm b/code/modules/mob/living/simple_animal/slime/slime_life.dm index 0394ffb60a5..6f261dd9d17 100644 --- a/code/modules/mob/living/simple_animal/slime/slime_life.dm +++ b/code/modules/mob/living/simple_animal/slime/slime_life.dm @@ -1,12 +1,3 @@ - -/mob/living/simple_animal/slime - var/AIproc = FALSE // determines if the AI loop is activated - var/Atkcool = FALSE // attack cooldown - var/Tempstun = FALSE // temporary temperature stuns - var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while - var/SStun = 0 // stun variable - - /mob/living/simple_animal/slime/Life() set invisibility = 0 if(notransform) diff --git a/code/modules/mob/living/simple_animal/slime/slime_mob.dm b/code/modules/mob/living/simple_animal/slime/slime_mob.dm index a1ae917a7b6..8c87c66cfeb 100644 --- a/code/modules/mob/living/simple_animal/slime/slime_mob.dm +++ b/code/modules/mob/living/simple_animal/slime/slime_mob.dm @@ -53,6 +53,18 @@ var/force_stasis = FALSE var/static/regex/slime_name_regex = new("\\w+ (baby|adult) slime \\(\\d+\\)") + + /// Determines if the AI loop is activated + var/AIproc = FALSE + /// Attack cooldown + var/Atkcool = FALSE + /// Temporary temperature stuns + var/Tempstun = FALSE + /// If a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while + var/Discipline = 0 + /// Stun variable + var/SStun = 0 + ///////////TIME FOR SUBSPECIES var/colour = "grey" diff --git a/code/modules/mob/mob_vars.dm b/code/modules/mob/mob_vars.dm index d2e991a8e78..5fbbc7ea067 100644 --- a/code/modules/mob/mob_vars.dm +++ b/code/modules/mob/mob_vars.dm @@ -216,3 +216,8 @@ var/runechat_msg_location /// The datum receiving keyboard input. parent mob by default. var/datum/input_focus = null + + /// lazy list. contains /obj/screen/alert only. On /mob so clientless mobs will throw alerts properly + var/list/alerts + + var/list/screens = list()