cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Medbot centcom announcer and relative station trait. (#57532)

Browse Source 
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
This commit is contained in:
Ghom
2021-03-09 16:11:17 -08:00
committed by GitHub
co-authored by Qustinnus
parent 3ac8a75d0e
commit d5b14f5cc4
25 changed files with 87 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/announcers/default_announcer.dm
+15 -15
View File
@@ -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')
code/datums/announcers/intern_announcer.dm
+36 -36
View File
@@ -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 = "<br><span class='alert'>Please stand by for an important message from our new intern.</span><br>"
code/datums/announcers/medbot_announcer.dm
+21
View File
@@ -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')
code/datums/station_traits/neutral_traits.dm
+14 -1
View File
@@ -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
sound/ai/intern/aimalf.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/aliens.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/animes.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/attention.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/commandreport.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/granomalies.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/intercept.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/ionstorm.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/meteors.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/newAI.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/outbreak5.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/outbreak7.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/poweroff.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/poweron.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/radiation.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/shuttlecalled.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/shuttledock.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/shuttlerecalled.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/spanomalies.ogg
BIN
View File
Binary file not shown.
sound/ai/medbot/welcome.ogg
BIN
View File
Binary file not shown.
tgstation.dme
+1
View File
@@ -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"