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

code/__DEFINES/atmospherics.dm

@@ -213,15 +213,19 @@
 #define ATMOS_TANK_AIRMIX "o2=2644;n2=10580;TEMP=293.15"
 #define ATMOS_TANK_FUEL "o2=33000;plasma=66000;TEMP=293.15"
 
-//LAVALAND
+//PLANETARY
 /// what pressure you have to be under to increase the effect of equipment meant for lavaland
 #define LAVALAND_EQUIPMENT_EFFECT_PRESSURE 90
+#define ICEMOON_DEFAULT_ATMOS "ICEMOON_ATMOS"
+#define GAS_GIANT_ATMOS "GAS_GIANT_ATMOS"
+#define PLASMA_GIANT_ATMOS "PLASMA_GIANT_ATMOS"
+#define WASTEPLANET_DEFAULT_ATMOS "WASTEPLANET_ATMOS"
+#define LAVALAND_DEFAULT_ATMOS "LAVALAND_ATMOS"
 
 
 //ATMOS MIX IDS
-#define LAVALAND_DEFAULT_ATMOS "LAVALAND_ATMOS"
-#define ICEMOON_DEFAULT_ATMOS "ICEMOON_ATMOS"
-#define WASTEPLANET_DEFAULT_ATMOS "WASTEPLANET_ATMOS"
+
+
 
 
 //ATMOSIA GAS MONITOR TAGS

code/__DEFINES/flags.dm

@@ -152,6 +152,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 
 #define ZAP_DEFAULT_FLAGS ZAP_MACHINE_EXPLOSIVE | ZAP_ALLOW_DUPLICATES | ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN
 #define ZAP_FUSION_FLAGS ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN
+#define ZAP_STORM_FLAGS ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN
 
 #define ZAP_SUPERMATTER_FLAGS ZAP_GIVES_RESEARCH
 #define ZAP_TESLA_FLAGS ZAP_DEFAULT_FLAGS | ZAP_GIVES_RESEARCH

code/__DEFINES/maths.dm

@@ -273,6 +273,8 @@
 	else if(dx < 0)
 		. += 360
 
+//Magnitude. used for ship velocity
+#define MAGNITUDE(a, b) (sqrt(a ** 2 + b ** 2))
 
 /// Converts a probability/second chance to probability/seconds_per_tick chance
 /// For example, if you want an event to happen with a 10% per second chance, but your proc only runs every 5 seconds, do `if(prob(100*SPT_PROB_RATE(0.1, 5)))`
@@ -282,5 +284,3 @@
 
 /// Like SPT_PROB_RATE but easier to use, simply put `if(SPT_PROB(10, 5))`
 #define SPT_PROB(prob_per_second_percent, seconds_per_tick) (prob(100*SPT_PROB_RATE((prob_per_second_percent)/100, (seconds_per_tick))))
-
-#define MAGNITUDE(a, b) (sqrt(a ** 2 + b ** 2))

code/__DEFINES/misc.dm

@@ -419,6 +419,7 @@ GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE)))
 #define GAUSSIAN_BLUR(filter_size) filter(type="blur", size=filter_size)
 
 #define STANDARD_GRAVITY 1 //Anything above this is high gravity, anything below no grav
+#define GAS_GIANT_GRAVITY 2
 #define GRAVITY_DAMAGE_TRESHOLD 3 //Starting with this value gravity will start to damage mobs
 
 #define CAMERA_NO_GHOSTS 0

code/__DEFINES/overmap.dm

@@ -32,6 +32,8 @@
 #define DYNAMIC_WORLD_REEBE "reebe" //celestial bodies
 #define DYNAMIC_WORLD_ASTEROID "asteroid"
 #define DYNAMIC_WORLD_SPACERUIN "space"
+#define DYNAMIC_WORLD_GAS_GIANT "gas giant"
+#define DYNAMIC_WORLD_PLASMA_GIANT "plasma giant"
 
 /// Make sure you are adding new planet types to this, in order as seen above preferrably
 #define DYNAMIC_WORLD_LIST_ALL list(\
@@ -44,7 +46,9 @@
 	DYNAMIC_WORLD_WASTEPLANET,\
 	DYNAMIC_WORLD_REEBE,\
 	DYNAMIC_WORLD_ASTEROID,\
-	DYNAMIC_WORLD_SPACERUIN)
+	DYNAMIC_WORLD_SPACERUIN,\
+	DYNAMIC_WORLD_GAS_GIANT,\
+	DYNAMIC_WORLD_PLASMA_GIANT)
 
 //Possible ship states
 #define OVERMAP_SHIP_IDLE "idle"

code/datums/atmosphere/planetary.dm

@@ -53,6 +53,46 @@
 	minimum_temp = 180
 	maximum_temp = 180
 
