Revert "Merge branch 'master' into Yeehaw"

This reverts commit 972c03f79f, reversing changes made to 8ebd698763.
2020-01-08 12:26:45 +13:00
parent 972c03f79f
commit 05a644cc41
256 changed files with 12890 additions and 18839 deletions
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -59,7 +59,9 @@
 		return
 	var/area/AS = get_area(src)
 	if(istype(AS, /area/holodeck))
-		log_mapping("Holodeck computer cannot be in a holodeck, This would cause circular power dependency.")
+		log_world("### MAPPING ERROR")
+		log_world("Holodeck computer cannot be in a holodeck.")
+		log_world("This would cause circular power dependency.")
 		qdel(src)
 		return
 	else