Merge pull request #6049 from Novacat/nova-basicfixes

Assortment of minor fixes

code/game/objects/effects/step_triggers.dm

@@ -229,6 +229,10 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop
 		if(isobserver(A))
 			A.forceMove(T) // Harmlessly move ghosts.
 			return
+		//VOREStation Edit Start
+		if(!(A.can_fall()))
+			return // Phased shifted kin should not fall
+		//VOREStation Edit End
 
 		A.forceMove(T)
 		// Living things should probably be logged when they fall...

code/game/turfs/turf_changing.dm

@@ -28,7 +28,7 @@
 
 	if(N == /turf/space)
 		var/turf/below = GetBelow(src)
-		if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && !istype(below, /turf/unsimulated/wall))	// VOREStation Edit: Weird open space
+		if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && (!istype(below, /turf/unsimulated/wall) && !istype(below, /turf/simulated/sky)))	// VOREStation Edit: Weird open space
 			N = /turf/simulated/open
 
 	var/obj/fire/old_fire = fire

code/modules/food/glass/bottle_vr.dm

@@ -137,3 +137,12 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-3"
 	prefill = list("unsorbitol" = 60)
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose
+	name = "glucose container"
+	desc = "A container of glucose. Used to treat bloodloss through a hardsuit in unconscious patients."
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose/Initialize()
+	. = ..()
+	reagents.add_reagent("glucose", 100)
+	on_reagent_change()

code/modules/multiz/structures.dm

@@ -111,7 +111,7 @@
 		if(!A.CanPass(M, M.loc, 1.5, 0))
 			to_chat(M, "<span class='notice'>\The [A] is blocking \the [src].</span>")
 			return FALSE
-	return M.Move(T)
+	return M.forceMove(T) //VOREStation Edit - Fixes adminspawned ladders
 
 /obj/structure/ladder/CanPass(obj/mover, turf/source, height, airflow)
 	return airflow || !density

code/modules/multiz/structures_vr.dm

@@ -49,12 +49,15 @@
 	if (!( target ))
 		qdel(src)
 		return
+	if (istype(target, /obj/structure/portal_subtle))
+		qdel(src)
+		return
 	if (istype(M, /atom/movable))
 		if(prob(failchance)) //oh dear a problem, put em in deep space
 			src.icon_state = "portal1"
 			do_noeffect_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0)
 		else
-			do_noeffect_teleport(M, target, 1) ///You will appear adjacent to the beacon
+			do_noeffect_teleport(M, target, 0) ///You will appear on the beacon
 
 /obj/structure/portal_gateway
 	name = "portal"

maps/submaps/shelters/shelter_4.dmm

@@ -95,6 +95,7 @@
 /obj/item/weapon/reagent_containers/glass/beaker/large,
 /obj/item/weapon/reagent_containers/glass/beaker/large,
 /obj/item/weapon/reagent_containers/glass/beaker/large,
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose,
 /turf/simulated/shuttle/floor/voidcraft/light,
 /area/survivalpod)
 "i" = (

maps/tether/tether-10-colony.dmm

@@ -418,6 +418,7 @@
 /obj/item/weapon/storage/pill_bottle/nutriment,
 /obj/item/weapon/storage/pill_bottle/iron,
 /obj/item/weapon/storage/pill_bottle/iron,
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose,
 /turf/unsimulated/floor{
 	icon_state = "vault";
 	dir = 5