From e9d3f0ad9d4555e822c1fceffcb148ea319d0e07 Mon Sep 17 00:00:00 2001
From: Spookerton <918997+Spookerton@users.noreply.github.com>
Date: Fri, 31 Jan 2025 14:56:59 +0000
Subject: [PATCH] [MIRROR] isatom -> istom, add is_loc_predicate

---
 code/_helpers/functional.dm                              | 9 +++++++--
 code/_macros.dm                                          | 2 +-
 code/datums/audio/jukebox.dm                             | 2 +-
 code/game/objects/items/weapons/storage/ammobox.dm       | 2 +-
 code/modules/admin/view_variables/vv_set_handlers.dm     | 5 +++++
 .../definitions/personal_achievement_specific_object.dm  | 2 +-
 code/modules/psionics/faculties/energistics.dm           | 2 +-
 7 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/code/_helpers/functional.dm b/code/_helpers/functional.dm
index 44ad12c2273c3..58ce825057907 100644
--- a/code/_helpers/functional.dm
+++ b/code/_helpers/functional.dm
@@ -32,11 +32,16 @@
 #undef PREPARE_ARGUMENTS
 #undef PREPARE_INPUT
 
-/proc/is_atom_predicate(value, feedback_receiver)
-	. = isatom(value)
+/proc/is_loc_predicate(value, feedback_receiver)
+	. = isloc(value)
 	if(!. && feedback_receiver)
 		to_chat(feedback_receiver, SPAN_WARNING("Value must be an atom."))
 
+/proc/is_tom_predicate(value, feedback_receiver)
+	. = istom(value)
+	if(!. && feedback_receiver)
+		to_chat(feedback_receiver, SPAN_WARNING("Value must be a turf or movable."))
+
 /proc/is_num_predicate(value, feedback_receiver)
 	. = isnum(value)
 	if(!. && feedback_receiver)
diff --git a/code/_macros.dm b/code/_macros.dm
index cf33f37a5ff76..5518f481f41c7 100644
--- a/code/_macros.dm
+++ b/code/_macros.dm
@@ -36,7 +36,7 @@
 
 #define isairlock(A) istype(A, /obj/machinery/door/airlock)
 
-#define isatom(A) (isloc(A) && !isarea(A))
+#define istom(A) (isloc(A) && !isarea(A))
 
 #define isprojectile(A) istype(A, /obj/item/projectile)
 
diff --git a/code/datums/audio/jukebox.dm b/code/datums/audio/jukebox.dm
index f3a4a5f7c3265..f5e48135ad1f2 100644
--- a/code/datums/audio/jukebox.dm
+++ b/code/datums/audio/jukebox.dm
@@ -19,7 +19,7 @@
 
 /datum/jukebox/New(atom/_owner, _template, _ui_title, _ui_width, _ui_height)
 	. = ..()
-	if (QDELETED(_owner) || !isatom(_owner))
+	if (QDELETED(_owner) || !istom(_owner))
 		qdel(src)
 		return
 	owner = _owner
diff --git a/code/game/objects/items/weapons/storage/ammobox.dm b/code/game/objects/items/weapons/storage/ammobox.dm
index c25e8270e737f..13c58d3e6d2d2 100644
--- a/code/game/objects/items/weapons/storage/ammobox.dm
+++ b/code/game/objects/items/weapons/storage/ammobox.dm
@@ -312,7 +312,7 @@
  * Has no return value.
  */
 /obj/item/ammobox/proc/set_ammo_type(obj/item/ammo_casing/new_ammo_type, casing_spent = FALSE)
-	if (isatom(new_ammo_type))
+	if (istom(new_ammo_type))
 		if (!istype(new_ammo_type))
 			return
 		casing_spent = !new_ammo_type.BB
diff --git a/code/modules/admin/view_variables/vv_set_handlers.dm b/code/modules/admin/view_variables/vv_set_handlers.dm
index ae3bfd663651a..a1f0f5aa2989b 100644
--- a/code/modules/admin/view_variables/vv_set_handlers.dm
+++ b/code/modules/admin/view_variables/vv_set_handlers.dm
@@ -70,8 +70,13 @@
 
 /singleton/vv_set_handler/ghost_appearance_handler
 	handled_type = /mob/observer/ghost
+<<<<<<< ours
 	handled_vars = list("appearance" = TYPE_PROC_REF(/mob/observer/ghost, set_appearance))
 	predicates = list(GLOBAL_PROC_REF(is_atom_predicate))
+=======
+	handled_vars = list("appearance" = /mob/observer/ghost/proc/set_appearance)
+	predicates = list(/proc/is_tom_predicate)
+>>>>>>> theirs
 
 /singleton/vv_set_handler/virtual_ability_handler
 	handled_type = /mob/observer/virtual
diff --git a/code/modules/goals/definitions/personal_achievement_specific_object.dm b/code/modules/goals/definitions/personal_achievement_specific_object.dm
index 9c57790ab863f..607686041180f 100644
--- a/code/modules/goals/definitions/personal_achievement_specific_object.dm
+++ b/code/modules/goals/definitions/personal_achievement_specific_object.dm
@@ -17,7 +17,7 @@
 		if(ispath(progress))
 			if(ispath(progress, object_path) || ispath(object_path, progress))
 				success = TRUE
-		else if(isatom(progress))
+		else if(istom(progress))
 			var/atom/A = progress
 			if(istype(A, object_path) || ispath(object_path, A.type))
 				success = TRUE
diff --git a/code/modules/psionics/faculties/energistics.dm b/code/modules/psionics/faculties/energistics.dm
index 479d383b3b18f..38941ac7c190c 100644
--- a/code/modules/psionics/faculties/energistics.dm
+++ b/code/modules/psionics/faculties/energistics.dm
@@ -46,7 +46,7 @@
 		if(istype(target))
 			target.electrocute_act(rand(15,45), user, 1, user.zone_sel.selecting)
 			return TRUE
-		else if(isatom(target))
+		else if(istom(target))
 			var/obj/item/cell/charging_cell = target.get_cell()
 			if(istype(charging_cell))
 				charging_cell.give(rand(15,45))