Overmap 4.7: Gas Giants, More Storms, 8 hours of work

code/modules/overmap/objects/dynamic_datum.dm

@@ -86,10 +86,8 @@
 		for(var/mob/Mob as anything in GLOB.player_list)
 			if(dock_requester.shuttle_port.is_in_shuttle_bounds(Mob))
 				Mob.play_screen_text("<span class='maptext' style=font-size:24pt;text-align:center valign='top'><u>[planet_name]</u></span><br>[station_time_timestamp_fancy("hh:mm")]")
-				if (landing_sound == "friendly")
-					playsound(Mob, 'sound/effects/planet_landing_1.ogg', 100)
-				if (landing_sound == "hostile")
-					playsound(Mob, 'sound/effects/planet_landing_2.ogg', 100)
+				playsound(Mob, landing_sound, 100)
+
 
 /datum/overmap/dynamic/post_undocked(datum/overmap/dock_requester)
 	if(preserve_level)
@@ -122,8 +120,12 @@
 			probabilities[initial(planet_type.planet)] = initial(planet_type.weight)
 	planet = SSmapping.planet_types[force_encounter ? force_encounter : pickweightAllowZero(probabilities)]
 
-	planet_name = gen_planet_name()
-	Rename(planet_name)
+
+	if(planet.planet !=DYNAMIC_WORLD_ASTEROID && planet.planet != DYNAMIC_WORLD_SPACERUIN) //these aren't real planets
+		planet_name = gen_planet_name()
+		Rename(planet_name)
+	if(planet.planet == DYNAMIC_WORLD_ASTEROID || planet.planet == DYNAMIC_WORLD_SPACERUIN)
+		Rename(planet.name)
 	token.icon_state = planet.icon_state
 	token.desc = planet.desc
 	token.color = planet.color

code/modules/overmap/objects/event_datum.dm

@@ -59,11 +59,10 @@
 
 /datum/overmap/event/meteor/apply_effect()
 	for(var/datum/overmap/ship/controlled/Ship in get_nearby_overmap_objects())
-		if(MAGNITUDE(Ship.speed_x, Ship.speed_y) > safe_speed)
-			if(prob(chance_to_affect))
+		if(Ship.get_speed() > safe_speed)
+			var/how_fast =  (Ship.get_speed() - safe_speed)
+			if(prob(chance_to_affect + how_fast))
 				affect_ship(Ship)
-				return
-			return
 
 /datum/overmap/event/meteor/affect_ship(datum/overmap/ship/controlled/Ship)
 	spawn_meteor(meteor_types, Ship.shuttle_port.get_virtual_level(), 0)
@@ -96,30 +95,38 @@
 	token_icon_state = "ion1"
 	spread_chance = 20
 	chain_rate = 2
+	chance_to_affect = 20
 	var/strength = 4
 
 /datum/overmap/event/emp/Initialize(position, ...)
 	. = ..()
 	token.icon_state = "ion[rand(1, 4)]"
 
 /datum/overmap/event/emp/affect_ship(datum/overmap/ship/controlled/S)
+	message_admins("1")
 	var/area/source_area = pick(S.shuttle_port.shuttle_areas)
+	message_admins("2")
 	source_area.set_fire_alarm_effect()
+	message_admins("3")
 	var/source_object = pick(source_area.contents)
+	message_admins("4")
 	empulse(get_turf(source_object), round(rand(strength / 2, strength)), rand(strength, strength * 2))
+	message_admins("EMP PULSE at [source_object]")
 	for(var/mob/M as anything in GLOB.player_list)
 		if(S.shuttle_port.is_in_shuttle_bounds(M))
 			M.playsound_local(S.shuttle_port, 'sound/weapons/ionrifle.ogg', strength)
 
 /datum/overmap/event/emp/minor
 	name = "ion storm (minor)"
 	chain_rate = 1
-	strength = 2
+	strength = 1
+	chance_to_affect = 15
 
 /datum/overmap/event/emp/major
 	name = "ion storm (major)"
+	chance_to_affect = 25
 	chain_rate = 4
-	strength = 8
+	strength = 6
 
 ///ELECTRICAL STORM - explodes your computer and IPCs
 /datum/overmap/event/electric
@@ -219,7 +226,7 @@
 	chance_to_affect = 15
 	spread_chance = 50
 	chain_rate = 4
