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.

Sign up for GitHub

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

Jump to bottom

[pull] dev from Baystation12:dev #25

Merged
merged 3 commits into from
Jan 2, 2024
Merged

[pull] dev from Baystation12:dev #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76e5523
fix exo awakening resetting other event timers
MuckerMayhem Dec 31, 2023
d2e6606
Merge pull request #34422 from MuckerMayhem/exoplanet-event-fix
Spookerton Dec 31, 2023
b2b6636
Automatic changelog generation [ci skip]
Bay12Bot Jan 2, 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
20 changes: 11 additions & 9 deletions code/modules/events/exo_awakening/exo_awaken.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,18 @@ GLOBAL_LIST_INIT(exo_event_mob_count,list())// a list of all mobs currently spaw
var/spawning = FALSE
///Set to TRUE when the event fails one or more of the start conditions
var/failed = FALSE
///Severity of the event. Used to calculate spawn rates and event length.
var/event_severity

/datum/event/exo_awakening/setup()
announceWhen = rand(15, 45)
affecting_z = list()
if (prob(25))
severity = EVENT_LEVEL_MAJOR
event_severity = EVENT_LEVEL_MAJOR

chosen_mob_list = pick(typesof(/datum/mob_list/major) - /datum/mob_list/major)
else
severity = EVENT_LEVEL_MODERATE
event_severity = EVENT_LEVEL_MODERATE
chosen_mob_list = pick(typesof(/datum/mob_list/moderate) - /datum/mob_list/moderate)

for (var/area/A in world)
Expand All @@ -43,15 +45,15 @@ GLOBAL_LIST_INIT(exo_event_mob_count,list())// a list of all mobs currently spaw
chosen_mob_list = new chosen_mob_list
target_mob_count = chosen_mob_list.limit
endWhen = chosen_mob_list.length
endWhen += severity*25
endWhen += event_severity*25

apply_spawn_delay()

/datum/event/exo_awakening/proc/apply_spawn_delay()
delay_time = chosen_mob_list.delay_time
var/delay_mod = delay_time / 6
var/delay_max = (EVENT_LEVEL_MAJOR - severity) * delay_mod
var/delay_min = -1 * severity * delay_mod
var/delay_max = (EVENT_LEVEL_MAJOR - event_severity) * delay_mod
var/delay_min = -1 * event_severity * delay_mod
delay_mod = max(rand(delay_min, delay_max), 0)
delay_time += delay_mod
endWhen += delay_time
Expand Down Expand Up @@ -113,7 +115,7 @@ GLOBAL_LIST_INIT(exo_event_mob_count,list())// a list of all mobs currently spaw
//Notify all players on the planet that the event is beginning.
/datum/event/exo_awakening/proc/notify_players()
for (var/mob/M in players_on_site[chosen_area])
if (severity > EVENT_LEVEL_MODERATE)
if (event_severity > EVENT_LEVEL_MODERATE)
to_chat(M, SPAN_DANGER(chosen_mob_list.arrival_message))
else
to_chat(M, SPAN_WARNING(chosen_mob_list.arrival_message))
Expand All @@ -128,7 +130,7 @@ GLOBAL_LIST_INIT(exo_event_mob_count,list())// a list of all mobs currently spaw

/datum/event/exo_awakening/announce()
var/announcement = ""
if (severity > EVENT_LEVEL_MODERATE)
if (event_severity > EVENT_LEVEL_MODERATE)
announcement = "Extreme biological activity spike detected on [location_name()]."
else
announcement = "Anomalous biological activity detected on [location_name()]."
Expand All @@ -154,7 +156,7 @@ GLOBAL_LIST_INIT(exo_event_mob_count,list())// a list of all mobs currently spaw
return

var/list/area_turfs = get_area_turfs(chosen_area)
var/n = rand(severity-1, severity*2)
var/n = rand(event_severity-1, event_severity*2)
var/I = 0
while (I < n)
var/turf/T
Expand Down Expand Up @@ -220,7 +222,7 @@ GLOBAL_LIST_INIT(exo_event_mob_count,list())// a list of all mobs currently spaw
chosen_planet.add_scan_data("exo_awaken_aftermath", SPAN_COLOR(COLOR_GREEN, "Biological and geological activity within tolerance, trace unknown lifeforms detected."), null, SKILL_SCIENCE, SKILL_TRAINED)

QDEL_NULL(chosen_mob_list)
log_debug("Exoplanet Awakening event spawned [spawned_mobs] mobs. It was a level [severity] out of 3 severity.")
log_debug("Exoplanet Awakening event spawned [spawned_mobs] mobs. It was a level [event_severity] out of 3 severity.")

if (!failed)
for (var/mob/M in GLOB.player_list)
Expand Down
15 changes: 0 additions & 15 deletions html/changelog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,21 +407,6 @@ <h3 class="author">orelbon updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fire extinguisher spray should now act as expected without having to directly click on target.</li>
</ul>

<h2 class="date">31 October 2023</h2>
<h3 class="author">Mucker updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Space carp will now actually make it to the ship during carp events again.</li>
</ul>
<h3 class="author">SierraKomodo updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Organs now take 50-100% of their maximum damage when their holding body part is gibbed. This primarily effects brain damage from exploding heads.</li>
<li class="spellcheck">Fixed a typo in the organic body part gibbing message.</li>
</ul>
<h3 class="author">Spookerton updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Mapped injectors don't turn themselves off during game setup.</li>
</ul>
</div>

<b>GoonStation 13 Development Team</b>
Expand Down