Another, lattice shut up

code/game/mecha/combat/fighter.dm

@@ -13,6 +13,8 @@
 	icon_state = ""
 	initial_icon = ""
 
+	dir_in = null //Don't reset direction when empty
+
 	step_in = 2 //Fast
 
 	health = 400

code/game/objects/structures/lattice.dm

@@ -11,12 +11,12 @@
 /obj/structure/lattice/Initialize()
 	. = ..()
 
-	if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral)))
+	if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral) || istype(src.loc, /turf/simulated/shuttle/plating/airless/carry)))
 		return INITIALIZE_HINT_QDEL
 
 	for(var/obj/structure/lattice/LAT in src.loc)
 		if(LAT != src)
-			crash_with("Found multiple lattices at '[log_info_line(loc)]'")
+			log_debug("Found multiple lattices at '[log_info_line(loc)]'") //VOREStation Edit, why was this a runtime, it's harmless
 			return INITIALIZE_HINT_QDEL
 	icon = 'icons/obj/smoothlattice.dmi'
 	icon_state = "latticeblank"

code/game/turfs/simulated/floor_types_vr.dm

@@ -41,4 +41,33 @@
 		set_light(3,3,"#26c5a9")
 		spawn(5 SECONDS)
 			icon_state = "floor"
-			set_light(0,0,"#ffffff")
+			set_light(0,0,"#ffffff")
+
+/turf/simulated/shuttle/plating/airless/carry/attackby(obj/item/C, mob/user) //this is gross
+	if (istype(C, /obj/item/stack/rods))
+		var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
+		if(L)
+			return
+		var/obj/item/stack/rods/R = C
+		if (R.use(1))
+			to_chat(user, "<span class='notice'>Constructing support lattice ...</span>")
+			playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+			new/obj/structure/lattice(src)
+		return
+
+	if (istype(C, /obj/item/stack/tile/floor))
+		var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
+		if(L)
+			var/obj/item/stack/tile/floor/S = C
+			if (S.get_amount() < 1)
+				return
+			qdel(L)
+			playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+			S.use(1)
+			ChangeTurf(/turf/simulated/floor/airless)
+			return
+		else
+			to_chat(user, "<span class='warning'>The plating is going to need some support.</span>")
+
+/turf/simulated/shuttle/plating/airless/carry/is_solid_structure()
+	return locate(/obj/structure/lattice, src)

maps/expedition_vr/space/_debrisfield.dm

@@ -108,6 +108,105 @@
 /area/submap/debrisfield/mining_outpost
 	name = "POI - Destroyed Mining Outpost"
 
