From d57b624b6c8a6a235e6f47b73fbab75c3489521f Mon Sep 17 00:00:00 2001 From: Archie Date: Sat, 12 Jun 2021 00:52:53 -0300 Subject: [PATCH 1/2] Balancing + reorg --- hyperstation/code/modules/events/crystalline_reentry.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hyperstation/code/modules/events/crystalline_reentry.dm b/hyperstation/code/modules/events/crystalline_reentry.dm index 034e5ce3..71206465 100644 --- a/hyperstation/code/modules/events/crystalline_reentry.dm +++ b/hyperstation/code/modules/events/crystalline_reentry.dm @@ -14,6 +14,7 @@ /datum/round_event/crystalline_reentry announceWhen = 0 + startWhen = 10 fakeable = FALSE /datum/round_event/crystalline_reentry/announce(fake) @@ -177,7 +178,6 @@ if(asteroidhealth <= 0) collision_effect() atmos_spawn_air("water_vapor=1000;TEMP=0") //brr - make_debris() switch(rand(1,100)) if(1 to 20) var/obj/structure/spawner/crystalline/M = new(src.loc) @@ -205,6 +205,7 @@ new thing_to_spawn(get_turf(src)) /obj/effect/crystalline_reentry/proc/collision_effect() + make_debris() explosion(src.loc, 0, 0, 5, 3, 1, 0, 0, 0, 0) var/sound/meteor_sound = sound(meteorsound) var/random_frequency = get_rand_frequency() @@ -267,8 +268,8 @@ /obj/structure/spawner/crystalline/proc/delayedInitialize() //Why is this needed? Simple, because apparently explosion is so slow that it triggers after the spawner spawns and kills it on the spot. This just makes it killable. resistance_flags = FIRE_PROOF | LAVA_PROOF - max_integrity = 250 - obj_integrity = 250 + max_integrity = 200 + obj_integrity = 200 /obj/effect/light_emitter/crystalline set_luminosity = 4 From 955b40626662930db2ce144112d40ffcb9d1671d Mon Sep 17 00:00:00 2001 From: Archie Date: Sat, 12 Jun 2021 01:28:03 -0300 Subject: [PATCH 2/2] right! --- hyperstation/code/modules/events/crystalline_reentry.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hyperstation/code/modules/events/crystalline_reentry.dm b/hyperstation/code/modules/events/crystalline_reentry.dm index 71206465..bcdb01c5 100644 --- a/hyperstation/code/modules/events/crystalline_reentry.dm +++ b/hyperstation/code/modules/events/crystalline_reentry.dm @@ -268,8 +268,8 @@ /obj/structure/spawner/crystalline/proc/delayedInitialize() //Why is this needed? Simple, because apparently explosion is so slow that it triggers after the spawner spawns and kills it on the spot. This just makes it killable. resistance_flags = FIRE_PROOF | LAVA_PROOF - max_integrity = 200 - obj_integrity = 200 + max_integrity = 225 + obj_integrity = 225 /obj/effect/light_emitter/crystalline set_luminosity = 4