Revert "Merge branch 'master' into cumcom"

This reverts commit 05c4645c35, reversing
changes made to d3867f491b.

code/game/area/areas/ruins/space.dm

@@ -58,8 +58,8 @@
 /area/ruin/space/has_grav/powered/cat_man
 	name = "Kitty Den"
 
-/area/ruin/space/has_grav/powered/wiz_home
-	name = "Wizards Cabin"
+/area/ruin/space/has_grav/powered/wiz_home/area/ruin/space/has_grav/powered/wiz_home
+	name = "Wizard's Cabin"
 
 /area/ruin/space/has_grav/powered/authorship
 	name = "Authorship"

code/game/atoms.dm

@@ -864,16 +864,14 @@ Proc for attack log creation, because really why not
 		filters += filter(arglist(arguments))
 
 /atom/movable/proc/get_filter(name)
-	if(filter_data)
-		if(filter_data[name])
-			return filters[filter_data.Find(name)]
+	if(filter_data && filter_data[name])
+		return filters[filter_data.Find(name)]
 
 /atom/movable/proc/remove_filter(name)
-	if(filter_data)
-		if(filter_data[name])
-			filter_data -= name
-			update_filters()
-			return TRUE
+	if(filter_data[name])
+		filter_data -= name
+		update_filters()
+		return TRUE
 
 /atom/proc/intercept_zImpact(atom/movable/AM, levels = 1)
 	. |= SEND_SIGNAL(src, COMSIG_ATOM_INTERCEPT_Z_FALL, AM, levels)

code/game/machinery/doors/airlock.dm

@@ -133,7 +133,6 @@
 
 /obj/machinery/door/airlock/LateInitialize()
 	. = ..()
-	autorotation() //auto rotate door
 	if (cyclelinkeddir)
 		cyclelinkairlock()
 	if(abandoned)
@@ -160,20 +159,11 @@
 	update_icon()
 
 
-/obj/machinery/door/airlock/proc/autorotation() //for auto rotating doors, because im sick of doing it
-	var/turf/N = get_step(src, NORTH)
-	var/turf/S = get_step(src, SOUTH)
-
-	if(istype(N, /turf/closed)) //Wall
-		dir = 4
-	if(istype(S, /turf/closed))
-		dir = 4
-	var/obj/structure/window/W = locate(/obj/structure/window, N) //Window
-	if(W)
-		dir = 4
-	var/obj/structure/window/R = locate(/obj/structure/window, S)
-	if(R)
-		dir = 4
+/obj/machinery/door/airlock/proc/getrotation() //for auto rotating doors, because im sick of doing it
+	for(var/turf/O in get_step(src,SOUTH))
+		log_mapping("[src]: [O]")
+		if(O.density)
+			log_mapping("[src]: [O] is dense")
 
 /obj/machinery/door/airlock/ComponentInitialize()
 	. = ..()

code/game/machinery/doors/airlock_types.dm

@@ -350,10 +350,7 @@
 	icon = 'icons/obj/doors/airlocks/external/external.dmi'
 	overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
 	note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
-	color_overlay_file = 'icons/obj/doors/airlocks/external/color.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_ext
-	basecolor = "#ff0000" //red
-
 
 /obj/machinery/door/airlock/external/glass
 	opacity = 0

code/game/objects/items/storage/backpack.dm

@@ -319,9 +319,6 @@
 			new R(src)
 		revealed = TRUE
 
-/obj/item/storage/backpack/satchel/flat/secret/chloe_ruin
-	reward_one_of_these = list(/obj/item/book/granter/spell/summonitem, /obj/item/book_of_babel)
-
 /obj/item/storage/backpack/duffelbag
 	name = "duffel bag"
 	desc = "A large duffel bag for holding extra things."