These are not Vorestation edits. (#4088)

Y'all are confusing the shit out of us.

code/modules/mob/living/say.dm

@@ -302,7 +302,7 @@ proc/get_radio_key_from_channel(var/channel)
 	var/image/speech_bubble = image('icons/mob/talk.dmi',src,"[speech_type][speech_bubble_test]")
 	spawn(30) qdel(speech_bubble)
 
-	// VOREStation Edit - Attempt Multi-Z Talking
+	// Attempt Multi-Z Talking
 	var/mob/above = src.shadow
 	while(!QDELETED(above))
 		var/turf/ST = get_turf(above)
@@ -315,7 +315,6 @@ proc/get_radio_key_from_channel(var/channel)
 					listening[item] = z_speech_bubble
 			listening_obj |= results["objs"]
 		above = above.shadow
-	// VOREStation Edit End
 
 	//Main 'say' and 'whisper' message delivery
 	for(var/mob/M in listening)
@@ -325,12 +324,12 @@ proc/get_radio_key_from_channel(var/channel)
 				var/dst = get_dist(get_turf(M),get_turf(src))
 
 				if(dst <= message_range || (M.stat == DEAD && !forbid_seeing_deadchat)) //Inside normal message range, or dead with ears (handled in the view proc)
-					M << (listening[M] || speech_bubble) // VOREStation Edit - Send the image attached to shadow mob if available
+					M << (listening[M] || speech_bubble) // Send the image attached to shadow mob if available
 					M.hear_say(message, verb, speaking, alt_name, italics, src, speech_sound, sound_vol)
 
 				if(whispering) //Don't even bother with these unless whispering
 					if(dst > message_range && dst <= w_scramble_range) //Inside whisper scramble range
-						M << (listening[M] || speech_bubble) // VOREStation Edit - Send the image attached to shadow mob if available
+						M << (listening[M] || speech_bubble) // Send the image attached to shadow mob if available
 						M.hear_say(stars(message), verb, speaking, alt_name, italics, src, speech_sound, sound_vol*0.2)
 					if(dst > w_scramble_range && dst <= world.view) //Inside whisper 'visible' range
 						M.show_message("<span class='game say'><span class='name'>[src.name]</span> [w_not_heard].</span>", 2)

code/modules/multiz/movement.dm

@@ -57,10 +57,8 @@
 		if(!A.CanPass(src, start, 1.5, 0))
 			to_chat(src, "<span class='warning'>\The [A] blocks you.</span>")
 			return 0
-	//VOREStation Edit
 	if(!Move(destination))
 		return 0
-	//VOREStation Edit End
 	return 1
 
 /mob/observer/zMove(direction)
@@ -199,7 +197,7 @@
 /obj/structure/catwalk/CanFallThru(atom/movable/mover as mob|obj, turf/target as turf)
 	if(target.z < z)
 		return FALSE // TODO - Technically should be density = 1 and flags |= ON_BORDER
-	if(!isturf(mover.loc)) // VORESTATION EDIT. Feel free to do an upstream suggestion as well.
+	if(!isturf(mover.loc))
 		return FALSE // Only let loose floor items fall. No more snatching things off people's hands.
 	else
 		return TRUE
@@ -213,7 +211,7 @@
 		return TRUE // We don't block sideways or upward movement.
 	else if(istype(mover) && mover.checkpass(PASSGRILLE))
 		return TRUE // Anything small enough to pass a grille will pass a lattice
-	if(!isturf(mover.loc)) // VORESTATION EDIT. Feel free to do an upstream suggestion as well.
+	if(!isturf(mover.loc))
 		return FALSE // Only let loose floor items fall. No more snatching things off people's hands.
 	else
 		return FALSE // TODO - Technically should be density = 1 and flags |= ON_BORDER

code/modules/multiz/turf.dm

@@ -85,13 +85,12 @@
 			bottom_turf.plane = src.plane
 			bottom_turf.color = below.color
 			underlays = list(bottom_turf)
-		// VOREStation Edit - Hack workaround to byond crash bug - Include the magic overlay holder object.
+		// Hack workaround to byond crash bug - Include the magic overlay holder object.
 		overlays += below.overlays
 		// if(below.overlay_holder)
 		// 	overlays += (below.overlays + below.overlay_holder.overlays)
 		// else
 		// 	overlays += below.overlays
-		// VOREStation Edit End
 
 		// get objects (not mobs, they are handled by /obj/zshadow)
 		var/list/o_img = list()

code/modules/multiz/zshadow.dm

@@ -121,7 +121,7 @@
 /mob/zshadow/set_typing_indicator(var/state)
 	if(!typing_indicator)
 		typing_indicator = new
-		typing_indicator.icon = 'icons/mob/talk.dmi' //VOREStation Edit - Looks better on the right with job icons.
+		typing_indicator.icon = 'icons/mob/talk.dmi' // Looks better on the right with job icons.
 		typing_indicator.icon_state = "typing"
 	if(state && !typing)
 		overlays += typing_indicator

code/modules/power/cable_heavyduty.dm

@@ -8,7 +8,7 @@
 	name = "large power cable"
 	desc = "This cable is tough. It cannot be cut with simple hand tools."
 	layer = 2.39 //Just below pipes, which are at 2.4
-	color = null //VOREStation Edit
+	color = null
 
 /obj/structure/cable/heavyduty/attackby(obj/item/W, mob/user)