Storyteller edits and monkey event

code/modules/events/carp_migration.dm

@@ -4,7 +4,7 @@
 	weight = 15
 	min_players = 20 //monkie edit: 12 to 20
 	earliest_start = 40 MINUTES //monkie edit: 10 to 40
-	max_occurrences = 2 //monkie edit: 6 to 2
+	max_occurrences = 3 //monkie edit: 6 to 2
 	category = EVENT_CATEGORY_ENTITIES
 	description = "Summons a school of space carp."
 	min_wizard_trigger_potency = 0

code/modules/events/disease_outbreak.dm

@@ -22,10 +22,10 @@
 /datum/round_event_control/disease_outbreak
 	name = "Disease Outbreak: Classic"
 	typepath = /datum/round_event/disease_outbreak
-	max_occurrences = 1
+	max_occurrences = 2
 	min_players = 10
 	weight = 0
-	track = EVENT_TRACK_MAJOR
+	track = EVENT_TRACK_MAJOR //monkie edit
 	earliest_start = 55 MINUTES
 	category = EVENT_CATEGORY_HEALTH
 	description = "A 'classic' virus will infect some members of the crew."

code/modules/events/ghost_role/blob.dm

@@ -3,9 +3,8 @@
 	typepath = /datum/round_event/ghost_role/blob
 	weight = 5  //monkie edit: 10 to 5
 	max_occurrences = 1
-
 	min_players = 35  //monkie edit: 20 to 35
-	earliest_start = 60 MINUTES //monkie edit: 20 to 90
+	earliest_start = 80 MINUTES //monkie edit: 20 to 90
 	//dynamic_should_hijack = TRUE
 	category = EVENT_CATEGORY_ENTITIES
 	description = "Spawns a new blob overmind."

code/modules/events/meteors/stray_meteor_event.dm

@@ -1,9 +1,9 @@
 /datum/round_event_control/stray_meteor
 	name = "Stray Meteor"
 	typepath = /datum/round_event/stray_meteor
-	weight = 15 //Number subject to change based on how often meteors actually collide with the station
+	weight = 18 //Number subject to change based on how often meteors actually collide with the station
 	min_players = 15
-	max_occurrences = 3
+	max_occurrences = 6
 	earliest_start = 20 MINUTES
 	category = EVENT_CATEGORY_SPACE
 	description = "Throw a random meteor somewhere near the station."

code/modules/events/portal_storm.dm

@@ -32,6 +32,32 @@
 		/mob/living/basic/construct/wraith/hostile = 6,
 	)
 
+//begin monkestation edit
+/datum/round_event_control/portal_storm_monkey
+	name = "Portal Storm: Monkeys"
+	typepath = /datum/round_event/portal_storm/portal_storm_monkey
+	weight = 4
+	max_occurrences = 2
+	earliest_start = 20 MINUTES
+	category = EVENT_CATEGORY_ENTITIES
+	track = EVENT_TRACK_MAJOR
+	description = "Angry monkies pour out of portals."
+
+/datum/round_event/portal_storm/portal_storm_monkey
+	boss_types = list(/mob/living/basic/gorilla/lesser = 1)
+	hostile_types = list(
+		/mob/living/carbon/human/species/monkey/angry = 10,
+	)
+
+/datum/round_event/portal_storm/portal_storm_monkey/announce(fake)
+	set waitfor = 0
+	sound_to_playing_players('sound/magic/lightning_chargeup.ogg')
+	sleep(8 SECONDS)
+	priority_announce("Massive bluespace anomaly detected en route to [station_name()]. Brace for impact.")
+	sleep(2 SECONDS)
+	sound_to_playing_players('monkestation/sound/misc/monkeystorm.ogg')
+
+//end monkestation edit
 /datum/round_event/portal_storm
 	start_when = 7
 	end_when = 999

code/modules/events/spider_infestation.dm

