Merge conflict fix

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

@@ -66,13 +66,10 @@
 	var/datum/gas_mixture/gas = (..())
 	if(!gas)
 		return null
+
 	var/datum/gas_mixture/newgas = new/datum/gas_mixture()
-	newgas.oxygen = gas.oxygen
-	newgas.carbon_dioxide = gas.carbon_dioxide
-	newgas.nitrogen = gas.nitrogen
-	newgas.toxins = gas.toxins
-	newgas.volume = gas.volume
-	newgas.temperature = gas.temperature
+	newgas.copy_from(gas)
+
 	if(newgas.temperature <= target_temp)
 		return
 

code/game/objects/structures/grille.dm

@@ -11,6 +11,7 @@
 	var/health = 10
 	var/destroyed = 0
 	var/obj/item/stack/rods/stored
+	level = 3
 
 /obj/structure/grille/New()
 	stored = new/obj/item/stack/rods(src)

code/game/objects/structures/janicart.dm

@@ -23,10 +23,12 @@
 /obj/structure/janitorialcart/proc/wet_mop(obj/item/weapon/mop, mob/user)
 	if(reagents.total_volume < 1)
 		user << "<span class='warning'>[src] is out of water!</span>"
+		return 0
 	else
-		reagents.trans_to(mop, 5)	//
+		reagents.trans_to(mop, 5)
 		user << "<span class='notice'>You wet [mop] in [src].</span>"
 		playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+		return 1
 
 /obj/structure/janitorialcart/proc/put_in_cart(obj/item/I, mob/user)
 	if(!user.drop_item())
@@ -43,8 +45,8 @@
 	if(istype(I, /obj/item/weapon/mop))
 		var/obj/item/weapon/mop/m=I
 		if(m.reagents.total_volume < m.reagents.maximum_volume)
-			wet_mop(m, user)
-			return
+			if (wet_mop(m, user))
+				return
 		if(!mymop)
 			m.janicart_insert(user, src)
 		else

code/game/objects/structures/mirror.dm

@@ -61,6 +61,7 @@
 
 
 /obj/structure/mirror/attackby(obj/item/I, mob/living/user, params)
+	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
 	if(I.damtype == STAMINA)
 		return
@@ -90,6 +91,7 @@
 
 
 /obj/structure/mirror/attack_alien(mob/living/user)
+	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
 	if(islarva(user))
 		return
@@ -106,6 +108,7 @@
 	var/mob/living/simple_animal/M = user
 	if(M.melee_damage_upper <= 0)
 		return
+	user.changeNext_move(CLICK_CD_MELEE)
 	M.do_attack_animation(src)
 	if(shattered)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
@@ -115,6 +118,7 @@
 
 
 /obj/structure/mirror/attack_slime(mob/living/user)
+	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
 	if(shattered)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
@@ -246,4 +250,4 @@
 			if(new_eye_color)
 				H.eye_color = sanitize_hexcolor(new_eye_color)
 				H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
-				H.update_body()
+				H.update_body()

code/game/objects/structures/plasticflaps.dm

@@ -7,6 +7,17 @@
 	anchored = 1
 	layer = 4
 
+/obj/structure/plasticflaps/CanAStarPass(ID, to_dir, caller)
+	if(istype(caller, /mob/living))
+		if(istype(caller,/mob/living/simple_animal/bot/mulebot))
+			return 1
+
+		var/mob/living/M = caller
+		if(!M.ventcrawler && M.mob_size != MOB_SIZE_TINY)
+			return 0
+
+	return 1 //diseases, stings, etc can pass
+
 /obj/structure/plasticflaps/CanPass(atom/movable/A, turf/T)
 	if(istype(A) && A.checkpass(PASSGLASS))
 		return prob(60)

code/game/objects/structures/transit_tubes/transit_tube_pod.dm

@@ -11,8 +11,9 @@
 /obj/structure/transit_tube_pod/New(loc)
 	..(loc)
 
-	air_contents.oxygen = MOLES_O2STANDARD * 2
-	air_contents.nitrogen = MOLES_N2STANDARD
+	air_contents.assert_gases("o2", "n2")
+	air_contents.gases["o2"][MOLES] = MOLES_O2STANDARD * 2
+	air_contents.gases["n2"][MOLES] = MOLES_N2STANDARD
 	air_contents.temperature = T20C
 
 	// Give auto tubes time to align before trying to start moving
@@ -124,11 +125,7 @@
 //  datum, there might be problems if I don't...
 /obj/structure/transit_tube_pod/return_air()
 	var/datum/gas_mixture/GM = new()
-	GM.oxygen			= air_contents.oxygen
-	GM.carbon_dioxide	= air_contents.carbon_dioxide
-	GM.nitrogen			= air_contents.nitrogen
-	GM.toxins			= air_contents.toxins
-	GM.temperature		= air_contents.temperature
+	GM.copy_from(air_contents)
 	return GM
 
 // For now, copying what I found in an unused FEA file (and almost identical in a

code/game/objects/structures/window.dm

@@ -439,6 +439,14 @@
 /obj/structure/window/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
 	return 0
 
+/obj/structure/window/CanAStarPass(ID, to_dir)
+	if(!density)
+		return 1
+	if((dir == SOUTHWEST) || (dir == to_dir))
+		return 0
+
+	return 1
+
 /obj/structure/window/reinforced
 	name = "reinforced window"
 	icon_state = "rwindow"
@@ -475,6 +483,7 @@
 	fulltile = 1
 	smooth = SMOOTH_TRUE
 	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile)
+	level = 3
 
 /obj/structure/window/reinforced/tinted/fulltile
 	icon = 'icons/obj/smooth_structures/tinted_window.dmi'
@@ -483,12 +492,14 @@
 	fulltile = 1
 	smooth = SMOOTH_TRUE
 	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile/)
+	level = 3
 
 /obj/structure/window/reinforced/fulltile/ice
 	icon = 'icons/obj/smooth_structures/rice_window.dmi'
 	icon_state = "ice_window"
 	maxhealth = 150
 	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/reinforced/fulltile/ice)
+	level = 3
 
 /obj/structure/window/shuttle
 	name = "shuttle window"
@@ -503,3 +514,4 @@
 	smooth = SMOOTH_TRUE
 	canSmoothWith = null
 	explosion_block = 1
+	level = 3