Skip to content

Commit

Permalink
Merge pull request #760 from Sord213/dagoth-ur-announcer
Browse files Browse the repository at this point in the history
Nerevar, you left me back on Monkestation 1.0 (Dagoth Ur Announcer Pack)
  • Loading branch information
dwasint authored Dec 24, 2023
2 parents e33431f + d9c50ad commit b65f766
Show file tree
Hide file tree
Showing 33 changed files with 55 additions and 4 deletions.
6 changes: 3 additions & 3 deletions code/datums/station_traits/neutral_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
weight = 1
show_in_report = TRUE
report_message = "Please be nice to him."
blacklist = list(/datum/station_trait/announcement_medbot, /datum/station_trait/birthday, /datum/station_trait/announcement_duke)
blacklist = list(/datum/station_trait/announcement_medbot, /datum/station_trait/birthday, /datum/station_trait/announcement_duke, /datum/station_trait/announcement_dagoth)

/datum/station_trait/announcement_intern/New()
. = ..()
Expand All @@ -122,7 +122,7 @@
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/birthday, /datum/station_trait/announcement_duke)
blacklist = list(/datum/station_trait/announcement_intern, /datum/station_trait/birthday, /datum/station_trait/announcement_duke, /datum/station_trait/announcement_dagoth)

/datum/station_trait/announcement_medbot/New()
. = ..()
Expand Down Expand Up @@ -202,7 +202,7 @@
show_in_report = TRUE
report_message = "We here at Nanotrasen would all like to wish Employee Name a very happy birthday"
trait_to_give = STATION_TRAIT_BIRTHDAY
blacklist = list(/datum/station_trait/announcement_intern, /datum/station_trait/announcement_medbot, /datum/station_trait/announcement_duke) //Overiding the annoucer hides the birthday person in the annoucement message.
blacklist = list(/datum/station_trait/announcement_intern, /datum/station_trait/announcement_medbot, /datum/station_trait/announcement_duke, /datum/station_trait/announcement_dagoth) //Overiding the annoucer hides the birthday person in the annoucement message.
///Variable that stores a reference to the person selected to have their birthday celebrated.
var/mob/living/carbon/human/birthday_person
///Variable that holds the real name of the birthday person once selected, just incase the birthday person's real_name changes.
Expand Down
33 changes: 33 additions & 0 deletions monkestation/code/datums/announcers/dagoth.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/datum/centcom_announcer/dagoth
welcome_sounds = list('monkestation/sound/ai/dagoth/welcome/welcome.ogg',
'monkestation/sound/ai/dagoth/welcome/welcome2.ogg',
'monkestation/sound/ai/dagoth/welcome/welcome3.ogg',
'monkestation/sound/ai/dagoth/welcome/welcome4.ogg')

alert_sounds = list('monkestation/sound/ai/dagoth/alerts/alert1.ogg',
'monkestation/sound/ai/dagoth/alerts/alert2.ogg',
'monkestation/sound/ai/dagoth/alerts/alert3.ogg',
'monkestation/sound/ai/dagoth/alerts/alert4.ogg',
'monkestation/sound/ai/dagoth/alerts/alert5.ogg',
'monkestation/sound/ai/dagoth/alerts/alert6.ogg',
'monkestation/sound/ai/dagoth/alerts/alert7.ogg')

command_report_sounds = list('monkestation/sound/ai/dagoth/commandreport/centralcommand1.ogg',
'monkestation/sound/ai/dagoth/commandreport/centralcommand2.ogg')

event_sounds = list(ANNOUNCER_AIMALF = 'monkestation/sound/ai/dagoth/aimalf.ogg',
ANNOUNCER_ALIENS = 'monkestation/sound/ai/dagoth/aliens.ogg',
ANNOUNCER_ANIMES = 'monkestation/sound/ai/dagoth/animes.ogg',
ANNOUNCER_GRANOMALIES = 'monkestation/sound/ai/dagoth/granomalies.ogg',
ANNOUNCER_INTERCEPT = 'monkestation/sound/ai/dagoth/intercept.ogg',
ANNOUNCER_IONSTORM = 'monkestation/sound/ai/dagoth/ionstorm.ogg',
ANNOUNCER_METEORS = 'monkestation/sound/ai/dagoth/meteors.ogg',
ANNOUNCER_OUTBREAK5 = 'monkestation/sound/ai/dagoth/blob.ogg',
ANNOUNCER_OUTBREAK7 = 'monkestation/sound/ai/dagoth/virus.ogg',
ANNOUNCER_POWEROFF = 'monkestation/sound/ai/dagoth/power_off.ogg',
ANNOUNCER_POWERON = 'monkestation/sound/ai/dagoth/power_on.ogg',
ANNOUNCER_RADIATION = 'monkestation/sound/ai/dagoth/radiation.ogg',
ANNOUNCER_SHUTTLECALLED = 'monkestation/sound/ai/dagoth/shuttle_call.ogg',
ANNOUNCER_SHUTTLEDOCK = 'monkestation/sound/ai/dagoth/shuttle_arrive.ogg',
ANNOUNCER_SHUTTLERECALLED = 'monkestation/sound/ai/dagoth/shuttle_recall.ogg',
ANNOUNCER_SPANOMALIES = 'monkestation/sound/ai/dagoth/spanomalies.ogg')
19 changes: 18 additions & 1 deletion monkestation/code/datums/station_traits/neutral_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,26 @@
report_message = "The Duke himself is your announcer today."
blacklist = list(/datum/station_trait/announcement_medbot,
/datum/station_trait/birthday,
/datum/station_trait/announcement_intern
/datum/station_trait/announcement_intern,
/datum/station_trait/announcement_dagoth
)

/datum/station_trait/announcement_duke/New()
. = ..()
SSstation.announcer = /datum/centcom_announcer/duke

/datum/station_trait/announcement_dagoth
name = "Announcement Dagoth Ur"
trait_type = STATION_TRAIT_NEUTRAL
weight = 10
show_in_report = TRUE
report_message = "I am bestowing upon you my presence, Nerevar."
blacklist = list(/datum/station_trait/announcement_medbot,
/datum/station_trait/birthday,
/datum/station_trait/announcement_intern,
/datum/station_trait/announcement_duke
)

/datum/station_trait/announcement_dagoth/New()
. = ..()
SSstation.announcer = /datum/centcom_announcer/dagoth
Binary file added monkestation/sound/ai/dagoth/aimalf.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/alerts/alert1.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/alerts/alert2.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/alerts/alert3.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/alerts/alert4.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/alerts/alert5.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/alerts/alert6.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/alerts/alert7.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/aliens.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/animes.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/blob.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/granomalies.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/intercept.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/ionstorm.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/meteors.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/power_off.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/power_on.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/radiation.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/shuttle_arrive.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/shuttle_call.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/shuttle_recall.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/spanomalies.ogg
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/virus.ogg
Binary file not shown.
Binary file not shown.
Binary file added monkestation/sound/ai/dagoth/welcome/welcome2.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5603,6 +5603,7 @@
#include "monkestation\code\datums\ai\idle_behaviors\idle_dukeman.dm"
#include "monkestation\code\datums\ai\monkey\dukeman_controller.dm"
#include "monkestation\code\datums\ai_laws\laws_monke.dm"
#include "monkestation\code\datums\announcers\dagoth.dm"
#include "monkestation\code\datums\announcers\duke.dm"
#include "monkestation\code\datums\brain_damage\magic.dm"
#include "monkestation\code\datums\components\carbon_sprint.dm"
Expand Down

0 comments on commit b65f766

Please sign in to comment.