These are not Vorestation edits. (#4088)

Y'all are confusing the shit out of us.

code/game/jobs/job_controller.dm

@@ -623,7 +623,7 @@ var/global/datum/controller/occupations/job_master
 		else
 			spawnpos = spawntypes[H.client.prefs.spawnpoint]
 
-	if(spawnpos && istype(spawnpos) && spawnpos.turfs.len)  // VOREStation Edit - Fix runtime if no landmarks exist for a spawntype
+	if(spawnpos && istype(spawnpos) && spawnpos.turfs.len)
 		if(spawnpos.check_job_spawning(rank))
 			H.forceMove(spawnpos.get_spawn_position())
 			. = spawnpos.msg

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -124,7 +124,6 @@
 	icon_state = "tile_white"
 	no_variants = FALSE
 
-// VOREStation Edit
 /obj/item/stack/tile/floor/techgrey
 	name = "grey techfloor tile"
 	singular_name = "grey techfloor tile"
@@ -143,7 +142,6 @@
 	icon_state = "tile_steel"
 	matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
 	no_variants = FALSE
-// VOREStation Edit End
 
 /obj/item/stack/tile/floor/steel
 	name = "steel floor tile"

code/game/objects/structures/lattice.dm

@@ -68,7 +68,6 @@
 			new /obj/item/stack/rods(src.loc)
 			qdel(src)
 		return
-	// VOREStation Edit - Added Catwalks
 	if (istype(C, /obj/item/stack/rods))
 		var/obj/item/stack/rods/R = C
 		if(R.use(2))
@@ -78,7 +77,6 @@
 				new /obj/structure/catwalk(src.loc)
 				qdel(src)
 		return
-	// VOREStation Edit End
 	return
 
 /obj/structure/lattice/proc/updateOverlays()

code/game/objects/structures/railing.dm

@@ -103,7 +103,7 @@
 
 /obj/structure/railing/update_icon(var/UpdateNeighgors = 1)
 	NeighborsCheck(UpdateNeighgors)
-	//layer = (dir == SOUTH) ? FLY_LAYER : initial(layer) // Vorestation edit because wtf does this even do
+	//layer = (dir == SOUTH) ? FLY_LAYER : initial(layer) // wtf does this even do
 	overlays.Cut()
 	if (!check || !anchored)//|| !anchored
 		icon_state = "railing0"

code/game/turfs/flooring/flooring.dm

@@ -98,7 +98,6 @@ var/list/flooring_types
 		'sound/effects/footstep/carpet4.ogg',
 		'sound/effects/footstep/carpet5.ogg'))
 
-// VOREStation Edit - Eris Carpets
 /decl/flooring/carpet/bcarpet
 	name = "black carpet"
 	icon_base = "bcarpet"
@@ -133,14 +132,13 @@ var/list/flooring_types
 	name = "orange carpet"
 	icon_base = "oracarpet"
 	build_type = /obj/item/stack/tile/carpet/oracarpet
-// VOREStation Edit End
 
 /decl/flooring/tiling
 	name = "floor"
 	desc = "Scuffed from the passage of countless greyshirts."
-	icon = 'icons/turf/flooring/tiles.dmi' // VOREStation Edit - Eris floors
-	icon_base = "tiled" // VOREStation Edit - Eris floors
-	has_damage_range = 2 // VOREStation Edit - Eris floors
+	icon = 'icons/turf/flooring/tiles.dmi'
+	icon_base = "tiled"
+	has_damage_range = 2
 	damage_temperature = T0C+1400
 	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK | TURF_CAN_BURN
 	build_type = /obj/item/stack/tile/floor
@@ -152,7 +150,6 @@ var/list/flooring_types
 		'sound/effects/footstep/floor4.ogg',
 		'sound/effects/footstep/floor5.ogg'))
 
-//VOREStation Edit for icons and extra types
 /decl/flooring/tiling/tech
 	desc = "Scuffed from the passage of countless greyshirts."
 	icon = 'icons/turf/flooring/techfloor.dmi'

code/game/turfs/flooring/flooring_decals.dm

@@ -14,7 +14,7 @@ var/list/floor_decals = list()
 	if(newcolour) color = newcolour
 	..(newloc)
 
-// VOREStation Edit - Hack to workaround byond crash bug
+// Hack to workaround byond crash bug
 /obj/effect/floor_decal/initialize()
 	if(!floor_decals_initialized || !loc || QDELETED(src))
 		return
@@ -23,7 +23,6 @@ var/list/floor_decals = list()
 	T.apply_decals()
 	qdel(src)
 	return
-// VOREStation Edit End
 
 /obj/effect/floor_decal/reset
 	name = "reset marker"

code/game/turfs/simulated/floor_icon.dm

@@ -60,11 +60,10 @@ var/list/flooring_cache = list()
 						if(!(istype(T) && T.flooring && T.flooring.name == flooring.name))
 							overlays |= get_flooring_overlay("[flooring.icon_base]-corner-[SOUTHWEST]", "[flooring.icon_base]_corners", SOUTHWEST)
 
-	// VOREStation Edit - Hack workaround to byond crash bug
+	// Hack workaround to byond crash bug
 	//if(decals && decals.len)
 		//overlays |= decals
 	apply_decals()
-	// VOREStation Edit End
 
 	if(is_plating() && !(isnull(broken) && isnull(burnt))) //temp, todo
 		icon = 'icons/turf/flooring/plating.dmi'

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)