-	safe_speed = 1
+	safe_speed = 2
 	meteor_types = list(
 		/obj/effect/meteor/carp=8,
 		/obj/effect/meteor/carp/big=1, //numbers I pulled out of my ass

code/modules/overmap/planets/planet_types.dm

@@ -22,7 +22,7 @@
 	default_baseturf = /turf/open/floor/plating/asteroid/basalt/lava
 	weather_controller_type = /datum/weather_controller/lavaland
 	ruin_type = RUINTYPE_LAVA
-	landing_sound = "hostile"
+	landing_sound = 'sound/effects/planet_landing_2.ogg'
 
 
 /datum/planet_type/ice
@@ -35,7 +35,7 @@
 	default_baseturf = /turf/open/floor/plating/asteroid/snow/icemoon
 	weather_controller_type = /datum/weather_controller/snow_planet
 	ruin_type = RUINTYPE_ICE
-	landing_sound = "hostile"
+	landing_sound = 'sound/effects/planet_landing_2.ogg'
 
 /datum/planet_type/jungle
 	name = "jungle planet"
@@ -47,7 +47,7 @@
 	default_baseturf = /turf/open/floor/plating/dirt/jungle
 	weather_controller_type = /datum/weather_controller/lush
 	ruin_type = RUINTYPE_JUNGLE
-	landing_sound = "friendly"
+	landing_sound = 'sound/effects/planet_landing_1.ogg'
 
 /datum/planet_type/rock
 	name = "rock planet"
@@ -59,7 +59,7 @@
 	default_baseturf = /turf/open/floor/plating/asteroid
 	weather_controller_type = /datum/weather_controller/rockplanet
 	ruin_type = RUINTYPE_ROCK
-	landing_sound = "hostile"
+	landing_sound = 'sound/effects/planet_landing_2.ogg'
 
 /datum/planet_type/sand
 	name = "sand planet"
@@ -71,7 +71,7 @@
 	default_baseturf = /turf/open/floor/plating/asteroid/whitesands
 	weather_controller_type = /datum/weather_controller/desert
 	ruin_type = RUINTYPE_SAND
-	landing_sound = "hostile"
+	landing_sound = 'sound/effects/planet_landing_2.ogg'
 
 /datum/planet_type/beach
 	name = "beach planet"
@@ -83,7 +83,7 @@
 	default_baseturf = /turf/open/floor/plating/asteroid/sand/lit
 	weather_controller_type = /datum/weather_controller/lush
 	ruin_type = RUINTYPE_BEACH
-	landing_sound = "friendly"
+	landing_sound = 'sound/effects/planet_landing_1.ogg'
 
 /datum/planet_type/reebe
 	name = "???"
@@ -109,7 +109,7 @@
 	default_baseturf = /turf/open/space
 	weather_controller_type = null
 	ruin_type = null // asteroid ruins when
-	landing_sound = "friendly"
+	landing_sound = 'sound/effects/planet_landing_1.ogg'
 
 /datum/planet_type/spaceruin
 	name = "weak energy signal"
@@ -121,7 +121,7 @@
 	default_baseturf = /turf/open/space
 	weather_controller_type = null
 	ruin_type = RUINTYPE_SPACE
-	landing_sound = "hostile"
+	landing_sound = 'sound/effects/planet_landing_2.ogg'
 
 /datum/planet_type/waste
 	name = "waste disposal planet"
@@ -133,7 +133,7 @@
 	default_baseturf = /turf/open/floor/plating/asteroid/wasteplanet
 	weather_controller_type = /datum/weather_controller/chlorine
 	ruin_type = RUINTYPE_WASTE
-	landing_sound = "hostile"
+	landing_sound = 'sound/effects/planet_landing_2.ogg'
 
 /datum/planet_type/gas_giant
 	name = "gas giant"
@@ -147,7 +147,7 @@
 	ruin_type = null //it's a Gas Giant. Not Cloud fuckin City
 	weight = 5
 	preserve_level = TRUE
-	landing_sound = "friendly"
+	landing_sound = 'sound/effects/planet_landing_1.ogg'
 
 /datum/planet_type/plasma_giant
 	name = "plasma giant"
@@ -159,4 +159,4 @@
 	weight = 1
 	icon_state = "globe"
 	preserve_level = TRUE
-	landing_sound = "friendly"
+	landing_sound = 'sound/effects/planet_landing_1.ogg'