Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3

An oversight with one of the new area helper procs.

code/__HELPERS/areas.dm

@@ -227,6 +227,8 @@
 /proc/get_sub_areas_contents(area/A, include_base = TRUE)
 	if(ispath(A))
 		A = GLOB.areas_by_type[A]
+	else
+		A = get_area(A) //in case it's called on other atoms.
 	if(!A)
 		return
 	if(A.base_area)

code/game/machinery/firealarm.dm

@@ -198,7 +198,7 @@
 					return
 				else if(W.force) //hit and turn it on
 					..()
-					var/area/A = get_area(src)
+					var/area/A = get_base_area(src)
 					if(!A.fire)
 						alarm()
 					return

code/modules/VR/vr_sleeper.dm

@@ -231,7 +231,7 @@
 	if (!vr_area)
 		qdel(src)
 		return
-	var/list/contents = get_sub_areas_contents(src)
+	var/list/contents = get_sub_areas_contents(vr_area)
 	for (var/obj/item/ammo_casing/casing in contents)
 		qdel(casing)
 	for(var/obj/effect/decal/cleanable/C in contents)