Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update

code/game/objects/effects/step_triggers.dm

@@ -117,7 +117,7 @@
 			L.stop_pulling()
 			P.forceMove(T)
 			L.forceMove(T)
-			L.start_pulling(P)
+			L.continue_pulling(P)
 		else
 			L.forceMove(T)
 	else
@@ -285,4 +285,3 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop
 
 /obj/effect/step_trigger/warning/train_edge
 	warningmessage = "The wind billowing alongside the train is extremely strong here! Any movement could easily pull you down beneath the carriages, return to the train immediately!"
-

code/game/objects/random/mapping.dm

@@ -85,7 +85,8 @@
 				prob(5);/obj/machinery/vending/sovietvend,
 				prob(5);/obj/machinery/vending/radren,
 				prob(3);/obj/machinery/vending/altevian,
-				prob(5);/obj/machinery/vending/desatti) //VOREStation Edit End
+				prob(5);/obj/machinery/vending/desatti,
+				prob(5);/obj/machinery/vending/nukie) //VOREStation Edit End
 
 /obj/random/vendorfood //Random food vendors for station use
 	name = "random snack vending machine"
@@ -114,7 +115,8 @@
 				/obj/machinery/vending/cola/soft,
 				/obj/machinery/vending/bepis,
 				/obj/machinery/vending/sovietsoda,
-				/obj/machinery/vending/radren)
+				/obj/machinery/vending/radren,
+				/obj/machinery/vending/nukie)
 //VOREStation Edit End
 
 /obj/random/obstruction //Large objects to block things off in maintenance