Removes the Intern announcer station trait (#600)

Artea-Station · Jul 1, 2024 · 5504002 · 5504002
1 parent 02bb7aa
commit 5504002
Show file tree

Hide file tree

Showing 41 changed files with 0 additions and 60 deletions.
diff --git a/code/datums/announcers/intern_announcer.dm b/code/datums/announcers/intern_announcer.dm
diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm
@@ -97,25 +97,12 @@
 	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
-	name = "Announcement Intern"
-	trait_type = STATION_TRAIT_NEUTRAL
-	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()
 	. = ..()

diff --git a/sound/ai/intern/alerts/1.ogg b/sound/ai/intern/alerts/1.ogg
diff --git a/sound/ai/intern/alerts/10.ogg b/sound/ai/intern/alerts/10.ogg
diff --git a/sound/ai/intern/alerts/11.ogg b/sound/ai/intern/alerts/11.ogg
diff --git a/sound/ai/intern/alerts/12.ogg b/sound/ai/intern/alerts/12.ogg
diff --git a/sound/ai/intern/alerts/13.ogg b/sound/ai/intern/alerts/13.ogg
diff --git a/sound/ai/intern/alerts/14.ogg b/sound/ai/intern/alerts/14.ogg
diff --git a/sound/ai/intern/alerts/2.ogg b/sound/ai/intern/alerts/2.ogg
diff --git a/sound/ai/intern/alerts/3.ogg b/sound/ai/intern/alerts/3.ogg
diff --git a/sound/ai/intern/alerts/4.ogg b/sound/ai/intern/alerts/4.ogg
diff --git a/sound/ai/intern/alerts/5.ogg b/sound/ai/intern/alerts/5.ogg
diff --git a/sound/ai/intern/alerts/6.ogg b/sound/ai/intern/alerts/6.ogg
diff --git a/sound/ai/intern/alerts/7.ogg b/sound/ai/intern/alerts/7.ogg
diff --git a/sound/ai/intern/alerts/8.ogg b/sound/ai/intern/alerts/8.ogg
diff --git a/sound/ai/intern/alerts/9.ogg b/sound/ai/intern/alerts/9.ogg
diff --git a/sound/ai/intern/aliens.ogg b/sound/ai/intern/aliens.ogg
diff --git a/sound/ai/intern/animes.ogg b/sound/ai/intern/animes.ogg
diff --git a/sound/ai/intern/commandreport/1.ogg b/sound/ai/intern/commandreport/1.ogg
diff --git a/sound/ai/intern/commandreport/2.ogg b/sound/ai/intern/commandreport/2.ogg
diff --git a/sound/ai/intern/commandreport/3.ogg b/sound/ai/intern/commandreport/3.ogg
diff --git a/sound/ai/intern/granomalies.ogg b/sound/ai/intern/granomalies.ogg
diff --git a/sound/ai/intern/intercept.ogg b/sound/ai/intern/intercept.ogg
diff --git a/sound/ai/intern/ionstorm.ogg b/sound/ai/intern/ionstorm.ogg
diff --git a/sound/ai/intern/meteors.ogg b/sound/ai/intern/meteors.ogg
diff --git a/sound/ai/intern/outbreak5.ogg b/sound/ai/intern/outbreak5.ogg
diff --git a/sound/ai/intern/outbreak7.ogg b/sound/ai/intern/outbreak7.ogg
diff --git a/sound/ai/intern/poweroff.ogg b/sound/ai/intern/poweroff.ogg
diff --git a/sound/ai/intern/poweron.ogg b/sound/ai/intern/poweron.ogg
diff --git a/sound/ai/intern/radiation.ogg b/sound/ai/intern/radiation.ogg
diff --git a/sound/ai/intern/shuttlecalled.ogg b/sound/ai/intern/shuttlecalled.ogg
diff --git a/sound/ai/intern/shuttledock.ogg b/sound/ai/intern/shuttledock.ogg
diff --git a/sound/ai/intern/shuttlerecalled.ogg b/sound/ai/intern/shuttlerecalled.ogg
diff --git a/sound/ai/intern/spanomalies.ogg b/sound/ai/intern/spanomalies.ogg
diff --git a/sound/ai/intern/welcome/1.ogg b/sound/ai/intern/welcome/1.ogg
diff --git a/sound/ai/intern/welcome/2.ogg b/sound/ai/intern/welcome/2.ogg
diff --git a/sound/ai/intern/welcome/3.ogg b/sound/ai/intern/welcome/3.ogg
diff --git a/sound/ai/intern/welcome/4.ogg b/sound/ai/intern/welcome/4.ogg
diff --git a/sound/ai/intern/welcome/5.ogg b/sound/ai/intern/welcome/5.ogg
diff --git a/sound/ai/intern/welcome/6.ogg b/sound/ai/intern/welcome/6.ogg
diff --git a/tgstation.dme b/tgstation.dme
@@ -780,7 +780,6 @@
 #include "code\datums\ai_laws\laws_station_sided.dm"
 #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"