Midweek bugfix release (#16867)

* fix adminjump to area (#16853)

* fix a runtime in the keyloop (#16852)

* fix a runtime in the keyloop

* also fix that

* gloves runtime

* do it proper

* fix stun effect act (#16850)

* fix a runtime and some usr to user (#16849)

* fix a runtimg and some usr to user

* .

* .

* more usr

* fix some bad replaces (#16856)

* fix a lot of map issues (#16857)

* fix a lot of map issues

* fix SM template...

* fix change turf (#16860)

* Fluff item for Beeholddrbeesphb/Evelynn (#16859)

* Fix synth_color not working (#16866)

* Fix synth_color not working

* Fix spawnpoint pref

* living

* oups

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>

code/_helpers/unsorted.dm

@@ -802,7 +802,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 
 					//Move the mobs unless it's an AI eye or other eye type.
 					for(var/mob/M in T)
-						if(isobserver(M)) continue // If we need to check for more mobs, I'll add a variable
+						if(isEye(M)) continue // If we need to check for more mobs, I'll add a variable
 						M.loc = X
 
 						if(z_level_change) // Same goes for mobs.
@@ -945,7 +945,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 
 					for(var/mob/M in T)
 
-						if(!ismob(M) || isobserver(M)) continue // If we need to check for more mobs, I'll add a variable
+						if(!ismob(M) || isEye(M)) continue // If we need to check for more mobs, I'll add a variable
 						mobs += M
 
 					for(var/mob/M in mobs)

code/game/jobs/job_controller.dm

@@ -660,16 +660,16 @@ var/global/datum/controller/occupations/job_master
 	fail_deadly = J?.offmap_spawn
 
 	//Spawn them at their preferred one
-	if(C && C.prefs.read_preference(/datum/preference/choiced/human/spawnpoint))
-		if(!(C.prefs.read_preference(/datum/preference/choiced/human/spawnpoint) in using_map.allowed_spawns))
+	if(C && C.prefs.read_preference(/datum/preference/choiced/living/spawnpoint))
+		if(!(C.prefs.read_preference(/datum/preference/choiced/living/spawnpoint) in using_map.allowed_spawns))
 			if(fail_deadly)
 				to_chat(C, span_warning("Your chosen spawnpoint is unavailable for this map and your job requires a specific spawnpoint. Please correct your spawn point choice."))
 				return
 			else
-				to_chat(C, span_warning("Your chosen spawnpoint ([C.prefs.read_preference(/datum/preference/choiced/human/spawnpoint)]) is unavailable for the current map. Spawning you at one of the enabled spawn points instead."))
+				to_chat(C, span_warning("Your chosen spawnpoint ([C.prefs.read_preference(/datum/preference/choiced/living/spawnpoint)]) is unavailable for the current map. Spawning you at one of the enabled spawn points instead."))
 				spawnpos = null
 		else
-			spawnpos = spawntypes[C.prefs.read_preference(/datum/preference/choiced/human/spawnpoint)]
+			spawnpos = spawntypes[C.prefs.read_preference(/datum/preference/choiced/living/spawnpoint)]
 
 	//We will return a list key'd by "turf" and "msg"
 	. = list("turf","msg")

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -121,6 +121,7 @@
 	density = FALSE
 	anchored = TRUE
 	icon = 'icons/effects/tomatodecal.dmi'
+	icon_state = "tomato_floor1"
 	random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
 
 /obj/effect/decal/cleanable/egg_smudge
@@ -129,6 +130,7 @@
 	density = FALSE
 	anchored = TRUE
 	icon = 'icons/effects/tomatodecal.dmi'
+	icon_state = "smashed_egg1"
 	random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
 
 /obj/effect/decal/cleanable/pie_smudge //honk
@@ -137,6 +139,7 @@
 	density = FALSE
 	anchored = TRUE
 	icon = 'icons/effects/tomatodecal.dmi'
+	icon_state = "smashed_pie"
 	random_icon_states = list("smashed_pie")
 
 /obj/effect/decal/cleanable/fruit_smudge

code/game/objects/items/devices/laserpointer.dm

@@ -184,7 +184,7 @@
 
 
 	//laser pointer image
-	icon_state = "pointer_[pointer_icon_state]"
+	icon_state = "[initial(icon_state)]_[pointer_icon_state]"
 	var/list/showto = list()
 	for(var/mob/M in viewers(world.view,targloc))
 		if(M.client)
@@ -211,7 +211,7 @@
 
 	flick_overlay(I, showto, cooldown)
 	spawn(cooldown)
-		icon_state = "pointer"
+		icon_state = initial(icon_state)
 
 /obj/item/laser_pointer/process()
 	if(prob(20 - recharge_locked*5))

code/game/objects/random/mob.dm

@@ -237,7 +237,7 @@
 /obj/random/mob/mouse
 	name = "Random Mouse"
 	desc = "This is a random boring maus."
-	icon_state = "mouse_gray"
+	icon_state = "animal"
 	spawn_nothing_percentage = 15
 
 /obj/random/mob/mouse/item_to_spawn()

code/game/turfs/simulated.dm

@@ -170,7 +170,8 @@
 				B.blood_DNA = list()
 			if(!B.blood_DNA[M.dna.unique_enzymes])
 				B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
-				B.viruses = M.viruses.Copy()
+				if(M.viruses)
+					B.viruses = M.viruses.Copy()
 			return 1 //we bloodied the floor
 		blood_splatter(src,M.get_blood(M.vessel),1)
 		return 1 //we bloodied the floor

code/game/turfs/simulated/walls.dm

@@ -120,7 +120,7 @@
 
 /turf/simulated/wall/ChangeTurf(var/turf/N, var/tell_universe, var/force_lighting_update, var/preserve_outdoors)
 	clear_plants()
-	..(N, tell_universe, force_lighting_update, preserve_outdoors)
+	. = ..(N, tell_universe, force_lighting_update, preserve_outdoors)
 
 //Appearance
 /turf/simulated/wall/examine(mob/user)

code/modules/admin/verbs/adminjump.dm

@@ -20,7 +20,7 @@
 	if(areaname)
 		A = return_sorted_areas()[areaname]
 	else
-		A = tgui_input_list(usr, "Pick an area:", "Jump to Area", return_sorted_areas())
+		A = return_sorted_areas()[tgui_input_list(usr, "Pick an area:", "Jump to Area", return_sorted_areas())]
 
 	if(!A)
 		return

code/modules/client/preference_setup/general/01_basic.dm

@@ -63,7 +63,7 @@
 	. += span_bold("Biological Sex:") + " <a href='byond://?src=\ref[src];bio_gender=1'><b>[gender2text(pref.biological_gender)]</b></a><br>"
 	. += span_bold("Pronouns:") + " <a href='byond://?src=\ref[src];id_gender=1'><b>[gender2text(pref.identifying_gender)]</b></a><br>"
 	. += span_bold("Age:") + " <a href='byond://?src=\ref[src];age=1'>[pref.read_preference(/datum/preference/numeric/human/age)]</a> <b>Birthday:</b> <a href='byond://?src=\ref[src];bday_month=1'>[pref.read_preference(/datum/preference/numeric/human/bday_month)]</a><b>/</b><a href='byond://?src=\ref[src];bday_day=1'>[pref.read_preference(/datum/preference/numeric/human/bday_day)]</a> - <b>Announce?:</b> <a href='byond://?src=\ref[src];bday_announce=1'>[pref.read_preference(/datum/preference/toggle/human/bday_announce) ? "Yes" : "No"]</a><br>"
-	. += span_bold("Spawn Point:") + " <a href='byond://?src=\ref[src];spawnpoint=1'>[pref.read_preference(/datum/preference/choiced/human/spawnpoint)]</a><br>"
+	. += span_bold("Spawn Point:") + " <a href='byond://?src=\ref[src];spawnpoint=1'>[pref.read_preference(/datum/preference/choiced/living/spawnpoint)]</a><br>"
 	if(CONFIG_GET(flag/allow_metadata))
 		. += span_bold("OOC Notes: <a href='byond://?src=\ref[src];edit_ooc_notes=1'>Edit</a><a href='byond://?src=\ref[src];edit_ooc_note_likes=1'>Likes</a><a href='byond://?src=\ref[src];edit_ooc_note_dislikes=1'>Dislikes</a>") + "<br>"
 	. = jointext(.,null)
@@ -183,7 +183,7 @@
 			spawnkeys += spawntype
 		var/choice = tgui_input_list(user, "Where would you like to spawn when late-joining?", "Late-Join Choice", spawnkeys)
 		if(!choice || !spawntypes[choice] || !CanUseTopic(user))	return TOPIC_NOACTION
-		pref.update_preference_by_type(/datum/preference/choiced/human/spawnpoint, choice)
+		pref.update_preference_by_type(/datum/preference/choiced/living/spawnpoint, choice)
 		return TOPIC_REFRESH
 
 	else if(href_list["edit_ooc_notes"])

code/modules/client/preferences/types/character/general/01_basic.dm

@@ -159,17 +159,17 @@
 /datum/preference/toggle/human/name_is_always_random/apply_to_human(mob/living/carbon/human/target, value)
 	return // handled in copy_to
 
-/datum/preference/choiced/human/spawnpoint
+/datum/preference/choiced/living/spawnpoint
 	category = PREFERENCE_CATEGORY_MANUALLY_RENDERED
 	savefile_key = "spawnpoint"
 	savefile_identifier = PREFERENCE_CHARACTER
 	can_randomize = FALSE
 
-/datum/preference/choiced/human/spawnpoint/init_possible_values()
+/datum/preference/choiced/living/spawnpoint/init_possible_values()
 	var/list/spawnkeys = list()
-	for(var/spawntype in spawntypes)
+	for(var/spawntype in get_spawn_points())
 		spawnkeys += spawntype
 	return spawnkeys
 
-/datum/preference/choiced/human/spawnpoint/apply_to_human(mob/living/carbon/human/target, value)
+/datum/preference/choiced/living/spawnpoint/apply_to_living(mob/living/target, value)
 	return // handled in job_controller

code/modules/client/preferences/types/character/general/03_body.dm

@@ -56,7 +56,7 @@
 /datum/preference/color/human/synth_color
 	category = PREFERENCE_CATEGORY_MANUALLY_RENDERED
 	savefile_identifier = PREFERENCE_CHARACTER
-	savefile_key = "synth_color"
+	savefile_key = "synth_color_rgb"
 	can_randomize = FALSE
 
 /datum/preference/color/human/synth_color/apply_to_human(mob/living/carbon/human/target, value)

code/modules/client/preferences_spawnpoints.dm

@@ -6,6 +6,11 @@ var/list/spawntypes = list()
 		var/datum/spawnpoint/S = new type()
 		spawntypes[S.display_name] = S
 
+/proc/get_spawn_points()
+	if(!LAZYLEN(spawntypes))
+		populate_spawn_points()
+	return spawntypes
+
 /datum/spawnpoint
 	var/msg          //Message to display on the arrivals computer.
 	var/list/turfs   //List of turfs to spawn on.
@@ -103,4 +108,4 @@ var/global/list/latejoin_tram   = list()
 
 /datum/spawnpoint/tram/New()
 	..()
-	turfs = latejoin_tram
+	turfs = latejoin_tram

code/modules/client/verbs/ooc.dm

@@ -155,7 +155,7 @@
 	for(var/mob/viewer in m_viewers)
 		if(viewer.client && viewer.client.prefs?.read_preference(/datum/preference/toggle/show_looc))
 			receivers |= viewer.client
-		else if(isobserver(viewer)) // For AI eyes and the like
+		else if(isEye(viewer)) // For AI eyes and the like
 			var/mob/observer/eye/E = viewer
 			if(E.owner && E.owner.client)
 				receivers |= E.owner.client

code/modules/clothing/spacesuits/rig/modules/protean.dm

@@ -131,6 +131,9 @@ These should come standard with the Protean rigsuit, unless you want them to wor
 /obj/item/rig_module/protean/armor/process()
 	if(active)
 		var/mob/living/carbon/human/H = holder.wearer
+		if(!H)
+			deactivate(1)
+			return
 		if(istype(H.species, /datum/species/protean))
 			to_chat(H, span_warning("Your Protean modules do not function on yourself."))
 			deactivate(1)
@@ -185,7 +188,10 @@ These should come standard with the Protean rigsuit, unless you want them to wor
 	if(active)
 		var/mob/living/carbon/human/H = holder.wearer
 		var/mob/living/P = holder?:myprotean
-		if((istype(H.species, /datum/species/protean)) || !H || !P)
+		if(!H || !P)
+			deactivate()
+			return
+		if(istype(H.species, /datum/species/protean))
 			to_chat(H, span_warning("Your Protean modules do not function on yourself."))
 			deactivate()
 			return

code/modules/food/drinkingglass/drinkingglass.dm

@@ -10,6 +10,7 @@
 	icon = DRINK_ICON_FILE
 	var/base_icon = "square" // Base icon name
 	volume = 30
+	icon_state = "square"
 
 	var/list/filling_states // List of percentages full that have icons
 

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

@@ -571,10 +571,11 @@ emp_act
 
 
 /mob/living/carbon/human/proc/bloody_hands(var/mob/living/source, var/amount = 2)
-	if (gloves)
-		gloves.add_blood(source)
-		gloves:transfer_blood = amount
-		gloves:bloody_hands_mob = source
+	if (istype(gloves, /obj/item/clothing/gloves))
+		var/obj/item/clothing/gloves/gl = gloves
+		gl.add_blood(source)
+		gl.transfer_blood = amount
+		gl.bloody_hands_mob = source
 	else
 		add_blood(source)
 		bloody_hands = amount

code/modules/mob/living/living_defense.dm

@@ -150,7 +150,7 @@
 		apply_effect(EYE_BLUR, stun_amount)
 
 	if (agony_amount)
-		apply_damage(agony_amount, HALLOSS, def_zone, 0, used_weapon)
+		apply_damage(agony_amount, HALLOSS, def_zone, 0, used_weapon=used_weapon)
 		apply_effect(STUTTER, agony_amount/10)
 		apply_effect(EYE_BLUR, agony_amount/10)
 

code/modules/overmap/spacetravel.dm

@@ -102,7 +102,7 @@
 		return
 
 	// Don't let AI eyes yeet themselves off the map
-	if(isobserver(A))
+	if(isEye(A))
 		return
 
 	if(A.lost_in_space())

code/modules/paperwork/photocopier.dm

@@ -87,7 +87,7 @@
 
 				if(!camera)
 					return
-				var/obj/item/photo/selection = camera.selectpicture()
+				var/obj/item/photo/selection = camera.selectpicture(ui.user)
 				if (!selection)
 					return
 

code/modules/paperwork/silicon_photography.dm

@@ -21,29 +21,29 @@
 	p.name = "Image [photos_taken][sufix]"
 	aipictures += p
 
-/obj/item/camera/siliconcam/proc/injectmasteralbum(obj/item/photo/p) //stores image information to a list similar to that of the datacore
-	var/mob/living/silicon/robot/C = usr
+/obj/item/camera/siliconcam/proc/injectmasteralbum(mob/user, obj/item/photo/p) //stores image information to a list similar to that of the datacore
+	var/mob/living/silicon/robot/C = user
 	if(C.connected_ai)
 		C.connected_ai.aiCamera.injectaialbum(p.copy(1), " (synced from [C.name])")
 		to_chat(C.connected_ai, span_unconscious("Image uploaded by [C.name]"))
-		to_chat(usr, span_unconscious("Image synced to remote database"))	//feedback to the Cyborg player that the picture was taken
+		to_chat(user, span_unconscious("Image synced to remote database"))	//feedback to the Cyborg player that the picture was taken
 	else
-		to_chat(usr, span_unconscious("Image recorded"))
+		to_chat(user, span_unconscious("Image recorded"))
 	// Always save locally
 	injectaialbum(p)
 
-/obj/item/camera/siliconcam/proc/selectpicture(obj/item/camera/siliconcam/cam)
+/obj/item/camera/siliconcam/proc/selectpicture(mob/user, obj/item/camera/siliconcam/cam)
 	if(!cam)
-		cam = getsource()
+		cam = getsource(user)
 
 	var/list/nametemp = list()
 	var/find
 	if(cam.aipictures.len == 0)
-		to_chat(usr, span_userdanger("No images saved"))
+		to_chat(user, span_userdanger("No images saved"))
 		return
 	for(var/obj/item/photo/t in cam.aipictures)
 		nametemp += t.name
-	find = tgui_input_list(usr, "Select image (numbered in order taken)", "Picture Choice", nametemp)
+	find = tgui_input_list(user, "Select image (numbered in order taken)", "Picture Choice", nametemp)
 	if(!find)
 		return
 
@@ -51,48 +51,50 @@
 		if(q.name == find)
 			return q
 
-/obj/item/camera/siliconcam/proc/viewpictures()
-	var/obj/item/photo/selection = selectpicture()
+/obj/item/camera/siliconcam/proc/viewpictures(mob/user)
+	var/obj/item/photo/selection = selectpicture(user)
 
 	if(!selection)
 		return
 
-	selection.show(usr)
-	to_chat(usr,selection.desc)
+	selection.show(user)
 
-/obj/item/camera/siliconcam/proc/deletepicture(obj/item/camera/siliconcam/cam)
-	var/selection = selectpicture(cam)
+	if(selection.desc)
+		to_chat(user,selection.desc)
+
+/obj/item/camera/siliconcam/proc/deletepicture(mob/user, obj/item/camera/siliconcam/cam)
+	var/selection = selectpicture(user, cam)
 
 	if(!selection)
 		return
 
 	aipictures -= selection
-	to_chat(usr, span_unconscious("Local image deleted"))
+	to_chat(user, span_unconscious("Local image deleted"))
 
 /obj/item/camera/siliconcam/ai_camera/can_capture_turf(turf/T, mob/user)
 	var/mob/living/silicon/ai = user
 	return ai.TurfAdjacent(T)
 
-/obj/item/camera/siliconcam/proc/toggle_camera_mode()
+/obj/item/camera/siliconcam/proc/toggle_camera_mode(mob/user)
 	if(in_camera_mode)
-		camera_mode_off()
+		camera_mode_off(user)
 	else
-		camera_mode_on()
+		camera_mode_on(user)
 
-/obj/item/camera/siliconcam/proc/camera_mode_off()
+/obj/item/camera/siliconcam/proc/camera_mode_off(mob/user)
 	src.in_camera_mode = 0
-	to_chat(usr, span_infoplain(span_bold("Camera Mode deactivated")))
+	to_chat(user, span_infoplain(span_bold("Camera Mode deactivated")))
 
-/obj/item/camera/siliconcam/proc/camera_mode_on()
+/obj/item/camera/siliconcam/proc/camera_mode_on(mob/user)
 	src.in_camera_mode = 1
-	to_chat(usr, span_infoplain(span_bold("Camera Mode activated")))
+	to_chat(user, span_infoplain(span_bold("Camera Mode activated")))
 
 /obj/item/camera/siliconcam/ai_camera/printpicture(mob/user, obj/item/photo/p)
 	injectaialbum(p)
-	to_chat(usr, span_unconscious("Image recorded"))
+	to_chat(user, span_unconscious("Image recorded"))
 
 /obj/item/camera/siliconcam/robot_camera/printpicture(mob/user, obj/item/photo/p)
-	injectmasteralbum(p)
+	injectmasteralbum(user, p)
 
 /mob/living/silicon/ai/proc/take_image()
 	set category = "AI.Commands"
@@ -100,7 +102,7 @@
 	set desc = "Takes an image"
 
 	if(aiCamera)
-		aiCamera.toggle_camera_mode()
+		aiCamera.toggle_camera_mode(src)
 
 /mob/living/silicon/ai/proc/view_images()
 	set category = "AI.Commands"
@@ -108,7 +110,7 @@
 	set desc = "View images"
 
 	if(aiCamera)
-		aiCamera.viewpictures()
+		aiCamera.viewpictures(src)
 
 /mob/living/silicon/ai/proc/delete_images()
 	set category = "AI.Commands"
@@ -116,7 +118,7 @@
 	set desc = "Delete image"
 
 	if(aiCamera)
-		aiCamera.deletepicture()
+		aiCamera.deletepicture(src)
 
 /mob/living/silicon/robot/proc/take_image()
 	set category ="Abilities.Silicon"
@@ -124,7 +126,7 @@
 	set desc = "Takes an image"
 
 	if(aiCamera)
-		aiCamera.toggle_camera_mode()
+		aiCamera.toggle_camera_mode(src)
 
 /mob/living/silicon/robot/proc/view_images()
 	set category ="Abilities.Silicon"
@@ -132,7 +134,7 @@
 	set desc = "View images"
 
 	if(aiCamera)
-		aiCamera.viewpictures()
+		aiCamera.viewpictures(src)
 
 /mob/living/silicon/robot/proc/delete_images()
 	set category = "Abilities.Silicon"
@@ -140,13 +142,13 @@
 	set desc = "Delete a local image"
 
 	if(aiCamera)
-		aiCamera.deletepicture()
+		aiCamera.deletepicture(src)
 
-/obj/item/camera/siliconcam/proc/getsource()
+/obj/item/camera/siliconcam/proc/getsource(mob/user)
 	if(isAI(src.loc))
 		return src
 
-	var/mob/living/silicon/robot/C = usr
+	var/mob/living/silicon/robot/C = user
 	var/obj/item/camera/siliconcam/Cinfo
 	if(C.connected_ai)
 		Cinfo = C.connected_ai.aiCamera
@@ -157,4 +159,4 @@
 /mob/living/silicon/proc/GetPicture()
 	if(!aiCamera)
 		return
-	return aiCamera.selectpicture()
+	return aiCamera.selectpicture(src)

code/modules/power/cable.dm

@@ -208,7 +208,7 @@ var/list/possible_cable_coil_colours = list(
 					if(c.d1 == UP || c.d2 == UP)
 						qdel(c)
 
-		investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires")
+		investigate_log("was cut by [key_name(user, user.client)] in [user.loc.loc]","wires")
 
 		qdel(src)
 		return
@@ -245,7 +245,7 @@ var/list/possible_cable_coil_colours = list(
 		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 		s.set_up(5, 1, src)
 		s.start()
-		if(usr.stunned)
+		if(user.stunned)
 			return 1
 	return 0
 
@@ -601,8 +601,8 @@ var/list/possible_cable_coil_colours = list(
 
 /obj/item/stack/cable_coil/attackby(obj/item/W, mob/user)
 	if(istype(W, /obj/item/multitool))
-		var/selected_type = tgui_input_list(usr, "Pick new colour.", "Cable Colour", possible_cable_coil_colours)
-		set_cable_color(selected_type, usr)
+		var/selected_type = tgui_input_list(user, "Pick new colour.", "Cable Colour", possible_cable_coil_colours)
+		set_cable_color(selected_type, user)
 		return
 	return ..()
 
@@ -981,7 +981,7 @@ var/list/possible_cable_coil_colours = list(
 
 /obj/item/stack/cable_coil/alien/attack_hand(mob/user as mob)
 	if (user.get_inactive_hand() == src)
-		var/N = tgui_input_number(usr, "How many units of wire do you want to take from [src]? You can only take up to [amount] at a time.", "Split stacks", 1, amount)
+		var/N = tgui_input_number(user, "How many units of wire do you want to take from [src]? You can only take up to [amount] at a time.", "Split stacks", 1, amount)
 		if(N && N <= amount)
 			var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc)
 			CC.amount = N
@@ -992,8 +992,8 @@ var/list/possible_cable_coil_colours = list(
 				src.add_fingerprint(user)
 				CC.add_fingerprint(user)
 				spawn(0)
-					if (src && usr.machine==src)
-						src.interact(usr)
+					if (src && user.machine==src)
+						src.interact(user)
 		else
 			return
 	else

code/modules/power/cable_heavyduty.dm

@@ -18,10 +18,10 @@
 		return
 
 	if(W.has_tool_quality(TOOL_WIRECUTTER))
-		to_chat(usr, span_blue("These cables are too tough to be cut with those [W.name]."))
+		to_chat(user, span_blue("These cables are too tough to be cut with those [W.name]."))
 		return
 	else if(istype(W, /obj/item/stack/cable_coil))
-		to_chat(usr, span_blue("You will need heavier cables to connect to these."))
+		to_chat(user, span_blue("You will need heavier cables to connect to these."))
 		return
 	else
 		..()

code/modules/tgui/modules/late_choices.dm

@@ -134,4 +134,4 @@
 				tgui_alert_async(new_user,"Your current species, [new_user.client.prefs.species], is not available for play on the station.")
 				return 0
 
-			new_user.AttemptLateSpawn(job, new_user.read_preference(/datum/preference/choiced/human/spawnpoint))
+			new_user.AttemptLateSpawn(job, new_user.read_preference(/datum/preference/choiced/living/spawnpoint))

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -1579,3 +1579,11 @@
 
 	icon = 'icons/inventory/accessory/item.dmi'
 	icon_state = "silver"
+
+//beeholddrbeesphb: Evelynn
+/obj/item/laser_pointer/evelynn_fluff
+	name = "Evelynn's Laser Pointer"
+	desc = "A small, furry, and fluffy toy that looks like a bee. It has laser eyes. Upon firing, the lasers make a buzzing noise."
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "evelynn"
+	pointer_icon_state = "purple_laser"

code/modules/vore/persist/persist_vr.dm

@@ -91,7 +91,7 @@
 
 	// Okay we can start saving the data
 	if(new_spawn_point_type && prefs.persistence_settings & PERSIST_SPAWN)
-		prefs.update_preference_by_type(/datum/preference/choiced/human/spawnpoint, initial(new_spawn_point_type.display_name))
+		prefs.update_preference_by_type(/datum/preference/choiced/living/spawnpoint, initial(new_spawn_point_type.display_name))
 	if(ishuman(occupant) && occupant.stat != DEAD)
 		var/mob/living/carbon/human/H = occupant
 		testing("Persist (PID): Saving stuff from [H] to [prefs] (\ref[prefs]).")

maps/expedition_vr/aerostat/aerostat.dmm

@@ -1088,7 +1088,6 @@
 /area/tether_away/aerostat/inside)
 "di" = (
 /obj/structure/cable/heavyduty{
-	dir = 2;
 	icon_state = "0-4"
 	},
 /obj/structure/cable/yellow,
@@ -1348,7 +1347,6 @@
 	dir = 8
 	},
 /obj/structure/cable/heavyduty{
-	dir = 2;
 	icon_state = "0-4"
 	},
 /obj/structure/cable{

maps/expedition_vr/space/fueldepot.dmm

@@ -323,7 +323,6 @@
 /area/tether_away/fueldepot)
 "aR" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/fuel{
@@ -340,7 +339,6 @@
 	icon_state = "1-8"
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/structure/catwalk,
@@ -362,7 +360,6 @@
 	dir = 10
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/structure/catwalk,
@@ -534,7 +531,6 @@
 /area/tether_away/fueldepot)
 "bq" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/aux{
@@ -574,7 +570,6 @@
 	dir = 10
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/structure/cable/green{
@@ -585,7 +580,6 @@
 /area/tether_away/fueldepot)
 "bw" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/visible/fuel{
@@ -597,7 +591,6 @@
 /area/tether_away/fueldepot)
 "bx" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/structure/catwalk,
@@ -605,7 +598,6 @@
 /area/tether_away/fueldepot)
 "by" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/fuel{
@@ -622,7 +614,6 @@
 	dir = 8
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/structure/catwalk,
@@ -636,7 +627,6 @@
 	dir = 8
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/structure/catwalk,
@@ -676,7 +666,6 @@
 /area/tether_away/fueldepot)
 "bF" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/fuel{
@@ -687,7 +676,6 @@
 /area/tether_away/fueldepot)
 "bG" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/fuel{
@@ -698,7 +686,6 @@
 /area/tether_away/fueldepot)
 "bH" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/visible/fuel{
@@ -716,7 +703,6 @@
 	dir = 6
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/structure/cable/green{
@@ -985,7 +971,6 @@
 	dir = 5
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/structure/catwalk,
@@ -1363,7 +1348,6 @@
 	icon_state = "1-2"
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/visible/fuel,
@@ -1422,7 +1406,6 @@
 	dir = 8
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/structure/cable{

maps/gateway_vr/lucky_7.dmm

@@ -2431,7 +2431,6 @@
 /obj/structure/disposalpipe/segment,
 /obj/structure/catwalk,
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
@@ -3260,7 +3259,6 @@
 	},
 /obj/structure/catwalk,
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
@@ -3894,7 +3892,6 @@
 /obj/structure/disposalpipe/segment,
 /obj/structure/catwalk,
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,

maps/offmap_vr/om_ships/aro.dmm

@@ -2901,7 +2901,6 @@
 /area/ship/aro/engineering)
 "gQ" = (
 /obj/structure/cable/pink{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /turf/simulated/shuttle/floor/alienplating/blue,
@@ -2924,7 +2923,6 @@
 /area/ship/aro/engines)
 "gU" = (
 /obj/structure/cable/pink{
-	dir = 1;
 	icon_state = "2-5"
 	},
 /turf/simulated/shuttle/wall/alien/blue,

maps/offmap_vr/om_ships/sdf_corvette.dmm

@@ -13,13 +13,9 @@
 /area/shuttle/sdf_corvette)
 "bn" = (
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -46,8 +42,6 @@
 /area/shuttle/sdf_corvette)
 "dv" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/wall/rshull,
@@ -155,8 +149,6 @@
 	dir = 1
 	},
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber,
@@ -209,13 +201,9 @@
 /area/shuttle/sdf_corvette)
 "mT" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/machinery/sleep_console,
@@ -255,8 +243,6 @@
 	dir = 8
 	},
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
@@ -293,8 +279,6 @@
 	dir = 4
 	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/machinery/door/blast/regular/open{
@@ -334,8 +318,6 @@
 /area/shuttle/sdf_corvette)
 "tg" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/sleeper{
@@ -378,8 +360,6 @@
 	icon_state = "4-8"
 	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -405,8 +385,6 @@
 /area/shuttle/sdf_corvette)
 "wQ" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor/glass,
@@ -424,8 +402,6 @@
 	icon_state = "1-2"
 	},
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -463,8 +439,6 @@
 /area/shuttle/sdf_corvette)
 "zb" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -504,8 +478,6 @@
 /area/shuttle/sdf_corvette)
 "Cq" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/computer/ship/engines{
@@ -551,8 +523,6 @@
 /area/shuttle/sdf_corvette)
 "Fb" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/wall/rshull,
@@ -702,13 +672,9 @@
 /area/shuttle/sdf_corvette)
 "Oc" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /obj/structure/closet/walllocker/emerglocker/north,

maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm

@@ -16,13 +16,9 @@
 /area/shuttle/sdf_corvette_wreck)
 "bn" = (
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -58,8 +54,6 @@
 /area/shuttle/sdf_corvette_wreck)
 "dv" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/structure/girder,
@@ -195,8 +189,6 @@
 	dir = 1
 	},
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber,
@@ -272,13 +264,9 @@
 /area/shuttle/sdf_corvette_wreck)
 "mT" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled/techfloor{
@@ -330,8 +318,6 @@
 	dir = 8
 	},
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
@@ -372,8 +358,6 @@
 /obj/machinery/door/firedoor/glass,
 /obj/structure/grille,
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/machinery/door/blast/regular/open{
@@ -421,8 +405,6 @@
 /area/shuttle/sdf_corvette_wreck)
 "tg" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/item/material/shard/shrapnel,
@@ -472,8 +454,6 @@
 	icon_state = "4-8"
 	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/effect/landmark/corpse/vintage/marine,
@@ -496,8 +476,6 @@
 /area/shuttle/sdf_corvette_wreck)
 "wQ" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor/glass,
@@ -515,8 +493,6 @@
 	icon_state = "1-2"
 	},
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -562,8 +538,6 @@
 /area/shuttle/sdf_corvette_wreck)
 "zb" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -623,8 +597,6 @@
 /area/shuttle/sdf_corvette_wreck)
 "Cq" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/computer/ship/engines{
@@ -682,8 +654,6 @@
 /area/shuttle/sdf_corvette_wreck)
 "Fb" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/structure/girder,
@@ -864,13 +834,9 @@
 /area/shuttle/sdf_corvette_wreck)
 "Oc" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /obj/structure/closet/walllocker/emerglocker/north,