+/area/submap/debrisfield/tinyshuttle
+	secret_name = 0
+
+/area/submap/debrisfield/tinyshuttle/crew
+	name = "Crew Bay"
+
+/area/submap/debrisfield/tinyshuttle/bridge
+	name = "Bridge"
+
+/area/submap/debrisfield/tinyshuttle/hangar
+	name = "Hangar"
+	has_gravity = 0
+
+/area/submap/debrisfield/tinyshuttle/engine
+	name = "Systems Bay"
+
+/datum/shuttle/autodock/overmap/tinycarrier
+	name = "Debris Carrier"
+	warmup_time = 0
+	current_location = "debris_field_carrier_start"
+	docking_controller_tag = "debris_carrier_docker"
+	shuttle_area = list(/area/submap/debrisfield/tinyshuttle/crew, /area/submap/debrisfield/tinyshuttle/bridge, /area/submap/debrisfield/tinyshuttle/hangar, /area/submap/debrisfield/tinyshuttle/engine)
+	fuel_consumption = 3
+	defer_initialisation = TRUE
+	move_direction = WEST
+
+/obj/effect/shuttle_landmark/shuttle_initializer/tinycarrier
+	name = "Debris Field"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "debris_field_carrier_start"
+	shuttle_type = /datum/shuttle/autodock/overmap/tinycarrier
+
+/obj/effect/shuttle_landmark/shuttle_initializer/tinycarrier/Initialize()
+	var/obj/effect/overmap/visitable/O = get_overmap_sector(get_z(src)) //make this into general system some other time
+	LAZYINITLIST(O.initial_restricted_waypoints)
+	O.initial_restricted_waypoints["Debris Carrier"] = list(landmark_tag)
+	. = ..()
+
+/obj/effect/overmap/visitable/ship/landable/tinycarrier
+	scanner_name = "TBD"
+	scanner_desc = "TBD"
+	vessel_mass = 12000
+	vessel_size = SHIP_SIZE_SMALL
+	shuttle = "Debris Carrier"
+
+/obj/effect/overmap/visitable/ship/landable/tinycarrier/Initialize()
+	. = ..()
+	var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/other/sysdef]
+	var/newname = "SDV [pick(O.ship_names)]"
+	scanner_name = newname
+	scanner_desc = {"\[i\]Registration\[/i\]: [newname]
+\[i\]Class\[/i\]: Light Escort Carrier
+\[i\]Transponder\[/i\]: Transmitting (MIL), Weak Signal
+\[b\]Notice\[/b\]: Registration Expired"}
+	rename_areas(newname)
+
+/obj/effect/overmap/visitable/ship/landable/tinycarrier/proc/rename_areas(newname)
+	if(!SSshuttles.subsystem_initialized)
+		spawn(300)
+			rename_areas(newname)
+		return
+	var/datum/shuttle/S = SSshuttles.shuttles[shuttle]
+	for(var/area/A in S.shuttle_area)
+		A.name = "[newname] [initial(A.name)]"
+		if(A.apc)
+			A.apc.name = "[A.name] APC"
+		A.air_vent_names = list()
+		A.air_scrub_names = list()
+		A.air_vent_info = list()
+		A.air_scrub_info = list()
+		for(var/obj/machinery/alarm/AA in A)
+			AA.name = "[A.name] Air Alarm"
+
+/obj/machinery/computer/shuttle_control/explore/tinycarrier
+	shuttle_tag = "Debris Carrier"
+	req_one_access = list()
+
+/obj/mecha/combat/fighter/baron/loaded/busted
+	starting_components = list(/obj/item/mecha_parts/component/hull/lightweight,/obj/item/mecha_parts/component/actuator/hispeed,/obj/item/mecha_parts/component/armor,/obj/item/mecha_parts/component/gas,/obj/item/mecha_parts/component/electrical/high_current)
+
+/obj/mecha/combat/fighter/baron/loaded/busted/Initialize()
+	. = ..()
+	health = round(rand(50,120))
+	cell?.charge = 0
+	for(var/slot in internal_components)
+		var/obj/item/mecha_parts/component/comp = internal_components[slot]
+		if(!istype(comp))
+			continue
+		comp.adjust_integrity(-(round(rand(comp.max_integrity - 10, 0))))
+
+	setInternalDamage(MECHA_INT_SHORT_CIRCUIT)
+
+/obj/structure/fuel_port/empty_tank/Initialize()
+	. = ..()
+	var/obj/item/weapon/tank/phoron/T = locate() in src
+	if(T)
+		T.air_contents.remove(T.air_contents.total_moles)
+
 /area/submap/debrisfield/misc_debris //for random bits of debris that should use dynamic lights
 	requires_power = 1
 	always_unpowered = 1

maps/submaps/pois_vr/debris_field/_templates.dm

@@ -218,6 +218,12 @@
 	cost = 30
 	allow_duplicates = FALSE
 
+/datum/map_template/debrisfield/tinycarrier
+	name = "Disabled Tiny Carrier"
+	mappath = 'tinycarrier.dmm'
+	cost = 30
+	allow_duplicates = FALSE
+
 /datum/map_template/debrisfield/alien_massive_derelict
 	name = "Alien Derelict"
 	mappath = 'derelict.dmm'

maps/submaps/pois_vr/debris_field/debris14.dmm

@@ -1,14 +1,22 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"b" = (
-/turf/simulated/wall,
-/area/space)
-"c" = (
+"a" = (
 /obj/item/weapon/material/shard/shrapnel,
+/obj/machinery/firealarm/alarms_hidden{
+	dir = 4;
+	pixel_x = -24
+	},
 /turf/simulated/floor/airless,
-/area/space)
+/area/tether_away/debrisfield/shuttle_buffer)
+"b" = (
+/obj/structure/girder,
+/turf/simulated/floor/airless,
+/area/tether_away/debrisfield/shuttle_buffer)
+"c" = (
+/turf/template_noop,
+/area/tether_away/debrisfield/shuttle_buffer)
 "d" = (
 /turf/simulated/floor/airless,
-/area/space)
+/area/tether_away/debrisfield/shuttle_buffer)
 "e" = (
 /obj/structure/lattice,
 /turf/space,
@@ -16,57 +24,56 @@
 "f" = (
 /obj/item/stack/rods,
 /turf/simulated/floor/airless,
-/area/space)
+/area/tether_away/debrisfield/shuttle_buffer)
 "g" = (
 /obj/structure/lattice,
 /obj/item/stack/rods,
 /turf/space,
-/area/space)
+/area/tether_away/debrisfield/shuttle_buffer)
 "h" = (
 /obj/structure/lattice,
 /obj/structure/lattice,
 /turf/space,
-/area/space)
+/area/tether_away/debrisfield/shuttle_buffer)
 "i" = (
-/obj/structure/girder,
-/turf/simulated/floor/airless,
-/area/space)
-"j" = (
 /obj/item/weapon/material/shard/shrapnel,
-/obj/machinery/firealarm/alarms_hidden{
-	dir = 4;
-	pixel_x = -24
-	},
 /turf/simulated/floor/airless,
-/area/space)
+/area/tether_away/debrisfield/shuttle_buffer)
+"j" = (
+/obj/structure/lattice,
+/turf/space,
+/area/tether_away/debrisfield/shuttle_buffer)
 "k" = (
 /turf/template_noop,
 /area/space)
+"l" = (
+/turf/simulated/wall,
+/area/tether_away/debrisfield/shuttle_buffer)
 
 (1,1,1) = {"
-i
 b
-e
-e
+l
+j
+j
 e
 "}
 (2,1,1) = {"
-k
-j
+c
+a
 f
-e
+j
 k
 "}
 (3,1,1) = {"
-c
+i
 d
 d
-e
+j
 k
 "}
 (4,1,1) = {"
 k
-e
+j
 g
 h
 k

maps/tether/submaps/_tether_submaps.dm

@@ -244,7 +244,7 @@
 /datum/map_template/tether_lateload/away_debrisfield/on_map_loaded(z)
 	. = ..()
 	//Commented out until we actually get POIs
-	seed_submaps(list(Z_LEVEL_DEBRISFIELD), 300, /area/space, /datum/map_template/debrisfield)
+	seed_submaps(list(Z_LEVEL_DEBRISFIELD), 400, /area/space, /datum/map_template/debrisfield)
 
 /datum/map_z_level/tether_lateload/away_debrisfield
 	name = "Away Mission - Debris Field"