Changes for merge

code/game/objects/structures/watercloset.dm

@@ -752,12 +752,14 @@
 	if(!open)
 		icon_state = "closed"
 		layer = WALL_OBJ_LAYER
+		density = TRUE
 		open = FALSE
 		opacity = TRUE
 
 	else
 		icon_state = "open"
 		layer = SIGN_LAYER
+		density = FALSE
 		open = TRUE
 		opacity = FALSE
 

code/game/turfs/simulated/minerals.dm

@@ -459,7 +459,7 @@
 	// base_icon_state = "rock_wall"
 	smooth = SMOOTH_MORE|SMOOTH_BORDER
 	canSmoothWith = list (/turf/closed)
-	baseturfs = /turf/open/floor/spooktime/dirtpatch
+	baseturfs = /turf/open/floor/plating/ashplanet/wateryrock
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	environment_type = "waste"
 	turf_type = /turf/open/floor/plating/ashplanet/rocky

code/modules/holiday/halloween/jacqueen.dm

@@ -50,7 +50,7 @@
 	var/cached_z
 	/// I'm busy, don't move.
 	var/busy = FALSE
-	var/spawn_cars = TRUE
+	var/spawn_cars = FALSE
 
 	var/static/blacklisted_items = typecacheof(list(
 		/obj/effect,

code/modules/mining/lavaland/necropolis_chests.dm

@@ -379,7 +379,7 @@
 
 	else
 		to_chat(user, "<span class='notice'>You return the wisp to the lantern.</span>")
-		icon_state = initial(icon_state)
+		icon_state = "lantern-blue"
 		wisp.forceMove(src)
 		SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
 

code/modules/research/designs/bluespace_designs.dm

@@ -106,16 +106,6 @@
 	category = list("Bluespace Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
 
-/datum/design/bluespace_carrier
-	name = "Bluespace Jar"
-	desc = "A jar used to contain creatures, using the power of bluespace."
-	id = "bluespace_carrier"
-	build_type = PROTOLATHE
-	build_path = /obj/item/pet_carrier/bluespace
-	materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 600)
-	category = list("Bluespace Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
 /datum/design/bluespace_pipe
 	name = "Bluespace Pipe"
 	desc = "A pipe that teleports gases."

code/modules/research/designs/mecha_designs.dm

@@ -251,11 +251,11 @@
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
 
 /datum/design/mech_missile_rack
-	name = "Exosuit Weapon (SRM-8 Missile Rack)"
-	desc = "Allows for the construction of an SRM-8 Missile Rack."
+	name = "Exosuit Weapon (BRM-6 Missile Rack)"
+	desc = "Allows for the construction of an BRM-6 Breaching Missile Rack."
 	id = "mech_missile_rack"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/breaching
 	materials = list(/datum/material/iron=22000,/datum/material/gold=6000,/datum/material/silver=8000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -265,7 +265,7 @@
 	desc = "Ammunition for the SRM-8 Missile Rack."
 	id = "mech_missile_rack_ammo"
 	build_type = PROTOLATHE | MECHFAB
-	build_path = /obj/item/mecha_ammo/missiles_he
+	build_path = /obj/item/mecha_ammo/missiles_br
 	materials = list(/datum/material/iron=8000,/datum/material/gold=500,/datum/material/silver=500)
 	construction_time = 20
 	category = list("Exosuit Ammunition", "Ammo")
@@ -297,7 +297,7 @@
 	desc = "An exosuit module that allows generating of small quasi-stable wormholes."
 	id = "mech_wormhole_gen"
 	build_type = MECHFAB
-	build_path = /obj/item/reagent_containers/food/snacks/pie/cream //Temporary fix for the ball so someone doesn't griff
+	build_path = /obj/item/mecha_parts/mecha_equipment/wormhole_generator
 	materials = list(/datum/material/iron=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -307,7 +307,7 @@
 	desc = "An exosuit module that allows exosuits to teleport to any position in view."
 	id = "mech_teleporter"
 	build_type = MECHFAB
-	build_path = /obj/item/reagent_containers/food/snacks/pie/cream //Temporary fix for the ball so someone doesn't griff
+	build_path = /obj/item/mecha_parts/mecha_equipment/teleporter
 	materials = list(/datum/material/iron=10000,/datum/material/diamond=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")