@@ -885,8 +851,6 @@
 /area/shuttle/sdf_corvette_wreck)
 "Oe" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/wall/rshull,

maps/offmap_vr/om_ships/sdf_cutter.dmm

@@ -29,8 +29,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/yellow{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -66,21 +64,15 @@
 	},
 /obj/structure/handrail,
 /obj/structure/cable/yellow{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/sdf_cutter)
 "fi" = (
 /obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
@@ -92,8 +84,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/light{
@@ -178,8 +168,6 @@
 	pixel_x = 22
 	},
 /obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/light{
@@ -266,8 +254,6 @@
 /area/shuttle/sdf_cutter)
 "pZ" = (
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -363,8 +349,6 @@
 	dir = 1
 	},
 /obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -468,8 +452,6 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -503,8 +485,6 @@
 	dir = 5
 	},
 /obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -520,8 +500,6 @@
 /area/shuttle/sdf_cutter)
 "FP" = (
 /obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
@@ -560,8 +538,6 @@
 	dir = 5
 	},
 /obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /obj/machinery/alarm/alarms_hidden{
@@ -573,8 +549,6 @@
 "Jy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel,
@@ -616,8 +590,6 @@
 	dir = 4
 	},
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -675,8 +647,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/door/airlock/voidcraft,
 /obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -694,8 +664,6 @@
 "Pf" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
