diff --git a/code/game/objects/door_assembly.dm b/code/game/objects/door_assembly.dm index 23f59a082f6..923bb897ab3 100644 --- a/code/game/objects/door_assembly.dm +++ b/code/game/objects/door_assembly.dm @@ -272,7 +272,7 @@ obj/structure/door_assembly door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly name = "High Tech Security Assembly" - icon_state = "door_as_hatch1" + icon_state = "door_as_highsec1" airlock_type = /obj/machinery/door/airlock/highsecurity anchored = 1 density = 1 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index ebaddd6dd0d..a8e3c73fd62 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -431,7 +431,15 @@ //THIS IS HOW YOU ADD OBJECTS TO BE OBSERVED - creatures += getmobs() + for(var/mob/M in sortAtom(mob_list)) + var/name = M.name + if (name in names) + namecounts[name]++ + name = "[name] ([namecounts[name]])" + else + names.Add(name) + namecounts[name] = 1 + creatures[name] = M //THIS IS THE MOBS PART: LOOK IN HELPERS.DM client.perspective = EYE_PERSPECTIVE diff --git a/html/changelog.html b/html/changelog.html index 4c9c585ca70..0dc0ea3ee8b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,7 +53,7 @@ should be listed in the changelog upon commit tho. Thanks. --> diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index e0117c37bb4..81be91b74ea 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi index fce3344be3c..10e85722a74 100644 Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