cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

announcement fixes

Browse Source
This commit is contained in:
alberyk
2022-01-30 20:42:56 -03:00
parent cb145c3bb7
commit 3f86f85675
9 changed files with 196 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/modules/events/carp_migration.dm
View File

@@ -20,15 +20,17 @@
despawn_turfs = typecacheof(despawn_turfs)
/datum/event/carp_migration/announce()
if(affecting_z in current_map.station_levels)
var/announcement = ""
var/soundfile = 'sound/AI/spacecarp.ogg'
if(severity == EVENT_LEVEL_MAJOR && deploy_drones)
announcement = "Massive migration of unknown biological entities has been detected near [location_name()], please stand-by. The NDV Icarus has dispatched combat drones to assist."
soundfile = 'sound/AI/massivespacecarp.ogg'
else
announcement = "Unknown biological [length(spawned_carp) == 1 ? "entity has" : "entities have"] been detected near [location_name()], please stand-by.[severity == EVENT_LEVEL_MODERATE ? " The NDV Icarus has dispatched combat drones to assist." : ""]"
command_announcement.Announce(announcement, "Lifesign Alert", new_sound = soundfile)
for (var/zlevel in affecting_z)
if(zlevel in current_map.station_levels)
var/announcement = ""
var/soundfile = 'sound/AI/spacecarp.ogg'
if(severity == EVENT_LEVEL_MAJOR && deploy_drones)
announcement = "Massive migration of unknown biological entities has been detected near [location_name()], please stand-by. The NDV Icarus has dispatched combat drones to assist."
soundfile = 'sound/AI/massivespacecarp.ogg'
else
announcement = "Unknown biological [length(spawned_carp) == 1 ? "entity has" : "entities have"] been detected near [location_name()], please stand-by.[severity == EVENT_LEVEL_MODERATE ? " The NDV Icarus has dispatched combat drones to assist." : ""]"
command_announcement.Announce(announcement, "Lifesign Alert", new_sound = soundfile)
break
/datum/event/carp_migration/start()
if(severity == EVENT_LEVEL_MAJOR)
@@ -103,8 +105,10 @@
spawn_fish(7, 3, 5)
/datum/event/carp_migration/cozmo/announce()
if(affecting_z in current_map.station_levels)
command_announcement.Announce("A migration of non-hostile entities has been detected outside.", "Lifesign Alert", 'sound/AI/cozmo_migration.ogg')
for (var/zlevel in affecting_z)
if(zlevel in current_map.station_levels)
command_announcement.Announce("A migration of non-hostile entities has been detected outside.", "Lifesign Alert", 'sound/AI/cozmo_migration.ogg')
break
/datum/event/carp_migration/cozmo/spawn_fish(var/num_groups, var/group_size_min = 3, var/group_size_max = 5, var/spawn_drones = FALSE)
set waitfor = FALSE

25
code/modules/events/electrical_storm.dm
View File

@@ -7,15 +7,16 @@
/datum/event/electrical_storm/announce()
..()
if(affecting_z in current_map.station_levels)
switch(severity)
if(EVENT_LEVEL_MUNDANE)
command_announcement.Announce("A minor electrical storm has been detected near the [location_name()]. Please watch out for possible electrical discharges.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg')
if(EVENT_LEVEL_MODERATE)
command_announcement.Announce("The [location_name()] is about to pass through an electrical storm. Please secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg')
if(EVENT_LEVEL_MAJOR)
command_announcement.Announce("Alert. A strong electrical storm has been detected in proximity of the [location_name()]. It is recommended to immediately secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg')
for (var/zlevel in affecting_z)
if(zlevel in current_map.station_levels)
switch(severity)
if(EVENT_LEVEL_MUNDANE)
command_announcement.Announce("A minor electrical storm has been detected near the [location_name()]. Please watch out for possible electrical discharges.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg')
if(EVENT_LEVEL_MODERATE)
command_announcement.Announce("The [location_name()] is about to pass through an electrical storm. Please secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg')
if(EVENT_LEVEL_MAJOR)
command_announcement.Announce("Alert. A strong electrical storm has been detected in proximity of the [location_name()]. It is recommended to immediately secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg')
break
/datum/event/electrical_storm/start()
..()
@@ -67,5 +68,7 @@
/datum/event/electrical_storm/end()
..()
if(affecting_z in current_map.station_levels)
command_announcement.Announce("The [location_name()] has cleared the electrical storm. Please repair any electrical overloads.", "Electrical Storm Alert")
for (var/zlevel in affecting_z)
if(zlevel in current_map.station_levels)
command_announcement.Announce("The [location_name()] has cleared the electrical storm. Please repair any electrical overloads.", "Electrical Storm Alert")
break

6
code/modules/events/gravity.dm
View File

@@ -7,8 +7,10 @@
endWhen = rand(15, 60)
/datum/event/gravity/announce()
if(affecting_z in current_map.station_levels)
command_announcement.Announce("Feedback surge detected in the gravity generation systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes.", "Gravity Failure")
for (var/zlevel in affecting_z)
if(zlevel in current_map.station_levels)
command_announcement.Announce("Feedback surge detected in the gravity generation systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes.", "Gravity Failure")
break
/datum/event/gravity/start()
gravity_is_on = 0

20
code/modules/events/meteors.dm
View File

@@ -19,12 +19,16 @@
endWhen = worst_case_end()
/datum/event/meteor_wave/announce()
if(affecting_z in current_map.station_levels)
command_announcement.Announce(current_map.meteors_detected_message, "Meteor Alert", new_sound = 'sound/AI/meteors.ogg')
for (var/zlevel in affecting_z)
if(zlevel in current_map.station_levels)
command_announcement.Announce(current_map.meteors_detected_message, "Meteor Alert", new_sound = 'sound/AI/meteors.ogg')
break
/datum/event/meteor_wave/start()
if(affecting_z in current_map.station_levels)
for (var/zlevel in affecting_z)
if(zlevel in current_map.station_levels)
command_announcement.Announce(current_map.meteor_contact_message, "Meteor Alert")
break
/datum/event/meteor_wave/end(var/faked)
if(faked)
@@ -104,7 +108,10 @@
return downed_ship_meteors
/datum/event/meteor_wave/downed_ship/announce()
command_announcement.Announce(current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/unknownvesseldowned.ogg')
for (var/zlevel in affecting_z)
if(zlevel in current_map.station_levels)
command_announcement.Announce(current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/unknownvesseldowned.ogg')
break
/datum/event/meteor_wave/downed_ship/start()
command_announcement.Announce(current_map.ship_meteor_contact_message, "Ship Debris Alert")
@@ -127,7 +134,10 @@
ic_name = "a dust belt"
/datum/event/meteor_wave/dust/announce()
command_announcement.Announce(current_map.dust_detected_message, "Dust Belt Alert")
for (var/zlevel in affecting_z)
if(zlevel in current_map.station_levels)
command_announcement.Announce(current_map.dust_detected_message, "Dust Belt Alert")
break
/datum/event/meteor_wave/dust/start()
command_announcement.Announce(current_map.dust_contact_message, "Dust Belt Alert")