Merge pull request #3090 from CHOMPStationBot/upstream-merge-11535

[MIRROR] Misc additions I made while sleep deprived

code/game/objects/structures/barricades.dm

@@ -104,6 +104,12 @@
 		return TRUE
 	return FALSE
 
+/obj/structure/barricade/planks
+	name = "crude barricade"
+	icon_state = "barricade_planks"
+	health = 50
+	maxhealth = 50
+
 /obj/structure/barricade/sandbag
 	name = "sandbags"
 	desc = "Bags. Bags of sand. It's rough and coarse and somehow stays in the bag."

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -301,7 +301,7 @@
 
 /obj/structure/bed/roller/Moved(atom/old_loc, direction, forced = FALSE)
 	. = ..()
-	
+
 	playsound(src, 'sound/effects/roll.ogg', 100, 1)
 
 /obj/structure/bed/roller/post_buckle_mob(mob/living/M as mob)