POI Tweaks (#4645)

* WOrk

* Changes more PoI stuff.

code/modules/awaymissions/corpse.dm

@@ -87,7 +87,7 @@
 
 
 /obj/effect/landmark/corpse/syndicatesoldier
-	name = "Syndicate Operative"
+	name = "Mercenary"
 	corpseuniform = /obj/item/clothing/under/syndicate
 	corpsesuit = /obj/item/clothing/suit/armor/vest
 	corpseshoes = /obj/item/clothing/shoes/boots/swat

code/modules/maps/tg/map_template.dm

@@ -23,6 +23,7 @@ var/list/global/map_templates = list()
 	it runs out. The cost of a submap should roughly corrispond with several factors such as size, loot, difficulty, desired scarcity, etc. \
 	Set to -1 to force the submap to always be made.
 	var/allow_duplicates = FALSE // If false, only one map template will be spawned by the game. Doesn't affect admins spawning then manually.
+	var/discard_prob = 0 // If non-zero, there is a chance that the map seeding algorithm will skip this template when selecting potential templates to use.
 
 	var/static/dmm_suite/maploader = new
 
@@ -197,6 +198,8 @@ var/list/global/map_templates = list()
 			continue
 		if(!istype(MT, desired_map_template_type)) // Not the type wanted.
 			continue
+		if(MT.discard_prob && prob(MT.discard_prob))
+			continue
 		if(MT.cost && MT.cost < 0) // Negative costs always get spawned.
 			priority_submaps += MT
 		else

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

@@ -61,6 +61,9 @@
 /mob/living/simple_animal/hostile/malf_drone/Process_Spacemove(var/check_drift = 0)
 	return 1
 
+/mob/living/simple_animal/hostile/malf_drone/isSynthetic()
+	return TRUE
+
 //self repair systems have a chance to bring the drone back to life
 /mob/living/simple_animal/hostile/malf_drone/Life()
 
@@ -150,6 +153,7 @@
 	disabled = rand(150, 600)
 	hostile = 0
 	walk(src,0)
+	..()
 
 /mob/living/simple_animal/hostile/malf_drone/death()
 	..(null,"suddenly breaks apart.")

code/modules/mob/living/simple_animal/corpse.dm

@@ -86,7 +86,7 @@
 //List of different corpse types
 
 /obj/effect/landmark/mobcorpse/syndicatesoldier
-	name = "Syndicate Operative"
+	name = "Mercenary"
 	corpseuniform = /obj/item/clothing/under/syndicate
 	corpsesuit = /obj/item/clothing/suit/armor/vest
 	corpseshoes = /obj/item/clothing/shoes/boots/swat

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

@@ -84,7 +84,7 @@
 	sparks.start()
 
 /mob/living/simple_animal/hostile/mecha/death()
-	..(0,"is explodes!")
+	..(0,"explodes!")
 	sparks.start()
 	explosion(get_turf(src), 0, 0, 1, 3)
 	qdel(src)
@@ -93,3 +93,26 @@
 /mob/living/simple_animal/hostile/mecha/Move()
 	..()
 	playsound(src,'sound/mecha/mechstep.ogg',40,1)
+
+
+/mob/living/simple_animal/hostile/mecha/malf_drone
+	intelligence_level = SA_ROBOTIC
+	faction = "malf_drone"
+	speak_chance = 1
+	speak = list(
+		"Resuming task: Protect area.",
+		"No threats found.",
+		"Error: No targets found."
+		)
+	emote_hear = list("humms ominously", "whirrs softly", "grinds a gear")
+	emote_see = list("looks around the area", "turns from side to side")
+	say_understood = list("Affirmative.", "Positive.")
+	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.")
+
+/mob/living/simple_animal/hostile/mecha/malf_drone/isSynthetic()
+	return TRUE
+
+/mob/living/simple_animal/hostile/mecha/malf_drone/speech_bubble_appearance()
+	return "synthetic_evil"

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

@@ -1,5 +1,5 @@
 /mob/living/simple_animal/hostile/syndicate
-	name = "syndicate operative"
+	name = "mercenary"
 	desc = "Death to the Company."
 	icon_state = "syndicate"
 	icon_living = "syndicate"

code/modules/planet/sif.dm

@@ -251,7 +251,7 @@ datum/weather/sif
 		WEATHER_OVERCAST = 5
 		)
 
-/datum/weather/sif/rain/process_effects()
+/datum/weather/sif/storm/process_effects()
 	for(var/mob/living/L in living_mob_list)
 		if(L.z in holder.our_planet.expected_z_levels)
 			var/turf/T = get_turf(L)

code/modules/power/smes_construction.dm

@@ -1,6 +1,6 @@
 // BUILDABLE SMES(Superconducting Magnetic Energy Storage) UNIT
 //
-// Last Change 1.1.2015 by Atlantis - Happy New Year!
+// Last Change 1.26.2018 by Neerti. Also signing this is 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.
@@ -55,8 +55,10 @@
 	component_parts += new /obj/item/weapon/smes_coil(src)
 	recalc_coils()
 
-
-
+// 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.