Merge pull request #11649 from Baystation12/master

Dev-freeze

code/game/machinery/camera/camera.dm

@@ -145,7 +145,6 @@
 				assembly.camera_network = english_list(network, "Exodus", ",", ",")
 				assembly.update_icon()
 				assembly.dir = src.dir
-				assembly = null //so qdel doesn't eat it.
 				if(stat & BROKEN)
 					assembly.state = 2
 					user << "<span class='notice'>You repaired \the [src] frame.</span>"
@@ -153,6 +152,7 @@
 					assembly.state = 1
 					user << "<span class='notice'>You cut \the [src] free from the wall.</span>"
 					new /obj/item/stack/cable_coil(src.loc, length=2)
+				assembly = null //so qdel doesn't eat it.
 			qdel(src)
 
 	// OTHER

code/modules/client/preferences_gear.dm

@@ -18,7 +18,17 @@ var/global/list/gear_datums = list()
 
 	//create a list of gear datums to sort
 	for(var/type in typesof(/datum/gear)-/datum/gear)
-		var/datum/gear/G = new type()
+		var/datum/gear/G = type
+		if(!initial(G.display_name))
+			error("Loadout - Missing display name: [G]")
+			continue
+		if(!initial(G.cost))
+			error("Loadout - Missing cost: [G]")
+			continue
+		if(!initial(G.path))
+			error("Loadout - Missing path definition: [G]")
+			continue
+		G = new G()
 
 		var/category = (G.sort_category in sort_categories)? G.sort_category : "unknown"
 		sort_categories[category][G.display_name] = G
@@ -127,13 +137,13 @@ var/global/list/gear_datums = list()
 	cost = 1
 	slot = slot_head
 
- /datum/gear/grcap
+/datum/gear/grcap
 	display_name = "cap, grey"
 	path = /obj/item/clothing/head/soft/grey
 	cost = 1
 	slot = slot_head
 
- /datum/gear/ocap
+/datum/gear/ocap
 	display_name = "cap, orange"
 	path = /obj/item/clothing/head/soft/orange
 	cost = 1
@@ -205,7 +215,7 @@ var/global/list/gear_datums = list()
 	cost = 1
 	slot = slot_head
 
- /datum/gear/bowler
+/datum/gear/bowler
 	display_name = "hat, bowler"
 	path = /obj/item/clothing/head/bowler
 	cost = 1

code/modules/clothing/spacesuits/rig/modules/ninja.dm

@@ -121,6 +121,11 @@
 
 	if(T.contains_dense_objects())
 		H << "<span class='warning'>You cannot teleport to a location with solid objects.</span>"
+		return 0
+
+	if(T.z != H.z || get_dist(T, get_turf(H)) > world.view)
+		H << "<span class='warning'>You cannot teleport to such a distant object.</span>"
+		return 0
 
 	phase_out(H,get_turf(H))
 	H.forceMove(T)