Storytellers

code/__DEFINES/DNA.dm

@@ -80,24 +80,25 @@
 #define SKINTONES 12
 #define ANIME 13
 #define MUTCOLORS_SECONDARY 14
+#define SPECIES_FUR 15
 
 /// Use this if you want to change the race's color without the player being able to pick their own color. AKA special color shifting
-#define DYNCOLORS 15
-#define AGENDER 16
+#define DYNCOLORS 16
+#define AGENDER 17
 /// Do not draw eyes or eyeless overlay
-#define NOEYESPRITES 17
+#define NOEYESPRITES 18
 ///If we have a limb-specific overlay sprite
-#define HAS_MARKINGS 18
+#define HAS_MARKINGS 19
 /// Do not draw blood overlay
-#define NOBLOODOVERLAY 19
+#define NOBLOODOVERLAY 20
 ///No augments, for monkeys in specific because they will turn into fucking freakazoids https://cdn.discordapp.com/attachments/326831214667235328/791313258912153640/102707682-fa7cad80-4294-11eb-8f13-8c689468aeb0.png
-#define NOAUGMENTS 20
+#define NOAUGMENTS 21
 ///will be assigned a universal vampire themed last name shared by their department. this is preferenced!
-#define BLOOD_CLANS 21
+#define BLOOD_CLANS 22
 
-#define REVIVESBYHEALING 22
-#define NOHUSK 23
-#define NOMOUTH 24
+#define REVIVESBYHEALING 23
+#define NOHUSK 24
+#define NOMOUTH 25
 
 //organ slots
 #define ORGAN_SLOT_ADAMANTINE_RESONATOR "adamantine_resonator"

code/__DEFINES/~monkestation/storytellers.dm

