Merge pull request #15275 from Heroman3003/shadekin-fixes

Fixes some shadekin issues

code/__defines/shadekin.dm

@@ -3,7 +3,8 @@
 #define SHIFTED_OR_NOT 3
 
 #define AB_PHASE_SHIFTED	0x1
-#define AB_SHADE_REGEN		0x2
+#define AB_PHASE_SHIFTING	0x2
+#define AB_SHADE_REGEN		0x4
 
 //Porting over the type system of the mobs
 #define BLUE_EYES 1

code/modules/mob/language/language.dm

@@ -130,9 +130,9 @@
 /datum/language/proc/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
 	log_say("(HIVE) [message]", speaker)
 
-	speaker.verbs |= /mob/proc/adjust_hive_range	//VOREStation Add - If you don't have the verb you should.
+	speaker.verbs |= /mob/proc/adjust_hive_range
 
-	if(!speaker_mask) speaker_mask = speaker.name
+	if(!speaker_mask) speaker_mask = speaker.real_name
 	message = "[get_spoken_verb(message)], \"[format_message(message, get_spoken_verb(message))]\""
 	//VOREStation Edit Start
 	if(speaker.hive_lang_range == -1)

code/modules/mob/living/carbon/human/human.dm

@@ -266,6 +266,8 @@
 
 //repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere
 /mob/living/carbon/human/proc/get_visible_name()
+	if(ability_flags & AB_PHASE_SHIFTED)
+		return "Something"	// Something
 	if( wear_mask && (wear_mask.flags_inv&HIDEFACE) )	//Wearing a mask which hides our face, use id-name if possible
 		return get_id_name("Unknown")
 	if( head && (head.flags_inv&HIDEFACE) )

code/modules/mob/living/carbon/human/say.dm

@@ -1,4 +1,6 @@
 /mob/living/carbon/human/GetAltName()
+	if(ability_flags & AB_PHASE_SHIFTED)
+		return ""
 	if(name != GetVoice())
 		return " (as [get_id_name("Unknown")])"
 

code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm

@@ -39,6 +39,9 @@
 		to_chat(src,"<span class='warning'>You can't use that here!</span>")
 		return FALSE
 
+	if(ability_flags & AB_PHASE_SHIFTING)
+		return FALSE
+
 	var/brightness = T.get_lumcount() //Brightness in 0.0 to 1.0
 	darkness = 1-brightness //Invert
 
@@ -87,8 +90,9 @@
 	//Shifting in
 	if(ability_flags & AB_PHASE_SHIFTED)
 		ability_flags &= ~AB_PHASE_SHIFTED
+		ability_flags |= AB_PHASE_SHIFTING
 		mouse_opacity = 1
-		name = real_name
+		name = get_visible_name()
 		for(var/obj/belly/B as anything in vore_organs)
 			B.escapable = initial(B.escapable)
 
@@ -119,6 +123,8 @@
 					target.forceMove(vore_selected)
 					to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")
 
+		ability_flags &= ~AB_PHASE_SHIFTING
+
 		//Affect nearby lights
 		var/destroy_lights = 0
 
@@ -134,9 +140,10 @@
 	//Shifting out
 	else
 		ability_flags |= AB_PHASE_SHIFTED
+		ability_flags |= AB_PHASE_SHIFTING
 		mouse_opacity = 0
 		custom_emote(1,"phases out!")
-		name = "Something"
+		name = get_visible_name()
 
 		for(var/obj/belly/B as anything in vore_organs)
 			B.escapable = FALSE
@@ -156,6 +163,7 @@
 		incorporeal_move = TRUE
 		density = FALSE
 		force_max_speed = TRUE
+		ability_flags &= ~AB_PHASE_SHIFTING
 
 /datum/modifier/shadekin_phase_vision
 	name = "Shadekin Phase Vision"

vorestation.dme

@@ -81,6 +81,7 @@
 #include "code\__defines\research.dm"
 #include "code\__defines\roguemining_vr.dm"
 #include "code\__defines\rust_g.dm"
+#include "code\__defines\shadekin.dm"
 #include "code\__defines\shields.dm"
 #include "code\__defines\shuttle.dm"
 #include "code\__defines\sound.dm"
@@ -2918,7 +2919,6 @@
 #include "code\modules\mob\living\carbon\human\species\outsider\skeleton.dm"
 #include "code\modules\mob\living\carbon\human\species\outsider\vox.dm"
 #include "code\modules\mob\living\carbon\human\species\outsider\vox_vr.dm"
-#include "code\modules\mob\living\carbon\human\species\shadekin\_defines.dm"
 #include "code\modules\mob\living\carbon\human\species\shadekin\shadekin.dm"
 #include "code\modules\mob\living\carbon\human\species\shadekin\shadekin_abilities.dm"
 #include "code\modules\mob\living\carbon\human\species\shadekin\shadekin_hud.dm"