Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00
parent e6aaad1921 a98178251d
commit 408182758f
284 changed files with 5080 additions and 1897 deletions
@@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E

 /obj/machinery/computer/telecrystals/uplinker/proc/ejectuplink()
 	if(uplinkholder)
-		uplinkholder.loc = get_turf(src.loc)
+		uplinkholder.forceMove(drop_location())
 		uplinkholder = null
 		update_icon()