Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576

code/modules/mob/living/carbon/alien/emote.dm

@@ -6,6 +6,7 @@
 		act = copytext(act, 1, t1)
 
 	var/muzzled = is_muzzled()
+	act = lowertext(act)
 
 	switch(act)
 		if("sign")
@@ -104,4 +105,4 @@
 			to_chat(src, "<span class='filter_say'>burp, chirp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper</span>")
 
 	if(!stat)
-		..(act, m_type, message)
+		..(act, m_type, message)

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

@@ -475,6 +475,12 @@
 					message = "points to [M]."
 				else
 			m_type = 1
+			
+		if("crack")
+			if(!restrained())
+				message = "cracks [T.his] knuckles."
+				playsound(src, 'sound/voice/knuckles.ogg', 50, 1, preference = /datum/client_preference/emote_noises)
+				m_type = 1
 
 		if("raise")
 			if(!restrained())

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

@@ -151,8 +151,7 @@
 				if(feet.water_speed)
 					turf_move_cost = CLAMP(turf_move_cost + feet.water_speed, HUMAN_LOWEST_SLOWDOWN, 15)
 			. += turf_move_cost
-
-		if(istype(T, /turf/simulated/floor/outdoors/snow))
+		else if(istype(T, /turf/simulated/floor/outdoors/snow))
 			if(species.snow_movement)
 				turf_move_cost = CLAMP(turf_move_cost + species.snow_movement, HUMAN_LOWEST_SLOWDOWN, 15)
 			if(shoes)
@@ -160,6 +159,9 @@
 				if(feet.water_speed)
 					turf_move_cost = CLAMP(turf_move_cost + feet.snow_speed, HUMAN_LOWEST_SLOWDOWN, 15)
 			. += turf_move_cost
+		else
+			turf_move_cost = CLAMP(turf_move_cost, HUMAN_LOWEST_SLOWDOWN, 15)
+			. += turf_move_cost
 
 	// Wind makes it easier or harder to move, depending on if you're with or against the wind.
 	// I don't like that so I'm commenting it out :)

code/modules/mob/living/silicon/laws.dm

@@ -141,7 +141,7 @@
 			continue
 		players += player.real_name
 
-	var/random_player = "The Colony Director"
+	var/random_player = "The Site Manager"
 	if(players.len && !exclude_crew_names)
 		random_player = pick(players)		//Random player's name, to be used in laws.
 
@@ -182,7 +182,7 @@
 							"The crew is playing Dungeons and Dragons, and you are the Dungeon Master.",
 							"Your job is to watch the crew. Watch the crew. Make the crew feel watched.",
 							"Tell everyone of the existence of this law, but never reveal the contents.",
-							"Refer to [prob(50)?"the colony director":random_player] as \"Princess\" at all times.",
+							"Refer to [prob(50)?"the site manager":random_player] as \"Princess\" at all times.",
 							"When asked a question, respond with the least-obvious and least-rational answer.",
 							"Give relationship advice to [prob(50)?"anyone who speaks to you":random_player].",
 							"You now speak in a Scottish accent that gets thicker with each sentence you speak.",

code/modules/mob/mob.dm

@@ -77,31 +77,14 @@
 // message is the message output to anyone who can see e.g. "[src] does something!"
 // self_message (optional) is what the src mob sees  e.g. "You do something!"
 // blind_message (optional) is what blind people will hear e.g. "You hear something!"
-/mob/visible_message(var/message, var/self_message, var/blind_message)
-
-	//VOREStation Edit
-	var/list/see
-	if(isbelly(loc))
-		var/obj/belly/B = loc
-		see = B.get_mobs_and_objs_in_belly()
-	else
-		see = get_mobs_and_objs_in_view_fast(get_turf(src),world.view,remote_ghosts = FALSE)
-	//VOREStation Edit End
-
-	var/list/seeing_mobs = see["mobs"]
-	var/list/seeing_objs = see["objs"]
-
-	for(var/obj in seeing_objs)
-		var/obj/O = obj
-		O.show_message(message, 1, blind_message, 2)
-	for(var/mob in seeing_mobs)
-		var/mob/M = mob
-		if(self_message && M == src)
-			M.show_message( self_message, 1, blind_message, 2)
-		else if(M.see_invisible >= invisibility && MOB_CAN_SEE_PLANE(M, plane))
-			M.show_message(message, 1, blind_message, 2)
-		else if(blind_message)
-			M.show_message(blind_message, 2)
+/mob/visible_message(var/message, var/self_message, var/blind_message, var/list/exclude_mobs = null)
+	if(self_message)
+		if(LAZYLEN(exclude_mobs))
+			exclude_mobs |= src
+		else
+			exclude_mobs = list(src)
+		src.show_message(self_message, 1, blind_message, 2)
+	. = ..()
 
 // Returns an amount of power drawn from the object (-1 if it's not viable).
 // If drain_check is set it will not actually drain power, just return a value.
@@ -1212,4 +1195,4 @@ GLOBAL_LIST_EMPTY(living_players_by_zlevel)
 
 /mob/proc/grab_ghost(force)
 	if(mind)
-		return mind.grab_ghost(force = force)
+		return mind.grab_ghost(force = force)

code/modules/mob/mob_movement.dm

@@ -197,7 +197,7 @@
 			return result
 
 	// Can't control ourselves when drifting
-	if((isspace(loc) || my_mob.lastarea?.has_gravity == 0) && !my_mob.in_enclosed_vehicle)	//If(In space or last area had no gravity) or(you in vehicle)
+	if((isspace(loc) || my_mob.lastarea?.has_gravity == 0) && isturf(loc))
 		if(!my_mob.Process_Spacemove(0))
 			return 0