+/datum/atmosphere/gas_giant
+	id = GAS_GIANT_ATMOS
+
+	base_gases = list(
+		GAS_N2=10,
+		GAS_NITROUS=10,
+	)
+	normal_gases = list(
+		GAS_O2=5,
+		GAS_H2O=7,
+		GAS_N2=5,
+		GAS_NITROUS=7,
+		GAS_CO2=5,
+	)
+	restricted_gases = list(
+		GAS_NITROUS=7,
+	)
+	restricted_chance = 1
+
+	minimum_pressure = WARNING_HIGH_PRESSURE + 175
+	maximum_pressure = HAZARD_HIGH_PRESSURE + 1000
+
+	minimum_temp = 30 //number i pulled out of my ass
+	maximum_temp = 120
+
+/datum/atmosphere/gas_giant/plasma
+	id = PLASMA_GIANT_ATMOS
+
+	base_gases = list(
+		GAS_PLASMA=10,
+	)
+	normal_gases = list(
+		GAS_PLASMA=10,
+		GAS_CO2=5,
+	)
+	restricted_gases = list(
+		GAS_PLASMA=0.1,
+	)
+	restricted_chance = 1
+
 /datum/atmosphere/wasteplanet
 	id = WASTEPLANET_DEFAULT_ATMOS
 

code/datums/mapgen/single_biome/Gas_Giant.dm

@@ -0,0 +1,36 @@
+/datum/map_generator/single_biome/gas_giant
+	use_cellautomata = FALSE
+
+	biome_type = /datum/biome/gas_giant
+	area_type = /area/overmap_encounter/planetoid/gas_giant
+
+/datum/biome/gas_giant
+	open_turf_types = list(/turf/open/chasm/gas_giant)
+
+	flora_spawn_list = list(
+	)
+	feature_spawn_list = null
+	mob_spawn_list = list(
+		/mob/living/simple_animal/hostile/asteroid/basilisk/watcher
+		//in the future, I'd like to add something like.
+		//The slylandro, or really any floating gas bag species, it'd be cool
+	)
+
+
+/datum/map_generator/single_biome/plasma_giant
+	use_cellautomata = FALSE
+
+	biome_type = /datum/biome/plasma_giant
+	area_type = /area/overmap_encounter/planetoid/gas_giant
+
+
+/datum/biome/plasma_giant
+	open_turf_types = list(/turf/open/chasm/gas_giant/plasma)
+
+	flora_spawn_list = list(
+	)
+	feature_spawn_list = null
+	mob_spawn_list = list(
+		/mob/living/simple_animal/hostile/asteroid/basilisk/watcher
+
+	)

code/game/gamemodes/meteor/meteors.dm

@@ -334,6 +334,29 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	if(prob(20))
 		explosion(src.loc,2,4,6,8)
 
+/obj/effect/meteor/carp
+	name = "high velocity space carp"
+	desc = "What the devil?"
+	icon_state = "carp"
+	hits = 1
+	hitpwr = 0
+	pass_flags = PASSTABLE
+	meteorsound = 'sound/effects/blobattack.ogg'
+	meteordrop = list(/mob/living/simple_animal/hostile/carp)
+	dropamt = 1
+
+/obj/effect/meteor/carp/big
+	name = "high velocity space carp"
+	desc = "What the devil?"
+	icon = 'icons/mob/broadMobs.dmi'
+	icon_state = "megacarp"
+	hits = 1
+	hitpwr = 1
+	pass_flags = PASSTABLE
+	meteordrop = list(/mob/living/simple_animal/hostile/carp/megacarp)
+	dropamt = 1
+
+
 //////////////////////////
 //Spookoween meteors
 /////////////////////////

code/game/objects/effects/anomalies/_anomalies.dm

@@ -146,3 +146,6 @@
 	. = ..()
 	if(user.research_scanner == TRUE)
 		to_chat(user, span_notice("If harvested, this anomaly would be worth [research_value] research points."))
+
+/obj/effect/anomaly/throw_atom_into_space()
+	qdel(src)

code/game/objects/effects/spawners/lootdrop.dm

@@ -1017,6 +1017,17 @@
 		/obj/effect/anomaly/plasmasoul/planetary,
 		/obj/effect/anomaly/melter/planetary,
 	)
+
+/obj/effect/spawner/lootdrop/anomaly/storm
+	loot = list(
+		/obj/effect/anomaly/flux,
+		/obj/effect/anomaly/pyro,
+		/obj/effect/anomaly/sparkler,
+		/obj/effect/anomaly/veins,
+		/obj/effect/anomaly/phantom,
+		/obj/effect/anomaly/melter,
+	)
+
 //wasteplanet things
 
 /obj/effect/spawner/lootdrop/waste/grille_or_trash

code/game/turfs/open/chasm.dm

@@ -115,3 +115,31 @@
 	underlay_appearance.icon = 'icons/turf/floors.dmi'
 	underlay_appearance.icon_state = "dirt"
 	return TRUE
