Storyteller Fix

cev_eris.dme

@@ -711,7 +711,6 @@
 #include "code\game\gamemodes\events\ion_storm.dm"
 #include "code\game\gamemodes\events\meteors.dm"
 #include "code\game\gamemodes\events\money_lotto.dm"
-#include "code\game\gamemodes\events\nothing.dm"
 #include "code\game\gamemodes\events\prison_break.dm"
 #include "code\game\gamemodes\events\radiation_storm.dm"
 #include "code\game\gamemodes\events\rogue_drones.dm"

code/__DEFINES/_planes+layers.dm

@@ -144,7 +144,7 @@ What is the naming convention for planes or layers?
 #define ABOVE_ALL_MOB_LAYER 4.5
 #define TYPING_LAYER 4.6
 
-#define SPACEVINE_LAYER 4.8
+#define SPACEVINE_LAYER 4.8	//Unused. We don't have vines anymore
 //#define FLY_LAYER 5 //For easy recordkeeping; this is a byond define
 #define GASFIRE_LAYER 5.05
 

code/__DEFINES/storyteller_defines.dm

@@ -3,13 +3,15 @@
 #define EVENT_LEVEL_MODERATE "moderate"
 #define EVENT_LEVEL_MAJOR    "major"
 #define EVENT_LEVEL_ROLESET  "roleset"
+#define EVENT_LEVEL_WEATHER  "weather"
 #define EVENT_LEVEL_ECONOMY  "economy"
 
 
 //The threshold of points that we need before attempting to purchase things
-#define POOL_THRESHOLD_MUNDANE	25
-#define POOL_THRESHOLD_MODERATE	50
+#define POOL_THRESHOLD_MUNDANE	20
+#define POOL_THRESHOLD_MODERATE	45
 #define POOL_THRESHOLD_MAJOR	90
+#define POOL_THRESHOLD_WEATHER  60
 #define POOL_THRESHOLD_ROLESET	120
 
 

code/__HELPERS/_global_lists.dm

@@ -338,7 +338,7 @@ GLOBAL_LIST_INIT(scary_sounds, list(
 		GLOB.mannequins_[ckey] = new/mob/living/carbon/human/dummy/mannequin()
 	. = GLOB.mannequins_[ckey]
 
-var/global/list/severity_to_string = list("[EVENT_LEVEL_MUNDANE]" = "Mundane", "[EVENT_LEVEL_MODERATE]" = "Moderate", "[EVENT_LEVEL_MAJOR]" = "Major", "[EVENT_LEVEL_ROLESET]" = "Roleset","[EVENT_LEVEL_ECONOMY]" = "Economy")
+var/global/list/severity_to_string = list("[EVENT_LEVEL_MUNDANE]" = "Mundane", "[EVENT_LEVEL_MODERATE]" = "Moderate", "[EVENT_LEVEL_MAJOR]" = "Major", "[EVENT_LEVEL_ROLESET]" = "Roleset", "[EVENT_LEVEL_WEATHER]" = "Weather", "[EVENT_LEVEL_ECONOMY]" = "Economy")
 
 
 

code/controllers/configuration/configuration.dm

@@ -106,6 +106,7 @@
 		EVENT_LEVEL_MODERATE = null,
 		EVENT_LEVEL_MAJOR = list("lower" = 48000, "upper" = 60000),
 		EVENT_LEVEL_ROLESET = null,
+		EVENT_LEVEL_WEATHER = null,
 		EVENT_LEVEL_ECONOMY = list("lower" = 16000, "upper" = 20000),
 	)
 	// The lowest delay until next event
@@ -115,6 +116,7 @@
 		EVENT_LEVEL_MODERATE = 18000,
 		EVENT_LEVEL_MAJOR = 30000,
 		EVENT_LEVEL_ROLESET = null,
+		EVENT_LEVEL_WEATHER = null,
 		EVENT_LEVEL_ECONOMY = 18000
 	)
 	// The upper delay until next event
@@ -124,6 +126,7 @@
 		EVENT_LEVEL_MODERATE = 27000,
 		EVENT_LEVEL_MAJOR = 42000,
 		EVENT_LEVEL_ROLESET = null,
+		EVENT_LEVEL_WEATHER = null,
 		EVENT_LEVEL_ECONOMY = 18000
 	)
 

code/game/antagonist/station/revolutionary/excelsior.dm

