Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mining Rework Part 1: First of his Name #2446

Merged
merged 66 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from 62 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
b327117
Drill foundation
BogCreature Oct 25, 2023
3803ab3
I THOUGHT I KILLED YOU!!!
BogCreature Oct 25, 2023
7e18b48
Animations and ore vein file
BogCreature Oct 26, 2023
b24e03a
Spawner changes and polish
BogCreature Oct 28, 2023
1a7f7d2
Merge remote-tracking branch 'upstream/master' into TestTest
BogCreature Oct 28, 2023
5e7e65d
Malfunctions part 1
BogCreature Oct 29, 2023
ddcedd8
Hate
BogCreature Oct 30, 2023
d5a4d85
Merge remote-tracking branch 'upstream/master' into TestTest
BogCreature Oct 30, 2023
7506e23
Beware: Nearing Completion
BogCreature Oct 31, 2023
e884e2a
Mission nightmare begins
BogCreature Oct 31, 2023
f806e2f
Bugged
BogCreature Oct 31, 2023
b57875c
I'm going to puke blood
BogCreature Nov 1, 2023
677b3cc
Merge remote-tracking branch 'upstream/master' into TestTest
BogCreature Nov 1, 2023
a8576c0
Judgement Day: TestMerge-ocalypse
BogCreature Nov 2, 2023
6a8bb89
Sand & ice planet spawn tweaks
BogCreature Nov 2, 2023
43c8d6f
I used the bitflags wrong
BogCreature Nov 3, 2023
cead9fb
Merge remote-tracking branch 'upstream/master' into TestTest
BogCreature Nov 4, 2023
1c1327e
515 funny update
BogCreature Nov 4, 2023
7bdfe74
I thought of a better place to put it
BogCreature Nov 4, 2023
5bf7c13
Refines some stuff
BogCreature Nov 6, 2023
23c325d
More refining
BogCreature Nov 6, 2023
2a036fc
Spawner bugfixes
BogCreature Nov 8, 2023
b3bd54d
Merge remote-tracking branch 'upstream/master' into TestTest
BogCreature Nov 8, 2023
307975c
Reworks the wave spawning to runtime less
BogCreature Nov 10, 2023
0354395
Last bit of stuff I can think of
BogCreature Nov 10, 2023
2826247
Merge remote-tracking branch 'upstream/master' into TestTest
BogCreature Nov 11, 2023
d90f26b
Fixes that absolutely vile pinpointer runtime
BogCreature Nov 13, 2023
ac45d39
I'm genuinely surprised I'm even literate
BogCreature Nov 14, 2023
3cd1703
Smaples...
BogCreature Nov 14, 2023
8a9b851
Spawning scales with player count
BogCreature Nov 15, 2023
50b8bc8
Fixes a minor yet annoying bug
BogCreature Nov 15, 2023
1b6bf5f
Merge branch 'TestTest' of https://github.com/BogCreature/Shiptest in…
BogCreature Nov 15, 2023
a055d75
Forgot to remove this before pushing, my bad
BogCreature Nov 15, 2023
77fd8dd
Merge remote-tracking branch 'upstream/master' into TestTest
BogCreature Nov 15, 2023
660c8e1
Infinite mining loot fix
BogCreature Nov 15, 2023
7950132
Vein time and malfunction tweak
BogCreature Nov 15, 2023
e455b2f
FUCK!!!
BogCreature Nov 15, 2023
3a5a6d8
I hate this
BogCreature Nov 15, 2023
63406bb
Forgot to change these
BogCreature Nov 15, 2023
1a490b4
Fix to stock part hell
BogCreature Nov 15, 2023
9c80491
Temporarily buffed drill output overall
BogCreature Nov 15, 2023
11222bc
Forgot I moved this around on the main drill
BogCreature Nov 16, 2023
ebb9f65
Cooldown stuffs
BogCreature Nov 16, 2023
0946008
Spawner waves improved
BogCreature Nov 17, 2023
b26494c
Drill anti cheese measure
BogCreature Nov 17, 2023
839338f
Balance tweaks
BogCreature Nov 23, 2023
8a28244
I like these numbers a bit better
BogCreature Nov 23, 2023
a8777da
Merge remote-tracking branch 'upstream/master' into TestTest
BogCreature Nov 29, 2023
3002eb7
Drill mission progress fix
BogCreature Nov 29, 2023
cebb293
Finer control of veins
BogCreature Nov 29, 2023
26b9afe
No more dwarf legion farming
BogCreature Nov 30, 2023
4bf40d5
runtime fix
BogCreature Nov 30, 2023
12966d4
Rebalances and a bugfix
BogCreature Dec 6, 2023
81eaffc
Merge remote-tracking branch 'upstream/master' into TestTest
BogCreature Dec 9, 2023
be05c97
Off button update
BogCreature Dec 9, 2023
053dfdc
Apply suggestions from code review
BogCreature Dec 12, 2023
c27ba67
Apply suggestions from code review
BogCreature Dec 12, 2023
5bc39b1
Ough
BogCreature Dec 12, 2023
b19593b
Apply suggestions from code review
BogCreature Dec 12, 2023
bd55652
Null mining variable fix
BogCreature Feb 22, 2024
a8cfa07
First batch of review fixes
BogCreature Feb 23, 2024
4969ec4
Second batch of review fixes
BogCreature Feb 23, 2024
b6bb48a
Divides mine() into 2 procs and fixes a rare bug
BogCreature Feb 25, 2024
52f6fdc
Obliterates trailing returns
BogCreature Feb 25, 2024
58d7229
Signalizes the ore vein spawning component
BogCreature Feb 25, 2024
74b2c5e
Stops an extremely rare bug
BogCreature Feb 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/__DEFINES/stock_parts.dm
Original file line number Diff line number Diff line change
@@ -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"
22 changes: 22 additions & 0 deletions code/__HELPERS/game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
94 changes: 78 additions & 16 deletions code/datums/components/spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -22,36 +28,92 @@
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))
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/pause_spawning()
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)

/datum/component/spawner/proc/unpause_spawning()
START_PROCESSING(SSprocessing, src)

/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(unpause_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(!isliving(player))
continue
if(player.stat != CONSCIOUS)
continue
if(get_dist(get_turf(player), spot) > spawn_distance_max)
tmtmtl30 marked this conversation as resolved.
Show resolved Hide resolved
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)
7 changes: 7 additions & 0 deletions code/datums/looping_sounds/machinery_sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 13 additions & 7 deletions code/datums/mapgen/planetary/LavaGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,12 @@
)
feature_spawn_chance = 0.3
feature_spawn_list = list(
/obj/structure/flora/rock/hell = 10,
/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,

)
Expand All @@ -112,9 +115,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,
thgvr marked this conversation as resolved.
Show resolved Hide resolved
/obj/structure/spawner/lavaland/medium_threat = 3,
/obj/structure/spawner/lavaland/high_threat = 1,
)

/datum/biome/lavaland/forest
Expand Down Expand Up @@ -161,7 +164,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
Expand Down Expand Up @@ -231,8 +237,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
)
Expand Down
6 changes: 6 additions & 0 deletions code/datums/mapgen/planetary/RockGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,11 @@
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/structure/vein/classthree = 10,
/obj/effect/spawner/lootdrop/anomaly/big = 1 //get out of here stalker
)

Expand Down Expand Up @@ -147,8 +150,11 @@
)
feature_spawn_chance = 0.5
feature_spawn_list = list(
/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,
)
Expand Down
5 changes: 5 additions & 0 deletions code/datums/mapgen/planetary/SandGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
Expand Down
54 changes: 33 additions & 21 deletions code/datums/mapgen/planetary/SnowGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,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,
Expand All @@ -116,7 +116,10 @@
/obj/effect/spawner/lootdrop/anomaly/big = 1,
/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/structure/spawner/ice_moon/demonic_portal/high_threat = 13,
/obj/structure/vein/ice = 25,
/obj/structure/vein/ice/classtwo = 50,
/obj/structure/vein/ice/classthree = 10,
)

/datum/biome/snow/lush
Expand Down Expand Up @@ -164,15 +167,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,
Expand Down Expand Up @@ -209,10 +215,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,
)


Expand Down Expand Up @@ -249,8 +258,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,
Expand All @@ -260,13 +269,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/effect/spawner/lootdrop/anomaly/ice/cave = 10
/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,
)

/datum/biome/cave/snow/thawed
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/pinpointer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
. = ..()
if(!active)
return
if(!target)
if(!target?.loc)
. += "pinon[alert ? "alert" : ""]null[icon_suffix]"
return
var/turf/here = get_turf(src)
Expand Down
4 changes: 3 additions & 1 deletion code/game/objects/structures/spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ GLOBAL_LIST_INIT(astroloot, list(
var/faction = list("hostile")
var/spawn_sound = list('sound/effects/break_stone.ogg')
var/spawner_type = /datum/component/spawner
var/spawn_distance_min = 1
var/spawn_distance_max = 1

/obj/structure/spawner/Initialize()
. = ..()
AddComponent(spawner_type, mob_types, spawn_time, faction, spawn_text, max_mobs, spawn_sound)
AddComponent(spawner_type, mob_types, spawn_time, faction, spawn_text, max_mobs, spawn_sound, spawn_distance_min, spawn_distance_max)

/obj/structure/spawner/attack_animal(mob/living/simple_animal/M)
if(faction_check(faction, M.faction, FALSE)&&!M.client)
Expand Down
Loading
Loading