+
+//gas giant "chasm"
+/turf/open/chasm/gas_giant
+	name = "void"
+	desc = "The gas that makes up the gas giant. You can't see further, but you're fairly sure if you slipped in, you'd be dead."
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "reebemap" //to-do. Don't use Rebee Sprite
+	layer = SPACE_LAYER
+	baseturfs = /turf/open/chasm/gas_giant
+	planetary_atmos = TRUE
+	initial_gas_mix = GAS_GIANT_ATMOS
+	color = COLOR_DARK_MODERATE_ORANGE
+	light_range = 2
+	light_power = 0.6
+	light_color = COLOR_DARK_MODERATE_ORANGE
+	smoothing_flags = NONE
+	smoothing_groups = null
+	canSmoothWith = null
+	tiled_dirt = FALSE
+
+/turf/open/chasm/gas_giant/Initialize(mapload, inherited_virtual_z)
+	. = ..()
+	icon_state = "reebegame"
+
+/turf/open/chasm/gas_giant/plasma
+	light_color = COLOR_PURPLE
+	color = COLOR_PURPLE
+	initial_gas_mix = PLASMA_GIANT_ATMOS

code/game/turfs/open/space/transit.dm

@@ -37,8 +37,8 @@
 	if(iseffect(src))
 		return
 	if(isliving(src))
-		var/mob/living/poor_soul = src			// This may not seem like much, but if you toss someone out
-		poor_soul.apply_damage_type(50, BRUTE)	// and they go through like four tiles, they're goners
+		var/mob/living/poor_soul = src	// This may not seem like much, but if you toss someone out
+		poor_soul.apply_damage_type(25, BRUTE)	// and they go through like four tiles, they're goners
 		return
 	qdel(src)
 

code/modules/mob/living/simple_animal/hostile/carp.dm

@@ -139,6 +139,9 @@
 		add_dead_carp_overlay()
 	..()
 
+/mob/living/simple_animal/hostile/carp/throw_atom_into_space()
+	return
+
 /mob/living/simple_animal/hostile/carp/tamed()
 	. = ..()
 	can_buckle = TRUE

code/modules/overmap/missions/acquire_mission.dm

@@ -107,6 +107,39 @@
 	weight = 1
 	objective_type = /obj/item/strange_crystal
 
+/*
+Acquire: Anomaly
+*/
+
+/datum/mission/acquire/anomaly
+	name = "Anomaly core requested"
+	weight = 8
+	value = 3000
+	duration = 40 MINUTES
+	dur_mod_range = 0.2
+	container_type = /obj/item/storage/box/anomaly
+	objective_type = /obj/item/assembly/signaler/anomaly
+	num_wanted = 1
+
+/datum/mission/acquire/anomaly/New(...)
+	var/group = pick(list(
+		"Cybersun Industries",
+		"CMM-GOLD",
+		"Nanotrasen Anomalous Studies Division",
+		"The Naturalienwissenschaftlicher Studentenverbindungs-Verband",
+		"The Central Solarian Anomaly Research Agency",
+		"DeForest Medical R&D",
+		"A strange lizard on the outpost"
+	))
+
+	desc = "[group] has requested that a ship [pick(list("procure", "grab", "acquire", "find", "locate"))] \
+	an anomaly core for [pick(list("research", "analysis", "technical development", "closer inspection", "some reason"))]. \
+	They've offered to pay well, so we're relaying this mission to you"
+	. = ..()
+
+
+
+
 /*
 		Acquire: The Creature
 */
@@ -184,7 +217,7 @@
 
 /datum/mission/acquire/aquarium
 	name = "Fish needed for my aquarium"
-	weight = 14
+	weight = 6
 	value = 750
 	duration = 60 MINUTES
 	val_mod_range = 0.2
@@ -210,7 +243,7 @@
 
 /datum/mission/acquire/aquarium/rare
 	name = "Rare fish needed for my aquarium!"
-	weight = 8
+	weight = 1
 	value = 1500
 	val_mod_range = 0.3
 
@@ -236,7 +269,7 @@
 
 /datum/mission/acquire/fish_cook
 	name = "Fish needed for my meal"
-	weight = 8
+	weight = 3
 	duration = 40 MINUTES
 	val_mod_range = 0.2
 	objective_type = /obj/item/fish
@@ -307,3 +340,20 @@
 	. = ..()
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_items = 3
+
+/obj/item/storage/box/anomaly
+	name = "anomaly case"
+	desc = "A metallic box made to store anomaly cores. They aren't always the safest to lug around."
+	icon = 'icons/obj/nuke_tools.dmi'
+	icon_state = "core_container_sealed" //it'd be neat if I could figure out how to make this seal but that's a problem for me in 6 months
+	item_state = "tile"
+	lefthand_file = 'icons/mob/inhands/misc/tiles_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/tiles_righthand.dmi'
+	foldable = null
+
+/obj/item/storage/box/anomaly/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_combined_w_class = WEIGHT_CLASS_NORMAL
+	STR.max_w_class = WEIGHT_CLASS_NORMAL
+	STR.max_items = 1