@@ -0,0 +1,95 @@
+
+//Could be bitflags, but that would require a good amount of translations, which eh, either way works for me
+/// When the event is combat oriented (spawning monsters, inherently hostile antags)
+#define TAG_COMBAT "combat"
+/// When the event is spooky (broken lights, some antags)
+#define TAG_SPOOKY "spooky"
+/// When the event is destructive in a decent capacity (meteors, blob)
+#define TAG_DESTRUCTIVE "destructive"
+/// When the event impacts most of the crewmembers in some capacity (comms blackout)
+#define TAG_COMMUNAL "communal"
+/// When the event targets a person for something (appendix, heart attack)
+#define TAG_TARGETED "targeted"
+/// When the event is positive and helps the crew, in some capacity (Shuttle Loan, Supply Pod)
+#define TAG_POSITIVE "positive"
+/// When one of the crewmembers becomes an antagonist
+#define TAG_CREW_ANTAG "crew_antag"
+/// When the antagonist event is focused around team cooperation.
+#define TAG_TEAM_ANTAG "team_antag"
+/// When one of the non-crewmember players becomes an antagonist
+#define TAG_OUTSIDER_ANTAG "away_antag"
+/// When the event impacts the overmap
+#define TAG_OVERMAP "overmap"
+/// When the event requires the station to be in space (meteors, carp)
+#define TAG_SPACE "space"
+/// When the event requires the station to be on planetary.
+#define TAG_PLANETARY "planetary"
+
+#define EVENT_TRACK_MUNDANE "Mundane"
+#define EVENT_TRACK_MODERATE "Moderate"
+#define EVENT_TRACK_MAJOR "Major"
+#define EVENT_TRACK_ROLESET "Roleset"
+#define EVENT_TRACK_OBJECTIVES "Objectives"
+
+#define ALL_EVENTS "All"
+#define UNCATEGORIZED_EVENTS "Uncategorized"
+
+#define STORYTELLER_WAIT_TIME 5 SECONDS
+
+#define EVENT_POINT_GAINED_PER_SECOND 0.08
+
+#define TRACK_FAIL_POINT_PENALTY_MULTIPLIER 0.75
+
+#define GAMEMODE_PANEL_MAIN "Main"
+#define GAMEMODE_PANEL_VARIABLES "Variables"
+
+#define MUNDANE_POINT_THRESHOLD 40
+#define MODERATE_POINT_THRESHOLD 70
+#define MAJOR_POINT_THRESHOLD 130
+#define ROLESET_POINT_THRESHOLD 150
+#define OBJECTIVES_POINT_THRESHOLD 170
+
+#define MUNDANE_MIN_POP 4
+#define MODERATE_MIN_POP 6
+#define MAJOR_MIN_POP 20
+#define ROLESET_MIN_POP 25
+#define OBJECTIVES_MIN_POP 20
+
+/// Defines for how much pop do we need to stop applying a pop scalling penalty to event frequency.
+#define MUNDANE_POP_SCALE_THRESHOLD 25
+#define MODERATE_POP_SCALE_THRESHOLD 32
+#define MAJOR_POP_SCALE_THRESHOLD 45
+#define ROLESET_POP_SCALE_THRESHOLD 45
+#define OBJECTIVES_POP_SCALE_THRESHOLD 45
+
+/// The maximum penalty coming from pop scalling, when we're at the most minimum point, easing into 0 as we reach the SCALE_THRESHOLD. This is treated as a percentage.
+#define MUNDANE_POP_SCALE_PENALTY 35
+#define MODERATE_POP_SCALE_PENALTY 35
+#define MAJOR_POP_SCALE_PENALTY 35
+#define ROLESET_POP_SCALE_PENALTY 35
+#define OBJECTIVES_POP_SCALE_PENALTY 35
+
+#define STORYTELLER_VOTE "storyteller"
+
+#define EVENT_TRACKS list(EVENT_TRACK_MUNDANE, EVENT_TRACK_MODERATE, EVENT_TRACK_MAJOR, EVENT_TRACK_ROLESET, EVENT_TRACK_OBJECTIVES)
+#define EVENT_PANEL_TRACKS list(EVENT_TRACK_MUNDANE, EVENT_TRACK_MODERATE, EVENT_TRACK_MAJOR, EVENT_TRACK_ROLESET, EVENT_TRACK_OBJECTIVES, UNCATEGORIZED_EVENTS, ALL_EVENTS)
+
+/// Defines for the antag cap to prevent midround injections.
+#define ANTAG_CAP_FLAT 2
+#define ANTAG_CAP_DENOMINATOR 9
+
+///Below are defines for roundstart point pool. The GAIN ones are multiplied by ready population
+#define ROUNDSTART_MUNDANE_BASE 20
+#define ROUNDSTART_MUNDANE_GAIN 0.5
+
+#define ROUNDSTART_MODERATE_BASE 35
+#define ROUNDSTART_MODERATE_GAIN 1.2
+
+#define ROUNDSTART_MAJOR_BASE 40
+#define ROUNDSTART_MAJOR_GAIN 2
+
+#define ROUNDSTART_ROLESET_BASE 60
+#define ROUNDSTART_ROLESET_GAIN 4
+
+#define ROUNDSTART_OBJECTIVES_BASE 40
+#define ROUNDSTART_OBJECTIVES_GAIN 2

code/__HELPERS/roundend.dm

@@ -236,6 +236,8 @@ GLOBAL_LIST_INIT(round_end_images, world.file2list("data/image_urls.txt"))
 
 	//Set news report and mode result
 	mode.set_round_result()
+	SSgamemode.round_end_report()
+	SSgamemode.store_roundend_data() // store data on roundend for next round
 
 	to_chat(world, span_infoplain(span_big(span_bold("<BR><BR><BR>The round has ended."))))
 	log_game("The round has ended.")

code/controllers/master.dm

@@ -282,6 +282,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	if(sleep_offline_after_initializations && CONFIG_GET(flag/resume_after_initializations))
 		world.sleep_offline = FALSE
 	initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10
