diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm
index 4126fe1725f..29392997893 100644
--- a/code/__DEFINES/hud.dm
+++ b/code/__DEFINES/hud.dm
@@ -26,6 +26,11 @@
#define PLANT_PEST_HUD "21"// Pest level
#define PLANT_WEED_HUD "22"// Weed level
#define DIAG_TRACK_HUD "23"// Mech tracking beacon
+#define DIAG_PATH_HUD "24"//Bot path indicators
+
+//by default everything in the hud_list of an atom is an image
+//a value in hud_list with one of these will change that behavior
+#define HUD_LIST_LIST 1
//data HUD (medhud, sechud) defines
//Don't forget to update human/New() if you change these!
@@ -34,20 +39,21 @@
#define DATA_HUD_MEDICAL_BASIC 3
#define DATA_HUD_MEDICAL_ADVANCED 4
#define DATA_HUD_DIAGNOSTIC 5
-#define DATA_HUD_HYDROPONIC 6
+#define DATA_HUD_DIAGNOSTIC_ADVANCED 6
+#define DATA_HUD_HYDROPONIC 7
//NATIONS
-#define GAME_HUD_NATIONS 7
+#define GAME_HUD_NATIONS 8
//antag HUD defines
-#define ANTAG_HUD_CULT 8
-#define ANTAG_HUD_REV 9
-#define ANTAG_HUD_OPS 10
-#define ANTAG_HUD_WIZ 11
-#define ANTAG_HUD_SHADOW 12
-#define ANTAG_HUD_TRAITOR 13
-#define ANTAG_HUD_NINJA 14 //For Daves Rework
-#define ANTAG_HUD_CHANGELING 15
-#define ANTAG_HUD_VAMPIRE 16
-#define ANTAG_HUD_ABDUCTOR 17 //For Fox
+#define ANTAG_HUD_CULT 9
+#define ANTAG_HUD_REV 10
+#define ANTAG_HUD_OPS 11
+#define ANTAG_HUD_WIZ 12
+#define ANTAG_HUD_SHADOW 13
+#define ANTAG_HUD_TRAITOR 14
+#define ANTAG_HUD_NINJA 15
+#define ANTAG_HUD_CHANGELING 16
+#define ANTAG_HUD_VAMPIRE 17
+#define ANTAG_HUD_ABDUCTOR 18
// Notification action types
#define NOTIFY_JUMP "jump"
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index 644740c9e20..28ebfca6b1b 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -25,6 +25,7 @@ var/global/list/respawnable_list = list() //List of all mobs, dead or in mindl
var/global/list/non_respawnable_keys = list() //List of ckeys that are excluded from respawning for remainder of round.
var/global/list/simple_animal_list = list() //List of all simple animals, including clientless
var/global/list/snpc_list = list() //List of all snpc's, including clientless
+var/global/list/bots_list = list() //List of all bots(beepsky, medibots,etc)
var/global/list/med_hud_users = list()
var/global/list/sec_hud_users = list()
diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index c29b5daf5b3..04ebcc68ed5 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -1,4 +1,5 @@
/* HUD DATUMS */
+var/global/list/all_huds = list()
///GLOBAL HUD LIST
var/datum/atom_hud/huds = list( \
@@ -7,6 +8,7 @@ var/datum/atom_hud/huds = list( \
DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(), \
DATA_HUD_MEDICAL_ADVANCED = new/datum/atom_hud/data/human/medical/advanced(), \
DATA_HUD_DIAGNOSTIC = new/datum/atom_hud/data/diagnostic(), \
+ DATA_HUD_DIAGNOSTIC_ADVANCED = new/datum/atom_hud/data/diagnostic/advanced(), \
DATA_HUD_HYDROPONIC = new/datum/atom_hud/data/hydroponic(), \
GAME_HUD_NATIONS = new/datum/atom_hud/antag(), \
ANTAG_HUD_CULT = new/datum/atom_hud/antag(), \
@@ -26,6 +28,18 @@ var/datum/atom_hud/huds = list( \
var/list/mob/hudusers = list() //list with all mobs who can see the hud
var/list/hud_icons = list() //these will be the indexes for the atom's hud_list
+
+/datum/atom_hud/New()
+ all_huds += src
+
+/datum/atom_hud/Destroy()
+ for(var/v in hudusers)
+ remove_hud_from(v)
+ for(var/v in hudatoms)
+ remove_from_hud(v)
+ all_huds -= src
+ return ..()
+
/datum/atom_hud/proc/remove_hud_from(mob/M)
if(!M)
return
@@ -82,7 +96,7 @@ var/datum/atom_hud/huds = list( \
serv_huds += serv.thrallhud
- for(var/datum/atom_hud/hud in (huds|serv_huds))//|gang_huds))
+ for(var/datum/atom_hud/hud in (all_huds|serv_huds))//|gang_huds))
if(src in hud.hudusers)
hud.add_hud_to(src)
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 604e92a47e0..5874a794c9a 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -46,6 +46,12 @@
/datum/atom_hud/data/diagnostic
hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD)
+/datum/atom_hud/data/diagnostic/advanced
+ hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_PATH_HUD)
+
+/datum/atom_hud/data/bot_path
+ hud_icons = list(DIAG_PATH_HUD)
+
/datum/atom_hud/data/hydroponic
hud_icons = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD)
diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
index d7fa1b4c9f2..9f39ca418ea 100644
--- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
+++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
@@ -127,6 +127,8 @@
..()
add_language("Swarmer", 1)
verbs -= /mob/living/verb/pulled
+ for(var/datum/atom_hud/data/diagnostic/diag_hud in huds)
+ diag_hud.add_to_hud(src)
updatename()
/mob/living/simple_animal/hostile/swarmer/Stat()
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 2f2772774a3..2f3f328ea58 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -98,8 +98,8 @@
log_message("[src] created.")
mechas_list += src //global mech list
prepare_huds()
- var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC]
- diag_hud.add_to_hud(src)
+ for(var/datum/atom_hud/data/diagnostic/diag_hud in huds)
+ diag_hud.add_to_hud(src)
diag_hud_set_mechhealth()
diag_hud_set_mechcell()
diag_hud_set_mechstat()
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 74daf90fa4e..7e986f2f434 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -30,7 +30,7 @@
var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use
var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use
- var/d_hud = DATA_HUD_DIAGNOSTIC //There is only one kind of diag hud
+ var/d_hud = DATA_HUD_DIAGNOSTIC_ADVANCED //There is only one kind of diag hud
var/obj/item/device/radio/common_radio
@@ -232,8 +232,8 @@
medsensor.add_hud_to(src)
/mob/living/silicon/proc/add_diag_hud()
- var/datum/atom_hud/diagsensor = huds[d_hud]
- diagsensor.add_hud_to(src)
+ for(var/datum/atom_hud/data/diagnostic/diagsensor in huds)
+ diagsensor.add_hud_to(src)
/mob/living/silicon/proc/toggle_sensor_mode()
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 09a7a124783..479f727d9e6 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -47,7 +47,7 @@
var/frustration = 0 //Used by some bots for tracking failures to reach their target.
var/base_speed = 2 //The speed at which the bot moves, or the number of times it moves per process() tick.
var/turf/ai_waypoint //The end point of a bot's path, or the target location.
- var/list/path = list() //List of turfs through which a bot 'steps' to reach the waypoint.
+ var/list/path = list() //List of turfs through which a bot 'steps' to reach the waypoint, associated with the path image, if there is one.
var/pathset = 0
var/list/ignore_list = list() //List of unreachable targets for an ignore-list enabled bot to ignore.
var/mode = BOT_IDLE //Standardizes the vars that indicate the bot is busy with its function.
@@ -82,7 +82,13 @@
"Responding", "Navigating to Delivery Location", "Navigating to Home", \
"Waiting for clear path", "Calculating navigation path", "Pinging beacon network", "Unable to reach destination")
- hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD) //Diagnostic HUD views
+ var/datum/atom_hud/data/bot_path/path_hud = new /datum/atom_hud/data/bot_path()
+ var/path_image_icon = 'icons/obj/aibots.dmi'
+ var/path_image_icon_state = "path_indicator"
+ var/path_image_color = "#FFFFFF"
+ var/reset_access_timer_id
+
+ hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD, DIAG_PATH_HUD = HUD_LIST_LIST)//Diagnostic HUD views
/obj/item/device/radio/headset/bot
subspace_transmission = 1
@@ -130,6 +136,7 @@
/mob/living/simple_animal/bot/New()
..()
+ bots_list += src
icon_living = icon_state
icon_dead = icon_state
access_card = new /obj/item/weapon/card/id(src)
@@ -151,14 +158,17 @@
radio_controller.add_object(bot_core, control_freq, bot_filter)
prepare_huds()
- var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC]
- diag_hud.add_to_hud(src)
+ for(var/datum/atom_hud/data/diagnostic/diag_hud in huds)
+ diag_hud.add_to_hud(src)
+ diag_hud.add_hud_to(src)
+ permanent_huds |= diag_hud
diag_hud_set_bothealth()
diag_hud_set_botstat()
diag_hud_set_botmode()
// give us the hud too!
- diag_hud.add_hud_to(src)
- permanent_huds |= diag_hud
+ if(path_hud)
+ path_hud.add_to_hud(src)
+ path_hud.add_hud_to(src)
/mob/living/simple_animal/bot/update_canmove(delay_action_updates = 0)
. = ..()
@@ -169,6 +179,10 @@
/mob/living/simple_animal/bot/Destroy()
if(paicard)
ejectpai()
+ if(path_hud)
+ QDEL_NULL(path_hud)
+ path_hud = null
+ bots_list -= src
QDEL_NULL(Radio)
QDEL_NULL(access_card)
if(radio_controller && bot_filter)
@@ -446,14 +460,14 @@ Pass a positive integer as an argument to override a bot's default speed.
/mob/living/simple_animal/bot/proc/bot_move(dest, move_speed)
if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set.
- path = list()
+ set_path(null)
return 0
dest = get_turf(dest) //We must always compare turfs, so get the turf of the dest var if dest was originally something else.
var/turf/last_node = get_turf(path[path.len]) //This is the turf at the end of the path, it should be equal to dest.
if(get_turf(src) == dest) //We have arrived, no need to move again.
return 1
else if(dest != last_node) //The path should lead us to our given destination. If this is not true, we must stop.
- path = list()
+ set_path(null)
return 0
var/step_count = move_speed ? move_speed : base_speed //If a value is passed into move_speed, use that instead of the default speed var.
@@ -472,14 +486,14 @@ Pass a positive integer as an argument to override a bot's default speed.
if(path.len > 1)
step_towards(src, path[1])
if(get_turf(src) == path[1]) //Successful move
- path -= path[1]
+ increment_path()
tries = 0
else
tries++
return 0
else if(path.len == 1)
step_to(src, dest)
- path = list()
+ set_path(null)
return 1
@@ -496,7 +510,7 @@ Pass a positive integer as an argument to override a bot's default speed.
var/datum/job/captain/All = new/datum/job/captain
all_access.access = All.get_access()
- path = get_path_to(src, waypoint, /turf/proc/Distance_cardinal, 0, 200, id=all_access)
+ set_path(get_path_to(src, waypoint, /turf/proc/Distance_cardinal, 0, 200, id=all_access))
calling_ai = caller //Link the AI to the bot!
ai_waypoint = waypoint
@@ -504,6 +518,9 @@ Pass a positive integer as an argument to override a bot's default speed.
if(!on)
turn_on() //Saves the AI the hassle of having to activate a bot manually.
access_card = all_access //Give the bot all-access while under the AI's command.
+ if(client)
+ reset_access_timer_id = addtimer(src, "bot_reset", 600) //if the bot is player controlled, they get the extra access for a limited time
+ to_chat(src, "Priority waypoint set by [calling_ai] [caller]. Proceed to [end_area.name].
[path.len-1] meters to destination. You have been granted additional door access for 60 seconds.")
if(message)
to_chat(calling_ai, "[bicon(src)] [name] called to [end_area.name]. [path.len-1] meters to destination.")
pathset = 1
@@ -513,7 +530,7 @@ Pass a positive integer as an argument to override a bot's default speed.
if(message)
to_chat(calling_ai, "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range.")
calling_ai = null
- path = list()
+ set_path(null)
/mob/living/simple_animal/bot/proc/call_mode() //Handles preparing a bot for a call, as well as calling the move proc.
//Handles the bot's movement during a call.
@@ -528,7 +545,10 @@ Pass a positive integer as an argument to override a bot's default speed.
if(calling_ai) //Simple notification to the AI if it called a bot. It will not know the cause or identity of the bot.
to_chat(calling_ai, "Call command to a bot has been reset.")
calling_ai = null
- path = list()
+ if(reset_access_timer_id)
+ deltimer(reset_access_timer_id)
+ reset_access_timer_id = null
+ set_path(null)
summon_target = null
pathset = 0
access_card.access = prev_access
@@ -593,7 +613,7 @@ Pass a positive integer as an argument to override a bot's default speed.
else if(path.len > 0 && patrol_target) // valid path
var/turf/next = path[1]
if(next == loc)
- path -= next
+ increment_path()
return
@@ -749,12 +769,12 @@ Pass a positive integer as an argument to override a bot's default speed.
// given an optional turf to avoid
/mob/living/simple_animal/bot/proc/calc_path(turf/avoid)
check_bot_access()
- path = get_path_to(src, patrol_target, /turf/proc/Distance_cardinal, 0, 120, id=access_card, exclude=avoid)
+ set_path(get_path_to(src, patrol_target, /turf/proc/Distance_cardinal, 0, 120, id=access_card, exclude=avoid))
/mob/living/simple_animal/bot/proc/calc_summon_path(turf/avoid)
check_bot_access()
spawn()
- path = get_path_to(src, summon_target, /turf/proc/Distance_cardinal, 0, 150, id=access_card, exclude=avoid)
+ set_path(get_path_to(src, summon_target, /turf/proc/Distance_cardinal, 0, 150, id=access_card, exclude=avoid))
if(!path.len) //Cannot reach target. Give up and announce the issue.
speak("Summon command failed, destination unreachable.",radio_channel)
bot_reset()
@@ -771,7 +791,7 @@ Pass a positive integer as an argument to override a bot's default speed.
else if(path.len > 0 && summon_target) //Proper path acquired!
var/turf/next = path[1]
if(next == loc)
- path -= next
+ increment_path()
return
var/moved = bot_move(summon_target, 3) // Move attempt
@@ -1015,3 +1035,64 @@ Pass a positive integer as an argument to override a bot's default speed.
/mob/living/simple_animal/bot/is_mechanical()
return 1
+
+/mob/living/simple_animal/bot/proc/set_path(list/newpath)
+ path = newpath ? newpath : list()
+ if(!path_hud)
+ return
+ var/list/path_huds_watching_me = list(huds[DATA_HUD_DIAGNOSTIC_ADVANCED])
+ if(path_hud)
+ path_huds_watching_me += path_hud
+ for(var/V in path_huds_watching_me)
+ var/datum/atom_hud/H = V
+ H.remove_from_hud(src)
+
+ var/list/path_images = hud_list[DIAG_PATH_HUD]
+ QDEL_LIST(path_images)
+ if(newpath)
+ for(var/i in 1 to newpath.len)
+ var/turf/T = newpath[i]
+ var/direction = NORTH
+ if(i > 1)
+ var/turf/prevT = path[i - 1]
+ var/image/prevI = path[prevT]
+ direction = get_dir(prevT, T)
+ if(i > 2)
+ var/turf/prevprevT = path[i - 2]
+ var/prevDir = get_dir(prevprevT, prevT)
+ var/mixDir = direction|prevDir
+ if(mixDir in diagonals)
+ prevI.dir = mixDir
+ if(prevDir & (NORTH|SOUTH))
+ var/matrix/ntransform = matrix()
+ ntransform.Turn(90)
+ if((mixDir == NORTHWEST) || (mixDir == SOUTHEAST))
+ ntransform.Scale(-1, 1)
+ else
+ ntransform.Scale(1, -1)
+ prevI.transform = ntransform
+ var/mutable_appearance/MA = new /mutable_appearance()
+ MA.icon = path_image_icon
+ MA.icon_state = path_image_icon_state
+ MA.layer = ABOVE_OPEN_TURF_LAYER
+ MA.plane = 0
+ MA.appearance_flags = RESET_COLOR|RESET_TRANSFORM
+ MA.color = path_image_color
+ MA.dir = direction
+ var/image/I = image(loc = T)
+ I.appearance = MA
+ path[T] = I
+ path_images += I
+
+ for(var/V in path_huds_watching_me)
+ var/datum/atom_hud/H = V
+ H.add_to_hud(src)
+
+
+/mob/living/simple_animal/bot/proc/increment_path()
+ if(!path || !path.len)
+ return
+ var/image/I = path[path[1]]
+ if(I)
+ I.icon = null
+ path.Cut(1, 2)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 58911c4316b..9cfc4da18eb 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -17,6 +17,8 @@
window_id = "autoclean"
window_name = "Automatic Station Cleaner v1.1"
pass_flags = PASSMOB
+ path_image_color = "#993299"
+
var/blood = 1
var/list/target_types = list()
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index c577722fe43..8a7ccfa37a5 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -20,6 +20,7 @@
bot_core = /obj/machinery/bot_core/secbot
window_id = "autoed209"
window_name = "Automatic Security Unit v2.6"
+ path_image_color = "#FF0000"
var/lastfired = 0
var/shot_delay = 3 //.3 seconds between shots
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 40a2b1f1631..8144cd84bd6 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -17,6 +17,7 @@
bot_core = /obj/machinery/bot_core/floorbot
window_id = "autofloor"
window_name = "Automatic Station Floor Repairer v1.1"
+ path_image_color = "#FFA500"
var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details.
var/targetdirection
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index c4952b09a34..ac48445e32c 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -19,6 +19,7 @@
bot_core_type = /obj/machinery/bot_core/medbot
window_id = "automed"
window_name = "Automatic Medical Unit v1.1"
+ path_image_color = "#DDDDFF"
var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents.
var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 6130213df27..380b301861e 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -26,6 +26,8 @@
model = "MULE"
bot_purpose = "deliver crates and other packages between departments, as requested"
bot_core_type = /obj/machinery/bot_core/mulebot
+ path_image_color = "#7F5200"
+
suffix = ""
@@ -502,7 +504,7 @@
var/turf/next = path[1]
reached_target = 0
if(next == loc)
- path -= next
+ increment_path()
return
if(istype(next, /turf/simulated))
// to_chat(world, "at ([x],[y]) moving to ([next.x],[next.y])")
@@ -513,7 +515,7 @@
if(moved && oldloc!=loc) // successful move
// to_chat(world, "Successful move.")
blockcount = 0
- path -= loc
+ increment_path()
if(destination == home_destination)
mode = BOT_GO_HOME
@@ -570,7 +572,7 @@
// given an optional turf to avoid
/mob/living/simple_animal/bot/mulebot/calc_path(turf/avoid = null)
check_bot_access()
- path = get_path_to(src, target, /turf/proc/Distance_cardinal, 0, 250, id=access_card, exclude=avoid)
+ set_path(get_path_to(src, target, /turf/proc/Distance_cardinal, 0, 250, id=access_card, exclude=avoid))
// sets the current destination
// signals all beacons matching the delivery code
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 9c04e47521a..2a06bb488cf 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -18,6 +18,7 @@
bot_core_type = /obj/machinery/bot_core/secbot
window_id = "autosec"
window_name = "Automatic Security Unit v1.6"
+ path_image_color = "#FF0000"
var/base_icon = "secbot"
var/mob/living/carbon/target
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index aa4fb41ca08..a98540b0a2d 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -34,8 +34,15 @@
..()
/atom/proc/prepare_huds()
+ hud_list = list()
for(var/hud in hud_possible)
- hud_list[hud] = image('icons/mob/hud.dmi', src, "")
+ var/hint = hud_possible[hud]
+ switch(hint)
+ if(HUD_LIST_LIST)
+ hud_list[hud] = list()
+ else
+ var/image/I = image('icons/mob/hud.dmi', src, "")
+ hud_list[hud] = I
/mob/proc/generate_name()
return name
diff --git a/icons/obj/aibots.dmi b/icons/obj/aibots.dmi
index b6e60dab2dc..b564c3a59e1 100644
Binary files a/icons/obj/aibots.dmi and b/icons/obj/aibots.dmi differ