@@ -709,8 +677,6 @@
 	},
 /obj/structure/handrail,
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
@@ -742,8 +708,6 @@
 	dir = 1
 	},
 /obj/structure/cable/yellow{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -798,8 +762,6 @@
 	dir = 4
 	},
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/airlock_sensor{

maps/southern_cross/southern_cross-4.dmm

@@ -549,8 +549,6 @@
 	dir = 6
 	},
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled,
@@ -566,8 +564,6 @@
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
@@ -584,8 +580,6 @@
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/research{
@@ -600,8 +594,6 @@
 	icon_state = "pipe-c"
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -614,8 +606,6 @@
 /area/surface/outpost/research/xenoarcheology/longtermstorage)
 "bx" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -628,8 +618,6 @@
 /area/surface/outpost/research/xenoarcheology/longtermstorage)
 "by" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -700,8 +688,6 @@
 	dir = 8
 	},
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -715,8 +701,6 @@
 "bG" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -739,8 +723,6 @@
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/effect/floor_decal/industrial/warning{
@@ -757,8 +739,6 @@
 	dir = 10
 	},
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled/white,
@@ -783,8 +763,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/effect/floor_decal/industrial/warning{
@@ -955,8 +933,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/white,
@@ -1032,8 +1008,6 @@
 "cj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -1057,8 +1031,6 @@
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/camera/network/research_outpost{
@@ -1077,8 +1049,6 @@
 "cm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -1118,8 +1088,6 @@
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/effect/floor_decal/industrial/warning/corner,
@@ -1129,8 +1097,6 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/wingrille_spawn/reinforced,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
@@ -1274,8 +1240,6 @@
 /area/surface/outpost/research/xenoarcheology)
 "cK" = (
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -1285,16 +1249,12 @@
 	dir = 8
 	},
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled/white,
 /area/surface/outpost/research/xenoarcheology)
 "cL" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1311,8 +1271,6 @@
 "cM" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1330,16 +1288,12 @@
 "cN" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -1351,8 +1305,6 @@
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -1360,8 +1312,6 @@
 	pixel_y = 0
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled,
@@ -1369,8 +1319,6 @@
 "cP" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1381,8 +1329,6 @@
 "cQ" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1405,13 +1351,9 @@
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled,
@@ -1422,8 +1364,6 @@
 	},
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/plating,
@@ -1534,8 +1474,6 @@
 "dh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -1581,8 +1519,6 @@
 	dir = 5
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
@@ -1669,8 +1605,6 @@
 	dir = 5
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/hologram/holopad,
@@ -1685,8 +1619,6 @@
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
@@ -1704,8 +1636,6 @@
 	req_one_access = list()
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
@@ -1716,8 +1646,6 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/neutral,
@@ -1727,16 +1655,12 @@
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled/neutral,
@@ -1774,8 +1698,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/glass_research{
@@ -1820,8 +1742,6 @@
 	},
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
@@ -1913,8 +1833,6 @@
 "dP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/structure/bed/chair/office/light{
