Merge branch 'master' into upstream-merge-8325

code/modules/overmap/overmap_object.dm

@@ -23,7 +23,7 @@
 	/// For showing to the pilot of the ship, so they see the 'real' appearance, despite others seeing the unknown ones
 	var/image/real_appearance
 
-	light_system = MOVABLE_LIGHT
+	//light_system = MOVABLE_LIGHT
 	light_on = FALSE
 
 /obj/effect/overmap/Initialize()

code/modules/overmap/ships/computers/sensors.dm

@@ -66,7 +66,7 @@
 		else
 			data["status"] = "OK"
 		var/list/contacts = list()
-		for(var/obj/effect/overmap/O in view(7,linked))
+		for(var/obj/effect/overmap/O in range(7,linked))
 			if(linked == O)
 				continue
 			if(!O.scannable)
@@ -125,10 +125,9 @@
 		return
 	if(sensors && sensors.use_power && sensors.powered())
 		var/sensor_range = round(sensors.range*1.5) + 1
-		linked.set_light_range(sensor_range + 0.5)
-		linked.set_light_on(TRUE)
+		linked.set_light(sensor_range + 0.5)
 	else
-		linked.set_light_on(FALSE)
+		linked.set_light(0)
 
 /obj/machinery/shipsensors
 	name = "sensors suite"

code/modules/overmap/ships/landable.dm

@@ -199,11 +199,10 @@
 	switch(status)
 		if(SHIP_STATUS_LANDED)
 			var/obj/effect/overmap/visitable/location = loc
-			if(istype(loc, /obj/effect/overmap/visitable/sector))
-				return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines."
-			if(istype(loc, /obj/effect/overmap/visitable/ship))
+			if(location.in_space)
 				return "Docked with \the [location.name]. Use secondary thrust to get clear before activating primary engines."
-			return "Docked with an unknown object."
+			else
+				return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines."
 		if(SHIP_STATUS_TRANSIT)
 			return "Maneuvering under secondary thrust."
 		if(SHIP_STATUS_OVERMAP)

code/modules/overmap/ships/panicbutton.dm

@@ -9,6 +9,9 @@
 	var/glass = TRUE
 	var/launched = FALSE
 
+/obj/structure/panic_button/small
+	icon_state = "smallpanicbutton"
+
 // In case we're annihilated by a meteor
 /obj/structure/panic_button/Destroy()
 	if(!launched)
@@ -26,10 +29,10 @@
 /obj/structure/panic_button/attack_hand(mob/living/user)
 	if(!istype(user))
 		return ..()
-	
+
 	if(user.incapacitated())
 		return
-	
+
 	// Already launched
 	if(launched)
 		to_chat(user, "<span class='warning'>The button is already depressed; the beacon has been launched already.</span>")
@@ -61,10 +64,10 @@
 	S.distress(user)
 	//Kind of pricey, but this is a one-time thing that can't be reused, so I'm not too worried.
 	var/list/hear_z = GetConnectedZlevels(z) // multiz 'physical' connections only, not crazy overmap connections
-	
+
 	var/mapsize = (world.maxx+world.maxy)*0.5
 	var/turf/us = get_turf(src)
-	
+
 	for(var/hz in hear_z)
 		for(var/mob/M as anything in GLOB.players_by_zlevel[hz])
 			var/sound/SND = sound('sound/misc/emergency_beacon_launched.ogg') // Inside the loop because playsound_local modifies it for each person, so, need separate instances