Merge branch 'master' into upstream-merge-10443

code/datums/uplink/tools_vr.dm

@@ -16,6 +16,18 @@
 	item_cost = 2
 	path = /obj/item/device/suit_cooling_unit/emergency
 
+/datum/uplink_item/item/tools/beacon_op
+	name = "Holomap Beacon-M"
+	item_cost = 2
+	path = /obj/item/device/holomap_beacon/operative
+	antag_roles = list("mercenary")
+
+/datum/uplink_item/item/tools/beacon_ert
+	name = "Holomap Beacon-E"
+	item_cost = 2
+	path = /obj/item/device/holomap_beacon/ert
+	antag_roles = list("ert")
+
 /datum/uplink_item/item/tools/basiclaptop
 	name = "Laptop (Basic)"
 	item_cost = 5
@@ -71,6 +83,18 @@
 	item_cost = 20
 	path = /obj/item/weapon/inducer/syndicate
 
+/datum/uplink_item/item/tools/mappingunit_op
+	name = "Mapping Unit-M"
+	item_cost = 20
+	path = /obj/item/device/mapping_unit/operative
+	antag_roles = list("mercenary")
+
+/datum/uplink_item/item/tools/mappingunit_ert
+	name = "Mapping Unit-E"
+	item_cost = 20
+	path = /obj/item/device/mapping_unit/ert
+	antag_roles = list("ert")
+
 /datum/uplink_item/item/tools/luxurycapsule
 	name = "Survival Capsule (Luxury)"
 	item_cost = 40

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

code/game/response_team.dm

@@ -37,6 +37,7 @@ var/silent_ert = 0
 		return
 
 	message_admins("[key_name_admin(usr)] is dispatching an Emergency Response Team.", 1)
+	admin_chat_message(message = "[key_name(usr)] is dispatching an Emergency Response Team", color = "#CC2222") //VOREStation Add
 	log_admin("[key_name(usr)] used Dispatch Response Team.")
 	trigger_armed_response_team(1)
 

code/game/turfs/flooring/flooring_decals_vr.dm

@@ -132,4 +132,7 @@
 	icon_state = "talon_center"
 
 /obj/effect/floor_decal/emblem/itgdauntless
-	icon_state = "itgdauntless"
+	icon_state = "itgdauntless"
+
+/obj/effect/floor_decal/emblem/aronai
+	icon_state = "aronai"

code/game/turfs/simulated/outdoors/snow.dm

@@ -51,6 +51,7 @@
 	name = "ice"
 	icon_state = "ice"
 	desc = "Looks slippery."
+	edge_blending_priority = 0
 
 /turf/simulated/floor/outdoors/ice/Entered(var/mob/living/M)
 	sleep(1 * world.tick_lag)

code/game/turfs/simulated/wall_icon.dm

@@ -113,6 +113,18 @@
 		if(can_join_with(W))
 			dirs += get_dir(src, W)
 
+	if(material.icon_base == "hull") // Could be improved...
+		var/additional_dirs = 0
+		for(var/direction in alldirs)
+			var/turf/T = get_step(src,direction)
+			if(T && (locate(/obj/structure/hull_corner) in T))
+				dirs += direction
+				additional_dirs |= direction
+		if(additional_dirs)
+			for(var/diag_dir in cornerdirs)
+				if ((additional_dirs & diag_dir) == diag_dir)
+					dirs += diag_dir
+
 	wall_connections = dirs_to_corner_states(dirs)
 
 /turf/simulated/wall/proc/can_join_with(var/turf/simulated/wall/W)

code/game/turfs/simulated/wall_types.dm

@@ -308,5 +308,49 @@
 		I.color = stripe_color
 		add_overlay(I)
 
+// Fake corners for making hulls look pretty
+/obj/structure/hull_corner
+	name = "hull corner"
+	
+	icon = 'icons/turf/wall_masks.dmi'
+	icon_state = "hull_corner"
+	
+	anchored = TRUE
+	density = TRUE
+	breakable = TRUE
 
+/obj/structure/hull_corner/Initialize()
+	return INITIALIZE_HINT_LATELOAD
 
+/obj/structure/hull_corner/LateInitialize()
+	. = ..()
+	update_look()
+
+/obj/structure/hull_corner/proc/update_look()
+	cut_overlays()
+	
+	var/turf/simulated/wall/T = get_step(src, dir)
+	if(!istype(T))
+		log_error("[src] at [x],[y] not placed facing a hull")
+		return
+	
+	name = T.name
+	desc = T.desc
+	
+	var/datum/material/B = T.material
+	var/datum/material/R = T.reinf_material
+	
+	if(B?.icon_colour)
+		color = B.icon_colour
+	if(R?.icon_colour)
+		var/image/I = image(icon, icon_state+"_reinf", dir=dir)
+		I.color = R.icon_colour
+		add_overlay(I)
+
+/obj/structure/hull_corner/long_vert
+	icon = 'icons/turf/wall_masks32x64.dmi'
+	bound_height = 64
+
+/obj/structure/hull_corner/long_horiz
+	icon = 'icons/turf/wall_masks64x32.dmi'
+	bound_width = 64

code/modules/ai/ai_holder_combat_unseen.dm

@@ -3,16 +3,19 @@
 // Used when a target is out of sight or invisible.
 /datum/ai_holder/proc/engage_unseen_enemy()
 	ai_log("engage_unseen_enemy() : Entering.", AI_LOG_TRACE)
+	// Also handled in strategic updates but handling it here allows for more fine resolution timeouts
+	if((lose_target_time+lose_target_timeout) >= world.time)
+		return remove_target()
 	// Lets do some last things before giving up.
 	if(conserve_ammo || !holder.ICheckRangedAttack(target_last_seen_turf))
 		if(get_dist(holder, target_last_seen_turf) > 1) // We last saw them over there.
 			// Go to where you last saw the enemy.
 			return give_destination(target_last_seen_turf, 1, TRUE) // Sets stance as well
-		else if(lose_target_time < world.time) // We last saw them next to us, so do a blind attack on that tile.
-			if(melee_on_tile(target_last_seen_turf) != ATTACK_SUCCESSFUL && intelligence_level >= AI_NORMAL)
-				var/obj/O = find_escape_route()
-				if(istype(O))
-					return give_destination(get_turf(O), 0, TRUE)
+		// We last saw them next to us, so do a blind attack on that tile.
+		else if(melee_on_tile(target_last_seen_turf) != ATTACK_SUCCESSFUL && intelligence_level >= AI_NORMAL)
+			var/obj/O = find_escape_route()
+			if(istype(O))
+				return give_destination(get_turf(O), 0, TRUE)
 		else
 			return find_target()
 	else

code/modules/ai/ai_holder_targeting.dm

@@ -183,6 +183,7 @@
 	give_up_movement()
 	lose_target_position()
 	set_stance(STANCE_IDLE)
+	return TRUE
 
 // Check if target is visible to us.
 /datum/ai_holder/proc/can_see_target(atom/movable/the_target, view_range = vision_range)

code/modules/emotes/definitions/audible.dm

@@ -213,7 +213,7 @@
 	emote_sound = 'sound/voice/teshsqueak.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
 
 /decl/emote/audible/teshchirp
-	key = "chirp"
+	key = "tchirp" // VOREStation Edit
 	emote_message_1p = "You chirp!"
 	emote_message_3p = "chirps!"
 	emote_message_1p_target = "You chirp at TARGET!"

code/modules/emotes/definitions/audible_furry_vr.dm

@@ -59,9 +59,11 @@
     emote_message_3p = "lets out a bork."
     emote_sound = 'sound/voice/bork.ogg'
 /decl/emote/audible/mrow
+    key = "mrow"
     emote_message_3p = "lets out a mrow."
     emote_sound = 'sound/voice/mrow.ogg'
 /decl/emote/audible/hypno
+    key = "hypno"
     emote_message_3p = "lets out a mystifying tone."
     emote_sound = 'sound/voice/hypno.ogg'
 /decl/emote/audible/hiss

code/modules/lighting/lighting_fake_sun_vr.dm

@@ -79,6 +79,7 @@
 	
 	var/list/turfs = block(locate(1,1,z),locate(world.maxx,world.maxy,z))
 	
+	var/count = 0
 	for(var/turf/simulated/T as anything in turfs)
 		if(!T.lighting_overlay)
 			T.lighting_build_overlay()
@@ -89,5 +90,6 @@
 			if(LC.update_gen != update_gen && LC.active)
 				LC.update_gen = update_gen
 				LC.update_lumcount(lum_r, lum_g, lum_b)
