Merge branch 'master' into fourth_week_preparation_and_fixes

# Conflicts:
#	code/game/jobs/faction/zavodskoi.dm

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

@@ -437,6 +437,7 @@
 	new /obj/item/gun/energy/xray(src)
 	new /obj/item/clothing/accessory/holster/armpit/brown(src)
 	new /obj/item/gun/energy/crossbow/largecrossbow(src)
+	new /obj/item/melee/energy/sword/red(src)
 
 /obj/structure/closet/crate/secure/gear_loadout/ninja/techno
 	associated_hardsuit = /obj/item/rig/light/offworlder/techno/ninja

code/game/objects/structures/railing.dm

@@ -8,6 +8,8 @@
 	climbable = TRUE
 	layer = OBJ_LAYER
 	anchored = FALSE
+
+	flags = ON_BORDER
 	obj_flags = OBJ_FLAG_ROTATABLE
 
 	build_amt = 2
@@ -278,35 +280,49 @@
 /obj/structure/railing/ex_act(severity)
 	qdel(src)
 
-/obj/structure/railing/can_climb(var/mob/living/user, climb_dir, post_climb_check=0)
+/obj/structure/railing/can_climb(var/mob/living/user, post_climb_check=0)
 	. = ..()
-	var/turf/dest = get_step(user, climb_dir)
-	if(. && get_turf(user) == get_turf(src))
-		if(turf_is_crowded(TRUE) || !user.Adjacent(dest) || turf_contains_dense_objects(dest) && get_turf(src) != dest)
+	if(!.)
+		return
+
+	var/turf/destination_turf = get_destination_turf(user)
+
+	if(destination_turf.density)
+		to_chat(user, SPAN_DANGER("You can't climb into \the [destination_turf]."))
+		return FALSE
+
+	if(!Adjacent(destination_turf))
+		to_chat(user, SPAN_DANGER("You can't climb there, the way is blocked."))
+		return FALSE
+
+	for(var/atom/A in destination_turf.contents - src)
+		if(A.density && !(A.flags & ON_BORDER))
 			to_chat(user, SPAN_DANGER("You can't climb there, the way is blocked."))
 			return FALSE
 
-/obj/structure/railing/do_climb(mob/living/user)
-	var/climb_dir = get_dir(user, src)
-	if(get_turf(src) == get_turf(user))
-		climb_dir = src.dir
-	if(!can_climb(user, climb_dir))
-		return
+	return TRUE
 
+/obj/structure/railing/do_climb(mob/living/user)
 	user.visible_message(SPAN_WARNING("\The [user] starts climbing over \the [src]!"))
 	LAZYADD(climbers, user)
 
-	if(!do_after(user, 50))
+	if(!do_after(user, 2 SECONDS))
 		LAZYREMOVE(climbers, user)
 		return
 
-	if(!can_climb(user, climb_dir, post_climb_check = TRUE))
+	if(!can_climb(user, post_climb_check = TRUE))
 		LAZYREMOVE(climbers, user)
 		return
 
-	user.forceMove(get_step(user, climb_dir))
+	var/turf/destination_turf = get_destination_turf(user)
+	user.forceMove(destination_turf)
 	user.visible_message(SPAN_WARNING("\The [user] climbs over \the [src]!"))
 	LAZYREMOVE(climbers, user)
 
 	if(!anchored || material.is_brittle())
-		take_damage(maxhealth) // Fatboy
+		take_damage(maxhealth) // Fatboy
+
+/obj/structure/railing/proc/get_destination_turf(var/mob/user)
+	. = get_turf(src) // by default, we pop into the turf the railing's on
+	if(get_turf(user) == . || !(get_dir(src, user) & dir)) // if the user's inside our turf or behind us, go in front of us
+		. = get_step(src, dir)