@@ -38,7 +38,7 @@
 /datum/antagonist/excelsior/create_antagonist(datum/mind/target, datum/faction/new_faction, doequip = TRUE, announce = TRUE, update = TRUE, check = TRUE)
 	. = ..()
 	BITSET(owner.current?.hud_updateflag, EXCELSIOR_HUD)
-	was_centor_spawned = FALSE		//[excel_faction.dm]
+	was_centor_spawned = FALSE		//When new pack of excels spawn - they must be able to create their own centor
 
 /datum/antagonist/excelsior/remove_antagonist()
 	BITSET(owner.current?.hud_updateflag, EXCELSIOR_HUD)

code/game/gamemodes/events/apc_damage.dm

@@ -7,7 +7,7 @@
 	name = "APC damage"
 
 	event_type =/datum/event/apc_damage
-	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE)
+	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE/2)
 	tags = list(TAG_DESTRUCTIVE, TAG_NEGATIVE)
 
 //////////////////////////////////////////////////////////

code/game/gamemodes/events/blob.dm

@@ -15,7 +15,7 @@
 
 
 	event_type = /datum/event/blob
-	event_pools = list(EVENT_LEVEL_MAJOR = POOL_THRESHOLD_MAJOR*1.35)
+	event_pools = list(EVENT_LEVEL_MAJOR = POOL_THRESHOLD_MAJOR)
 	tags = list(TAG_COMBAT, TAG_DESTRUCTIVE, TAG_NEGATIVE)
 //============================================
 
@@ -33,6 +33,7 @@
 	if(!T)
 		log_and_message_admins("Blob failed to find a viable turf.")
 		kill()
+		storyevent.cancel(severity)
 		return
 
 	log_and_message_admins("Blob spawned at \the [get_area(T)]", location = T)

code/game/gamemodes/events/camera_damage.dm

@@ -9,7 +9,7 @@
 	name = "camera damage"
 
 	event_type = /datum/event/camera_damage
-	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE)
+	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE/4)
 	tags = list(TAG_TARGETED, TAG_DESTRUCTIVE, TAG_NEGATIVE)
 
 /////////.//////////////////////////////////////

code/game/gamemodes/events/dust.dm

@@ -13,7 +13,7 @@ The "dust" will damage the hull of the station causin minor hull breaches.
 	name = "belt of space dust"
 
 	event_type =/datum/event/dust
-	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE, EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE)
+	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE, EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE/3, EVENT_LEVEL_MAJOR = POOL_THRESHOLD_MAJOR/3)
 	tags = list(TAG_DESTRUCTIVE, TAG_NEGATIVE)
 
 
@@ -37,7 +37,7 @@ The "dust" will damage the hull of the station causin minor hull breaches.
 		if(EVENT_LEVEL_MUNDANE)
 			return "weak"
 		if(EVENT_LEVEL_MODERATE)
-			return prob(80) ? "norm" : "strong"
+			return prob(75) ? "norm" : "strong"
 		if(EVENT_LEVEL_MAJOR)
 			return "super"
 	return "weak"

code/game/gamemodes/events/electrical_storm.dm

@@ -4,8 +4,8 @@
 
 
 	event_type = /datum/event/electrical_storm
-	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE,
-	EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE)
+	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE/2,
+	EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE/3)
 
 	tags = list(TAG_SCARY, TAG_TARGETED, TAG_NEGATIVE)
 

code/game/gamemodes/events/gravity.dm

@@ -8,7 +8,7 @@
 	name = "gravity failure"
 
 	event_type =/datum/event/gravity
-	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE*0.8)
+	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE)
 	tags = list(TAG_COMMUNAL)
 	weight = 0.4 //This is a pain, make it less common
 

code/game/gamemodes/events/hidden_events/bluespace_crystal_infestation.dm

@@ -9,11 +9,11 @@ Additionally, not harvested nest will periodically teleport items and people to
 	id = "bluespace_crystal_infestation"
 	name = "bluespace_crystal_infestation"
 
-	weight = 1
+	weight = 0.3
 
 	event_type = /datum/event/bluespace_crystal_infestation
 	event_pools = list(
-		EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE * 1.2
+		EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE * 0.5
 	)
 	tags = list(TAG_POSITIVE)
 

code/game/gamemodes/events/hidden_events/bluespace_rift.dm

@@ -7,11 +7,11 @@ They are unstable and be used only few times, and after that they die out on bot
 	id = "bluespace_rift"
 	name = "bluespace_rift"
 
