Merge branch 'master220' into Wryn_Resprite_and_More

ss220-space · Dec 11, 2024 · 5b66b77 · 5b66b77
2 parents 9e39cbb + 85a42d1
commit 5b66b77
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 7 deletions.
diff --git a/code/modules/space_management/zlevel_manager.dm b/code/modules/space_management/zlevel_manager.dm
@@ -43,15 +43,10 @@ GLOBAL_DATUM_INIT(space_manager, /datum/zlev_manager, new())
 
 
 /datum/zlev_manager/proc/get_zlev(z)
-	if(!("[z]" in z_list))
-		log_runtime(EXCEPTION("Unmanaged z level: '[z]'"))
-	else
-		return z_list["[z]"]
+	return z_list["[z]"] == null ? log_runtime(EXCEPTION("Unmanaged z level: '[z]'")) : z_list["[z]"]
 
 /datum/zlev_manager/proc/get_zlev_by_name(A)
-	if(!(A in levels_by_name))
-		log_runtime(EXCEPTION("Non-existent z level: '[A]'"))
-	return levels_by_name[A]
+	return levels_by_name[A] == null ? log_runtime(EXCEPTION("Non-existent z level: '[A]'")) : levels_by_name[A]
 
 /*
 * "Dirt" management

diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi
diff --git a/icons/mob/clothing/species/drask/eyes.dmi b/icons/mob/clothing/species/drask/eyes.dmi
diff --git a/icons/mob/clothing/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi
diff --git a/icons/mob/clothing/species/vox/eyes.dmi b/icons/mob/clothing/species/vox/eyes.dmi
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi