Merge branch 'master' into landmines

Signed-off-by: Sun-Soaked <[email protected]>
shiptest-ss13 · Feb 28, 2024 · 757bb6f · 757bb6f
2 parents 4be7fb9 + 871ad15
commit 757bb6f
Show file tree

Hide file tree

Showing 23 changed files with 1,051 additions and 61 deletions.
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
@@ -727,6 +727,10 @@
 /// From overmap Undock(): (datum/overmap)
 #define COMSIG_OVERMAP_UNDOCK "overmap_undock"
 
+// /datum/component/spawner signals
+// Called by parent when pausing spawning, returns bool: (datum/source, spawning_started)
+#define COMSIG_SPAWNER_TOGGLE_SPAWNING "spawner_toggle"
+
 ///Beam Signals
 /// Called before beam is redrawn
 #define COMSIG_BEAM_BEFORE_DRAW "beam_before_draw"

diff --git a/code/__DEFINES/stock_parts.dm b/code/__DEFINES/stock_parts.dm
@@ -0,0 +1,6 @@
+//Stock part types (like tool behaviour but for stock parts)
+#define PART_CAPACITOR "capacitor"
+#define PART_SCANNER "scanning module"
+#define PART_MANIPULATOR "manipulator"
+#define PART_LASER "micro-laser"
+#define PART_BIN "matter bin"
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
@@ -143,6 +143,28 @@ block( \
 	//turfs += centerturf
 	return atoms
 
+/**
+ * Behaves like the orange() proc, but only looks in the outer range of the function (The "peel" of the orange).
+ * Credit to ArcaneMusic for this one
+ */
+/proc/turf_peel(outer_range, inner_range, center, view_based = FALSE)
+	var/list/peel = list()
+	var/list/outer
+	var/list/inner
+	if(view_based)
+		outer = circleviewturfs(center, outer_range)
+		inner = circleviewturfs(center, inner_range)
+	else
+		outer = circlerangeturfs(center, outer_range)
+		inner = circlerangeturfs(center, inner_range)
+	for(var/turf/possible_spawn in outer)
+		if(possible_spawn in inner)
+			continue
+		if(istype(possible_spawn, /turf/closed))
+			continue
+		peel += possible_spawn
+	return peel
+
 /proc/get_dist_euclidian(atom/Loc1 as turf|mob|obj,atom/Loc2 as turf|mob|obj)
 	var/dx = Loc1.x - Loc2.x
 	var/dy = Loc1.y - Loc2.y

diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm
@@ -7,9 +7,15 @@
 	var/list/spawn_text = list("emerges from")
 	var/list/faction = list("mining")
 	var/list/spawn_sound = list()
+	var/spawn_distance_min = 1
+	var/spawn_distance_max = 1
+	var/wave_length //Average time until break in spawning
+	var/wave_downtime //Average time until spawning starts again
+	var/wave_timer
+	var/current_timerid
 
 
-/datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs, _spawn_sound)
+/datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs, _spawn_sound, _spawn_distance_min, _spawn_distance_max, _wave_length, _wave_downtime)
 	if(_spawn_time)
 		spawn_time=_spawn_time
 	if(_mob_types)
@@ -22,36 +28,99 @@
 		max_mobs=_max_mobs
 	if(_spawn_sound)
 		spawn_sound=_spawn_sound
+	if(_spawn_distance_min)
+		spawn_distance_min=_spawn_distance_min
+	if(_spawn_distance_max)
+		spawn_distance_max=_spawn_distance_max
+	if(_wave_length)
+		wave_length = _wave_length
+	if(_wave_downtime)
+		wave_downtime = _wave_downtime
 
 	RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), PROC_REF(stop_spawning))
+	RegisterSignal(parent, list(COMSIG_SPAWNER_TOGGLE_SPAWNING), PROC_REF(toggle_spawning))
 	START_PROCESSING(SSprocessing, src)
 
 /datum/component/spawner/process()
+	if(!parent) //Sanity check for instances where the spawner may be sleeping while the parent is destroyed
+		qdel(src)
+		return
 	try_spawn_mob()
 
-
 /datum/component/spawner/proc/stop_spawning(force)
 	SIGNAL_HANDLER
 
 	STOP_PROCESSING(SSprocessing, src)
+	deltimer(current_timerid)
 	for(var/mob/living/simple_animal/L in spawned_mobs)
 		if(L.nest == src)
 			L.nest = null
 	spawned_mobs = null
 
+//Different from stop_spawning() as it doesn't untether all mobs from it and is meant for temporarily stopping spawning
+/datum/component/spawner/proc/toggle_spawning(datum/source, spawning_started)
+	SIGNAL_HANDLER
+
+	if(spawning_started)
+		STOP_PROCESSING(SSprocessing, src)
+		deltimer(current_timerid) //Otherwise if spawning is paused while the wave timer is loose it'll just unpause on its own
+		COOLDOWN_RESET(src, wave_timer)
+		return FALSE
+	else
+		START_PROCESSING(SSprocessing, src)
+		return TRUE
+
 /datum/component/spawner/proc/try_spawn_mob()
 	var/atom/P = parent
-	if(spawned_mobs.len >= max_mobs)
-		return 0
-	if(spawn_delay > world.time)
-		return 0
-	spawn_delay = world.time + spawn_time
-	var/chosen_mob_type = pickweight(mob_types)
-	var/mob/living/simple_animal/L = new chosen_mob_type(P.loc)
-	L.flags_1 |= (P.flags_1 & ADMIN_SPAWNED_1)
-	spawned_mobs += L
-	L.nest = src
-	L.faction = src.faction
-	P.visible_message("<span class='danger'>[L] [pick(spawn_text)] [P].</span>")
-	if(length(spawn_sound))
-		playsound(P, pick(spawn_sound), 50, TRUE)
+	var/turf/spot = get_turf(P)
+	//Checks for handling the wave-based pausing and unpausing of spawning
+	//Almost certainly a better way to do this, but until then this technically works
+	if(wave_length)
+		if(!wave_timer)
+			COOLDOWN_START(src, wave_timer, wave_length)
+		if(wave_timer && COOLDOWN_FINISHED(src, wave_timer))
+			COOLDOWN_RESET(src, wave_timer)
+			STOP_PROCESSING(SSprocessing, src)
+			current_timerid = addtimer(CALLBACK(src, PROC_REF(toggle_spawning)), wave_downtime, TIMER_STOPPABLE)
+			return
+	////////////////////////////////
+	if(length(spawned_mobs) >= max_mobs)
+		return
+	if(!COOLDOWN_FINISHED(src, spawn_delay))
+		return
+	COOLDOWN_START(src, spawn_delay, spawn_time)
+	var/spawn_multiplier = 1
+	//Avoid using this with spawners that add this component on initialize
+	//It causes numerous runtime errors during planet generation
+	if(spawn_distance_max > 1)
+		var/player_count = 0
+		for(var/mob/player as anything in GLOB.player_list)
+			if(player.virtual_z() != spot.virtual_z())
+				continue
+			if(!isliving(player))
+				continue
+			if(player.stat != CONSCIOUS)
+				continue
+			if(get_dist(get_turf(player), spot) > spawn_distance_max)
+				continue
+			player_count++
+		if(player_count > 3)
+			spawn_multiplier = round(player_count/2)
+	spawn_multiplier = clamp(spawn_multiplier, 1, max_mobs - length(spawned_mobs))
+	for(var/mob_index in 1 to spawn_multiplier)
+		if(spawn_distance_max > 1)
+			var/origin = spot
+			var/list/peel = turf_peel(spawn_distance_max, spawn_distance_min, origin, view_based = TRUE)
+			if(length(peel))
+				spot = pick(peel)
+			else
+				spot = pick(circleviewturfs(origin, spawn_distance_max))
+		var/chosen_mob_type = pickweight(mob_types)
+		var/mob/living/simple_animal/L = new chosen_mob_type(spot)
+		L.flags_1 |= (P.flags_1 & ADMIN_SPAWNED_1)
+		spawned_mobs += L
+		L.nest = src
+		L.faction = src.faction
+		P.visible_message("<span class='danger'>[L] [pick(spawn_text)] [P].</span>")
+		if(length(spawn_sound))
+			playsound(P, pick(spawn_sound), 50, TRUE)
diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm
@@ -72,3 +72,10 @@
 	volume = 85
 	vary = TRUE
 
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/datum/looping_sound/drill
+	mid_sounds = list('sound/machines/gravgen/gravgen_mid1.ogg'=1, 'sound/machines/gravgen/gravgen_mid2.ogg'=1, 'sound/machines/gravgen/gravgen_mid3.ogg'=1, 'sound/machines/gravgen/gravgen_mid4.ogg'=1)
+	mid_length = 4
+	volume = 50
+	extra_range = 6
diff --git a/code/datums/mapgen/planetary/LavaGenerator.dm b/code/datums/mapgen/planetary/LavaGenerator.dm
@@ -102,6 +102,14 @@
 		/obj/structure/geyser/random = 4,
 		/obj/effect/spawner/lootdrop/anomaly/lava = 2,
 		/obj/effect/spawner/minefield = 1
+		/obj/structure/flora/rock/hell = 14,
+		/obj/structure/vein = 5,
+		/obj/structure/vein/classtwo = 2,
+		/obj/structure/elite_tumor = 2,
+		/obj/structure/geyser/random = 2,
+		/obj/structure/vein/classthree = 1,
+		/obj/effect/spawner/lootdrop/anomaly/lava = 1,
+    /obj/effect/spawner/minefield = 1,
 
 	)
 	mob_spawn_chance = 4
@@ -114,9 +122,9 @@
 		/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal = 1,
 		/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/forgotten = 1,
 		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/crystal = 1,
-		/obj/structure/spawner/lavaland/low_threat = 12,
-		/obj/structure/spawner/lavaland/medium_threat = 4,
-		/obj/structure/spawner/lavaland/high_threat = 2,
+		/obj/structure/spawner/lavaland/low_threat = 8,
+		/obj/structure/spawner/lavaland/medium_threat = 3,
+		/obj/structure/spawner/lavaland/high_threat = 1,
 	)
 
 /datum/biome/lavaland/forest
@@ -163,7 +171,10 @@
 	feature_spawn_list = list(
 		/obj/structure/flora/tree/dead/barren = 50,
 		/obj/structure/flora/tree/dead/tall/grey = 45,
-		/obj/effect/spawner/lootdrop/anomaly/lava = 5
+		/obj/effect/spawner/lootdrop/anomaly/lava = 10,
+		/obj/structure/vein = 5,
+		/obj/structure/vein/classtwo = 2,
+		/obj/structure/vein/classthree = 1,
 	)
 
 /datum/biome/lavaland/plains/dense/mixed
@@ -233,8 +244,8 @@
 		/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40,
 		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30,
 		/mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
-		/obj/structure/spawner/lavaland/low_threat = 12,
-		/obj/structure/spawner/lavaland/medium_threat = 4,
+		/obj/structure/spawner/lavaland/low_threat = 8,
+		/obj/structure/spawner/lavaland/medium_threat = 3,
 		/obj/structure/spawner/lavaland/high_threat = 2,
 		/obj/structure/spawner/lavaland/extreme_threat = 1
 	)

diff --git a/code/datums/mapgen/planetary/RockGenerator.dm b/code/datums/mapgen/planetary/RockGenerator.dm
@@ -86,9 +86,12 @@
 	feature_spawn_chance = 0.25
 	feature_spawn_list = list(
 		/obj/structure/geyser/random = 80,
+		/obj/structure/vein = 60,
 		/obj/structure/elite_tumor = 40,
+		/obj/structure/vein/classtwo = 40,
 		/obj/effect/spawner/lootdrop/anomaly/rock = 10,
-		/obj/effect/spawner/minefield = 2,
+		/obj/structure/vein/classthree = 10,
+    /obj/effect/spawner/minefield = 2,
 		/obj/effect/spawner/lootdrop/anomaly/big = 1 //get out of here stalker
 	)
 
@@ -151,11 +154,14 @@
 	)
 	feature_spawn_chance = 0.5
 	feature_spawn_list = list(
-		/obj/structure/geyser/random = 4,
-		/obj/structure/elite_tumor = 2,
-		/obj/structure/spawner/ice_moon/rockplanet = 6,
-		/obj/effect/spawner/lootdrop/anomaly/rock/cave = 2,
-		/obj/effect/spawner/minefield = 1
+		/obj/structure/vein = 3,
+		/obj/structure/geyser/random = 2,
+		/obj/structure/vein/classtwo = 2,
+		/obj/structure/elite_tumor = 1,
+		/obj/structure/vein/classthree = 1,
+		/obj/structure/spawner/ice_moon/rockplanet = 4,
+		/obj/effect/spawner/lootdrop/anomaly/rock/cave = 1,
+    	/obj/effect/spawner/minefield = 1,
 	)
 	mob_spawn_chance = 6
 	mob_spawn_list = list(

diff --git a/code/datums/mapgen/planetary/SandGenerator.dm b/code/datums/mapgen/planetary/SandGenerator.dm
@@ -92,7 +92,10 @@
 	feature_spawn_chance = 0.1
 	feature_spawn_list = list(
 		/obj/structure/geyser/random = 8,
+		/obj/structure/vein = 8,
+		/obj/structure/vein/classtwo = 4,
 		/obj/structure/elite_tumor = 4,
+		/obj/structure/vein/classthree = 2,
 		/obj/effect/spawner/lootdrop/anomaly/sand = 1,
 	)
 	mob_spawn_chance = 4
@@ -192,7 +195,9 @@
 		/obj/structure/flora/ash/puce = 1,
 	)
 	feature_spawn_list = list(
+		/obj/structure/vein = 8,
 		/obj/structure/geyser/random = 4,
+		/obj/structure/vein/classtwo = 4,
 		/obj/structure/elite_tumor = 4,
 		/obj/effect/spawner/lootdrop/anomaly/sand/cave = 1
 	)

diff --git a/code/datums/mapgen/planetary/SnowGenerator.dm b/code/datums/mapgen/planetary/SnowGenerator.dm
@@ -102,8 +102,8 @@
 	mob_spawn_chance = 1
 	mob_spawn_list = list(
 		/mob/living/simple_animal/hostile/asteroid/wolf/random = 30,
-		/obj/structure/spawner/ice_moon = 3,
-		/obj/structure/spawner/ice_moon/polarbear = 3,
+		/obj/structure/spawner/ice_moon = 2,
+		/obj/structure/spawner/ice_moon/polarbear = 2,
 		/mob/living/simple_animal/hostile/asteroid/polarbear/random = 30,
 		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50,
 		/mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
@@ -118,7 +118,10 @@
 		/obj/structure/spawner/ice_moon/demonic_portal/low_threat = 25,
 		/obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 50,
 		/obj/structure/spawner/ice_moon/demonic_portal/high_threat = 13,
-		/obj/effect/spawner/minefield = 2
+		/obj/structure/vein/ice = 25,
+		/obj/structure/vein/ice/classtwo = 50,
+		/obj/structure/vein/ice/classthree = 10,
+    	/obj/effect/spawner/minefield = 2,
 	)
 
 /datum/biome/snow/lush
@@ -168,15 +171,18 @@
 	)
 	feature_spawn_chance = 0.1
 	feature_spawn_list = list(
-		/obj/structure/spawner/ice_moon = 3,
-		/obj/structure/spawner/ice_moon/polarbear = 3,
+		/obj/structure/spawner/ice_moon = 2,
+		/obj/structure/spawner/ice_moon/polarbear = 2,
 		/obj/structure/statue/snow/snowman = 3,
-		/obj/structure/statue/snow/snowlegion = 1
+		/obj/structure/statue/snow/snowlegion = 1,
+		/obj/structure/vein/ice = 3,
+		/obj/structure/vein/ice/classtwo = 4,
+		/obj/structure/vein/ice/classthree = 1,
 	)
 	mob_spawn_list = list(
 		/mob/living/simple_animal/hostile/asteroid/wolf/random = 30,
-		/obj/structure/spawner/ice_moon = 3,
-		/obj/structure/spawner/ice_moon/polarbear = 3,
+		/obj/structure/spawner/ice_moon = 2,
+		/obj/structure/spawner/ice_moon/polarbear = 2,
 		/mob/living/simple_animal/hostile/asteroid/polarbear/random = 30,
 		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50,
 		/mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
@@ -213,10 +219,13 @@
 	feature_spawn_list = list(
 		/obj/effect/spawner/lootdrop/anomaly/ice = 100,
 		/obj/effect/spawner/lootdrop/anomaly/big = 1,
-		/obj/structure/spawner/ice_moon/demonic_portal/low_threat = 300,
-		/obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 500,
-		/obj/structure/spawner/ice_moon/demonic_portal/high_threat = 50,
-		/obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 1
+		/obj/structure/spawner/ice_moon/demonic_portal/low_threat = 200,
+		/obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 400,
+		/obj/structure/spawner/ice_moon/demonic_portal/high_threat = 40,
+		/obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 1,
+		/obj/structure/vein/ice = 300,
+		/obj/structure/vein/ice/classtwo = 500,
+		/obj/structure/vein/ice/classthree = 50,
 	)
 
 
@@ -254,8 +263,8 @@
 	mob_spawn_chance = 2
 	mob_spawn_list = list(
 		/mob/living/simple_animal/hostile/asteroid/wolf/random = 30,
-		/obj/structure/spawner/ice_moon = 3,
-		/obj/structure/spawner/ice_moon/polarbear = 3,
+		/obj/structure/spawner/ice_moon = 2,
+		/obj/structure/spawner/ice_moon/polarbear = 2,
 		/mob/living/simple_animal/hostile/asteroid/polarbear/random = 30,
 		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50,
 		/mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
@@ -265,13 +274,16 @@
 	)
 	feature_spawn_chance = 0.2
 	feature_spawn_list = list(
-		/obj/structure/spawner/ice_moon/demonic_portal/low_threat = 30,
-		/obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 50,
-		/obj/structure/spawner/ice_moon/demonic_portal/high_threat = 6,
-		/obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 2,
-		/obj/structure/spawner/ice_moon = 30,
-		/obj/structure/spawner/ice_moon/polarbear = 30,
+		/obj/structure/spawner/ice_moon/demonic_portal/low_threat = 20,
+		/obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 40,
+		/obj/structure/spawner/ice_moon/demonic_portal/high_threat = 5,
+		/obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 1,
+		/obj/structure/spawner/ice_moon = 20,
+		/obj/structure/spawner/ice_moon/polarbear = 20,
 		/obj/effect/spawner/lootdrop/anomaly/ice/cave = 10,
+		/obj/structure/vein/ice = 30,
+		/obj/structure/vein/ice/classtwo = 50,
+		/obj/structure/vein/ice/classthree = 6,
 		/obj/effect/spawner/minefield = 2,
 	)