+	/// run votes
+	SSvote.initiate_vote(/datum/vote/storyteller, "pick round storyteller", forced = TRUE) // idk where else to run this lol
 
 /**
  * Initialize a given subsystem and handle the results.

code/controllers/subsystem/processing/station.dm

@@ -76,6 +76,9 @@ PROCESSING_SUBSYSTEM_DEF(station)
 	for(var/iterator in 1 to amount)
 		var/datum/station_trait/trait_type = pick_weight(selectable_traits_by_types[trait_sign]) //Rolls from the table for the specific trait type
 		selectable_traits_by_types[trait_sign] -= trait_type
+		if(istype(trait_type, /datum/station_trait/late_arrivals) && SSmapping.config.map_name == "Oshan Station")
+			amount++
+			continue
 		setup_trait(trait_type)
 
 ///Creates a given trait of a specific type, while also removing any blacklisted ones from the future pool.

code/controllers/subsystem/statpanel.dm

@@ -26,6 +26,7 @@ SUBSYSTEM_DEF(statpanels)
 		global_data = list(
 			"Map: [SSmapping.config?.map_name || "Loading..."]",
 			cached ? "Next Map: [cached.map_name]" : null,
+			"Storyteller: [SSgamemode.storyteller ? SSgamemode.storyteller.name : "N/A"]", //monkestation addition
 			"Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]",
 			"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
 			"Round Time: [ROUND_TIME()]",

code/controllers/subsystem/ticker.dm

@@ -225,10 +225,14 @@ SUBSYSTEM_DEF(ticker)
 	var/init_start = world.timeofday
 
 	mode = new /datum/game_mode/dynamic
-
+	SSgamemode.init_storyteller() //monkestation addition
 	CHECK_TICK
 	//Configure mode and assign player to special mode stuff
 	var/can_continue = 0
+	//monkestation addition start
+	can_continue =	SSgamemode.pre_setup()
+	CHECK_TICK
+	//monkestation addition end
 	can_continue = src.mode.pre_setup() //Choose antagonists
 	CHECK_TICK
 	can_continue = can_continue && SSjob.DivideOccupations() //Distribute jobs
@@ -295,6 +299,8 @@ SUBSYSTEM_DEF(ticker)
 
 /datum/controller/subsystem/ticker/proc/PostSetup()
 	set waitfor = FALSE
+	SSgamemode.storyteller.process(STORYTELLER_WAIT_TIME * 0.1) // we want this asap
+	SSgamemode.storyteller.round_started = TRUE
 	mode.post_setup()
 	GLOB.start_state = new /datum/station_state()
 	GLOB.start_state.count()

code/controllers/subsystem/vote.dm

@@ -285,12 +285,16 @@ SUBSYSTEM_DEF(vote)
 			"message" = vote.message,
 		)
 
+		if(vote.has_desc)
+			vote_data += list("desc" = vote.return_desc(vote_name))
+
 		if(vote == current_vote)
 			var/list/choices = list()
 			for(var/key in current_vote.choices)
 				choices += list(list(
 					"name" = key,
 					"votes" = current_vote.choices[key],
+					"desc" = current_vote.return_desc(key)
 				))
 
 			data["currentVote"] = list(

code/datums/components/food/edible.dm

@@ -42,6 +42,9 @@ Behavior that's still missing from this component that original food items had t
 	var/list/tastes
 	///The buffs these foods give when eaten
 	var/food_buffs
+	///how many bites we can get
+	var/total_bites = 0
+	var/current_mask
 
 /datum/component/edible/Initialize(
 	list/initial_reagents,
@@ -74,6 +77,7 @@ Behavior that's still missing from this component that original food items had t
 	src.tastes = string_assoc_list(tastes)
 	src.check_liked = check_liked
 
+
 	setup_initial_reagents(initial_reagents)
 
 /datum/component/edible/RegisterWithParent()
@@ -214,6 +218,8 @@ Behavior that's still missing from this component that original food items had t
 		else
 			owner.reagents.add_reagent(rid, amount)
 
+	total_bites = round(owner.reagents.total_volume / bite_consumption)
+
 /datum/component/edible/proc/examine(datum/source, mob/user, list/examine_list)
 	SIGNAL_HANDLER
 
@@ -443,6 +449,14 @@ Behavior that's still missing from this component that original food items had t
 	var/fraction = min(bite_consumption / owner.reagents.total_volume, 1)
 	owner.reagents.trans_to(eater, bite_consumption, transfered_by = feeder, methods = INGEST)
 	bitecount++
+	var/desired_mask = (total_bites / bitecount)
+	desired_mask = round(desired_mask)
+	desired_mask = max(1,desired_mask)
+	desired_mask = min(desired_mask, 4)
+
+	if(desired_mask != current_mask)
+		current_mask = desired_mask
+		parent.add_filter("bite", 0, alpha_mask_filter(icon=icon('goon/icons/obj/food.dmi', "eating[desired_mask]")))
 	checkLiked(fraction, eater)
 	if(!owner.reagents.total_volume)
 		On_Consume(eater, feeder)
@@ -570,6 +584,15 @@ Behavior that's still missing from this component that original food items had t
 	if(bitecount == 0 || prob(50))
 		L.manual_emote("nibbles away at \the [parent].")
 	bitecount++
+	var/desired_mask = (total_bites / bitecount)
+	desired_mask = round(desired_mask)
+	desired_mask = max(1,desired_mask)
+	desired_mask = min(desired_mask, 4)
+
+	if(desired_mask != current_mask)
+		current_mask = desired_mask
+		src.add_filter("bite", 0, alpha_mask_filter(icon=icon('goon/icons/obj/food.dmi', "eating[desired_mask]")))
+
 	. = COMPONENT_CANCEL_ATTACK_CHAIN
 	L.taste(owner.reagents) // why should carbons get all the fun?
 	if(bitecount >= 5)

code/game/gamemodes/dynamic/dynamic.dm

@@ -135,7 +135,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 	var/waittime_h = 1800
 
 	/// Maximum amount of threat allowed to generate.
-	var/max_threat_level = 50
+	var/max_threat_level = 0 //disables dynamic threat PLEASE DONT LET ME MERGE THIS
 
 	/// The extra chance multiplier that a heavy impact midround ruleset will run next time.
 	/// For example, if this is set to 50, then the next heavy roll will be about 50% more likely to happen.

code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

@@ -370,7 +370,6 @@
 	cost = 7
 	minimum_round_time = 70 MINUTES
 	requirements = REQUIREMENTS_VERY_HIGH_THREAT_NEEDED
-	ruleset_lazy_templates = list(LAZY_TEMPLATE_KEY_NUKIEBASE)
 	flags = HIGH_IMPACT_RULESET
 
 	var/list/operative_cap = list(2,2,3,3,4,5,5,5,5,5)

code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm

@@ -450,7 +450,6 @@
 	requirements = list(90,90,90,80,60,40,30,20,10,10)
 	flags = HIGH_IMPACT_RULESET
 	antag_cap = list("denominator" = 18, "offset" = 1)
-	ruleset_lazy_templates = list(LAZY_TEMPLATE_KEY_NUKIEBASE)
 	var/required_role = ROLE_NUCLEAR_OPERATIVE
 	var/datum/team/nuclear/nuke_team
 

code/modules/admin/admin_verbs.dm

@@ -118,6 +118,7 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list(
 	/client/proc/drop_dynex_bomb,
 	/client/proc/flip_ghost_spawn,
 	/client/proc/forceEvent,
+	/client/proc/forceGamemode,
 	/client/proc/generate_bulk_code, //monkestation addition
 	/client/proc/generate_code, //monkestation addition
 	/client/proc/mass_add_metacoins, //monkestation addition

code/modules/admin/force_event.dm

@@ -1,4 +1,5 @@
 ///Allows an admin to force an event
+/*
 /client/proc/forceEvent()
 	set name = "Trigger Event"
 	set category = "Admin.Events"
@@ -15,7 +16,7 @@
 
 	var/datum/force_event/ui = new(usr)
 	ui.ui_interact(usr)
-
+*/
 /// Force Event Panel
 /datum/force_event
 

