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

Adds infinite weather! #362

Merged
merged 20 commits into from
Aug 25, 2024
Merged

Adds infinite weather! #362

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8fa8b21
adds infinite weather!
sunofang Aug 7, 2024
b9205b8
Oops, forgot include!
sunofang Aug 7, 2024
d2757d5
Oops, forgot include!
sunofang Aug 7, 2024
f521556
Merge branch 'weather' of https://github.com/sunofang/PvE-CMSS13 into…
sunofang Aug 7, 2024
3def452
Revert "Oops, forgot include!"
sunofang Aug 7, 2024
46d16fd
I fucked this up hard.
sunofang Aug 7, 2024
b27816d
Merge branch 'weather' of https://github.com/sunofang/PvE-CMSS13 into…
sunofang Aug 7, 2024
ba71466
True infinity
sunofang Aug 15, 2024
533ab89
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
16c4d00
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
82cf18b
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
0d47a51
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
c485961
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
f43b47a
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
a3a60d6
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
60ecf9e
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
98ba6d0
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
3f2b7bf
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
0e84635
Update code/datums/weather/weather_events/long.dm
sunofang Aug 22, 2024
1736fd4
Varadero Weather Stuff
sunofang Aug 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
48 changes: 48 additions & 0 deletions code/datums/weather/weather_events/long.dm
View file
Open in desktop
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 = INFINITE

Check failure on line 4 in code/datums/weather/weather_events/long.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved

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

Check failure on line 8 in code/datums/weather/weather_events/long.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved

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

Check failure on line 12 in code/datums/weather/weather_events/long.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved

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

Check failure on line 17 in code/datums/weather/weather_events/long.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved

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

Check failure on line 22 in code/datums/weather/weather_events/long.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved

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

Check failure on line 26 in code/datums/weather/weather_events/long.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved

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

Check failure on line 31 in code/datums/weather/weather_events/long.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved

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

Check failure on line 35 in code/datums/weather/weather_events/long.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved

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

Check failure on line 40 in code/datums/weather/weather_events/long.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved

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

Check failure on line 44 in code/datums/weather/weather_events/long.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved

/datum/weather_event/blizzard/infinite
name = "Blizzard (Infinite)"
length = INFINITE
sunofang marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions code/datums/weather/weather_events/lv522_chances_claim.dm
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion code/datums/weather/weather_events/new_varadero.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/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
Expand Down
1 change: 1 addition & 0 deletions colonialmarines.dme
View file
Open in desktop
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