diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 9953b593d9..64b950a417 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -18,6 +18,8 @@ GLOBAL_LIST_INIT(meteorsB, list(/obj/effect/meteor/meaty=5, /obj/effect/meteor/m GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event +GLOBAL_LIST_INIT(meteorsCat, list(/obj/effect/meteor/cat)) //for cat meteors + /////////////////////////////// //Meteor spawning global procs @@ -345,6 +347,17 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event ..() if(prob(20)) explosion(src.loc,2,4,6,8) + +/obj/effect/meteor/cat + name = "space cat" + icon_state = "catmeteor" + desc = "Meow." + hits = 1 + heavy = FALSE + meteorsound = 'sound/effects/meow1.ogg' + meteordrop = list(/mob/living/simple_animal/pet/cat/space) + threat = 0 + dropamt = 1 ////////////////////////// //Spookoween meteors diff --git a/code/modules/events/cat_wave.dm b/code/modules/events/cat_wave.dm new file mode 100644 index 0000000000..155da8ca08 --- /dev/null +++ b/code/modules/events/cat_wave.dm @@ -0,0 +1,11 @@ +/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") diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index e69af1df13..9aa9cac258 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -56,6 +56,8 @@ 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() diff --git a/icons/obj/meteor.dmi b/icons/obj/meteor.dmi index 84faabcc18..7c91a74004 100644 Binary files a/icons/obj/meteor.dmi and b/icons/obj/meteor.dmi differ