fixes and stuff

code/__HELPERS/_logging.dm

@@ -120,6 +120,10 @@
 	if (CONFIG_GET(flag/log_vote))
 		WRITE_LOG(GLOB.world_game_log, "VOTE: [text]")
 
+/proc/log_craft(text)
+	if (CONFIG_GET(flag/log_craft))
+		WRITE_LOG(GLOB.world_crafting_log, "CRAFT: [text]")
+
 /proc/log_topic(text)
 	WRITE_LOG(GLOB.world_game_log, "TOPIC: [text]")
 

code/_globalvars/logging.dm

@@ -32,6 +32,8 @@ GLOBAL_VAR(world_map_error_log)
 GLOBAL_PROTECT(world_map_error_log)
 GLOBAL_VAR(subsystem_log)
 GLOBAL_PROTECT(subsystem_log)
+GLOBAL_VAR(world_crafting_log)
+GLOBAL_PROTECT(world_crafting_log)
 
 GLOBAL_LIST_EMPTY(bombers)
 GLOBAL_PROTECT(bombers)

code/controllers/configuration/entries/general.dm

@@ -43,6 +43,8 @@
 
 /datum/config_entry/flag/log_vote	// log voting
 
+/datum/config_entry/flag/log_craft	// log crafting
+
 /datum/config_entry/flag/log_whisper	// log client whisper
 
 /datum/config_entry/flag/log_attack	// log attack messages

code/datums/shuttles.dm

@@ -131,6 +131,10 @@
 	port_id = "mining"
 	can_be_bought = FALSE
 
+/datum/map_template/shuttle/mining_common
+	port_id = "mining_common"
+	can_be_bought = FALSE
+
 /datum/map_template/shuttle/cargo
 	port_id = "cargo"
 	can_be_bought = FALSE
@@ -493,6 +497,10 @@
 	suffix = "delta"
 	name = "labour shuttle (Delta)"
 
+/datum/map_template/shuttle/mining_common/meta
+	suffix = "meta"
+	name = "lavaland shuttle (Meta)"
+
 /datum/map_template/shuttle/arrival/delta
 	suffix = "delta"
 	name = "arrival shuttle (Delta)"

code/game/objects/items/RCD.dm

@@ -677,18 +677,18 @@ RLD
 	icon_state = "rld"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
-	matter = 500
-	max_matter = 500
-	sheetmultiplier = 16
+	matter = 200
+	max_matter = 200
+	sheetmultiplier = 5
 	var/mode = LIGHT_MODE
 	actions_types = list(/datum/action/item_action/pick_color)
 	ammo_sections = 5
 	has_ammobar = TRUE
 
-	var/wallcost = 10
-	var/floorcost = 15
-	var/launchcost = 5
-	var/deconcost = 10
+	var/wallcost = 20
+	var/floorcost = 25
+	var/launchcost = 10
+	var/deconcost = 20
 
 	var/walldelay = 10
 	var/floordelay = 10

code/game/objects/items/RPD.dm

