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

Adds infinite weather! #362

Merged
merged 20 commits into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
48 changes: 48 additions & 0 deletions code/datums/weather/weather_events/long.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// Weather events for Big Red
/datum/weather_event/dust/infinite
name = "Duststorm (Infinite)"
length = INFINITY

/datum/weather_event/sand/infinite
name = "Sandstorm (Infinite)"
length = INFINITY

/datum/weather_event/rock/infinite
name = "Rockstorm (Infinite)"
length = INFINITY

// Weather events for Chances Claim
/datum/weather_event/light_rain/lv522/infinite
name = "LV522 Light Rain (Infinite)"
length = INFINITY

// Weather events for LV624
/datum/weather_event/light_rain/infinite
name = "Light Rain (Infinite)"
length = INFINITY

/datum/weather_event/heavy_rain/infinite
name = "Heavy Rain (Infinite)"
length = INFINITY

// Weather events for New Varadero
/datum/weather_event/light_rain/varadero/infinite
name = "Tropical Storm (Infinite)"
length = INFINITY

/datum/weather_event/monsoon/infinite
name = "Monsoon Warning (Infinite)"
length = INFINITY

// Weather events for Sorokyne
/datum/weather_event/snow/infinite
name = "Snow (Infinite)"
length = INFINITY

/datum/weather_event/snowstorm/infinite
name = "Snowstorm (Infinite)"
length = INFINITY

/datum/weather_event/blizzard/infinite
name = "Blizzard (Infinite)"
length = INFINITY
2 changes: 2 additions & 0 deletions code/datums/weather/weather_events/lv522_chances_claim.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/datum/weather_event/light_rain/lv522
name = "LV522 Light Rain"
display_name = "Light Rain"
length = 3 MINUTES
lightning_chance = 4

Expand Down
11 changes: 1 addition & 10 deletions code/datums/weather/weather_events/new_varadero.dm
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
/datum/weather_event/light_rain
/datum/weather_event/light_rain/varadero
name = "Tropical Storm"
sunofang marked this conversation as resolved.
Show resolved Hide resolved
display_name = "Tropical Storm"
length = 4 MINUTES
fullscreen_type = /atom/movable/screen/fullscreen/weather/low

turf_overlay_icon_state = "strata_storm"
turf_overlay_alpha = 40

effect_message = null
damage_per_tick = 0

has_process = TRUE
lightning_chance = 1

ambience = 'sound/ambience/rainforest.ogg'

fire_smothering_strength = 1

/datum/weather_event/monsoon
name = "Monsoon Warning"
display_name = "Monsoon Warning"
Expand Down
2 changes: 1 addition & 1 deletion code/datums/weather/weather_map_holders/new_varadero.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
no_weather_turf_icon_state = "strata_clearsky"

potential_weather_events = list(
/datum/weather_event/light_rain,
/datum/weather_event/light_rain/varadero,
/datum/weather_event/monsoon,
)

Expand Down
1 change: 1 addition & 0 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,7 @@
#include "code\datums\weather\weather_map_holder.dm"
#include "code\datums\weather\weather_events\big_red.dm"
#include "code\datums\weather\weather_events\faction_clash.dm"
#include "code\datums\weather\weather_events\long.dm"
#include "code\datums\weather\weather_events\lv522_chances_claim.dm"
#include "code\datums\weather\weather_events\lv624.dm"
#include "code\datums\weather\weather_events\new_varadero.dm"
Expand Down
Loading