Merge pull request #14841 from MrJWhit/revert-14762-patch-2

Revert "adds cat meteors"
2021-06-13 15:15:59 -07:00
parent fe031f32c0 a324701730
commit f56e95e4e7
4 changed files with 0 additions and 26 deletions
--- a/code/modules/events/cat_wave.dm
+++ b/code/modules/events/cat_wave.dm
@@ -1,11 +0,0 @@
-/datum/round_event_control/meteor_wave/cat
-	name = "Meteor Wave: CATastrophic"
-	typepath = /datum/round_event/meteor_wave/cat
-	weight = 10
-	max_occurrences = 1
-
-/datum/round_event/meteor_wave/cat
-	wave_name = "cat"
-
-/datum/round_event/meteor_wave/cat/announce(fake)
-		priority_announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", "meteors")
--- a/code/modules/events/meteor_wave.dm
+++ b/code/modules/events/meteor_wave.dm
@@ -56,8 +56,6 @@
 			wave_type = GLOB.meteorsC
 		if("halloween")
 			wave_type = GLOB.meteorsSPOOKY
-		if("cat")
-			wave_type = GLOB.meteorsCat
 		else
 			WARNING("Wave name of [wave_name] not recognised.")
 			kill()