+		count++
 	update_gen--
 	qdel(src)

code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm

@@ -140,7 +140,7 @@
 	if(large_cocoon)
 		C.icon_state = pick("cocoon_large1","cocoon_large2","cocoon_large3")
 
-	ai_holder.target = null
+	ai_holder.remove_target()
 
 	return TRUE
 

code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm

@@ -190,6 +190,7 @@
 	retaliate = 1
 	cooperative = TRUE
 	speak_chance = 1
+	lose_target_timeout = 0 // Easily distracted
 
 /datum/ai_holder/simple_mob/woof/hostile
 	hostile = 1

code/modules/overmap/ships/engines/ion_thruster.dm

@@ -37,8 +37,8 @@
 /obj/machinery/ion_engine
 	name = "ion propulsion device"
 	desc = "An advanced ion propulsion device, using energy and minutes amount of gas to generate thrust."
-	icon = 'icons/turf/shuttle_parts.dmi'
-	icon_state = "nozzle"
+	icon = 'icons/turf/shuttle_parts_vr.dmi' // VOREStation Edit - New icons
+	icon_state = "ion" // VOREStation Edit - New icons
 	power_channel = ENVIRON
 	idle_power_usage = 100
 	anchored = TRUE
@@ -53,6 +53,10 @@
 	. = ..()
 	controller = new(src)
 
+	var/image/i = image('icons/turf/shuttle_parts_vr.dmi', "ion_overlay") // VOREStation Edit
+	i.plane = PLANE_LIGHTING_ABOVE // VOREStation Edit
+	add_overlay(i) // VOREStation Edit
+
 /obj/machinery/ion_engine/Destroy()
 	QDEL_NULL(controller)
 	. = ..()

code/modules/persistence/graffiti.dm

@@ -18,7 +18,8 @@
 	..(newloc)
 	if(!isnull(_age))
 		graffiti_age = _age
-	message = _message
+	if(!isnull(_message))
+		message = _message
 	if(!isnull(author))
 		author = _author
 

maps/offmap_vr/om_ships/aro3.dm

@@ -0,0 +1,123 @@
+// Compile in the map for CI testing if we're testing compileability of all the maps
+#if MAP_TEST
+#include "aro3.dmm"
+#endif
+
+// Map template for spawning the shuttle
+/datum/map_template/om_ships/aro3
+	name = "OM Ship - Aronai 3.0 (New Z)"
+	desc = "It's Aronai! As a spaceship."
+	mappath = 'aro3.dmm'
+
+/area/aro3
+	requires_power = 1
+
+/area/aro3/cockpit
+	name = "Aronai - Cockpit"
+/area/aro3/kitchen
+	name = "Aronai - Kitchen"
+/area/aro3/eva_hall
+	name = "Aronai - EVA Hall"
+/area/aro3/function
+	name = "Aronai - Function Room"
+/area/aro3/hallway_port
+	name = "Aronai - Port Hallway"
+/area/aro3/hallway_starboard
+	name = "Aronai - Starboard Hallway"
+/area/aro3/park
+	name = "Aronai - Park"
+/area/aro3/wc_port
+	name = "Aronai - Port Public WC"
+/area/aro3/wc_starboard
+	name = "Aronai - Starboard Public WC"
+/area/aro3/suite_port
+	name = "Aronai - Port Suite (Room)"
+/area/aro3/suite_starboard
+	name = "Aronai - Starboard Suite (Room)"
+/area/aro3/suite_port_wc
+	name = "Aronai - Port Suite (WC)"
+/area/aro3/suite_starboard_wc
+	name = "Aronai - Starboard Suite (WC)"
+/area/aro3/surfluid
+	name = "Aronai - Surfluid Access"
+/area/aro3/bunkrooms
+	name = "Aronai - Bunkrooms"
+/area/aro3/hallway_bunkrooms
+	name = "Aronai - Bunkroom Access"
+/area/aro3/bar
+	name = "Aronai - Bar"
+/area/aro3/medical
+	name = "Aronai - Medical"
+/area/aro3/workshop
+	name = "Aronai - Workshop"
+/area/aro3/repair_bay
+	name = "Aronai - Repair Bay"
+/area/aro3/flight_deck
+	name = "Aronai - Flight Deck"
+/area/aro3/atmos
+	name = "Aronai - Atmospherics"
+/area/aro3/power
+	name = "Aronai - Power Supply"
+/area/aro3/engines
+	name = "Aronai - Engines"
+	dynamic_lighting = FALSE
+
+/area/shuttle/aroboat3
+	name = "Aronai - Ship's Boat"
+	requires_power = 1
+	dynamic_lighting = 1
+
+/turf/simulated/floor/water/indoors/surfluid
+	name = "surfluid pool"
+	desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right."
+	description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy."
+	color = "#222222"
+	outdoors = FALSE
+	reagent_type = "liquid_protean"
+
+// The 'ship'
+/obj/effect/overmap/visitable/ship/aro3
+	name = "spacecraft"
+	desc = "Spacefaring vessel. Friendly IFF detected."
+	scanner_name = "Aronai Sieyes"
+	scanner_desc = @{"[i]Registration[/i]: Aronai Sieyes
+[i]Class[/i]: Small Frigate (Low Displacement)
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Automated vessel"}
+	color = "#00aaff" //Bluey
+	vessel_mass = 8000
+	vessel_size = SHIP_SIZE_SMALL
+	initial_generic_waypoints = list("aronai3_fore", "aronai3_aft", "aronai3_port", "aronai3_starboard")
+	initial_restricted_waypoints = list("Aro's Boat" = list("omship_spawn_aroboat3"))
+	fore_dir = NORTH
+
+	skybox_icon = 'aro3.dmi'
+	skybox_icon_state = "skybox"
+	skybox_pixel_x = 130
+	skybox_pixel_y = 120
+
+
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/aroboat3
+	name = "boat control console"
+	shuttle_tag = "Aro's Boat"
+	req_one_access = list(access_cent_general)
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/aroboat3
+	name = "Aronai's Boat Bay"
+	base_area = /area/aro3/flight_deck
+	base_turf = /turf/simulated/floor/tiled/eris/dark/techfloor_grid
+	landmark_tag = "omship_spawn_aroboat3"
+	docking_controller = "aroship3_boatbay"
+	shuttle_type = /datum/shuttle/autodock/overmap/aroboat3
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/aroboat3
+	name = "Aro's Boat"
+	current_location = "omship_spawn_aroboat3"
+	docking_controller_tag = "aroboat3_docker"
+	shuttle_area = /area/shuttle/aroboat3
+	fuel_consumption = 0
+	defer_initialisation = TRUE
+	range = 1

maps/offmap_vr/om_ships/gecko_cr_wreck.dmm

@@ -172,6 +172,9 @@
 	},
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_wreck)
+"eu" = (
+/turf/template_noop,
+/area/shuttle/gecko_cr_cockpit_wreck)
 "eA" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/reinforced/airless,
@@ -851,6 +854,12 @@
 /obj/machinery/computer/shuttle_control/explore/gecko_cr_wreck,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_cockpit_wreck)
