diff --git a/code/_globalvars/lists/misc.dm b/code/_globalvars/lists/misc.dm index 3a0c58bffb3..d065f5fa7bc 100644 --- a/code/_globalvars/lists/misc.dm +++ b/code/_globalvars/lists/misc.dm @@ -55,6 +55,4 @@ GLOBAL_LIST_INIT(cooking_recipes, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN = GLOBAL_LIST_INIT(cooking_ingredients, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN = list(), RECIPE_GRILL = list(), RECIPE_CANDY = list())) GLOBAL_LIST_INIT(cooking_reagents, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN = list(), RECIPE_GRILL = list(), RECIPE_CANDY = list())) -GLOBAL_LIST(station_level_space_turfs) - #define EGG_LAYING_MESSAGES list("lays an egg.", "squats down and croons.", "begins making a huge racket.", "begins clucking raucously.") diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 9a333d268f3..8792e710f2b 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -1238,7 +1238,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/psych name = "\improper Psych Room" icon_state = "medbaypsych" - ambientsounds = list('sound/ambience/aurora_caelus_short.ogg') /area/medical/medbreak name = "\improper Break Room" diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm deleted file mode 100644 index acd10288d71..00000000000 --- a/code/modules/events/aurora_caelus.dm +++ /dev/null @@ -1,55 +0,0 @@ -/datum/event/aurora_caelus - announceWhen = 5 - startWhen = 1 - endWhen = 50 - var/list/aurora_colors = list("#A2FF80", "#A2FF8B", "#A2FF96", "#A2FFA5", "#A2FFB6", "#A2FFC7", "#A2FFDE") - var/aurora_progress = 0 //this cycles from 1 to 7, slowly changing colors from gentle green to gentle blue - -/datum/event/aurora_caelus/announce() - GLOB.event_announcement.Announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. \ -Nanotrasen has approved a short break for all employees to relax and observe this very rare event. \ -During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. \ -Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. \ -We hope you enjoy the lights.", "Harmless ions approaching", new_sound = 'sound/misc/notice2.ogg', from = "Nanotrasen Meteorology Division") - for(var/V in GLOB.player_list) - var/mob/M = V - if((M.client.prefs.toggles & SOUND_MIDI) && is_station_level(M.z)) - M.playsound_local(null, 'sound/ambience/aurora_caelus.ogg', 20, FALSE, pressure_affected = FALSE) - -/datum/event/aurora_caelus/start() - for(var/area in GLOB.all_areas) - var/area/A = area - if(initial(A.dynamic_lighting) == DYNAMIC_LIGHTING_IFSTARLIGHT) - for(var/turf/space/S in A) - S.set_light(S.light_range * 3, S.light_power * 0.5) - -/datum/event/aurora_caelus/tick() - if(aurora_progress >= aurora_colors.len) - return - if(activeFor % 5 == 0) - aurora_progress++ - var/aurora_color = aurora_colors[aurora_progress] - for(var/area in GLOB.all_areas) - var/area/A = area - if(initial(A.dynamic_lighting) == DYNAMIC_LIGHTING_IFSTARLIGHT) - for(var/turf/space/S in A) - S.set_light(l_color = aurora_color) - -/datum/event/aurora_caelus/end() - for(var/area in GLOB.all_areas) - var/area/A = area - if(initial(A.dynamic_lighting) == DYNAMIC_LIGHTING_IFSTARLIGHT) - for(var/turf/space/S in A) - fade_to_black(S) - GLOB.event_announcement.Announce("The Aurora Caelus event is now ending. Starlight conditions will slowly return to normal. \ -When this has concluded, please return to your workplace and continue work as normal. \ -Have a pleasant shift, [station_name()], and thank you for watching with us.", -"Harmless ions dissipating", new_sound = 'sound/misc/notice2.ogg', from = "Nanotrasen Meteorology Division") - -/datum/event/aurora_caelus/proc/fade_to_black(turf/space/S) - set waitfor = FALSE - var/new_light = config.starlight - while(S.light_range > new_light) - S.set_light(S.light_range - 0.2) - sleep(30) - S.set_light(new_light, 1, l_color = "") // we should be able to use `, null` as the last arg but BYOND is a piece of FUCKING SHIT AND SET_LIGHT DOESN'T WORK THAT WAY DESPITE EVERY FUCKING THING ABOUT IT INDICATING THAT IT GODDAMN WELL SHOULD AAAAAAAAAAAAAAAAA diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index ae7094f73ec..7b165f34213 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -139,7 +139,6 @@ GLOBAL_LIST_EMPTY(event_last_fired) new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Vermin Infestation",/datum/event/infestation, 100, list(ASSIGNMENT_JANITOR = 100)), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Sentience", /datum/event/sentience, 50), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot", /datum/event/wallrot, 0, list(ASSIGNMENT_ENGINEER = 30, ASSIGNMENT_GARDENER = 50)), - new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Aurora Caelus", /datum/event/aurora_caelus, 15, is_one_shot = TRUE), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Koi School", /datum/event/carp_migration/koi, 80,) ) diff --git a/paradise.dme b/paradise.dme index 876fbeb711d..2ba11f3a87f 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1445,7 +1445,6 @@ #include "code\modules\events\anomaly_vortex.dm" #include "code\modules\events\apc_overload.dm" #include "code\modules\events\apc_short.dm" -#include "code\modules\events\aurora_caelus.dm" #include "code\modules\events\blob.dm" #include "code\modules\events\brand_intelligence.dm" #include "code\modules\events\carp_migration.dm" diff --git a/sound/Attributions.txt b/sound/Attributions.txt index 729562855ba..df74fd7ef55 100644 --- a/sound/Attributions.txt +++ b/sound/Attributions.txt @@ -1,5 +1,3 @@ items/thermal_drill.ogg was sampled from Builders Drilling.wav under a Sampling Plus 1.0 license. It was uploaded by Koops on 2010-05-10. Source (http://soundbible.com/1420-Builders-Drilling.html) -ambience/aurora_caelus.ogg is Music for Manatees by Kevin Macleod. It is under a CC-BY 3.0 license. It has been cropped and fades out. - -creatures/dog_yelp.ogg is DogYelp.wav. It is under a CC-BY 3.0 license. It has been cropped, EQ'd, and compressed to .ogg. Source (https://freesound.org/people/TobiasKosmos/sounds/163280/) \ No newline at end of file +creatures/dog_yelp.ogg is DogYelp.wav. It is under a CC-BY 3.0 license. It has been cropped, EQ'd, and compressed to .ogg. Source (https://freesound.org/people/TobiasKosmos/sounds/163280/) diff --git a/sound/ambience/aurora_caelus.ogg b/sound/ambience/aurora_caelus.ogg deleted file mode 100644 index 0c741678d50..00000000000 Binary files a/sound/ambience/aurora_caelus.ogg and /dev/null differ diff --git a/sound/ambience/aurora_caelus_short.ogg b/sound/ambience/aurora_caelus_short.ogg deleted file mode 100644 index f6d1acaa2fe..00000000000 Binary files a/sound/ambience/aurora_caelus_short.ogg and /dev/null differ