@@ -1947,8 +1865,6 @@
 /area/surface/outpost/research/xenoarcheology)
 "dS" = (
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2016,13 +1932,9 @@
 	icon_state = "warningcorner"
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled,
@@ -2030,8 +1942,6 @@
 "dZ" = (
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
@@ -2040,8 +1950,6 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/wingrille_spawn/reinforced,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
@@ -2111,8 +2019,6 @@
 "el" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -2186,8 +2092,6 @@
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
@@ -2271,8 +2175,6 @@
 "eC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -2351,8 +2253,6 @@
 	icon_state = "warningcorner"
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
@@ -2473,14 +2373,10 @@
 /area/surface/outpost/research/xenoarcheology)
 "eW" = (
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -2490,8 +2386,6 @@
 /area/surface/outpost/research/xenoarcheology)
 "eX" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -2503,8 +2397,6 @@
 "eY" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -2517,8 +2409,6 @@
 /area/surface/outpost/research/xenoarcheology)
 "eZ" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -2529,13 +2419,9 @@
 /area/surface/outpost/research/xenoarcheology)
 "fa" = (
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -2606,8 +2492,6 @@
 "fh" = (
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/binary/pump{
@@ -2672,8 +2556,6 @@
 "fo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/effect/floor_decal/industrial/warning,
@@ -2701,8 +2583,6 @@
 /area/surface/outpost/research/xenoarcheology)
 "fs" = (
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2739,8 +2619,6 @@
 	icon_state = "warning"
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled,
@@ -2755,8 +2633,6 @@
 	icon_state = "tube1"
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
@@ -2765,8 +2641,6 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/wingrille_spawn/reinforced,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
@@ -2818,8 +2692,6 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/engineering{
@@ -2845,13 +2717,9 @@
 /area/surface/outpost/research/xenoarcheology)
 "fJ" = (
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -2864,8 +2732,6 @@
 /area/surface/outpost/research/xenoarcheology)
 "fK" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -2887,8 +2753,6 @@
 	dir = 4
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -2905,8 +2769,6 @@
 	dir = 1
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -2926,8 +2788,6 @@
 	dir = 10
 	},
 /obj/structure/cable/blue{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled,
@@ -3022,8 +2882,6 @@
 /area/surface/outpost/research/xenoarcheology/smes)
 "fX" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/structure/table/steel,
@@ -3038,8 +2896,6 @@
 "fY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/structure/table/steel,
@@ -3051,8 +2907,6 @@
 /area/surface/outpost/research/xenoarcheology/smes)
 "fZ" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -3070,13 +2924,9 @@
 	target_pressure = 200
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /obj/effect/floor_decal/industrial/warning{
@@ -3122,8 +2972,6 @@
 	},
 /obj/machinery/door/firedoor/border_only,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3150,8 +2998,6 @@
 /area/surface/outpost/research/xenoarcheology/anomaly)
 "gg" = (
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3350,8 +3196,6 @@
 /area/surface/outpost/research/xenoarcheology/restroom)
 "gC" = (
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3377,8 +3221,6 @@
 	req_one_access = list(65)
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3515,15 +3357,11 @@
 /area/surface/outpost/research/xenoarcheology/analysis)
 "gX" = (
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled/white,
@@ -3677,16 +3515,12 @@
 	dir = 5
 	},
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled/white,
 /area/surface/outpost/research/xenoarcheology/analysis)
 "hq" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -3697,8 +3531,6 @@
 /area/surface/outpost/research/xenoarcheology/analysis)
 "hr" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -3712,8 +3544,6 @@
 /area/surface/outpost/research/xenoarcheology/analysis)
 "hs" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -3723,8 +3553,6 @@
 /area/surface/outpost/research/xenoarcheology/analysis)
 "ht" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -3734,8 +3562,6 @@
 /area/surface/outpost/research/xenoarcheology/analysis)
 "hu" = (
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
@@ -3746,16 +3572,12 @@
 	name = "Emergency Storage"
 	},
 /obj/structure/cable/blue{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
 /area/surface/outpost/research/xenoarcheology/emergencystorage)
 "hw" = (
 /obj/structure/cable/blue{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/plating,

maps/submaps/admin_use_vr/ert.dmm

@@ -219,7 +219,6 @@
 	id_tag = "vonbraun_pd"
 	},
 /obj/structure/cable/yellow{
-	dir = 4;
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/reinforced/airless,
@@ -472,7 +471,6 @@
 	id_tag = "vonbraun_pd"
 	},
 /obj/structure/cable/yellow{
-	dir = 4;
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/reinforced/airless,
@@ -845,7 +843,6 @@
 	id_tag = "vonbraun_pd"
 	},
 /obj/structure/cable/yellow{
-	dir = 4;
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/reinforced/airless,
@@ -6347,7 +6344,6 @@
 	id_tag = "vonbraun_pd"
 	},
 /obj/structure/cable/yellow{
-	dir = 4;
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/reinforced/airless,
@@ -8837,7 +8833,6 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/yellow{
-	dir = 4;
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/tiled/techmaint,

maps/submaps/admin_use_vr/event_autonomous_drone.dmm

@@ -38,7 +38,6 @@
 /area/submap/event_autonomous_drone/cargo)
 "eW" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/light_switch{

maps/submaps/engine_submaps_vr/tether/engine_sme.dmm

@@ -319,9 +319,6 @@
 	},
 /turf/simulated/floor,
 /area/engineering/engine_room)
-"aV" = (
-/turf/simulated/floor/tiled/techmaint,
-/area/template_noop)
 "aW" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -1588,7 +1585,7 @@ ac
 ad
 ac
 ac
-ac
+ab
 ac
 ac
 ac
@@ -2359,8 +2356,8 @@ af
 av
 av
 av
-aV
-aV
+aa
+aa
 av
 bz
 bz

maps/submaps/pois_vr/debris_field/tinycarrier.dmm

@@ -342,7 +342,6 @@
 	dir = 4
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/airless,
@@ -355,7 +354,6 @@
 	dir = 8
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -394,7 +392,6 @@
 /area/submap/debrisfield/tinyshuttle/crew)
 "aO" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -603,7 +600,6 @@
 /area/submap/debrisfield/tinyshuttle/crew)
 "bf" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/structure/cable/green{
@@ -620,7 +616,6 @@
 /area/submap/debrisfield/tinyshuttle/crew)
 "bg" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -940,7 +935,6 @@
 /area/submap/debrisfield/tinyshuttle/hangar)
 "bJ" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,

