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

2021-06-16 23:33:14 -07:00
parent b407d125d3 64f762f59b
commit dbdc3001ba
80 changed files with 77218 additions and 75268 deletions
--- a/code/modules/admin/view_variables/mark_datum.dm
+++ b/code/modules/admin/view_variables/mark_datum.dm
@@ -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)