+"qD" = (
+/obj/structure/hull_corner{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/gecko_cr_engineering_wreck)
 "qL" = (
 /turf/simulated/wall/rshull,
 /area/shuttle/gecko_cr_cockpit_wreck)
@@ -1195,6 +1204,10 @@
 	},
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_wreck)
+"xo" = (
+/obj/item/weapon/material/shard/shrapnel,
+/turf/template_noop,
+/area/shuttle/gecko_cr_cockpit_wreck)
 "xT" = (
 /obj/effect/floor_decal/industrial/outline/grey,
 /obj/structure/fuel_port/empty{
@@ -1208,6 +1221,12 @@
 "xU" = (
 /turf/template_noop,
 /area/shuttle/gecko_cr_wreck)
+"xW" = (
+/obj/structure/hull_corner/long_vert{
+	dir = 6
+	},
+/turf/template_noop,
+/area/shuttle/gecko_cr_cockpit_wreck)
 "ye" = (
 /obj/structure/handrail{
 	dir = 8
@@ -1446,6 +1465,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
+"CM" = (
+/obj/structure/hull_corner{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/gecko_cr_engineering_wreck)
 "CW" = (
 /turf/simulated/wall/rshull,
 /area/shuttle/gecko_cr_engineering_wreck)
@@ -1584,6 +1609,12 @@
 /obj/item/weapon/material/shard,
 /turf/template_noop,
 /area/shuttle/gecko_cr_engineering_wreck)
+"Fq" = (
+/obj/structure/hull_corner{
+	dir = 8
+	},
+/turf/template_noop,
+/area/shuttle/gecko_cr_cockpit_wreck)
 "Fx" = (
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -1821,6 +1852,10 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
+"Jo" = (
+/obj/structure/hull_corner,
+/turf/template_noop,
+/area/shuttle/gecko_cr_cockpit_wreck)
 "JE" = (
 /obj/machinery/computer/ship/helm{
 	req_one_access = list()
@@ -3226,9 +3261,9 @@ WP
 WP
 WP
 WP
-WP
-WP
-WP
+eu
+xW
+eP
 eP
 eP
 eP
@@ -3267,12 +3302,12 @@ WP
 "}
 (7,1,1) = {"
 WP
-WP
-WP
-eP
+eu
+xW
 eP
 eP
 eP
+uw
 Nr
 GF
 Nr
@@ -3348,7 +3383,7 @@ aL
 Su
 Su
 Su
-WP
+qD
 WP
 "}
 (9,1,1) = {"
@@ -3439,7 +3474,7 @@ WP
 "}
 (11,1,1) = {"
 WP
-WP
+Fq
 qL
 wG
 aF
@@ -3478,7 +3513,7 @@ Su
 Su
 Su
 Su
-WP
+qD
 "}
 (12,1,1) = {"
 WP
@@ -3611,7 +3646,7 @@ WP
 "}
 (15,1,1) = {"
 WP
-WP
+Jo
 qL
 wG
 ic
@@ -3650,7 +3685,7 @@ Su
 Su
 Su
 Su
-WP
+CM
 "}
 (16,1,1) = {"
 WP
@@ -3778,7 +3813,7 @@ pG
 Su
 Su
 Su
-WP
+CM
 WP
 "}
 (19,1,1) = {"
@@ -3788,7 +3823,7 @@ WP
 OX
 NK
 jg
-eP
+uw
 uw
 NK
 uw
@@ -3828,9 +3863,9 @@ WP
 WP
 WP
 FV
-WP
-FV
-WP
+eu
+xo
+eu
 OX
 NK
 NK

maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm

@@ -106,6 +106,12 @@
 "ka" = (
 /turf/simulated/wall/shull,
 /area/shuttle/mackerel_lc_wreck)
+"kf" = (
+/obj/structure/hull_corner{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/mackerel_lc_wreck)
 "kU" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
 /obj/machinery/light/small{
@@ -732,6 +738,12 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc_wreck)
+"Qq" = (
+/obj/structure/hull_corner{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/mackerel_lc_wreck)
 "Qu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/random/empty_or_lootable_crate,
@@ -957,13 +969,13 @@ WP
 WP
 WP
 WP
-BB
+TC
 oG
 oe
 ka
 ka
 ka
-WP
+Qq
 WP
 "}
 (3,1,1) = {"
@@ -982,7 +994,7 @@ WP
 WP
 BB
 WP
-WP
+oG
 oe
 Zb
 bI
@@ -1007,13 +1019,13 @@ ka
 WP
 WP
 BB
-WP
+oG
 NI
 oq
 tV
 ka
 ka
-WP
+kf
 WP
 "}
 (5,1,1) = {"
@@ -1114,7 +1126,7 @@ tV
 ka
 ka
 ka
-WP
+Qq
 "}
 (9,1,1) = {"
 WP
@@ -1214,7 +1226,7 @@ tV
 ka
 ka
 ka
-WP
+kf
 "}
 (13,1,1) = {"
 WP
@@ -1307,13 +1319,13 @@ ka
 WP
 BB
 WP
-WP
+oG
 NI
 Zb
 ca
 NI
 oq
-WP
+oG
 BB
 "}
 (17,1,1) = {"
@@ -1332,7 +1344,7 @@ WP
 WP
 WP
 WP
-BB
+TC
 oe
 oq
 oq
@@ -1357,13 +1369,13 @@ WP
 WP
 WP
 WP
-WP
+oG
 oG
 oe
 oe
 oe
 oe
-BB
+TC
 WP
 "}
 (19,1,1) = {"

maps/offmap_vr/om_ships/salamander.dmm

@@ -1246,6 +1246,12 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/salamander)
+"rP" = (
+/obj/structure/hull_corner{
+	dir = 8
+	},
+/turf/template_noop,
+/area/shuttle/salamander_head)
 "sb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
@@ -1255,12 +1261,22 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/salamander_engineering)
+"ts" = (
+/obj/structure/hull_corner,
+/turf/template_noop,
+/area/shuttle/salamander)
 "tA" = (
 /obj/machinery/pointdefense{
 	id_tag = "salamander_pd"
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/salamander_engineering)
+"uf" = (
+/obj/structure/hull_corner{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salamander_galley)
 "ur" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/grille,
@@ -1292,6 +1308,10 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/salamander_cockpit)
+"wq" = (
+/obj/structure/hull_corner,
+/turf/template_noop,
+/area/shuttle/salamander_engineering)
 "wF" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 6
@@ -1405,6 +1425,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/salamander)
+"Bu" = (
+/obj/structure/hull_corner{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/salamander_engineering)
 "BW" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
@@ -1878,6 +1904,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor/plating,
 /area/shuttle/salamander_engineering)
+"WI" = (
+/obj/structure/hull_corner{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/salamander)
 "WN" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -2028,7 +2060,7 @@ WP
 WP
 WP
 WP
-WP
+wq
 Wj
 dj
 fn
@@ -2037,7 +2069,7 @@ Wj
 dj
 fn
 Wj
-WP
+Bu
 WP
 WP
 WP
@@ -2152,7 +2184,7 @@ WP
 "}
 (9,1,1) = {"
 WP
-WP
+ts
 VT
 VT
 Wj
@@ -2165,7 +2197,7 @@ lV
 Wj
 VT
 VT
-WP
+WI
 WP
 "}
 (10,1,1) = {"
@@ -2386,7 +2418,7 @@ WP
 "}
 (22,1,1) = {"
 WP
-WP
+rP
 Tg
 br
 cq
@@ -2399,7 +2431,7 @@ mR
 bI
 qu
 mR
-WP
+uf
 WP
 "}
 (23,1,1) = {"

maps/offmap_vr/om_ships/salamander_wreck.dmm

@@ -40,6 +40,12 @@
 	},
 /turf/simulated/floor/airless,
 /area/shuttle/salamander_wreck_q2)
+"bq" = (
+/obj/structure/hull_corner{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/salamander_wreck)
 "br" = (
 /obj/structure/window/reinforced/tinted,
 /obj/structure/toilet{
@@ -1355,6 +1361,12 @@
 	},
 /turf/simulated/floor/tiled/techmaint/airless,
 /area/shuttle/salamander_wreck)
+"zx" = (
+/obj/structure/hull_corner{
+	dir = 8
+	},
+/turf/template_noop,
+/area/shuttle/salamander_wreck_head)
 "zO" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -1473,6 +1485,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/salamander_wreck_galley)
+"EE" = (
+/obj/structure/hull_corner{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/salamander_wreck_engineering)
 "Fu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
@@ -1609,6 +1627,10 @@
 	},
 /turf/simulated/floor/tiled/techmaint/airless,
 /area/shuttle/salamander_wreck)
+"KB" = (
+/obj/structure/hull_corner,
+/turf/template_noop,
+/area/shuttle/salamander_wreck_engineering)
 "KX" = (
 /obj/structure/handrail,
 /obj/random/empty_or_lootable_crate,
@@ -1708,6 +1730,12 @@
 /obj/structure/girder,
 /turf/simulated/floor/airless,
 /area/shuttle/salamander_wreck)
+"PF" = (
+/obj/structure/hull_corner{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salamander_wreck_galley)
 "PN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
@@ -1982,6 +2010,10 @@
 	oxygen = 0
 	},
 /area/shuttle/salamander_wreck)
+"Xj" = (
+/obj/structure/hull_corner,
+/turf/template_noop,
+/area/shuttle/salamander_wreck)
 "Xn" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -2082,7 +2114,7 @@ WP
 WP
 WP
 WP
-WP
+KB
 Wj
 nP
 fn
@@ -2091,7 +2123,7 @@ Wj
 nP
 fn
 Wj
-WP
+EE
 WP
 WP
 WP
@@ -2206,7 +2238,7 @@ WP
 "}
 (9,1,1) = {"
 WP
-WP
+Xj
 VT
 VT
 Wj
@@ -2219,7 +2251,7 @@ lV
 Wj
 VT
 VT
-WP
+bq
 WP
 "}
 (10,1,1) = {"
@@ -2440,7 +2472,7 @@ WP
 "}
 (22,1,1) = {"
 WP
-WP
+zx
 Tg
 br
 cq
@@ -2453,7 +2485,7 @@ mR
 bI
 qu
 mR
-WP
+PF
 WP
 "}
 (23,1,1) = {"

maps/submaps/admin_use_vr/ert.dmm

@@ -11,10 +11,11 @@
 /area/ship/ert/barracks)
 "ac" = (
 /obj/machinery/light/no_nightshift,
+/obj/machinery/porta_turret/stationary/CIWS,
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/dock_port)
 "ad" = (
-/obj/machinery/porta_turret/stationary/CIWS,
+/obj/structure/hull_corner,
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/dock_port)
 "ae" = (
@@ -121,15 +122,77 @@
 /obj/machinery/telecomms/relay/preset/tether,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/atmos)
+"ar" = (
+/obj/structure/table/rack/steel,
+/obj/item/toy/plushie/squid/blue{
+	desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid.";
+	name = "NT 'Deathsquid' Plushie"
+	},
+/obj/effect/floor_decal/industrial/outline/grey,
+/obj/item/device/mapping_unit/deathsquad,
+/obj/item/device/holomap_beacon/deathsquad,
+/obj/item/device/holomap_beacon/deathsquad,
+/obj/item/device/holomap_beacon/deathsquad,
+/obj/item/device/holomap_beacon/deathsquad,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/ert/barracks)
+"as" = (
+/obj/machinery/light_switch{
+	pixel_y = 23
+	},
+/obj/structure/table/woodentable,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/holomap_beacon/ert,
+/obj/item/device/holomap_beacon/ert,
+/obj/item/device/mapping_unit/ert,
+/turf/simulated/floor/wood,
+/area/ship/ert/commander)
+"at" = (
+/obj/item/device/mapping_unit/ert,
+/turf/simulated/floor/wood,
+/area/ship/ert/commander)
+"ar" = (
+/obj/structure/table/rack/steel,
+/obj/item/toy/plushie/squid/blue{
+	desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid.";
+	name = "NT 'Deathsquid' Plushie"
+	},
+/obj/effect/floor_decal/industrial/outline/grey,
+/obj/item/device/mapping_unit/deathsquad,
+/obj/item/device/holomap_beacon/deathsquad,
+/obj/item/device/holomap_beacon/deathsquad,
+/obj/item/device/holomap_beacon/deathsquad,
+/obj/item/device/holomap_beacon/deathsquad,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/ert/barracks)
+"as" = (
+/obj/machinery/light_switch{
+	pixel_y = 23
+	},
+/obj/structure/table/woodentable,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/holomap_beacon/ert,
+/obj/item/device/holomap_beacon/ert,
+/obj/item/device/mapping_unit/ert,
+/turf/simulated/floor/wood,
+/area/ship/ert/commander)
+"at" = (
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/wood,
+/area/ship/ert/commander)
 "av" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/gunnery)
 "ax" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 4
+/obj/structure/hull_corner{
+	dir = 8
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/ert_ship_boat)
 "aC" = (
 /obj/machinery/pointdefense{
@@ -147,6 +210,10 @@
 /obj/fiftyspawner/tritium,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/eng_storage)
+"aF" = (
+/obj/machinery/porta_turret/stationary/CIWS,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/atmos)
 "aI" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -316,8 +383,16 @@
 /obj/machinery/light/no_nightshift,
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/atmos)
+"bU" = (
+/obj/structure/hull_corner/long_horiz{
+	dir = 5
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/hallways_aft)
 "bW" = (
-/obj/machinery/porta_turret/stationary/CIWS,
+/obj/structure/hull_corner/long_horiz{
+	dir = 6
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/atmos)
 "ch" = (
@@ -343,9 +418,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/dock_port)
 "cu" = (
-/obj/machinery/shipsensors,
+/obj/machinery/light/no_nightshift,
+/obj/machinery/porta_turret/stationary/CIWS,
 /turf/simulated/floor/reinforced/airless,
-/area/ship/ert/engineering)
+/area/ship/ert/barracks)
 "cv" = (
 /obj/machinery/shield_gen,
 /obj/effect/floor_decal/industrial/outline/blue,
@@ -510,15 +586,6 @@
 "dq" = (
 /turf/simulated/wall/shull,
 /area/ship/ert/med_surg)
-"dr" = (
-/obj/structure/table/rack/steel,
-/obj/item/toy/plushie/squid/blue{
-	desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid.";
-	name = "NT 'Deathsquid' Plushie"
-	},
-/obj/effect/floor_decal/industrial/outline/grey,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/ert/barracks)
 "ds" = (
 /obj/structure/table/rack,
 /obj/item/weapon/storage/backpack/ert/commander,
@@ -657,7 +724,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/barracks)
 "dW" = (
-/obj/machinery/light/no_nightshift{
+/obj/structure/hull_corner{
 	dir = 8
 	},
 /obj/machinery/pointdefense{
@@ -665,6 +732,13 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/gunnery)
+/obj/machinery/power/pointdefense{
+	id_tag = "vonbraun_pd"
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/gunnery)
+/turf/space,
+/area/space)
 "dX" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -785,7 +859,9 @@
 /turf/simulated/floor/plating,
 /area/ship/ert/engine)
 "eD" = (
-/obj/machinery/porta_turret/stationary/CIWS,
+/obj/structure/hull_corner{
+	dir = 4
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/med)
 "eF" = (
@@ -1290,8 +1366,22 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/hangar)
+"hW" = (
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 1
+	},
+/obj/machinery/power/pointdefense{
+	id_tag = "vonbraun_pd"
+	},
+/obj/machinery/light/no_nightshift{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/hangar)
 "hY" = (
-/obj/machinery/porta_turret/stationary/CIWS,
+/obj/structure/hull_corner{
+	dir = 4
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/dock_star)
 "ia" = (
@@ -1330,6 +1420,15 @@
 /obj/machinery/light/no_nightshift{
 	dir = 8
 	},
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 8
+	},
+/obj/machinery/power/pointdefense{
+	id_tag = "vonbraun_pd"
+	},
+/obj/machinery/light/no_nightshift{
+	dir = 8
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/hangar)
 "ij" = (
@@ -1602,7 +1701,9 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/barracks)
 "kO" = (
-/obj/machinery/porta_turret/stationary/CIWS,
+/obj/structure/hull_corner{
+	dir = 8
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/barracks)
 "kP" = (
@@ -2911,6 +3012,7 @@
 /obj/machinery/light/no_nightshift{
 	dir = 1
 	},
+/obj/machinery/porta_turret/stationary/CIWS,
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/eng_storage)
 "qJ" = (
@@ -3157,8 +3259,12 @@
 /obj/machinery/pointdefense{
 	id_tag = "vonbraun_pd"
 	},
+/obj/machinery/power/pointdefense{
+	id_tag = "vonbraun_pd"
+	},
+/obj/structure/hull_corner,
 /turf/simulated/floor/reinforced/airless,
-/area/ship/ert/hallways_aft)
+/area/ship/ert/barracks)
 "sC" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -3643,11 +3749,11 @@
 /turf/simulated/floor/tiled/white,
 /area/ship/ert/med_surg)
 "wr" = (
-/obj/machinery/shipsensors{
-	dir = 1
+/obj/machinery/power/pointdefense{
+	id_tag = "vonbraun_pd"
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/ert/atmos)
+/area/ship/ert/hallways_aft)
 "wt" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/weapon/storage/firstaid/bonemed{
@@ -3668,6 +3774,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/med)
+"wG" = (
+/obj/structure/hull_corner/long_horiz{
+	dir = 5
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/engine)
 "wO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -4573,7 +4685,13 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/armoury_st)
 "BI" = (
-/obj/machinery/porta_turret/stationary/CIWS,
+/obj/structure/hull_corner/long_horiz{
+	dir = 5
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/engineering)
+"BK" = (
+/obj/machinery/shipsensors,
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/engineering)
 "BM" = (
@@ -4962,17 +5080,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/ert_ship_boat)
-"Ez" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/wood,
-/area/ship/ert/commander)
 "EA" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/storage/box/trackimp,
@@ -5151,6 +5258,7 @@
 /obj/machinery/light/no_nightshift{
 	dir = 1
 	},
+/obj/machinery/porta_turret/stationary/CIWS,
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/dock_star)
 "FP" = (
@@ -5404,7 +5512,9 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/engine)
 "GJ" = (
-/obj/machinery/porta_turret/stationary/CIWS,
+/obj/structure/hull_corner{
+	dir = 1
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/eng_storage)
 "GK" = (
@@ -6266,15 +6376,12 @@
 	battery_lock = 0
 	},
 /obj/effect/floor_decal/industrial/outline/grey,
-<<<<<<< HEAD
-||||||| parent of d41e3bb7a8... Merge pull request #10091 from KillianKirilenko/kk-adminships
 /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
 /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
 /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
 /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
 /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
 /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
-=======
 /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{
 	pixel_y = 6
 	},
@@ -6291,7 +6398,6 @@
 /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{
 	pixel_y = -4
 	},
->>>>>>> d41e3bb7a8... Merge pull request #10091 from KillianKirilenko/kk-adminships
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/armoury_st)
 "LA" = (
@@ -6389,6 +6495,12 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/armoury_dl)
+"LX" = (
+/obj/structure/hull_corner/long_horiz{
+	dir = 6
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/hallways_aft)
 "LZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -6652,6 +6764,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/gunnery)
+"Nu" = (
+/obj/structure/hull_corner/long_horiz{
+	dir = 6
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/engine)
 "Nz" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -6676,14 +6794,10 @@
 "NI" = (
 /obj/structure/table/rack,
 /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid,
-<<<<<<< HEAD
-||||||| parent of a7910d7968... Merge pull request #9712 from KillianKirilenko/kk-shuttle
 /obj/item/weapon/storage/belt/explorer/pathfinder,
-=======
 /obj/item/weapon/storage/belt/explorer/pathfinder{
 	name = "ERT Commander's belt"
 	},
->>>>>>> a7910d7968... Merge pull request #9712 from KillianKirilenko/kk-shuttle
 /turf/simulated/floor/wood,
 /area/ship/ert/commander)
 "NJ" = (
@@ -6942,6 +7056,7 @@
 /obj/machinery/light/no_nightshift{
 	dir = 8
 	},
+/obj/machinery/porta_turret/stationary/CIWS,
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/gunnery)
 "ON" = (
@@ -7143,6 +7258,19 @@
 "Pq" = (
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/med)
+"Pw" = (
+/obj/machinery/shipsensors{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/atmos)
+"Py" = (
+/obj/machinery/light/no_nightshift{
+	dir = 1
+	},
+/obj/machinery/porta_turret/stationary/CIWS,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/med)
 "PA" = (
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled/techfloor,
@@ -7192,6 +7320,10 @@
 "PO" = (
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/gunnery)
+"PP" = (
+/obj/machinery/porta_turret/stationary/CIWS,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/engineering)
 "PS" = (
 /obj/machinery/shield_capacitor,
 /obj/effect/floor_decal/industrial/outline/blue,
@@ -7325,6 +7457,12 @@
 "QT" = (
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/med)
+"QV" = (
+/obj/structure/hull_corner{
+	dir = 1
+	},
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/ert_ship_boat)
 "QX" = (
 /obj/structure/window/reinforced,
 /obj/machinery/computer/shuttle_control/explore/ert_ship_boat{
@@ -7458,14 +7596,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/teleporter)
-"RV" = (
-/obj/machinery/light_switch{
-	pixel_y = 23
-	},
-/obj/structure/table/woodentable,
-/obj/item/device/flashlight/lamp,
-/turf/simulated/floor/wood,
-/area/ship/ert/commander)
 "Sc" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -7758,12 +7888,6 @@
 "Tl" = (
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/hangar)
-"Tr" = (
-/obj/machinery/shipsensors{
-	dir = 4
-	},
-/turf/simulated/floor/reinforced/airless,
-/area/ship/ert/med_surg)
 "Tx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
@@ -7884,6 +8008,12 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/armoury_dl)
+"UI" = (
+/obj/structure/hull_corner{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/ert/med)
 "UJ" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -8375,11 +8505,11 @@
 /turf/simulated/wall/shull,
 /area/ship/ert/engineering)
 "YO" = (
-/obj/machinery/light/no_nightshift{
-	dir = 8
+/obj/structure/hull_corner{
+	dir = 1
 	},
-/turf/simulated/floor/reinforced/airless,
-/area/ship/ert/med_surg)
+/turf/space,
+/area/space)
 "YP" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/fuel{
 	dir = 8
@@ -13586,7 +13716,7 @@ Hf
 yz
 yz
 yz
-kL
+lZ
 ZL
 lZ
 yz
@@ -14136,7 +14266,7 @@ yz
 yz
 yz
 yz
-lZ
+ZL
 Hf
 Hf
 ok
@@ -14156,7 +14286,7 @@ RO
 XH
 Hf
 Hf
-lZ
+ZL
 yz
 yz
 yz
@@ -14278,7 +14408,7 @@ yz
 yz
 yz
 yz
-lZ
+Nu
 Hf
 Hf
 op
@@ -14298,7 +14428,7 @@ SE
 cY
 Hf
 Hf
-lZ
+wG
 yz
 yz
 yz
@@ -14420,7 +14550,7 @@ yz
 yz
 yz
 yz
-ZL
+lZ
 Hf
 Hf
 vd
@@ -14440,7 +14570,7 @@ Hf
 Hf
 Hf
 Hf
-ZL
+lZ
 yz
 yz
 yz
@@ -14703,7 +14833,7 @@ yz
 yz
 yz
 yz
-bO
+Pw
 kJ
 pV
 kP
@@ -14725,7 +14855,7 @@ JG
 VC
 XW
 XW
-YR
+BK
 yz
 yz
 yz
@@ -14987,7 +15117,7 @@ yz
 yz
 yz
 yz
-bO
+aF
 kJ
 pV
 kT
@@ -15009,7 +15139,7 @@ XW
 XW
 XW
 XW
-YR
+PP
 yz
 yz
 yz
@@ -15271,7 +15401,7 @@ yz
 yz
 yz
 yz
-wr
+bO
 kJ
 pV
 ls
@@ -15293,7 +15423,7 @@ XW
 XW
 XW
 XW
-cu
+YR
 yz
 yz
 yz
@@ -15554,7 +15684,7 @@ yz
 yz
 yz
 yz
-Ib
+wr
 DS
 yl
 tK
@@ -15578,7 +15708,7 @@ kh
 Gv
 nY
 DS
-Ib
+wr
 yz
 yz
 yz
@@ -15696,7 +15826,7 @@ yz
 yz
 yz
 yz
-Ib
+LX
 DS
 pA
 HR
@@ -15720,7 +15850,7 @@ Ai
 Xh
 yG
 DS
-Ib
+bU
 yz
 yz
 yz
@@ -15838,7 +15968,7 @@ yz
 yz
 yz
 yz
-sB
+Ib
 DS
 cS
 cS
@@ -15862,7 +15992,7 @@ lu
 cS
 cS
 DS
-sB
+Ib
 yz
 yz
 yz
@@ -16128,7 +16258,7 @@ iB
 cS
 lu
 DS
-RV
+as
 Iv
 zP
 Eh
@@ -16273,7 +16403,7 @@ JB
 Wa
 eL
 zT
-Ez
+at
 IK
 Ks
 Oy
@@ -17257,7 +17387,7 @@ yz
 yz
 yz
 yz
-Sr
+cu
 Zo
 Bo
 ia
@@ -18535,7 +18665,7 @@ yz
 yz
 yz
 yz
-Sr
+cu
 Zo
 Bo
 sr
@@ -18677,7 +18807,7 @@ yz
 yz
 yz
 yz
-kO
+sB
 Zo
 Bo
 Bo
@@ -19812,7 +19942,7 @@ yz
 yz
 yz
 yz
-Sr
+cu
 Zo
 Zo
 do
@@ -19840,7 +19970,7 @@ xz
 HC
 ZT
 ZT
-Fd
+Py
 yz
 yz
 yz
@@ -19981,7 +20111,7 @@ VJ
 KI
 KI
 ZT
-eD
+UI
 yz
 yz
 yz
@@ -20241,7 +20371,7 @@ yz
 yz
 Ye
 Dd
-dr
+ar
 fj
 jz
 nc
@@ -21953,13 +22083,13 @@ FP
 vK
 xO
 WC
-ax
+HO
 HO
 yg
 HK
 yg
 HO
-ax
+HO
 WC
 Zx
 nl
@@ -22095,13 +22225,13 @@ Vq
 vK
 xO
 WC
-WC
+HO
 HO
 WC
 WC
 WC
 HO
-WC
+HO
 WC
 Mx
 dq
@@ -22237,13 +22367,13 @@ Vq
 vK
 xO
 WC
-WC
+ax
 HO
 WC
 WC
 WC
 HO
-WC
+QV
 WC
 aK
 Sh
@@ -22813,7 +22943,7 @@ za
 za
 za
 za
-hW
+ib
 MZ
 dq
 jv
@@ -22821,7 +22951,7 @@ ij
 dq
 MZ
 MZ
-Jg
+yz
 yz
 yz
 yz
@@ -22938,7 +23068,7 @@ yz
 yz
 yz
 yz
-nr
+dW
 vK
 vK
 wh
@@ -22962,7 +23092,7 @@ GY
 GY
 MZ
 MZ
-Cr
+YO
 yz
 yz
 yz
@@ -23224,7 +23354,7 @@ yz
 yz
 yz
 yz
-PO
+dW
 vK
 vK
 ej
@@ -23244,7 +23374,7 @@ Cr
 MZ
 MZ
 MZ
-aC
+YO
 yz
 yz
 yz
@@ -23367,8 +23497,8 @@ yz
 yz
 yz
 yz
-nr
-pE
+dW
+vK
 pE
 OM
 yz
@@ -23385,7 +23515,7 @@ yz
 CR
 MZ
 MZ
-Cr
+YO
 yz
 yz
 yz
@@ -23510,7 +23640,7 @@ yz
 yz
 yz
 yz
-PO
+dW
 PO
 PO
 yz
@@ -23526,7 +23656,7 @@ yz
 yz
 ci
 MZ
-Tr
+YO
 yz
 yz
 yz

maps/submaps/admin_use_vr/kk_mercship.dmm

@@ -7,6 +7,33 @@
 /obj/effect/shuttle_landmark/premade/manta_ship_near_port,
 /turf/space,
 /area/space)
+"ac" = (
+/obj/structure/table/steel_reinforced,
+/obj/effect/landmark{
+	name = "Syndicate-Uplink"
+	},
+/obj/item/device/mapping_unit/operative,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/armoury_st)
+"ad" = (
+/obj/structure/table/rack,
+/obj/item/weapon/storage/box/syndie_kit/chameleon,
+/obj/item/weapon/storage/box/syndie_kit/chameleon,
+/obj/item/weapon/storage/box/syndie_kit/chameleon,
+/obj/item/weapon/storage/box/syndie_kit/chameleon,
+/obj/item/weapon/storage/box/syndie_kit/chameleon,
+/obj/item/weapon/storage/box/syndie_kit/chameleon,
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 5;
+	pixel_y = -32
+	},
+/obj/effect/floor_decal/techfloor,
+/obj/item/device/holomap_beacon/operative,
+/obj/item/device/holomap_beacon/operative,
+/obj/item/device/holomap_beacon/operative,
+/obj/item/device/holomap_beacon/operative,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/armoury_st)
 "ag" = (
 /turf/simulated/floor/reinforced/airless,
 /area/ship/manta/hangar)
@@ -111,6 +138,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/hangar)
+"ay" = (
+/obj/structure/hull_corner{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/med)
 "aB" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 8
@@ -635,8 +668,16 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/armoury_st)
 "bT" = (
+<<<<<<< HEAD
 /obj/machinery/pointdefense{
 	id_tag = "mercenary_pd"
+||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+=======
+/obj/structure/hull_corner/long_horiz{
+	dir = 10
+>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/manta/hangar)
@@ -920,7 +961,9 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/armoury_st)
 "cS" = (
-/obj/machinery/porta_turret/stationary/syndie/CIWS,
+/obj/structure/hull_corner/long_horiz{
+	dir = 6
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/manta/armoury_st)
 "cW" = (
@@ -1075,7 +1118,9 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/recreation)
 "dI" = (
-/obj/machinery/porta_turret/stationary/syndie/CIWS,
+/obj/structure/hull_corner/long_horiz{
+	dir = 10
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/manta/med)
 "dJ" = (
@@ -1256,6 +1301,10 @@
 /obj/item/weapon/reagent_containers/glass/beaker/large,
 /turf/simulated/floor/tiled/white,
 /area/ship/manta/med)
+"eC" = (
+/obj/machinery/porta_turret/stationary/syndie/CIWS,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/holding)
 "eF" = (
 /obj/machinery/chemical_dispenser/biochemistry/full,
 /obj/structure/table/steel_reinforced,
@@ -1266,9 +1315,6 @@
 /turf/simulated/floor/tiled/white,
 /area/ship/manta/med)
 "eG" = (
-/turf/simulated/floor/reinforced/airless,
-/area/ship/manta/hallways_port)
-"eH" = (
 /obj/machinery/porta_turret/stationary/syndie/CIWS,
 /turf/simulated/floor/reinforced/airless,
 /area/ship/manta/hallways_port)
@@ -1518,9 +1564,11 @@
 /turf/simulated/floor/tiled/white,
 /area/ship/manta/med)
 "fZ" = (
-/obj/machinery/porta_turret/stationary/syndie/CIWS,
-/turf/simulated/floor/reinforced/airless,
-/area/ship/manta/recreation)
+/obj/structure/hull_corner{
+	dir = 4
+	},
+/turf/space,
+/area/space)
 "gb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -1766,9 +1814,16 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/bridge)
 "hq" = (
+<<<<<<< HEAD
 /obj/machinery/pointdefense{
 	id_tag = "mercenary_pd"
 	},
+||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+	},
+=======
+>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
 /turf/simulated/floor/reinforced/airless,
 /area/ship/manta/hallways_port)
 "hs" = (
@@ -2268,10 +2323,8 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/hangar)
 "jd" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 1
-	},
-/turf/simulated/floor/reinforced,
+/obj/structure/hull_corner,
+/turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/manta_ship_boat)
 "je" = (
 /turf/simulated/wall/rshull,
@@ -2296,11 +2349,19 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/bridge)
 "jh" = (
+<<<<<<< HEAD
 /obj/machinery/pointdefense{
 	id_tag = "mercenary_pd"
 	},
+||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+	},
+=======
+/obj/machinery/porta_turret/stationary/syndie/CIWS,
+>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
 /turf/simulated/floor/reinforced/airless,
-/area/ship/manta/recreation)
+/area/ship/manta/armoury_st)
 "jl" = (
 /obj/structure/bed/chair/bay/shuttle{
 	dir = 4
@@ -2611,10 +2672,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/hallways_aft)
-"kO" = (
-/obj/machinery/porta_turret/stationary/syndie/CIWS,
-/turf/simulated/floor/reinforced/airless,
-/area/ship/manta/hallways_star)
 "kP" = (
 /obj/structure/closet/crate{
 	dir = 1
@@ -2627,6 +2684,12 @@
 "kW" = (
 /turf/simulated/floor/reinforced/airless,
 /area/ship/manta/recreation)
+"lc" = (
+/obj/structure/hull_corner{
+	dir = 8
+	},
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/manta_ship_boat)
 "le" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 1
@@ -3590,14 +3653,25 @@
 /turf/space,
 /area/space)
 "pi" = (
+<<<<<<< HEAD
 /obj/machinery/pointdefense{
 	id_tag = "mercenary_pd"
 	},
+||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+	},
+=======
+/obj/machinery/porta_turret/stationary/syndie/CIWS,
+>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
 /turf/simulated/floor/reinforced/airless,
-/area/ship/manta/dock_star)
+/area/ship/manta/med)
 "pn" = (
-/turf/simulated/floor/reinforced/airless,
-/area/ship/manta/hallways_star)
+/obj/structure/hull_corner{
+	dir = 1
+	},
+/turf/space,
+/area/space)
 "pw" = (
 /obj/machinery/firealarm/alarms_hidden{
 	dir = 4;
@@ -3717,7 +3791,7 @@
 /obj/machinery/atmospherics/unary/engine{
 	dir = 1
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/manta_ship_boat)
 "qn" = (
 /turf/simulated/floor/wood,
@@ -3818,6 +3892,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/hallways_aft)
+"qI" = (
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/dock_star)
 "qJ" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
@@ -4031,8 +4111,16 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/engineering)
 "rR" = (
+<<<<<<< HEAD
 /obj/machinery/pointdefense{
 	id_tag = "mercenary_pd"
+||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+=======
+/obj/structure/hull_corner/long_horiz{
+	dir = 10
+>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/manta/holding)
@@ -4245,7 +4333,9 @@
 /turf/simulated/floor/tiled/white,
 /area/ship/manta/med)
 "sZ" = (
-/obj/machinery/porta_turret/stationary/syndie/CIWS,
+/obj/structure/hull_corner{
+	dir = 8
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/manta/holding)
 "th" = (
@@ -4303,11 +4393,19 @@
 /turf/simulated/floor/wood,
 /area/ship/manta/barracks)
 "ts" = (
+<<<<<<< HEAD
 /obj/machinery/pointdefense{
 	id_tag = "mercenary_pd"
+||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+=======
+/obj/structure/hull_corner/long_horiz{
+	dir = 9
+>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
 	},
-/turf/simulated/floor/reinforced/airless,
-/area/ship/manta/hallways_star)
+/turf/space,
+/area/space)
 "tt" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 1
@@ -4326,6 +4424,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/hallways_port)
+"tB" = (
+/obj/machinery/porta_turret/stationary/syndie/CIWS,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/recreation)
 "tE" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 1
@@ -4397,6 +4499,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/hangar)
+"tR" = (
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/dock_port)
 "tV" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -4523,7 +4631,7 @@
 /area/shuttle/manta_ship_boat)
 "ux" = (
 /obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/manta_ship_boat)
 "uy" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -4748,6 +4856,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/ship/manta/engine)
+"vC" = (
+/obj/structure/hull_corner/long_horiz{
+	dir = 6
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/hallways_port)
 "vD" = (
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
@@ -5868,6 +5982,12 @@
 /obj/item/weapon/gun/energy/plasmastun,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/armoury_st)
+"zw" = (
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/recreation)
 "zx" = (
 /obj/structure/table/rack,
 /obj/item/weapon/gun/energy/stunrevolver,
@@ -6095,6 +6215,11 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
 	},
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	id_tag = "manta_boarding_shuttle";
+	pixel_x = -11;
+	pixel_y = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/manta_ship_boat)
 "Aw" = (
@@ -6744,6 +6869,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/hallways_star)
+"DS" = (
+/obj/structure/hull_corner,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
 "DY" = (
 /turf/simulated/wall/shull,
 /area/ship/manta/teleporter)
@@ -8091,6 +8220,12 @@
 "KJ" = (
 /turf/simulated/wall/rshull,
 /area/ship/manta/teleporter)
+"KK" = (
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/holding)
 "KL" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 8
@@ -8132,6 +8267,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/ship/manta/barracks/bed_2)
+"KY" = (
+/obj/structure/hull_corner{
+	dir = 4
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
 "KZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -8289,6 +8430,17 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/engineering)
+"LQ" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 8
+	},
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	dir = 4;
+	id_tag = "manta_boarding_shuttle_dock";
+	pixel_x = -22
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/hangar)
 "LS" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
 	dir = 4
@@ -8342,6 +8494,12 @@
 "LZ" = (
 /turf/simulated/wall/shull,
 /area/ship/manta/hallways_star)
+"Ma" = (
+/obj/structure/hull_corner/long_vert{
+	dir = 5
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/engine)
 "Mb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -8626,6 +8784,12 @@
 /obj/structure/railing,
 /turf/simulated/floor/plating,
 /area/ship/manta/engine)
+"Nj" = (
+/obj/structure/hull_corner/long_horiz{
+	dir = 5
+	},
+/turf/space,
+/area/space)
 "No" = (
 /obj/structure/bed/chair/comfy/black{
 	dir = 8
@@ -9924,6 +10088,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/hallways_port)
+"Tu" = (
+/obj/structure/hull_corner/long_vert{
+	dir = 9
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/engine)
 "Tv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -10034,6 +10204,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/hallways_port)
+"TO" = (
+/obj/structure/hull_corner{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/holding)
 "TS" = (
 /obj/item/modular_computer/console/preset/mercenary{
 	dir = 4
@@ -10108,21 +10284,6 @@
 /obj/structure/table/steel_reinforced,
 /turf/simulated/floor/tiled/dark,
 /area/ship/manta/holding)
-"Us" = (
-/obj/structure/table/rack,
-/obj/item/weapon/storage/box/syndie_kit/chameleon,
-/obj/item/weapon/storage/box/syndie_kit/chameleon,
-/obj/item/weapon/storage/box/syndie_kit/chameleon,
-/obj/item/weapon/storage/box/syndie_kit/chameleon,
-/obj/item/weapon/storage/box/syndie_kit/chameleon,
-/obj/item/weapon/storage/box/syndie_kit/chameleon,
-/obj/machinery/recharger/wallcharger{
-	pixel_x = 5;
-	pixel_y = -32
-	},
-/obj/effect/floor_decal/techfloor,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/armoury_st)
 "Uy" = (
 /obj/item/weapon/reagent_containers/syringe/drugs{
 	pixel_x = 3;
@@ -10682,6 +10843,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/engineering)
+"Xb" = (
+/obj/structure/hull_corner,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/hallways_port)
 "Xd" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -10944,6 +11109,12 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/ship/manta/magazine)
+"Yc" = (
+/obj/machinery/power/pointdefense{
+	id_tag = "mercenary_pd"
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/hallways_port)
 "Yd" = (
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/bridge)
@@ -11303,13 +11474,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/recreation)
-"ZH" = (
-/obj/structure/table/steel_reinforced,
-/obj/effect/landmark{
-	name = "Syndicate-Uplink"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/armoury_st)
 "ZI" = (
 /obj/structure/cable/orange{
 	d1 = 4;
@@ -17254,20 +17418,20 @@ yz
 yz
 yz
 Hr
-Hr
-Hr
 nJ
 Hr
 Hr
+rT
+Hr
 yz
 yz
 yz
 yz
 kW
+tB
 kW
 kW
-jh
-kW
+zw
 kW
 yz
 yz
@@ -17401,10 +17565,10 @@ CF
 CF
 CF
 CF
-rT
-Hr
+KY
 Hr
 nJ
+DS
 lm
 lm
 lm
@@ -17554,7 +17718,7 @@ cW
 Jq
 lm
 lm
-kW
+fZ
 yz
 yz
 yz
@@ -17697,7 +17861,7 @@ gf
 Db
 lm
 lm
-kW
+Nj
 yz
 yz
 yz
@@ -17818,7 +17982,7 @@ yz
 yz
 yz
 yz
-Hr
+rT
 CF
 CF
 CF
@@ -17839,7 +18003,7 @@ Yi
 hD
 CQ
 lm
-jh
+yz
 yz
 yz
 yz
@@ -17982,7 +18146,7 @@ gh
 gd
 lm
 lm
-kW
+Nj
 yz
 yz
 yz
@@ -18102,7 +18266,7 @@ yz
 yz
 yz
 yz
-eH
+Xb
 CF
 CF
 CF
@@ -18124,7 +18288,7 @@ gh
 gf
 ik
 lm
-fZ
+yz
 yz
 yz
 yz
@@ -18243,7 +18407,7 @@ yz
 yz
 yz
 yz
-eG
+Yc
 ht
 ht
 ht
@@ -18267,7 +18431,7 @@ gh
 io
 lm
 lm
-kW
+Nj
 yz
 yz
 yz
@@ -18385,7 +18549,7 @@ yz
 yz
 yz
 yz
-eG
+vC
 ht
 kP
 ht
@@ -18409,7 +18573,7 @@ gk
 MV
 js
 lm
-kW
+yz
 yz
 yz
 yz
@@ -18810,7 +18974,7 @@ yz
 yz
 yz
 yz
-eG
+vC
 ht
 kT
 op
@@ -18952,7 +19116,7 @@ yz
 yz
 yz
 yz
-eH
+hq
 ht
 Cf
 ov
@@ -19093,7 +19257,7 @@ yz
 yz
 yz
 yz
-aE
+bG
 ZT
 ZT
 ZT
@@ -19235,7 +19399,7 @@ yz
 yz
 yz
 yz
-aE
+cS
 ZT
 hU
 lj
@@ -19377,7 +19541,7 @@ yz
 yz
 yz
 yz
-bG
+aE
 ZT
 ic
 bR
@@ -19518,7 +19682,7 @@ yz
 yz
 yz
 yz
-aE
+jh
 ZT
 ZT
 ic
@@ -19537,7 +19701,7 @@ OR
 sy
 nC
 bR
-Us
+ad
 ZT
 tx
 pB
@@ -19660,7 +19824,7 @@ yz
 yz
 yz
 yz
-aE
+cS
 ZT
 ZT
 ih
@@ -19802,7 +19966,7 @@ yz
 yz
 yz
 yz
-cS
+aE
 ZT
 ZT
 ZT
@@ -19818,7 +19982,7 @@ ZT
 ZT
 cP
 bR
-ZH
+ac
 aS
 bR
 RU
@@ -19988,7 +20152,7 @@ Bn
 GA
 vw
 WF
-yo
+tR
 yz
 yz
 yz
@@ -20130,8 +20294,8 @@ Zy
 xd
 RZ
 WF
-FZ
 WA
+Ma
 WA
 WA
 yz
@@ -20369,7 +20533,7 @@ yz
 yz
 yz
 yz
-aE
+cS
 ZT
 ZT
 ZT
@@ -20511,7 +20675,7 @@ yz
 yz
 yz
 yz
-bT
+ag
 Vp
 Vp
 Vp
@@ -20660,7 +20824,7 @@ fw
 au
 fw
 oZ
-au
+LQ
 tQ
 wX
 zI
@@ -20940,10 +21104,10 @@ yz
 ce
 dk
 ec
-da
 jd
 je
 je
+je
 da
 tW
 xe
@@ -21934,8 +22098,8 @@ yz
 ce
 dk
 ec
-da
-jd
+lc
+je
 je
 je
 da
@@ -22828,8 +22992,8 @@ rJ
 xB
 ZW
 PK
-pi
-WA
+Ly
+Tu
 WA
 WA
 yz
@@ -22970,7 +23134,7 @@ FH
 Ik
 Cn
 PK
-Ly
+qI
 yz
 yz
 yz
@@ -23352,7 +23516,7 @@ yz
 yz
 yz
 yz
-cr
+pi
 dl
 dl
 kl
@@ -23495,7 +23659,7 @@ yz
 yz
 yz
 yz
-cI
+dI
 dl
 ky
 nf
@@ -23779,7 +23943,7 @@ yz
 yz
 yz
 yz
-cr
+cI
 dl
 dl
 ny
@@ -24206,7 +24370,7 @@ yz
 yz
 yz
 yz
-cr
+pi
 dl
 dl
 rM
@@ -24349,7 +24513,7 @@ yz
 yz
 yz
 yz
-cI
+dI
 dl
 rM
 rM
@@ -24515,7 +24679,7 @@ hW
 xv
 LZ
 mT
-pn
+ts
 yz
 yz
 yz
@@ -24633,7 +24797,7 @@ yz
 yz
 yz
 yz
-cr
+cI
 dl
 dl
 rM
@@ -24657,7 +24821,7 @@ Mb
 MM
 mT
 mT
-pn
+yz
 yz
 yz
 yz
@@ -24776,7 +24940,7 @@ yz
 yz
 yz
 yz
-dI
+ay
 dl
 rM
 ch
@@ -24798,7 +24962,7 @@ ch
 hN
 Th
 mT
-kO
+ts
 yz
 yz
 yz
@@ -24940,7 +25104,7 @@ ch
 hS
 mT
 mT
-pn
+yz
 yz
 yz
 yz
@@ -25060,7 +25224,7 @@ yz
 yz
 yz
 yz
-cr
+pi
 dl
 ch
 ch
@@ -25223,7 +25387,7 @@ cM
 ch
 ch
 mT
-pn
+yz
 yz
 yz
 yz
@@ -25495,17 +25659,17 @@ ch
 ch
 ch
 ch
-sZ
+TO
 rS
-rS
-rR
-ch
-ch
-ch
-ch
-ch
-ch
+KK
 sZ
+ch
+ch
+ch
+ch
+ch
+ch
+pn
 yz
 yz
 yz
@@ -25632,20 +25796,20 @@ yz
 yz
 yz
 rS
+KK
 rS
 rS
-rR
-rS
+eC
 rS
 yz
 yz
 yz
 yz
 rS
+eC
 rS
 rS
-rR
-rS
+KK
 rS
 yz
 yz

maps/submaps/admin_use_vr/mercship.dm

@@ -143,7 +143,7 @@
 	vessel_mass = 8000
 	vessel_size = SHIP_SIZE_LARGE
 	initial_generic_waypoints = list("manta_ship_near_fore", "manta_ship_near_aft", "manta_ship_near_port", "manta_ship_near_star", "manta_ship_port", "manta_ship_star", "manta_ship_base_dock", "omship_spawn_manta_lander")
-//	initial_restricted_waypoints = list("Mercenary Cruiser's Bay" = list("omship_spawn_manta_lander"))
+	initial_restricted_waypoints = list("Mercenary Cruiser's Bay" = list("omship_spawn_manta_lander"))
 
 /obj/effect/landmark/map_data/manta_ship
 	height = 1

maps/tether/submaps/_tether_submaps.dm

@@ -519,6 +519,8 @@
 #include "../../offmap_vr/om_ships/screebarge.dm"
 #include "../../offmap_vr/om_ships/aro.dm"
 #include "../../offmap_vr/om_ships/aro2.dm"
+#include "../../offmap_vr/om_ships/aro3.dm"
+#include "../../offmap_vr/om_ships/bearcat.dm"
 #include "../../offmap_vr/om_ships/cruiser.dm"
 #include "../../offmap_vr/om_ships/vespa.dm"
 #include "../../offmap_vr/om_ships/generic_shuttle.dm"
@@ -555,4 +557,4 @@
 	name = "Talon"
 	flags = MAP_LEVEL_PLAYER|MAP_LEVEL_PERSIST|MAP_LEVEL_MAPPABLE
 	base_turf = /turf/space
-	z = Z_LEVEL_OFFMAP1
+	z = Z_LEVEL_OFFMAP1

tgui/yarn.lock

@@ -1387,14 +1387,15 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@^4.0.0, browserslist@^4.8.5, browserslist@^4.9.1:
-  version "4.11.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b"
-  integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
   dependencies:
-    caniuse-lite "^1.0.30001038"
-    electron-to-chromium "^1.3.390"
-    node-releases "^1.1.53"
-    pkg-up "^2.0.0"
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
 
 buffer-from@^1.0.0:
   version "1.1.1"
@@ -1523,10 +1524,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001038:
-  version "1.0.30001042"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001042.tgz#c91ec21ec2d270bd76dbc2ce261260c292b8c93c"
-  integrity sha512-igMQ4dlqnf4tWv0xjaaE02op9AJ2oQzXKjWf4EuAHFN694Uo9/EfPVIPJcmn2WkU9RqozCxx5e2KPcVClHDbDw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219:
+  version "1.0.30001230"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71"
+  integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==
 
 chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
@@ -1690,6 +1691,11 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
 commander@^2.18.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2209,10 +2215,10 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-electron-to-chromium@^1.3.390:
-  version "1.3.410"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.410.tgz#00e0ec61c22933daa8b4de172c03932678783adc"
-  integrity sha512-DbCBdwtARI0l3e3m6ZIxVaTNahb6dSsmGjuag/twiVcWuM4MSpL5IfsJsJSyqLqxosE/m0CXlZaBmxegQW/dAg==
+electron-to-chromium@^1.3.723:
+  version "1.3.739"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz#f07756aa92cabd5a6eec6f491525a64fe62f98b9"
+  integrity sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==
 
 elliptic@^6.0.0:
   version "6.5.4"
@@ -2329,6 +2335,11 @@ es6-object-assign@^1.1.0:
   resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
   integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -2700,13 +2711,6 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -3679,14 +3683,6 @@ loadjs@^4.2.0:
   resolved "https://registry.yarnpkg.com/loadjs/-/loadjs-4.2.0.tgz#2a0336376397a6a43edf98c9ec3229ddd5abb6f6"
   integrity sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA==
 
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
@@ -4093,10 +4089,10 @@ node-notifier@6.0.0:
     shellwords "^0.1.1"
     which "^1.3.1"
 
-node-releases@^1.1.53:
-  version "1.1.53"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
-  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
+node-releases@^1.1.71:
+  version "1.1.72"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
+  integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -4306,13 +4302,6 @@ p-is-promise@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
   integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
 p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -4327,13 +4316,6 @@ p-limit@^3.0.2:
   dependencies:
     p-try "^2.0.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
-  dependencies:
-    p-limit "^1.1.0"
-
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
@@ -4355,11 +4337,6 @@ p-map@^4.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -4501,13 +4478,6 @@ pkg-dir@^4.1.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-up@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"

vorestation.dme

@@ -2582,6 +2582,7 @@
 #include "code\modules\lighting\lighting_area.dm"
 #include "code\modules\lighting\lighting_atom.dm"
 #include "code\modules\lighting\lighting_corner.dm"
+#include "code\modules\lighting\lighting_fake_sun_vr.dm"
 #include "code\modules\lighting\lighting_overlay.dm"
 #include "code\modules\lighting\lighting_setup.dm"
 #include "code\modules\lighting\lighting_source.dm"