@@ -19,12 +19,14 @@ GLOBAL_LIST_INIT(atmos_pipe_recipes, list(
 		new /datum/pipe_info/pipe("Manifold",			/obj/machinery/atmospherics/pipe/manifold),
 		new /datum/pipe_info/pipe("Manual Valve",		/obj/machinery/atmospherics/components/binary/valve),
 		new /datum/pipe_info/pipe("Digital Valve",		/obj/machinery/atmospherics/components/binary/valve/digital),
+		new /datum/pipe_info/pipe("Relief Valve",		/obj/machinery/atmospherics/components/binary/relief_valve),
 		new /datum/pipe_info/pipe("4-Way Manifold",		/obj/machinery/atmospherics/pipe/manifold4w),
 		new /datum/pipe_info/pipe("Layer Manifold",		/obj/machinery/atmospherics/pipe/layer_manifold),
 	),
 	"Devices" = list(
 		new /datum/pipe_info/pipe("Connector",			/obj/machinery/atmospherics/components/unary/portables_connector),
 		new /datum/pipe_info/pipe("Unary Vent",			/obj/machinery/atmospherics/components/unary/vent_pump),
+		new /datum/pipe_info/pipe("Relief Valve",		/obj/machinery/atmospherics/components/unary/relief_valve),
 		new /datum/pipe_info/pipe("Gas Pump",			/obj/machinery/atmospherics/components/binary/pump),
 		new /datum/pipe_info/pipe("Passive Gate",		/obj/machinery/atmospherics/components/binary/passive_gate),
 		new /datum/pipe_info/pipe("Volume Pump",		/obj/machinery/atmospherics/components/binary/volume_pump),
@@ -33,6 +35,7 @@ GLOBAL_LIST_INIT(atmos_pipe_recipes, list(
 		new /datum/pipe_info/meter("Meter"),
 		new /datum/pipe_info/pipe("Gas Filter",			/obj/machinery/atmospherics/components/trinary/filter),
 		new /datum/pipe_info/pipe("Gas Mixer",			/obj/machinery/atmospherics/components/trinary/mixer),
+		new /datum/pipe_info/pipe("Passive Vent",		/obj/machinery/atmospherics/components/unary/passive_vent),
 	),
 	"Heat Exchange" = list(
 		new /datum/pipe_info/pipe("Pipe",				/obj/machinery/atmospherics/pipe/heat_exchanging/simple),

code/game/objects/items/circuitboards/computer_circuitboards.dm

@@ -293,6 +293,10 @@
 	name = "Mining Shuttle (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/mining
 
+/obj/item/circuitboard/computer/mining_shuttle/common
+	name = "Lavaland Shuttle (Computer Board)"
+	build_path = /obj/machinery/computer/shuttle/mining/common
+
 /obj/item/circuitboard/computer/white_ship
 	name = "White Ship (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/white_ship

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

@@ -202,6 +202,7 @@
 		if(O)
 			O.setDir(usr.dir)
 		use(R.req_amount * multiplier)
+		log_craft("[O] crafted by [usr] at [loc_name(O.loc)]")
 
 		//START: oh fuck i'm so sorry
 		if(istype(O, /obj/structure/windoor_assembly))

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -66,6 +66,14 @@
 	req_access = null
 	locked = FALSE
 
+/obj/structure/closet/secure_closet/freezer/gulag_fridge
+	name = "refrigerator"
+
+/obj/structure/closet/secure_closet/freezer/gulag_fridge/PopulateContents()
+	..()
+	for(var/i in 1 to 3)
+		new /obj/item/reagent_containers/food/drinks/beer/light(src)
+
 /obj/structure/closet/secure_closet/freezer/fridge
 	name = "refrigerator"
 

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -290,3 +290,17 @@
 	..()
 	for(var/i in 1 to 3)
 		new /obj/item/storage/box/lethalshot(src)
+
+/obj/structure/closet/secure_closet/labor_camp_security
+	name = "labor camp security locker"
+	req_access = list(ACCESS_SECURITY)
+	icon_state = "sec"
+
+/obj/structure/closet/secure_closet/labor_camp_security/PopulateContents()
+	..()
+	new /obj/item/clothing/suit/armor/vest(src)
+	new /obj/item/clothing/head/helmet/sec(src)
+	new /obj/item/clothing/under/rank/security(src)
+	new /obj/item/clothing/under/rank/security/skirt(src)
+	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
+	new /obj/item/flashlight/seclite(src)

code/game/turfs/simulated/minerals.dm

@@ -65,13 +65,16 @@
 
 		if(I.use_tool(src, user, 40, volume=50))
 			var/range = I.digrange //Store the current digrange so people don't cheese digspeed swapping for faster mining
+			var/list/dug_tiles = list()
 			if(ismineralturf(src))
 				if(I.digrange > 0)
 					for(var/turf/closed/mineral/M in range(user,range))
 						if(get_dir(user,M)&stored_dir)
-							M.gets_drilled()
+							M.gets_drilled(user)
+							dug_tiles += M
 				to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
-				gets_drilled(user)
+				if(!(src in dug_tiles))
+					gets_drilled(user)
 				SSblackbox.record_feedback("tally", "pick_used_mining", 1, I.type)
 	else
 		return attack_hand(user)
@@ -615,4 +618,4 @@
 	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
 	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
-	defer_change = 1
+	defer_change = 1

code/game/world.dm

@@ -116,6 +116,7 @@ GLOBAL_LIST(topic_status_cache)
 	GLOB.query_debug_log = "[GLOB.log_directory]/query_debug.log"
 	GLOB.world_job_debug_log = "[GLOB.log_directory]/job_debug.log"
 	GLOB.subsystem_log = "[GLOB.log_directory]/subsystem.log"
+	GLOB.world_crafting_log = "[GLOB.log_directory]/crafting.log"
 
 #ifdef UNIT_TESTS
 	GLOB.test_log = file("[GLOB.log_directory]/tests.log")
@@ -131,6 +132,7 @@ GLOBAL_LIST(topic_status_cache)
 	start_log(GLOB.world_runtime_log)
 	start_log(GLOB.world_job_debug_log)
 	start_log(GLOB.subsystem_log)
+	start_log(GLOB.world_crafting_log)
 
 	GLOB.changelog_hash = md5('html/changelog.html') //for telling if the changelog has changed recently
 	if(fexists(GLOB.config_error_log))

code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm

@@ -0,0 +1,108 @@
+/obj/machinery/atmospherics/components/binary/relief_valve
+	name = "binary pressure relief valve"
+	desc = "Like a manual valve, but opens at a certain pressure rather than being toggleable."
+	icon = 'icons/obj/atmospherics/components/relief_valve.dmi'
+	icon_state = "relief_valve-t-map"
+	can_unwrench = TRUE
+	construction_type = /obj/item/pipe/binary
+	var/opened = FALSE
+	var/open_pressure = ONE_ATMOSPHERE * 3
+	var/close_pressure = ONE_ATMOSPHERE
+	pipe_state = "relief_valve-t"
+
+/obj/machinery/atmospherics/components/binary/relief_valve/layer1
+	piping_layer = PIPING_LAYER_MIN
+	pixel_x = -PIPING_LAYER_P_X
+	pixel_y = -PIPING_LAYER_P_Y
+
+/obj/machinery/atmospherics/components/binary/relief_valve/layer3
+	piping_layer = PIPING_LAYER_MAX
+	pixel_x = PIPING_LAYER_P_X
+	pixel_y = PIPING_LAYER_P_Y
+
+/obj/machinery/atmospherics/components/binary/relief_valve/update_icon_nopipes()
+	if(dir==SOUTH)
+		setDir(NORTH)
+	else if(dir==WEST)
+		setDir(EAST)
+	cut_overlays()
+
+	if(!nodes[1] || !opened || !is_operational())
+		icon_state = "relief_valve-t"
+		return
+
+	icon_state = "relief_valve-t-blown"
+
+/obj/machinery/atmospherics/components/binary/relief_valve/proc/open()
+	opened = TRUE
+	update_icon_nopipes()
+	update_parents()
+	var/datum/pipeline/parent1 = parents[1]
+	parent1.reconcile_air()
+
+/obj/machinery/atmospherics/components/binary/relief_valve/proc/close()
+	opened = FALSE
+	update_icon_nopipes()
+
+/obj/machinery/atmospherics/components/binary/relief_valve/process_atmos()
+	..()
+
+	if(!is_operational())
+		return
+
+	var/datum/gas_mixture/air_contents = airs[1]
+	var/our_pressure = air_contents.return_pressure()
+	if(opened && our_pressure < close_pressure)
+		close()
+	else if(!opened && our_pressure >= open_pressure)
+		open()
+
+/obj/machinery/atmospherics/components/binary/relief_valve/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+																datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "atmos_relief", name, 335, 115, master_ui, state)
+		ui.open()
+
+/obj/machinery/atmospherics/components/binary/relief_valve/ui_data()
+	var/data = list()
+	data["open_pressure"] = round(open_pressure)
+	data["close_pressure"] = round(close_pressure)
+	data["max_pressure"] = round(50*ONE_ATMOSPHERE)
+	return data
+
+/obj/machinery/atmospherics/components/binary/relief_valve/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("open_pressure")
+			var/pressure = params["open_pressure"]
+			if(pressure == "max")
+				pressure = 50*ONE_ATMOSPHERE
+				. = TRUE
+			else if(pressure == "input")
+				pressure = input("New output pressure ([close_pressure]-[50*ONE_ATMOSPHERE] kPa):", name, open_pressure) as num|null
+				if(!isnull(pressure) && !..())
+					. = TRUE
+			else if(text2num(pressure) != null)
+				pressure = text2num(pressure)
+				. = TRUE
+			if(.)
+				open_pressure = CLAMP(pressure, close_pressure, 50*ONE_ATMOSPHERE)
+				investigate_log("open pressure was set to [open_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
+		if("close_pressure")
+			var/pressure = params["close_pressure"]
+			if(pressure == "max")
+				pressure = open_pressure
+				. = TRUE
+			else if(pressure == "input")
+				pressure = input("New output pressure (0-[open_pressure] kPa):", name, close_pressure) as num|null
+				if(!isnull(pressure) && !..())
+					. = TRUE
+			else if(text2num(pressure) != null)
+				pressure = text2num(pressure)
+				. = TRUE
+			if(.)
+				close_pressure = CLAMP(pressure, 0, open_pressure)
+				investigate_log("close pressure was set to [close_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
+	update_icon()

code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm

@@ -0,0 +1,55 @@
+/obj/machinery/atmospherics/components/unary/passive_vent
+	icon_state = "passive_vent_map-2"
+
+	name = "passive vent"
+	desc = "It is an open vent."
+	can_unwrench = TRUE
+
+	level = 1
+	layer = GAS_SCRUBBER_LAYER
+
+	pipe_state = "pvent"
+
+/obj/machinery/atmospherics/components/unary/passive_vent/update_icon_nopipes()
+	cut_overlays()
+	if(showpipe)
+		var/image/cap = getpipeimage(icon, "vent_cap", initialize_directions)
+		add_overlay(cap)
+	icon_state = "passive_vent"
+
+/obj/machinery/atmospherics/components/unary/passive_vent/process_atmos()
+	..()
+
+	var/datum/gas_mixture/environment = loc.return_air()
+	var/environment_pressure = environment.return_pressure()
+	var/pressure_delta = abs(environment_pressure - airs[1].return_pressure())
+
+	if((environment.temperature || airs[1].temperature) && pressure_delta > 0.5)
+		if(environment_pressure < airs[1].return_pressure())
+			var/air_temperature = (environment.temperature > 0) ? environment.temperature : airs[1].temperature
+			var/transfer_moles = (pressure_delta * environment.volume) / (air_temperature * R_IDEAL_GAS_EQUATION)
+			var/datum/gas_mixture/removed = airs[1].remove(transfer_moles)
+			loc.assume_air(removed)
+			air_update_turf()
+		else
+			var/air_temperature = (airs[1].temperature > 0) ? airs[1].temperature : environment.temperature
+			var/output_volume = airs[1].volume
+			var/transfer_moles = (pressure_delta * output_volume) / (air_temperature * R_IDEAL_GAS_EQUATION)
+			transfer_moles = min(transfer_moles, environment.total_moles()*airs[1].volume/environment.volume)
+			var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+			if(isnull(removed))
+				return
+			airs[1].merge(removed)
+			air_update_turf()
+	update_parents()
+
+/obj/machinery/atmospherics/components/unary/passive_vent/can_crawl_through()
+	return TRUE
+
+/obj/machinery/atmospherics/components/unary/passive_vent/layer1
+	piping_layer = PIPING_LAYER_MIN
+	icon_state = "passive_vent_map-1"
+
+/obj/machinery/atmospherics/components/unary/passive_vent/layer3
+	piping_layer = PIPING_LAYER_MAX
+	icon_state = "passive_vent_map-3"

code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm

@@ -0,0 +1,111 @@
+/obj/machinery/atmospherics/components/unary/relief_valve
+	name = "pressure relief valve"
+	desc = "A valve that opens to the air at a certain pressure, then closes once it goes below another."
+	icon = 'icons/obj/atmospherics/components/relief_valve.dmi'
+	icon_state = "relief_valve-e-map"
+	can_unwrench = TRUE
+	var/opened = FALSE
+	var/open_pressure = ONE_ATMOSPHERE * 3
+	var/close_pressure = ONE_ATMOSPHERE
+	pipe_state = "relief_valve-e"
+
+/obj/machinery/atmospherics/components/unary/relief_valve/layer1
+	piping_layer = PIPING_LAYER_MIN
+	pixel_x = -PIPING_LAYER_P_X
+	pixel_y = -PIPING_LAYER_P_Y
+
+/obj/machinery/atmospherics/components/unary/relief_valve/layer3
+	piping_layer = PIPING_LAYER_MAX
+	pixel_x = PIPING_LAYER_P_X
+	pixel_y = PIPING_LAYER_P_Y
+
+/obj/machinery/atmospherics/components/unary/relief_valve/atmos
+	close_pressure = ONE_ATMOSPHERE * 2
+
+/obj/machinery/atmospherics/components/unary/relief_valve/atmos/atmos_waste
+	name = "atmos waste relief valve"
+
+/obj/machinery/atmospherics/components/unary/relief_valve/update_icon_nopipes()
+	cut_overlays()
+
+	if(!nodes[1] || !opened || !is_operational())
+		icon_state = "relief_valve-e"
+		return
+
+	icon_state = "relief_valve-e-blown"
+
+/obj/machinery/atmospherics/components/unary/relief_valve/process_atmos()
+	..()
+
+	if(!is_operational())
+		return
+
+	var/datum/gas_mixture/air_contents = airs[1]
+	var/our_pressure = air_contents.return_pressure()
+	if(opened && our_pressure < close_pressure)
+		opened = FALSE
+		update_icon_nopipes()
+	else if(!opened && our_pressure >= open_pressure)
+		opened = TRUE
+		update_icon_nopipes()
+	if(opened && air_contents.temperature > 0)
+		var/datum/gas_mixture/environment = loc.return_air()
+		var/pressure_delta = our_pressure - environment.return_pressure()
+		var/transfer_moles = pressure_delta*200/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+		if(transfer_moles > 0)
+			var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
+
+			loc.assume_air(removed)
+			air_update_turf()
+
+			update_parents()
+
+/obj/machinery/atmospherics/components/unary/relief_valve/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+																datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "atmos_relief", name, 335, 115, master_ui, state)
+		ui.open()
+
+/obj/machinery/atmospherics/components/unary/relief_valve/ui_data()
+	var/data = list()
+	data["open_pressure"] = round(open_pressure)
+	data["close_pressure"] = round(close_pressure)
+	data["max_pressure"] = round(50*ONE_ATMOSPHERE)
+	return data
+
+/obj/machinery/atmospherics/components/unary/relief_valve/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("open_pressure")
+			var/pressure = params["open_pressure"]
+			if(pressure == "max")
+				pressure = 50*ONE_ATMOSPHERE
+				. = TRUE
+			else if(pressure == "input")
+				pressure = input("New output pressure ([close_pressure]-[50*ONE_ATMOSPHERE] kPa):", name, open_pressure) as num|null
+				if(!isnull(pressure) && !..())
+					. = TRUE
+			else if(text2num(pressure) != null)
+				pressure = text2num(pressure)
+				. = TRUE
+			if(.)
+				open_pressure = CLAMP(pressure, close_pressure, 50*ONE_ATMOSPHERE)
+				investigate_log("open pressure was set to [open_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
+		if("close_pressure")
+			var/pressure = params["close_pressure"]
+			if(pressure == "max")
+				pressure = open_pressure
+				. = TRUE
+			else if(pressure == "input")
+				pressure = input("New output pressure (0-[open_pressure] kPa):", name, close_pressure) as num|null
+				if(!isnull(pressure) && !..())
+					. = TRUE
+			else if(text2num(pressure) != null)
+				pressure = text2num(pressure)
+				. = TRUE
+			if(.)
+				close_pressure = CLAMP(pressure, 0, open_pressure)
+				investigate_log("close pressure was set to [close_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
+	update_icon()

code/modules/atmospherics/machinery/datum_pipeline.dm

@@ -227,6 +227,11 @@
 				if(V.on)
 					PL |= V.parents[1]
 					PL |= V.parents[2]
+			else if (istype(atmosmch,/obj/machinery/atmospherics/components/binary/relief_valve))
+				var/obj/machinery/atmospherics/components/binary/relief_valve/V = atmosmch
+				if(V.opened)
+					PL |= V.parents[1]
+					PL |= V.parents[2]
 			else if (istype(atmosmch, /obj/machinery/atmospherics/components/unary/portables_connector))
 				var/obj/machinery/atmospherics/components/unary/portables_connector/C = atmosmch
 				if(C.connected_device)

code/modules/crafting/craft.dm

@@ -158,6 +158,7 @@
 				I.CheckParts(parts, R)
 				if(send_feedback)
 					SSblackbox.record_feedback("tally", "object_crafted", 1, I.type)
+				log_craft("[I] crafted by [user] at [loc_name(I.loc)]")
 				return 0
 			return "."
 		return ", missing tool."

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -65,7 +65,7 @@
 	reagents.add_reagent(extra_reagent, 3)
 
 /obj/item/reagent_containers/food/snacks/donut/meat
-	name = "Meat Donut"
+	name = "meat donut"
 	desc = "Tastes as gross as it looks."
 	icon_state = "donut_meat"
 	bonus_reagents = list(/datum/reagent/consumable/ketchup = 1)
@@ -152,7 +152,7 @@
 	icon_state = "jelly"
 	decorated_icon = "jelly_homer"
 	bonus_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
-	extra_reagent = "berryjuice"
+	extra_reagent = /datum/reagent/consumable/berryjuice
 	tastes = list("jelly" = 1, "donut" = 3)
 	foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT | SUGAR | BREAKFAST
 
@@ -240,7 +240,7 @@
 	name = "jelly donut"
 	desc = "You jelly?"
 	icon_state = "jelly"
-	extra_reagent = "slimejelly"
+	extra_reagent = /datum/reagent/toxin/slimejelly
 	foodtype = JUNKFOOD | GRAIN | FRIED | TOXIC | SUGAR | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain

code/modules/mining/mine_items.dm

@@ -87,6 +87,14 @@
 		return
 	. = ..()
 
+/obj/machinery/computer/shuttle/mining/common
+	name = "lavaland shuttle console"
+	desc = "Used to call and send the lavaland shuttle."
+	req_access = list()
+	circuit = /obj/item/circuitboard/computer/mining_shuttle/common
+	shuttleId = "mining_common"
+	possible_destinations = "whiteship_home;lavaland_common_away;landing_zone_dock;mining_public"
+
 /**********************Mining car (Crate like thing, not the rail car)**************************/
 
 /obj/structure/closet/crate/miningcar

code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm

@@ -117,7 +117,7 @@
 	name = "Foam Riot Dart"
 	id = "riot_dart"
 	build_type = AUTOLATHE
-	materials = list(MAT_METAL = 1000) //Discount for making individually - no box = less metal!
+	materials = list(MAT_METAL = 1125) //Discount for making individually - no box = less metal!
 	build_path = /obj/item/ammo_casing/caseless/foam_dart/riot
 	category = list("hacked", "Security")
 

code/modules/ruins/spaceruin_code/hilbertshotel.dm

@@ -172,6 +172,15 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
 				var/turf/T = locate(_x, _y, _z)
 				A.forceMove(T)
 
+/obj/item/hilbertshotel/ghostdojo
+	name = "Infinite Dormitories"
+	anchored = TRUE
+	interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND
+
+/obj/item/hilbertshotel/ghostdojo/interact(mob/user)
+	. = ..()
+	promptAndCheckIn(user)
+
 //Template Stuff
 /datum/map_template/hilbertshotel
 	name = "Hilbert's Hotel Room"