Merge branch 'master' into cargo-bugfixes

code/game/objects/structures/ai_core.dm

@@ -50,7 +50,7 @@
 		return FALSE
 	var/turf/T = get_turf(src)
 	var/area/A = get_area(src)
-	if(!A.blob_allowed)
+	if(!(A.area_flags & BLOBS_ALLOWED))
 		return FALSE
 	if(!A.powered(EQUIP))
 		return FALSE

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

@@ -275,16 +275,15 @@
 /obj/structure/closet/proc/tool_interact(obj/item/W, mob/living/user)//returns TRUE if attackBy call shouldn't be continued (because tool was used/closet was of wrong type), FALSE if otherwise
 	. = TRUE
 	if(opened)
-		if(istype(W, /obj/item/weldingtool))
-			if(W.tool_behaviour == TOOL_WELDER)
-				// eigen check
-				if(eigen_teleport)
-					to_chat(user, "<span class='notice'>The unstable nature of \the [src] makes it impossible to deconstruct!</span>")
-					return
+		if(W.tool_behaviour == cutting_tool)
+			// eigen check
+			if(eigen_teleport)
+				to_chat(user, "<span class='notice'>The unstable nature of \the [src] makes it impossible to deconstruct!</span>")
+				return
 
+			if(W.tool_behaviour == TOOL_WELDER)
 				if(!W.tool_start_check(user, amount=0))
 					return
-
 				to_chat(user, "<span class='notice'>You begin cutting \the [src] apart...</span>")
 				if(W.use_tool(src, user, 40, volume=50))
 					if(!opened)
@@ -294,13 +293,29 @@
 									"<span class='hear'>You hear welding.</span>")
 					deconstruct(TRUE)
 				return
-			else // for example cardboard box is cut with wirecutters
+			else if(W.tool_behaviour == TOOL_WIRECUTTER)
+				W.use_tool(src, user, 40, volume=50)
 				user.visible_message("<span class='notice'>[user] cut apart \the [src].</span>", \
 									"<span class='notice'>You cut \the [src] apart with \the [W].</span>")
 				deconstruct(TRUE)
 				return
+			W.use_tool(src, user, 40, volume=50)
+			user.visible_message("<span class='notice'>[user] deconstructed \the [src].</span>", \
+									"<span class='notice'>You deconstructed \the [src] with \the [W].</span>")
+			deconstruct(TRUE) //Honestly by this point, if all checks were right and this is the cutting tool, just cut it
+			return
 		if(user.transferItemToLoc(W, drop_location())) // so we put in unlit welder too
 			return
+	else if(!opened && user.a_intent == INTENT_HELP)
+		var/item_is_id = W.GetID()
+		if(!item_is_id)
+			if(!open(user))
+				togglelock(user)
+				return
+			return
+		if(item_is_id || !toggle(user))
+			togglelock(user)
+			return
 	else if(W.tool_behaviour == TOOL_WELDER && can_weld_shut)
 		// eigen check
 		if(eigen_teleport)
@@ -328,12 +343,6 @@
 		user.visible_message("<span class='notice'>[user] [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.</span>", \
 						"<span class='notice'>You [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.</span>", \
 						"<span class='hear'>You hear a ratchet.</span>")
-	else if(user.a_intent != INTENT_HARM && !(W.item_flags & NOBLUDGEON))
-		var/item_is_id = W.GetID()
-		if(!item_is_id)
-			return FALSE
-		if(item_is_id || !toggle(user))
-			togglelock(user)
 	// cit addons
 	else if(istype(W, /obj/item/electronics/airlock))
 		handle_lock_addition(user, W)

code/game/objects/structures/stairs.dm

@@ -3,7 +3,7 @@
 #define STAIR_TERMINATOR_YES 2
 
 // dir determines the direction of travel to go upwards (due to lack of sprites, currently only 1 and 2 make sense)
-// stairs require /turf/open/transparent/openspace as the tile above them to work
+// stairs require /turf/open/openspace as the tile above them to work
 // multiple stair objects can be chained together; the Z level transition will happen on the final stair object in the chain
 
 /obj/structure/stairs
@@ -12,7 +12,7 @@
 	icon_state = "stairs"
 	anchored = TRUE
 
-	var/force_open_above = FALSE // replaces the turf above this stair obj with /turf/open/transparent/openspace
+	var/force_open_above = FALSE // replaces the turf above this stair obj with /turf/open/openspace
 	var/terminator_mode = STAIR_TERMINATOR_AUTOMATIC
 	var/turf/listeningTo
 
@@ -107,23 +107,23 @@
 /obj/structure/stairs/proc/build_signal_listener()
 	if(listeningTo)
 		UnregisterSignal(listeningTo, COMSIG_TURF_MULTIZ_NEW)
-	var/turf/open/transparent/openspace/T = get_step_multiz(get_turf(src), UP)
+	var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
 	RegisterSignal(T, COMSIG_TURF_MULTIZ_NEW, .proc/on_multiz_new)
 	listeningTo = T
 
 /obj/structure/stairs/proc/force_open_above()
-	var/turf/open/transparent/openspace/T = get_step_multiz(get_turf(src), UP)
+	var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
 	if(T && !istype(T))
-		T.ChangeTurf(/turf/open/transparent/openspace, flags = CHANGETURF_INHERIT_AIR)
+		T.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR)
 
 /obj/structure/stairs/proc/on_multiz_new(turf/source, dir)
 	//SIGNAL_HANDLER
 	SHOULD_NOT_SLEEP(TRUE) //the same thing.
 
 	if(dir == UP)
-		var/turf/open/transparent/openspace/T = get_step_multiz(get_turf(src), UP)
+		var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
 		if(T && !istype(T))
-			T.ChangeTurf(/turf/open/transparent/openspace, flags = CHANGETURF_INHERIT_AIR)
+			T.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR)
 
 /obj/structure/stairs/intercept_zImpact(atom/movable/AM, levels = 1)
 	. = ..()