hm what

ToasterBiome · Sep 28, 2024 · 43dbbce · 43dbbce
1 parent 95e28f5
commit 43dbbce
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm
@@ -199,9 +199,12 @@
 /// Checks if the given mob is infected.
 #define IS_INFECTED(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/zombie))
 
-/// Checks if the given mob is infected.
+/// Checks if the given mob is a clockcultist.
 #define IS_CLOCK_CULTIST(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/clockcult))
 
+/// Checks if the given mob is infected.
+#define IS_CHANGELING(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/changeling))
+
 // Antag resource defines
 #define ANTAG_RESOURCE_DARKSPAWN "psi"
 #define ANTAG_RESOURCE_VAMPIRE "blood"
diff --git a/code/datums/saymode.dm b/code/datums/saymode.dm
@@ -16,7 +16,7 @@
 	mode = MODE_CHANGELING
 
 /datum/saymode/changeling/handle_message(mob/living/user, message, datum/language/language)
-	if(ismob(user.pulledby) && is_changeling(user.pulledby) && user.pulledby.grab_state >= GRAB_NECK)
+	if(ismob(user.pulledby) && IS_CHANGELING(user.pulledby) && user.pulledby.grab_state >= GRAB_NECK)
 		to_chat(user, span_warning("Our abilities are being dampened! We cannot speak through the hivemind!"))
 		return FALSE
 	switch(user.lingcheck())

diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
@@ -164,9 +164,6 @@ GLOBAL_VAR(changeling_team_objective_type)
 			of the Thing being sent to a station in this sector is highly likely. It may be in the guise of any crew member. Trust nobody - suspect everybody. Do not announce this to the crew, \
 			as paranoia may spread and inhibit workplace efficiency."
 
-/proc/is_changeling(mob/M) //Usefull check changeling
-	return M?.mind?.has_antag_datum(/datum/antagonist/changeling)
-
 /proc/changeling_transform(mob/living/carbon/human/user, datum/changelingprofile/chosen_prof)
 	var/datum/dna/chosen_dna = chosen_prof.dna
 	user.real_name = chosen_prof.name

diff --git a/code/modules/antagonists/changeling/powers/headcrab.dm b/code/modules/antagonists/changeling/powers/headcrab.dm
@@ -15,7 +15,7 @@
 		return
 	if(QDELETED(user)) // Yogs: Implies maybe that the user was already gibbed or something. Prevents a null mob loc later on
 		return
-	if(ismob(user.pulledby) && is_changeling(user.pulledby) && user.pulledby.grab_state >= GRAB_NECK)
+	if(ismob(user.pulledby) && IS_CHANGELING(user.pulledby) && user.pulledby.grab_state >= GRAB_NECK)
 		to_chat(user, span_warning("Our abilities are being dampened! We cannot use [src]!"))
 		return
 	..()