maps/submaps/surface_submaps/mountains/Rockb1.dmm

@@ -117,16 +117,12 @@
 /area/submap/Rockb1)
 "A" = (
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled,
 /area/submap/Rockb1)
 "B" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
@@ -136,8 +132,6 @@
 	dir = 1
 	},
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,

maps/submaps/surface_submaps/plains/VRDen.dmm

@@ -31,8 +31,6 @@
 "f" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/machinery/light{
@@ -67,8 +65,6 @@
 "k" = (
 /obj/effect/decal/cleanable/blood/oil,
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled/virgo3b,
@@ -83,8 +79,6 @@
 	icon_state = "0-4"
 	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled/virgo3b,

maps/submaps/surface_submaps/plains/dogbase.dmm

@@ -75,8 +75,6 @@
 /area/submap/DogBase)
 "cS" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /mob/living/simple_mob/mechanical/viscerator/mercenary,
@@ -395,8 +393,6 @@
 /area/template_noop)
 "xc" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/structure/cable{
@@ -611,13 +607,9 @@
 /area/submap/DogBase)
 "Kt" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /obj/machinery/light{
@@ -628,8 +620,6 @@
 /area/submap/DogBase)
 "Le" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /mob/living/simple_mob/mechanical/viscerator/mercenary,

maps/submaps/surface_submaps/wilderness/dogbase.dmm