@@ -1,7 +1,7 @@
 /datum/round_event_control/spider_infestation
 	name = "Spider Infestation"
 	typepath = /datum/round_event/spider_infestation
-	weight = 6 //monkestation edit: from 10 to 6
+	weight = 7 //monkestation edit: from 10 to 6
 	max_occurrences = 1
 	min_players = 35 //monkie edit: 20 to 35
 	earliest_start = 60 MINUTES //monke edit: 20 to 60

monkestation/code/game/machinery/bomb_actualizer.dm

@@ -220,6 +220,15 @@
 		if(light > 12)
 			capped_light = (GLOB.MAX_EX_LIGHT_RANGE + (light * actualizer_multiplier))
 
+		if(capped_light > 200)
+			capped_light = 200
+
+		if(capped_medium > 120)
+			capped_medium = 120
+
+		if(capped_heavy > 60)
+			capped_heavy = 60
+
 		SSexplosions.explode(location, capped_heavy, capped_medium, capped_light, flame, flash, TRUE, TRUE, FALSE, FALSE)
 		exploded = TRUE
 		return COMSIG_CANCEL_EXPLOSION

monkestation/code/modules/storytellers/converted_events/event_overrides.dm

@@ -137,6 +137,7 @@
 
 /datum/round_event_control/operative
 	track = EVENT_TRACK_MAJOR //this is a safe guard and does not trigger normally(technically it can but not really) so no tags
+	checks_antag_cap = TRUE
 
 /datum/round_event_control/portal_storm_syndicate
 	track = EVENT_TRACK_MAJOR

strings/names/clown.txt

@@ -1,7 +1,9 @@
 Aluminium Dave
 Baba
 Baby Cakes
+Banana Bastar
 Bananium LXIX
+Barely Funny
 Bimbim
 Bingo
 Birdman From Birdland
@@ -23,6 +25,7 @@ Clownpiece
 Congo Bongo
 Cool Cooper
 Crusty
+Daniel
 Deedum Dedah
 Delicious Dan
 Dinkster
@@ -74,10 +77,11 @@ Mister Safety Hazard
 Moinen
 Mr Shoe
 Mr Weird
-Ningelo
+Nutcase
 Oranges
 Patches
 Pepinpop
+Peppino
 Pocket
 Pogo
 Polite Pablo
@@ -98,6 +102,7 @@ Shoe Giving Gerald
 Silly Willy
 Sir Honks-a-Lot
 Skiddle
+Slam Cakeface
 Slippo Supreme
 Slippy Joe
 Slipsy Dipsy

strings/names/mime.txt

@@ -1,3 +1,4 @@
+Calamity
 Ceci N'est Pas Une Mime
 Cousteau
 Eastern Standard Mime
@@ -7,37 +8,46 @@ Harpo Marx
 Hushed Henri
 Instrumental
 Invisible Man
+Juxtaposition
+Le Meilleur Mime
 Lemon Mime
 Loudmouth
 Marcel
 Marcel Mime
 Mime
+Mime for a Change
 Mime is Relative
+Mimebender
+Monsieur Mimi
 Mr Beret
+Mr Gimmick
 Mr Mime
 Mr Mute
 Mute
+Mute Point
 Nickel and Mime
-The Noiseless Wonder
 Omerta
-One Hand Clapping
 Oreo
 Oui Oui
 Pantomime
+Pandemonium
 Parles Francais
 Partner in Mime
 Quiet
+Quiet Deadly
 Quiet Riot
+Robuste
 Shouty Rousseau
 Silence
 Silencio
 Silent Knight
 Silent Majority
 Silent Night
 Silent Sorrow
-Speaks-No-Evil
 Soul of Wit
+Speaks-No-Evil
 Tace Volitaris
+The Noiseless Wonder
 Tongueless Ted
 Transparency
 Trapped-in-Box
@@ -47,4 +57,4 @@ Victimless Mime
 Voiceless Dead
 Wall Runner
 Wes
-Zips-the-Lips
+Zips-the-Lips