Merge pull request #4766 from Neerti/2/9/2018_poi_adjustments

POI Adjustments

code/modules/mob/living/simple_animal/aliens/drone.dm

@@ -275,3 +275,10 @@
 
 /obj/item/projectile/beam/pulse/drone
 	damage = 10
+
+// A slightly easier drone, for POIs.
+// Difference is that it should not be faster than you.
+/mob/living/simple_animal/hostile/malf_drone/lesser
+	desc = "An automated combat drone with an aged apperance."
+	returns_home = TRUE
+	move_to_delay = 6

code/modules/mob/living/simple_animal/humanoids/mechamobs.dm

@@ -1,5 +1,5 @@
 /mob/living/simple_animal/hostile/mecha
-	name = "syndicate gygax"
+	name = "mercenary gygax"
 	desc = "Well that's forboding."
 	icon = 'icons/mecha/mecha.dmi'
 	icon_state = "darkgygax"
@@ -96,6 +96,8 @@
 
 
 /mob/living/simple_animal/hostile/mecha/malf_drone
+	name = "autonomous mechanized drone"
+	desc = "It appears to be an exosuit, piloted by a drone intelligence. It looks scary."
 	intelligence_level = SA_ROBOTIC
 	faction = "malf_drone"
 	speak_chance = 1
@@ -110,6 +112,7 @@
 	say_cannot = list("Denied.", "Negative.")
 	say_maybe_target = list("Possible threat detected. Investigating.", "Motion detected.", "Investigating.")
 	say_got_target = list("Threat detected.", "New task: Remove threat.", "Threat removal engaged.", "Engaging target.")
+	returns_home = TRUE
 
 /mob/living/simple_animal/hostile/mecha/malf_drone/isSynthetic()
 	return TRUE

code/modules/power/apc.dm

@@ -107,6 +107,7 @@
 	var/failure_timer = 0
 	var/force_update = 0
 	var/updating_icon = 0
+	var/secret = FALSE // If true, it won't show up on the alert computer.
 	var/global/list/status_overlays_lock
 	var/global/list/status_overlays_charging
 	var/global/list/status_overlays_equipment
@@ -223,6 +224,10 @@
 		src.area = get_area_name(areastring)
 		name = "\improper [area.name] APC"
 	area.apc = src
+
+	if(istype(area, /area/submap))
+		secret = TRUE
+
 	update_icon()
 
 	make_terminal()
@@ -1108,7 +1113,8 @@
 		equipment = autoset(equipment, 0)
 		lighting = autoset(lighting, 0)
 		environ = autoset(environ, 0)
-		power_alarm.triggerAlarm(loc, src)
+		if(!secret)
+			power_alarm.triggerAlarm(loc, src)
 		autoflag = 0
 
 	// update icon & area power if anything changed
@@ -1138,21 +1144,24 @@
 			equipment = autoset(equipment, 2)
 			lighting = autoset(lighting, 1)
 			environ = autoset(environ, 1)
-			power_alarm.triggerAlarm(loc, src)
+			if(!secret)
+				power_alarm.triggerAlarm(loc, src)
 			autoflag = 2
 	else if(cell.percent() <= 15)        // <15%, turn off lighting & equipment
 		if((autoflag > 1 && longtermpower < 0) || (autoflag > 1 && longtermpower >= 0))
 			equipment = autoset(equipment, 2)
 			lighting = autoset(lighting, 2)
 			environ = autoset(environ, 1)
-			power_alarm.triggerAlarm(loc, src)
+			if(!secret)
+				power_alarm.triggerAlarm(loc, src)
 			autoflag = 1
 	else                                   // zero charge, turn all off
 		if(autoflag != 0)
 			equipment = autoset(equipment, 0)
 			lighting = autoset(lighting, 0)
 			environ = autoset(environ, 0)
-			power_alarm.triggerAlarm(loc, src)
+			if(!secret)
+				power_alarm.triggerAlarm(loc, src)
 			autoflag = 0
 
 // val 0=off, 1=off(auto) 2=on 3=on(auto)

code/modules/power/smes_construction.dm

@@ -1,6 +1,6 @@
 // BUILDABLE SMES(Superconducting Magnetic Energy Storage) UNIT
 //
-// Last Change 1.26.2018 by Neerti. Also signing this is dumb.
+// Last Change 2.8.2018 by Neerti. Also signing this is still dumb.
 //
 // This is subtype of SMES that should be normally used. It can be constructed, deconstructed and hacked.
 // It also supports RCON System which allows you to operate it remotely, if properly set.
@@ -58,7 +58,11 @@
 // Pre-installed and pre-charged SMES hidden from the station, for use in submaps.
 /obj/machinery/power/smes/buildable/point_of_interest/New()
 	..(1)
-	charge = 1e6 // Should be enough for an individual POI.
+	charge = 1e7 // Should be enough for an individual POI.
+	RCon = FALSE
+	input_level = input_level_max
+	output_level = output_level_max
+	input_attempt = TRUE