@@ -75,8 +75,6 @@
 /area/submap/DogBase)
 "cS" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /mob/living/simple_mob/mechanical/viscerator/mercenary,
@@ -399,8 +397,6 @@
 /area/template_noop)
 "xc" = (
 /obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/structure/cable{
@@ -620,13 +616,9 @@
 /area/submap/DogBase)
 "Kt" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/structure/cable/green{
-	d1 = 2;
-	d2 = 8;
 	icon_state = "2-8"
 	},
 /obj/machinery/light{
@@ -637,8 +629,6 @@
 /area/submap/DogBase)
 "Le" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 4;
 	icon_state = "1-4"
 	},
 /mob/living/simple_mob/mechanical/viscerator/mercenary,

maps/tether/tether-02-surface2.dmm

@@ -14983,7 +14983,6 @@
 /area/maintenance/commandmaint)
 "azH" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -15427,7 +15426,6 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -15661,7 +15659,6 @@
 "aBo" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -16004,7 +16001,6 @@
 "aBW" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -16020,7 +16016,6 @@
 	req_one_access = list(17)
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -16459,7 +16454,6 @@
 "aCL" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -17791,7 +17785,6 @@
 "aFr" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18441,7 +18434,6 @@
 	pixel_x = 26
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/wood,

maps/tether/tether-05-station1.dmm

@@ -14698,7 +14698,6 @@
 /area/tether/exploration)
 "bYK" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
@@ -15379,7 +15378,6 @@
 	icon_state = "0-2"
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
@@ -15929,7 +15927,6 @@
 /area/quartermaster/belterdock/refinery)
 "dfN" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /obj/structure/cable/green{
@@ -28049,7 +28046,6 @@
 	dir = 4
 	},
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/dark{
@@ -28912,7 +28908,6 @@
 /area/engineering/hallway)
 "rFu" = (
 /obj/structure/cable/green{
-	dir = 1;
 	icon_state = "1-2"
 	},
 /obj/machinery/hologram/holopad,