Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

# Conflicts: # tgstation.dme
2021-06-20 03:29:50 -04:00
parent c6a70b9a4e 0a1f0d3e66
commit fb32aa1248
284 changed files with 90888 additions and 77430 deletions
@@ -6,7 +6,7 @@
 	holder.marked_datum = D
 	vv_update_display(D, "marked", VV_MSG_MARKED)

-/client/proc/mark_datum_mapview(datum/D as mob|obj|turf|area in view(view))
+/client/proc/mark_datum_mapview(datum/D in world)
 	set category = "Debug"
 	set name = "Mark Object"
 	mark_datum(D)