Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

code/game/objects/structures/ladders.dm

@@ -66,7 +66,7 @@
 		go_up(user,is_ghost)
 	else if(down)
 		go_down(user,is_ghost)
-		
+
 	if(!is_ghost)
 		add_fingerprint(user)
 
@@ -92,6 +92,8 @@
 /obj/structure/ladder/proc/can_use(mob/user)
 	return 1
 
-/obj/structure/ladder/unbreakable/Destroy()
-	return QDEL_HINT_LETMELIVE
-
+/obj/structure/ladder/unbreakable/Destroy(force)
+	if(force)
+		. = ..()
+	else
+		return QDEL_HINT_LETMELIVE

code/game/objects/structures/tables_racks.dm

@@ -325,7 +325,9 @@
 	buildstack = /obj/item/stack/sheet/mineral/wood
 	burn_state = FLAMMABLE
 	burntime = 20
-	canSmoothWith = list(/obj/structure/table/wood, /obj/structure/table/wood/poker)
+	canSmoothWith = list(/obj/structure/table/wood,
+		/obj/structure/table/wood/poker,
+		/obj/structure/table/wood/bar)
 
 /obj/structure/table/wood/narsie_act()
 	return
@@ -336,7 +338,6 @@
 	icon = 'icons/obj/smooth_structures/poker_table.dmi'
 	icon_state = "poker_table"
 	buildstack = /obj/item/stack/tile/carpet
-	canSmoothWith = list(/obj/structure/table/wood/poker, /obj/structure/table/wood)
 
 /obj/structure/table/wood/poker/narsie_act()
 	new /obj/structure/table/wood(src.loc)

code/game/objects/structures/window.dm

@@ -487,3 +487,6 @@
 
 /obj/structure/window/shuttle/narsie_act()
 	color = "#3C3434"
+
+/obj/structure/window/shuttle/tinted
+	opacity = TRUE