code/modules/admin/topic.dm

@@ -70,6 +70,7 @@
 		if(!check_rights(R_ADMIN))
 			return
 		SSticker.mode.admin_panel()
+		SSgamemode.admin_panel(usr) //monkestation addition
 
 	else if(href_list["call_shuttle"])
 		if(!check_rights(R_ADMIN))

code/modules/antagonists/nukeop/nukeop.dm

@@ -126,8 +126,6 @@
 
 /// Actually moves our nukie to where they should be
 /datum/antagonist/nukeop/proc/move_to_spawnpoint()
-	// Ensure that the nukiebase is loaded, and wait for it if required
-	SSmapping.lazy_load_template(LAZY_TEMPLATE_KEY_NUKIEBASE)
 	var/turf/destination = get_spawnpoint()
 	owner.current.forceMove(destination)
 	if(!owner.current.onSyndieBase())
@@ -530,13 +528,6 @@
 /// Returns whether or not syndicate operatives escaped.
 /proc/is_infiltrator_docked_at_syndiebase()
 	var/obj/docking_port/mobile/infiltrator/infiltrator_port = SSshuttle.getShuttle("syndicate")
+	var/obj/docking_port/stationary/transit/infiltrator_dock = locate() in infiltrator_port.loc
 
-	var/datum/lazy_template/nukie_base/nukie_template = GLOB.lazy_templates[LAZY_TEMPLATE_KEY_NUKIEBASE]
-	if(!nukie_template)
-		return FALSE // if its not even loaded, cant be docked
-
-	for(var/datum/turf_reservation/loaded_area as anything in nukie_template.reservations)
-		var/infiltrator_turf = get_turf(infiltrator_port)
-		if(infiltrator_turf in loaded_area.reserved_turfs)
-			return TRUE
-	return FALSE
+	return infiltrator_port && (is_centcom_level(infiltrator_port.z) || infiltrator_dock)