-	weight = 1
+	weight = 0.3
 
 	event_type = /datum/event/bluespace_rift
 	event_pools = list(
-		EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE * 1.2
+		EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE * 1
 	)
 	tags = list(TAG_POSITIVE)
 
@@ -23,7 +23,7 @@ They are unstable and be used only few times, and after that they die out on bot
 	var/rift_number
 
 /datum/event/bluespace_rift/setup()
-	pair_number = rand(1, 5)
+	pair_number = rand(3, 8)
 	rift_number = pair_number * 2
 	prepare_event_areas(rift_number)
 

code/game/gamemodes/events/hidden_events/kaiser.dm

@@ -13,7 +13,7 @@ It will also bring a hoard of roaches with it.
 
 	event_type = /datum/event/kaiser
 	event_pools = list(
-		EVENT_LEVEL_MAJOR = POOL_THRESHOLD_MAJOR * 1.2)
+		EVENT_LEVEL_MAJOR = POOL_THRESHOLD_MAJOR)
 	tags = list(TAG_COMBAT, TAG_NEGATIVE)
 
 /datum/event/kaiser

code/game/gamemodes/events/hivemind_invasion.dm

@@ -11,7 +11,7 @@
 	req_crew = 14
 
 	event_type = /datum/event/hivemind
-	event_pools = list(EVENT_LEVEL_MAJOR = POOL_THRESHOLD_MAJOR*0.9) //bit more common
+	event_pools = list(EVENT_LEVEL_MAJOR = POOL_THRESHOLD_MAJOR)
 	tags = list(TAG_COMMUNAL, TAG_DESTRUCTIVE, TAG_NEGATIVE, TAG_SCARY)
 //============================================
 
@@ -31,6 +31,7 @@
 		if(!start_location && i == 100)
 			log_and_message_admins("Hivemind failed to find a viable turf.")
 			kill()
+			storyevent.cancel(severity)
 			return
 		if(start_location)
 			break

code/game/gamemodes/events/infestation.dm

@@ -8,13 +8,13 @@ It focuses on spawning large numbers of moderate-to-weak monsters, and includes
 	id = "infestation"
 	name = "infestation"
 
-	weight = 2
+	weight = 1.5
 	//Since it's a large pool of content, infestation has twice the weight of other events
 
 	event_type = /datum/event/infestation
-	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE*1.2,
-	EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE*1.2,
-	EVENT_LEVEL_MAJOR = POOL_THRESHOLD_MAJOR*1.2)
+	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE*0.75,
+	EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE*1,
+	EVENT_LEVEL_MAJOR = POOL_THRESHOLD_MAJOR*0.75)
 	tags = list(TAG_COMBAT, TAG_DESTRUCTIVE, TAG_NEGATIVE)
 //============================================
 

code/game/gamemodes/events/ion_storm.dm

@@ -8,7 +8,7 @@
 
 
 	event_type = /datum/event/ionstorm
-	event_pools = list(EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE)
+	event_pools = list(EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE/1.5)
 
 	tags = list(TAG_SCARY, TAG_COMMUNAL)
 /////////////////////

code/game/gamemodes/events/meteors.dm

@@ -1,5 +1,5 @@
 /*
-	Meteors damage the station and the shields
+	Meteors damage the ship and the shields
 */
 /datum/storyevent/meteor
 	id = "meteor"

code/game/gamemodes/events/rogue_drones.dm

@@ -8,7 +8,7 @@
 	name = "rogue drone"
 
 	event_type =/datum/event/rogue_drone
-	event_pools = list(EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE)
+	event_pools = list(EVENT_LEVEL_MODERATE = POOL_THRESHOLD_MODERATE/1.5)
 	tags = list(TAG_COMMUNAL, TAG_COMBAT, TAG_DESTRUCTIVE, TAG_SCARY, TAG_EXTERNAL)
 
 //////////////////////////////////////////////////////////

code/game/gamemodes/events/shipping_error.dm

@@ -7,7 +7,7 @@
 	name = "shipping error"
 
 	event_type = /datum/event/shipping_error
-	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE*0.3) //Low cost since its a really minor thing
+	event_pools = list(EVENT_LEVEL_MUNDANE = POOL_THRESHOLD_MUNDANE*0.25) //Low cost since its a really minor thing
 
 	tags = list(TAG_TARGETED, TAG_POSITIVE)