mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 03:55:11 +01:00
Weather DLC - Make it Rain Anything! (#89550)
Introducing more weather types! And yes, you can now have rain be reagent based! <details> <summary>Regular Rain</summary>  </details> <details> <summary>Blood Rain</summary>  </details> <details> <summary>Acid Rain</summary>  </details> You can even make it rain ants, plasma, or drugs. All of their effects get applied to turfs, objects, and mobs depending on the weather options you select. Did I mention... there is thunder? <details> <summary>Thunder Strikes</summary>  </details> <details> <summary>Sand Storms</summary>  </details> Despite all this new stuff, none of it has been directly added to the game but the code can be used in the future for: - Wizard event - Similar to lava on floor, but this time make the reagent random or picked from a list and give wizard immunity - Chaplain ability - Maybe make this a benefit or ability once enough favor has been obtained - Admin events - I have added a BUNCH of admin tooling to run customized weather events that let you control a lot of options - New station maps/biomes for downstreams (Jungle Station, etc.) - Change Ion storms to use the new weather system that triggers EMP/thunder effects across the station - IceBox could get plasma rain - Lavaland could get thunder effects applied to ash storms Relevant PRs that removed/added some of the weather stuff I used: - #60303 - #25222 --- - Rain sprites were added via [novaepee](https://github.com/novaepee) in https://github.com/tgstation/TerraGov-Marine-Corps/pull/9675 - Sand sprites were added via [TiviPlus](https://github.com/TiviPlus) (who commissioned them from bimmer) in https://github.com/tgstation/TerraGov-Marine-Corps/pull/4645 - Rain sounds [already existed on tg](https://github.com/tgstation/tgstation/pull/25222#discussion_r106794579) and were provided by provided by Cuboos, using Royalty Free sounds, presumed under default tg sound license - Creative Commons 3.0 BY-SA - Siren sound is from siren.wav by IFartInUrGeneralDirection -- [Freesound](https://freesound.org/s/46092/) -- License: Attribution 4.0 The original `siren.ogg` sound used on a lot of SS13 servers doesn't seem to have any attribution that I could locate. The sound was added about 15 years ago. So I just looked for a somewhat similar sounding siren noise on Freesound. More weather customization! 🆑 add: Added new weather types for rain and sandstorms. Rain now uses a reagent that gets exposed to the turfs, mobs, and objects. There is also a thunder strike setting you can apply to any weather. add: Hydro trays and soil will now add reagents to their trays when exposed to a chemical reaction. (weather, shower, chem spills, foam grenades, etc.) add: Weather temperature now affects weather reagents and mobs body temperature. bal: Snowstorm temperature calculations were tweaked to allow universal weather temperature effects. sound: Added weather sounds from TGMC for rain and sirens (attributed to Cuboos and IFartInUrGeneralDirection ) image: Added weather images from TGMC for rain and sand storms (attributed to Novaepee and Bimmer) refactor: Refactored a lot of the weather code to be more robust admin: Admins can now control more weather related options when running weather events. The weather admin verbs have been moved to their own "Weather" category under the Admin tab. /🆑 --------- Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
Tim
@@ -152,22 +152,6 @@ ADMIN_VERB(change_sec_level, R_ADMIN, "Set Security Level", "Changes the securit
|
||||
message_admins("[key_name_admin(user)] changed the security level to [level]")
|
||||
BLACKBOX_LOG_ADMIN_VERB("Set Security Level [capitalize(level)]")
|
||||
|
||||
ADMIN_VERB(run_weather, R_FUN, "Run Weather", "Triggers specific weather on the z-level you choose.", ADMIN_CATEGORY_EVENTS)
|
||||
var/weather_type = input(user, "Choose a weather", "Weather") as null|anything in sort_list(subtypesof(/datum/weather), GLOBAL_PROC_REF(cmp_typepaths_asc))
|
||||
if(!weather_type)
|
||||
return
|
||||
|
||||
var/turf/T = get_turf(user.mob)
|
||||
var/z_level = input(user, "Z-Level to target?", "Z-Level", T?.z) as num|null
|
||||
if(!isnum(z_level))
|
||||
return
|
||||
|
||||
SSweather.run_weather(weather_type, z_level)
|
||||
|
||||
message_admins("[key_name_admin(user)] started weather of type [weather_type] on the z-level [z_level].")
|
||||
log_admin("[key_name(user)] started weather of type [weather_type] on the z-level [z_level].")
|
||||
BLACKBOX_LOG_ADMIN_VERB("Run Weather")
|
||||
|
||||
ADMIN_VERB(command_report_footnote, R_ADMIN, "Command Report Footnote", "Adds a footnote to the roundstart command report.", ADMIN_CATEGORY_EVENTS)
|
||||
var/datum/command_footnote/command_report_footnote = new /datum/command_footnote()
|
||||
GLOB.communications_controller.block_command_report += 1 //Add a blocking condition to the counter until the inputs are done.
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
ADMIN_VERB(run_weather, R_ADMIN|R_FUN, "Run Weather", "Triggers specific weather on the z-level you choose.", ADMIN_CATEGORY_EVENTS)
|
||||
|
||||
var/list/weather_choices = list()
|
||||
if(!length(weather_choices))
|
||||
for(var/datum/weather/weather_type as anything in subtypesof(/datum/weather))
|
||||
weather_choices[initial(weather_type.type)] = weather_type
|
||||
|
||||
var/datum/weather/weather_choice = tgui_input_list(user, "Choose a weather to run", "Weather", weather_choices)
|
||||
if(!weather_choice)
|
||||
return
|
||||
weather_choice = weather_choices[weather_choice]
|
||||
|
||||
var/turf/current_turf = get_turf(user.mob)
|
||||
var/z_level = tgui_input_number(user, "Z-Level to target", "Z-Level", min_value = 1, max_value = world.maxz, default = current_turf?.z)
|
||||
if(!isnum(z_level))
|
||||
return
|
||||
|
||||
var/static/list/custom_options = list("Default", "Custom", "Cancel")
|
||||
var/custom_choice = tgui_alert(user, "How would you like to run the weather settings?", "Custom Weather", custom_options)
|
||||
switch(custom_choice)
|
||||
if("Default")
|
||||
SSweather.run_weather(weather_choice, z_level) // default settings
|
||||
message_admins("[key_name_admin(user)] started weather of type [weather_choice] on the z-level [z_level].")
|
||||
log_admin("[key_name(user)] started weather of type [weather_choice] on the z-level [z_level].")
|
||||
BLACKBOX_LOG_ADMIN_VERB("Run Weather")
|
||||
return
|
||||
if("Cancel")
|
||||
return
|
||||
|
||||
var/list/area_choices = list()
|
||||
if(!length(area_choices))
|
||||
for(var/area/area_type as anything in typesof(/area))
|
||||
area_choices[initial(area_type.type)] = area_type
|
||||
|
||||
var/area/area_choice = tgui_input_list(user, "Select an area for weather to target", "Target Area", area_choices)
|
||||
if(!area_choice)
|
||||
return
|
||||
area_choice = area_choices[area_choice]
|
||||
|
||||
var/weather_bitflags = input_bitfield(
|
||||
user,
|
||||
"Weather flags - Select the flags for your weather event",
|
||||
"weather_flags",
|
||||
weather_choice::weather_flags,
|
||||
)
|
||||
|
||||
var/datum/reagent/reagent_choice
|
||||
if((weather_bitflags & (WEATHER_TURFS|WEATHER_MOBS)))
|
||||
var/static/list/reagent_options = list("Yes", "No", "Cancel")
|
||||
var/reagent_option = tgui_alert(user, "Would you like to make the weather use a custom reagent?", "Weather Reagent", reagent_options)
|
||||
switch(reagent_option)
|
||||
if("Cancel")
|
||||
return
|
||||
if("Yes")
|
||||
var/static/list/reagent_choices = list()
|
||||
if(!length(reagent_choices))
|
||||
for(var/datum/reagent/reagent_type as anything in subtypesof(/datum/reagent))
|
||||
reagent_choices[initial(reagent_type.type)] = reagent_type
|
||||
|
||||
reagent_choice = tgui_input_list(user, "Select a reagent for the rain", "Rain Reagent", reagent_choices)
|
||||
if(!reagent_choice)
|
||||
return
|
||||
reagent_choice = reagent_choices[reagent_choice]
|
||||
|
||||
var/thunder_value
|
||||
if(weather_bitflags & (WEATHER_THUNDER))
|
||||
var/static/list/thunder_choices = GLOB.thunder_chance_options
|
||||
|
||||
var/thunder_choice = tgui_input_list(user, "How much thunder would you like", "Thunder", thunder_choices)
|
||||
if(!thunder_choice)
|
||||
return
|
||||
thunder_value = GLOB.thunder_chance_options[thunder_choice]
|
||||
|
||||
var/list/weather_data = list(
|
||||
area = area_choice,
|
||||
weather_flags = weather_bitflags,
|
||||
thunder_chance = thunder_value,
|
||||
reagent = reagent_choice,
|
||||
)
|
||||
|
||||
SSweather.run_weather(weather_choice, z_level, weather_data)
|
||||
|
||||
message_admins("[key_name_admin(user)] started weather of type [weather_choice] on the z-level [z_level].")
|
||||
log_admin("[key_name(user)] started weather of type [weather_choice] on the z-level [z_level].")
|
||||
BLACKBOX_LOG_ADMIN_VERB("Run Weather")
|
||||
|
||||
ADMIN_VERB(stop_weather, R_ADMIN|R_DEBUG, "Stop All Active Weather", "Stop all currently active weather.", ADMIN_CATEGORY_EVENTS)
|
||||
log_admin("[key_name(user)] stopped all currently active weather.")
|
||||
message_admins("[key_name_admin(user)] stopped all currently active weather.")
|
||||
for(var/datum/weather/current_weather as anything in SSweather.processing)
|
||||
if(current_weather in SSweather.processing)
|
||||
current_weather.end()
|
||||
BLACKBOX_LOG_ADMIN_VERB("Stop All Active Weather")
|
||||
Reference in New Issue
Block a user