Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

code/modules/events/brand_intelligence.dm

@@ -61,7 +61,7 @@
 			originMachine.visible_message("[originMachine] beeps and seems lifeless.")
 		kill()
 		return
-	vendingMachines = listclearnulls(vendingMachines)
+	listclearnulls(vendingMachines)
 	if(!vendingMachines.len)	//if every machine is infected
 		for(var/obj/machinery/vending/upriser in infectedMachines)
 			if(prob(70) && !QDELETED(upriser))

code/modules/events/cat_surgeon.dm

@@ -0,0 +1,22 @@
+/datum/round_event_control/cat_surgeon
+    name = "Cat Surgeon"
+    typepath = /datum/round_event/cat_surgeon
+    max_occurrences = 1
+    weight = 10
+
+
+/datum/round_event/cat_surgeon/start()
+    var/list/spawn_locs = list()
+    for(var/X in GLOB.xeno_spawn)
+        spawn_locs += X
+
+    if(!spawn_locs.len)
+        message_admins("No valid spawn locations found, aborting...")
+        return MAP_ERROR
+
+    var/turf/T = get_turf(pick(spawn_locs))
+    var/mob/living/simple_animal/hostile/cat_butcherer/S = new(T)
+    playsound(S, 'sound/misc/catscream.ogg', 50, 1, -1)
+    message_admins("A cat surgeon has been spawned at [COORD(T)][ADMIN_JMP(T)]")
+    log_game("A cat surgeon has been spawned at [COORD(T)]")
+    return SUCCESSFUL_SPAWN

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")

code/modules/events/floorcluwne.dm

@@ -0,0 +1,23 @@
+/datum/round_event_control/floor_cluwne
+	name = "Floor Cluwne"
+	typepath = /datum/round_event/floor_cluwne
+	max_occurrences = 1
+	min_players = 20
+	weight = 10
+
+
+/datum/round_event/floor_cluwne/start()
+	var/list/spawn_locs = list()
+	for(var/X in GLOB.xeno_spawn)
+		spawn_locs += X
+
+	if(!spawn_locs.len)
+		message_admins("No valid spawn locations found, aborting...")
+		return MAP_ERROR
+
+	var/turf/T = get_turf(pick(spawn_locs))
+	var/mob/living/simple_animal/hostile/floor_cluwne/S = new(T)
+	playsound(S, 'sound/misc/bikehorn_creepy.ogg', 50, 1, -1)
+	message_admins("A floor cluwne has been spawned at [COORD(T)][ADMIN_JMP(T)]")
+	log_game("A floor cluwne has been spawned at [COORD(T)]")
+	return SUCCESSFUL_SPAWN

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()