code/modules/antagonists/nukeop/outfits.dm

@@ -44,8 +44,6 @@
 	if(visualsOnly)
 		return
 
-	// We don't require the nukiebase be loaded to function, but lets go ahead and kick off loading just in case
-	INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, lazy_load_template), LAZY_TEMPLATE_KEY_NUKIEBASE)
 	var/obj/item/radio/radio = nukie.ears
 	radio.set_frequency(FREQ_SYNDICATE)
 	radio.freqlock = RADIO_FREQENCY_LOCKED

code/modules/antagonists/pirate/pirate_event.dm

@@ -9,11 +9,9 @@
 	description = "The crew will either pay up, or face a pirate assault."
 	admin_setup = list(/datum/event_admin_setup/listed_options/pirates)
 	map_flags = EVENT_SPACE_ONLY
-
-/datum/round_event_control/pirates/preRunEvent()
-	if (!SSmapping.is_planetary())
-		return EVENT_CANT_RUN
-	return ..()
+	track = EVENT_TRACK_MAJOR
+	tags = list(TAG_COMBAT, TAG_COMMUNAL)
+	checks_antag_cap = TRUE
 
 /datum/round_event/pirates
 	///admin chosen pirate team

code/modules/antagonists/wizard/wizard.dm

@@ -115,9 +115,6 @@ GLOBAL_LIST_EMPTY(wizard_spellbook_purchases_by_key)
 	RegisterSignal(ritual, COMSIG_GRAND_RITUAL_FINAL_COMPLETE, PROC_REF(on_ritual_complete))
 
 /datum/antagonist/wizard/proc/send_to_lair()
-	// And now we ensure that its loaded
-	SSmapping.lazy_load_template(LAZY_TEMPLATE_KEY_WIZARDDEN)
-
 	if(!owner.current)
 		return
 	if(!GLOB.wizardstart.len)

code/modules/bitrunning/event.dm

@@ -18,7 +18,7 @@
 		ROLE_CYBER_POLICE,
 	)
 
-/datum/round_event_control/bitrunning_glitch/can_spawn_event(players_amt, allow_magic = FALSE)
+/datum/round_event_control/bitrunning_glitch/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE)
 	. = ..()
 	if(!.)
 		return .