Merge pull request #10411 from VOREStation/Arokha/aro3

Aro shipself v3

code/game/objects/items/stacks/marker_beacons.dm

@@ -86,23 +86,31 @@ var/list/marker_beacon_colors = list(
 	light_power = 0.8
 	var/remove_speed = 15
 	var/picked_color
+	var/perma = FALSE
+	var/mapped_in_color
 
 /obj/structure/marker_beacon/New(newloc, set_color)
 	. = ..()
-	picked_color = set_color
+	if(set_color)
+		picked_color = set_color
+	else if(mapped_in_color)
+		picked_color = mapped_in_color
 	update_icon()
 
 /obj/structure/marker_beacon/examine(mob/user)
 	. = ..()
-	. += "<span class='notice'>Alt-click to select a color. Current color is [picked_color].</span>"
+	if(!perma)
+		. += "<span class='notice'>Alt-click to select a color. Current color is [picked_color].</span>"
 
 /obj/structure/marker_beacon/update_icon()
-	while(!picked_color || !marker_beacon_colors[picked_color])
+	if(!picked_color || !marker_beacon_colors[picked_color])
 		picked_color = pick(marker_beacon_colors)
 	icon_state = "[initial(icon_state)][lowertext(picked_color)]-on"
 	set_light(light_range, light_power, marker_beacon_colors[picked_color])
 
 /obj/structure/marker_beacon/attack_hand(mob/living/user)
+	if(perma)
+		return
 	to_chat(user, "<span class='notice'>You start picking [src] up...</span>")
 	if(do_after(user, remove_speed, target = src))
 		var/obj/item/stack/marker_beacon/M = new(loc)
@@ -114,6 +122,8 @@ var/list/marker_beacon_colors = list(
 			qdel(src) //otherwise delete us
 
 /obj/structure/marker_beacon/attackby(obj/item/I, mob/user, params)
+	if(perma)
+		return
 	if(istype(I, /obj/item/stack/marker_beacon))
 		var/obj/item/stack/marker_beacon/M = I
 		to_chat(user, "<span class='notice'>You start picking [src] up...</span>")
@@ -126,6 +136,8 @@ var/list/marker_beacon_colors = list(
 
 /obj/structure/marker_beacon/AltClick(mob/living/user)
 	..()
+	if(perma)
+		return
 	if(user.incapacitated() || !istype(user))
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return

code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm

@@ -1,4 +1,4 @@
-/decl/closet_appearance/wall/autolok
+/decl/closet_appearance/wall_double/autolok
 	color = COLOR_GRAY20
 	decals = null
 	extra_decals = list(

code/game/objects/structures/crates_lockers/closets/misc_vr.dm

@@ -207,8 +207,8 @@
 /obj/structure/closet/autolok_wall
 	name = "autolok suit storage"
 	desc = "It's wall-mounted storage unit for an AutoLok suit."
-	icon = 'icons/obj/closets/bases/wall.dmi'
-	closet_appearance = /decl/closet_appearance/wall/autolok
+	icon = 'icons/obj/closets/bases/wall_double.dmi'
+	closet_appearance = /decl/closet_appearance/wall_double/autolok
 	anchored = 1
 	density = 0
 	wall_mounted = 1