diff --git a/code/datums/announcers/default_announcer.dm b/code/datums/announcers/default_announcer.dm index f14d57f3862..9db822e02fe 100644 --- a/code/datums/announcers/default_announcer.dm +++ b/code/datums/announcers/default_announcer.dm @@ -3,18 +3,18 @@ alert_sounds = list('sound/ai/default/attention.ogg') command_report_sounds = list('sound/ai/default/commandreport.ogg') event_sounds = list(ANNOUNCER_AIMALF = 'sound/ai/default/aimalf.ogg', - ANNOUNCER_ALIENS = 'sound/ai/default/aliens.ogg', - ANNOUNCER_ANIMES = 'sound/ai/default/animes.ogg', - ANNOUNCER_GRANOMALIES = 'sound/ai/default/granomalies.ogg', - ANNOUNCER_INTERCEPT = 'sound/ai/default/intercept.ogg', - ANNOUNCER_IONSTORM = 'sound/ai/default/ionstorm.ogg', - ANNOUNCER_METEORS = 'sound/ai/default/meteors.ogg', - ANNOUNCER_OUTBREAK5 = 'sound/ai/default/outbreak5.ogg', - ANNOUNCER_OUTBREAK7 = 'sound/ai/default/outbreak7.ogg', - ANNOUNCER_POWEROFF = 'sound/ai/default/poweroff.ogg', - ANNOUNCER_POWERON = 'sound/ai/default/poweron.ogg', - ANNOUNCER_RADIATION = 'sound/ai/default/radiation.ogg', - ANNOUNCER_SHUTTLECALLED = 'sound/ai/default/shuttlecalled.ogg', - ANNOUNCER_SHUTTLEDOCK = 'sound/ai/default/shuttledock.ogg', - ANNOUNCER_SHUTTLERECALLED = 'sound/ai/default/shuttlerecalled.ogg', - ANNOUNCER_SPANOMALIES = 'sound/ai/default/spanomalies.ogg') + ANNOUNCER_ALIENS = 'sound/ai/default/aliens.ogg', + ANNOUNCER_ANIMES = 'sound/ai/default/animes.ogg', + ANNOUNCER_GRANOMALIES = 'sound/ai/default/granomalies.ogg', + ANNOUNCER_INTERCEPT = 'sound/ai/default/intercept.ogg', + ANNOUNCER_IONSTORM = 'sound/ai/default/ionstorm.ogg', + ANNOUNCER_METEORS = 'sound/ai/default/meteors.ogg', + ANNOUNCER_OUTBREAK5 = 'sound/ai/default/outbreak5.ogg', + ANNOUNCER_OUTBREAK7 = 'sound/ai/default/outbreak7.ogg', + ANNOUNCER_POWEROFF = 'sound/ai/default/poweroff.ogg', + ANNOUNCER_POWERON = 'sound/ai/default/poweron.ogg', + ANNOUNCER_RADIATION = 'sound/ai/default/radiation.ogg', + ANNOUNCER_SHUTTLECALLED = 'sound/ai/default/shuttlecalled.ogg', + ANNOUNCER_SHUTTLEDOCK = 'sound/ai/default/shuttledock.ogg', + ANNOUNCER_SHUTTLERECALLED = 'sound/ai/default/shuttlerecalled.ogg', + ANNOUNCER_SPANOMALIES = 'sound/ai/default/spanomalies.ogg') diff --git a/code/datums/announcers/intern_announcer.dm b/code/datums/announcers/intern_announcer.dm index 0b75a8273e8..771b98b91b9 100644 --- a/code/datums/announcers/intern_announcer.dm +++ b/code/datums/announcers/intern_announcer.dm @@ -1,46 +1,46 @@ /datum/centcom_announcer/intern welcome_sounds = list('sound/ai/intern/welcome/1.ogg', - 'sound/ai/intern/welcome/2.ogg', - 'sound/ai/intern/welcome/3.ogg', - 'sound/ai/intern/welcome/4.ogg', - 'sound/ai/intern/welcome/5.ogg', - 'sound/ai/intern/welcome/6.ogg') + 'sound/ai/intern/welcome/2.ogg', + 'sound/ai/intern/welcome/3.ogg', + 'sound/ai/intern/welcome/4.ogg', + 'sound/ai/intern/welcome/5.ogg', + 'sound/ai/intern/welcome/6.ogg') alert_sounds = list('sound/ai/intern/alerts/1.ogg', - 'sound/ai/intern/alerts/2.ogg', - 'sound/ai/intern/alerts/3.ogg', - 'sound/ai/intern/alerts/4.ogg', - 'sound/ai/intern/alerts/5.ogg', - 'sound/ai/intern/alerts/6.ogg', - 'sound/ai/intern/alerts/7.ogg', - 'sound/ai/intern/alerts/8.ogg', - 'sound/ai/intern/alerts/9.ogg', - 'sound/ai/intern/alerts/10.ogg', - 'sound/ai/intern/alerts/11.ogg', - 'sound/ai/intern/alerts/12.ogg', - 'sound/ai/intern/alerts/13.ogg', - 'sound/ai/intern/alerts/14.ogg') + 'sound/ai/intern/alerts/2.ogg', + 'sound/ai/intern/alerts/3.ogg', + 'sound/ai/intern/alerts/4.ogg', + 'sound/ai/intern/alerts/5.ogg', + 'sound/ai/intern/alerts/6.ogg', + 'sound/ai/intern/alerts/7.ogg', + 'sound/ai/intern/alerts/8.ogg', + 'sound/ai/intern/alerts/9.ogg', + 'sound/ai/intern/alerts/10.ogg', + 'sound/ai/intern/alerts/11.ogg', + 'sound/ai/intern/alerts/12.ogg', + 'sound/ai/intern/alerts/13.ogg', + 'sound/ai/intern/alerts/14.ogg') command_report_sounds = list('sound/ai/intern/commandreport/1.ogg', - 'sound/ai/intern/commandreport/2.ogg', - 'sound/ai/intern/commandreport/3.ogg') + 'sound/ai/intern/commandreport/2.ogg', + 'sound/ai/intern/commandreport/3.ogg') - event_sounds = list(ANNOUNCER_AIMALF = 'sound/ai/intern/aimalf.ogg', - ANNOUNCER_ALIENS = 'sound/ai/intern/aliens.ogg', - ANNOUNCER_ANIMES = 'sound/ai/intern/animes.ogg', - ANNOUNCER_GRANOMALIES = 'sound/ai/intern/granomalies.ogg', - ANNOUNCER_INTERCEPT = 'sound/ai/intern/intercept.ogg', - ANNOUNCER_IONSTORM = 'sound/ai/intern/ionstorm.ogg', - ANNOUNCER_METEORS = 'sound/ai/intern/meteors.ogg', - ANNOUNCER_OUTBREAK5 = 'sound/ai/intern/outbreak5.ogg', - ANNOUNCER_OUTBREAK7 = 'sound/ai/intern/outbreak7.ogg', - ANNOUNCER_POWEROFF = 'sound/ai/intern/poweroff.ogg', - ANNOUNCER_POWERON = 'sound/ai/intern/poweron.ogg', - ANNOUNCER_RADIATION = 'sound/ai/intern/radiation.ogg', - ANNOUNCER_SHUTTLECALLED = 'sound/ai/intern/shuttlecalled.ogg', - ANNOUNCER_SHUTTLEDOCK = 'sound/ai/intern/shuttledock.ogg', - ANNOUNCER_SHUTTLERECALLED = 'sound/ai/intern/shuttlerecalled.ogg', - ANNOUNCER_SPANOMALIES = 'sound/ai/intern/spanomalies.ogg') + event_sounds = list(ANNOUNCER_AIMALF = 'sound/ai/default/aimalf.ogg', + ANNOUNCER_ALIENS = 'sound/ai/intern/aliens.ogg', + ANNOUNCER_ANIMES = 'sound/ai/intern/animes.ogg', + ANNOUNCER_GRANOMALIES = 'sound/ai/intern/granomalies.ogg', + ANNOUNCER_INTERCEPT = 'sound/ai/intern/intercept.ogg', + ANNOUNCER_IONSTORM = 'sound/ai/intern/ionstorm.ogg', + ANNOUNCER_METEORS = 'sound/ai/intern/meteors.ogg', + ANNOUNCER_OUTBREAK5 = 'sound/ai/intern/outbreak5.ogg', + ANNOUNCER_OUTBREAK7 = 'sound/ai/intern/outbreak7.ogg', + ANNOUNCER_POWEROFF = 'sound/ai/intern/poweroff.ogg', + ANNOUNCER_POWERON = 'sound/ai/intern/poweron.ogg', + ANNOUNCER_RADIATION = 'sound/ai/intern/radiation.ogg', + ANNOUNCER_SHUTTLECALLED = 'sound/ai/intern/shuttlecalled.ogg', + ANNOUNCER_SHUTTLEDOCK = 'sound/ai/intern/shuttledock.ogg', + ANNOUNCER_SHUTTLERECALLED = 'sound/ai/intern/shuttlerecalled.ogg', + ANNOUNCER_SPANOMALIES = 'sound/ai/intern/spanomalies.ogg') custom_alert_message = "
Please stand by for an important message from our new intern.
" diff --git a/code/datums/announcers/medbot_announcer.dm b/code/datums/announcers/medbot_announcer.dm new file mode 100644 index 00000000000..17e85552213 --- /dev/null +++ b/code/datums/announcers/medbot_announcer.dm @@ -0,0 +1,21 @@ +/datum/centcom_announcer/medbot + welcome_sounds = list('sound/ai/medbot/welcome.ogg', + 'sound/ai/medbot/newAI.ogg') + alert_sounds = list('sound/ai/medbot/attention.ogg') + command_report_sounds = list('sound/ai/medbot/commandreport.ogg') + event_sounds = list(ANNOUNCER_AIMALF = 'sound/ai/default/aimalf.ogg', + ANNOUNCER_ALIENS = 'sound/ai/medbot/aliens.ogg', + ANNOUNCER_ANIMES = 'sound/ai/medbot/animes.ogg', + ANNOUNCER_GRANOMALIES = 'sound/ai/medbot/granomalies.ogg', + ANNOUNCER_INTERCEPT = 'sound/ai/medbot/intercept.ogg', + ANNOUNCER_IONSTORM = 'sound/ai/medbot/ionstorm.ogg', + ANNOUNCER_METEORS = 'sound/ai/medbot/meteors.ogg', + ANNOUNCER_OUTBREAK5 = 'sound/ai/medbot/outbreak5.ogg', + ANNOUNCER_OUTBREAK7 = 'sound/ai/medbot/outbreak7.ogg', + ANNOUNCER_POWEROFF = 'sound/ai/medbot/poweroff.ogg', + ANNOUNCER_POWERON = 'sound/ai/medbot/poweron.ogg', + ANNOUNCER_RADIATION = 'sound/ai/medbot/radiation.ogg', + ANNOUNCER_SHUTTLECALLED = 'sound/ai/medbot/shuttlecalled.ogg', + ANNOUNCER_SHUTTLEDOCK = 'sound/ai/medbot/shuttledock.ogg', + ANNOUNCER_SHUTTLERECALLED = 'sound/ai/medbot/shuttlerecalled.ogg', + ANNOUNCER_SPANOMALIES = 'sound/ai/medbot/spanomalies.ogg') diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm index e66d2ee210c..3fbbe3aa962 100644 --- a/code/datums/station_traits/neutral_traits.dm +++ b/code/datums/station_traits/neutral_traits.dm @@ -49,7 +49,7 @@ trait_type = STATION_TRAIT_NEUTRAL weight = 15 show_in_report = TRUE - report_message = "Something seems to be wrong with the PDAs issues to you all this shift. Nothing too bad though." + report_message = "Something seems to be wrong with the PDAs issued to you all this shift. Nothing too bad though." trait_to_give = STATION_TRAIT_PDA_GLITCHED /datum/station_trait/announcement_intern @@ -58,7 +58,20 @@ weight = 1 show_in_report = TRUE report_message = "Please be nice to him." + blacklist = list(/datum/station_trait/announcement_medbot) /datum/station_trait/announcement_intern/New() . = ..() SSstation.announcer = /datum/centcom_announcer/intern + +/datum/station_trait/announcement_medbot + name = "Announcement \"System\"" + trait_type = STATION_TRAIT_NEUTRAL + weight = 1 + show_in_report = TRUE + report_message = "Our announcement system is under scheduled maintanance at the moment. Thankfully, we have a backup." + blacklist = list(/datum/station_trait/announcement_intern) + +/datum/station_trait/announcement_medbot/New() + . = ..() + SSstation.announcer = /datum/centcom_announcer/medbot diff --git a/sound/ai/intern/aimalf.ogg b/sound/ai/intern/aimalf.ogg deleted file mode 100644 index b7996916b47..00000000000 Binary files a/sound/ai/intern/aimalf.ogg and /dev/null differ diff --git a/sound/ai/medbot/aliens.ogg b/sound/ai/medbot/aliens.ogg new file mode 100644 index 00000000000..57fa70c3cae Binary files /dev/null and b/sound/ai/medbot/aliens.ogg differ diff --git a/sound/ai/medbot/animes.ogg b/sound/ai/medbot/animes.ogg new file mode 100644 index 00000000000..7615a744a66 Binary files /dev/null and b/sound/ai/medbot/animes.ogg differ diff --git a/sound/ai/medbot/attention.ogg b/sound/ai/medbot/attention.ogg new file mode 100644 index 00000000000..d4d5a270852 Binary files /dev/null and b/sound/ai/medbot/attention.ogg differ diff --git a/sound/ai/medbot/commandreport.ogg b/sound/ai/medbot/commandreport.ogg new file mode 100644 index 00000000000..4e5c2e1d1ff Binary files /dev/null and b/sound/ai/medbot/commandreport.ogg differ diff --git a/sound/ai/medbot/granomalies.ogg b/sound/ai/medbot/granomalies.ogg new file mode 100644 index 00000000000..2713a3cb194 Binary files /dev/null and b/sound/ai/medbot/granomalies.ogg differ diff --git a/sound/ai/medbot/intercept.ogg b/sound/ai/medbot/intercept.ogg new file mode 100644 index 00000000000..c59d0455c1c Binary files /dev/null and b/sound/ai/medbot/intercept.ogg differ diff --git a/sound/ai/medbot/ionstorm.ogg b/sound/ai/medbot/ionstorm.ogg new file mode 100644 index 00000000000..15aeac9f7ff Binary files /dev/null and b/sound/ai/medbot/ionstorm.ogg differ diff --git a/sound/ai/medbot/meteors.ogg b/sound/ai/medbot/meteors.ogg new file mode 100644 index 00000000000..91208cae122 Binary files /dev/null and b/sound/ai/medbot/meteors.ogg differ diff --git a/sound/ai/medbot/newAI.ogg b/sound/ai/medbot/newAI.ogg new file mode 100644 index 00000000000..c40b0990206 Binary files /dev/null and b/sound/ai/medbot/newAI.ogg differ diff --git a/sound/ai/medbot/outbreak5.ogg b/sound/ai/medbot/outbreak5.ogg new file mode 100644 index 00000000000..7118af44492 Binary files /dev/null and b/sound/ai/medbot/outbreak5.ogg differ diff --git a/sound/ai/medbot/outbreak7.ogg b/sound/ai/medbot/outbreak7.ogg new file mode 100644 index 00000000000..1fc542534db Binary files /dev/null and b/sound/ai/medbot/outbreak7.ogg differ diff --git a/sound/ai/medbot/poweroff.ogg b/sound/ai/medbot/poweroff.ogg new file mode 100644 index 00000000000..875df350025 Binary files /dev/null and b/sound/ai/medbot/poweroff.ogg differ diff --git a/sound/ai/medbot/poweron.ogg b/sound/ai/medbot/poweron.ogg new file mode 100644 index 00000000000..4b1605b1c74 Binary files /dev/null and b/sound/ai/medbot/poweron.ogg differ diff --git a/sound/ai/medbot/radiation.ogg b/sound/ai/medbot/radiation.ogg new file mode 100644 index 00000000000..5c48830b5f2 Binary files /dev/null and b/sound/ai/medbot/radiation.ogg differ diff --git a/sound/ai/medbot/shuttlecalled.ogg b/sound/ai/medbot/shuttlecalled.ogg new file mode 100644 index 00000000000..a775567abed Binary files /dev/null and b/sound/ai/medbot/shuttlecalled.ogg differ diff --git a/sound/ai/medbot/shuttledock.ogg b/sound/ai/medbot/shuttledock.ogg new file mode 100644 index 00000000000..933928db067 Binary files /dev/null and b/sound/ai/medbot/shuttledock.ogg differ diff --git a/sound/ai/medbot/shuttlerecalled.ogg b/sound/ai/medbot/shuttlerecalled.ogg new file mode 100644 index 00000000000..53b622576d4 Binary files /dev/null and b/sound/ai/medbot/shuttlerecalled.ogg differ diff --git a/sound/ai/medbot/spanomalies.ogg b/sound/ai/medbot/spanomalies.ogg new file mode 100644 index 00000000000..d710999e1e1 Binary files /dev/null and b/sound/ai/medbot/spanomalies.ogg differ diff --git a/sound/ai/medbot/welcome.ogg b/sound/ai/medbot/welcome.ogg new file mode 100644 index 00000000000..f9a698fd080 Binary files /dev/null and b/sound/ai/medbot/welcome.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 29220a7f356..d2e65edd736 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -436,6 +436,7 @@ #include "code\datums\announcers\_announcer.dm" #include "code\datums\announcers\default_announcer.dm" #include "code\datums\announcers\intern_announcer.dm" +#include "code\datums\announcers\medbot_announcer.dm" #include "code\datums\atmosphere\_atmosphere.dm" #include "code\datums\atmosphere\planetary.dm" #include "code\datums\brain_damage\brain_trauma.dm"