TG Sync 12/15/17

s s
2017-12-15 03:28:09 -08:00
parent b6b0ab69e3
commit 253c819bc1
762 changed files with 13429 additions and 14872 deletions
@@ -16,6 +16,7 @@
 	// 50% chance of being incremented by one
 	var/spawncount = 1
 	var/successSpawn = 0	//So we don't make a command report if nothing gets spawned.
+	fakeable = TRUE


 /datum/round_event/ghost_role/alien_infestation/setup()
@@ -11,6 +11,7 @@
 /datum/round_event/ghost_role/blob
 	announceWhen	= -1
 	role_name = "blob overmind"
+	fakeable = TRUE

 /datum/round_event/ghost_role/blob/announce(fake)
 	priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak5.ogg')
@@ -23,3 +23,5 @@
 			new /mob/living/simple_animal/hostile/carp(C.loc)
 		else
 			new /mob/living/simple_animal/hostile/carp/megacarp(C.loc)
+
+
@@ -10,6 +10,8 @@

 	var/virus_type

+	var/max_severity = 3
+

 /datum/round_event/disease_outbreak/announce(fake)
 	priority_announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak7.ogg')
@@ -17,8 +19,14 @@
 /datum/round_event/disease_outbreak/setup()
 	announceWhen = rand(15, 30)

+
 /datum/round_event/disease_outbreak/start()
-	if(!virus_type)
+	var/advanced_virus = FALSE
+	max_severity = 3 + max(Floor((world.time - control.earliest_start)/6000),0) //3 symptoms at 20 minutes, plus 1 per 10 minutes
+	if(prob(20 + (10 * max_severity)))
+		advanced_virus = TRUE
+
+	if(!virus_type && !advanced_virus)
 		virus_type = pick(/datum/disease/dnaspread, /datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis)

 	for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list))
@@ -41,16 +49,48 @@
 			continue

 		var/datum/disease/D
-		if(virus_type == /datum/disease/dnaspread)		//Dnaspread needs strain_data set to work.
-			if(!H.dna || (H.disabilities & BLIND))	//A blindness disease would be the worst.
-				continue
-			D = new virus_type()
-			var/datum/disease/dnaspread/DS = D
-			DS.strain_data["name"] = H.real_name
-			DS.strain_data["UI"] = H.dna.uni_identity
-			DS.strain_data["SE"] = H.dna.struc_enzymes
+		if(!advanced_virus)
+			if(virus_type == /datum/disease/dnaspread)		//Dnaspread needs strain_data set to work.
+				if(!H.dna || (H.disabilities & BLIND))	//A blindness disease would be the worst.
+					continue
+				D = new virus_type()
+				var/datum/disease/dnaspread/DS = D
+				DS.strain_data["name"] = H.real_name
+				DS.strain_data["UI"] = H.dna.uni_identity
+				DS.strain_data["SE"] = H.dna.struc_enzymes
+			else
+				D = new virus_type()
 		else
-			D = new virus_type()
+			D = make_virus(max_severity, max_severity)
 		D.carrier = TRUE
 		H.AddDisease(D)
-		break
+
+		if(advanced_virus)
+			var/datum/disease/advance/A = D
+			var/list/name_symptoms = list() //for feedback
+			for(var/datum/symptom/S in A.symptoms)
+				name_symptoms += S.name
+			message_admins("An event has triggered a random advanced virus outbreak on [key_name_admin(H)]! It has these symptoms: [english_list(name_symptoms)]")
+			log_game("An event has triggered a random advanced virus outbreak on [key_name(H)]! It has these symptoms: [english_list(name_symptoms)]")
+		break
+
+/datum/round_event/disease_outbreak/proc/make_virus(max_symptoms, max_level)
+	if(max_symptoms > SYMPTOM_LIMIT)
+		max_symptoms = SYMPTOM_LIMIT
+	var/datum/disease/advance/A = new(FALSE, null)
+	A.symptoms = list()
+	var/list/datum/symptom/possible_symptoms = list()
+	for(var/symptom in subtypesof(/datum/symptom))
+		var/datum/symptom/S = symptom
+		if(initial(S.level) > max_level)
+			continue
+		if(initial(S.level) <= 0) //unobtainable symptoms
+			continue
+		possible_symptoms += S
+	for(var/i in 1 to max_symptoms)
+		var/datum/symptom/chosen_symptom = pick_n_take(possible_symptoms)
+		if(chosen_symptom)
+			var/datum/symptom/S = new chosen_symptom
+			A.symptoms += S
+	A.Refresh() //just in case someone already made and named the same disease
+	return A
@@ -28,4 +28,4 @@
 	fakeable = FALSE

 /datum/round_event/sandstorm/tick()
-	spawn_meteors(10, GLOB.meteorsC)
+	spawn_meteors(10, GLOB.meteorsC)
@@ -7,6 +7,7 @@
 	var/minimum_required = 1
 	var/role_name = "debug rat with cancer" // Q U A L I T Y  M E M E S
 	var/list/spawned_mobs = list()
+	fakeable = FALSE

 /datum/round_event/ghost_role/start()
 	try_spawning()
@@ -15,4 +15,4 @@

 /datum/round_event/fridaythethirteen/announce(fake)
 	for(var/mob/living/L in player_list)
-		to_chat(L, "<span class='warning'>You are feeling unlucky today.</span>")
+		to_chat(L, "<span class='warning'>You are feeling unlucky today.</span>")
@@ -45,19 +45,26 @@
 			to_chat(L, "<span class='warning'><B>You didn't get a date! They're all having fun without you! you'll show them though...</B></span>")
 			var/datum/objective/martyr/normiesgetout = new
 			normiesgetout.owner = L.mind
+			L.mind.special_role = "heartbreaker"
 			SSticker.mode.traitors |= L.mind
 			L.mind.objectives += normiesgetout

+			L.mind.add_antag_datum(/datum/antagonist/auto_custom)
+
 /proc/forge_valentines_objective(mob/living/lover,mob/living/date)

 	SSticker.mode.traitors |= lover.mind
 	lover.mind.special_role = "valentine"
+	

 	var/datum/objective/protect/protect_objective = new /datum/objective/protect
 	protect_objective.owner = lover.mind
 	protect_objective.target = date.mind
 	protect_objective.explanation_text = "Protect [date.real_name], your date."
 	lover.mind.objectives += protect_objective
+
+	lover.mind.add_antag_datum(/datum/antagonist/auto_custom)
+
 	to_chat(lover, "<span class='warning'><B>You're on a date with [date]! Protect them at all costs. This takes priority over all other loyalties.</B></span>")


@@ -10,4 +10,4 @@

 /datum/round_event/mass_hallucination/start()
 	for(var/mob/living/carbon/C in GLOB.alive_mob_list)
-		C.hallucination += rand(20, 50)
+		C.hallucination += rand(20, 50)
@@ -35,6 +35,7 @@
 	player_mind.assigned_role = "Nightmare"
 	player_mind.special_role = "Nightmare"
 	SSticker.mode.traitors += player_mind
+	player_mind.add_antag_datum(/datum/antagonist/auto_custom)
 	S.set_species(/datum/species/shadow/nightmare)
 	playsound(S, 'sound/magic/ethereal_exit.ogg', 50, 1, -1)
 	message_admins("[key_name_admin(S)] has been made into a Nightmare by an event.")
@@ -26,32 +26,12 @@
 	var/datum/preferences/A = new
 	A.copy_to(operative)
 	operative.dna.update_dna_identity()
-
-	operative.equipOutfit(/datum/outfit/syndicate/full)
-
 	var/datum/mind/Mind = new /datum/mind(selected.key)
 	Mind.assigned_role = "Lone Operative"
 	Mind.special_role = "Lone Operative"
-	SSticker.mode.traitors |= Mind
 	Mind.active = 1
-
-	var/obj/machinery/nuclearbomb/selfdestruct/nuke = locate() in GLOB.machines
-	if(nuke)
-		var/nuke_code
-		if(!nuke.r_code || nuke.r_code == "ADMIN")
-			nuke_code = random_nukecode()
-			nuke.r_code = nuke_code
-		else
-			nuke_code = nuke.r_code
-
-		Mind.store_memory("<B>Station Self-Destruct Device Code</B>: [nuke_code]", 0, 0)
-		to_chat(Mind.current, "The nuclear authorization code is: <B>[nuke_code]</B>")
-
-		var/datum/objective/nuclear/O = new()
-		O.owner = Mind
-		Mind.objectives += O
-
 	Mind.transfer_to(operative)
+	Mind.add_antag_datum(/datum/antagonist/nukeop/lone)

 	message_admins("[key_name_admin(operative)] has been made into lone operative by an event.")
 	log_game("[key_name(operative)] was spawned as a lone operative by an event.")
@@ -56,4 +56,4 @@
 				temp.prison_open()
 			else if(istype(O, /obj/machinery/door_timer))
 				var/obj/machinery/door_timer/temp = O
-				temp.timer_end(forced = TRUE)
+				temp.timer_end(forced = TRUE)
@@ -16,5 +16,4 @@
 	//sound not longer matches the text, but an audible warning is probably good

 /datum/round_event/radiation_storm/start()
-	SSweather.run_weather("radiation storm",ZLEVEL_STATION_PRIMARY)
-	make_maint_all_access()
+	SSweather.run_weather("radiation storm",ZLEVEL_STATION_PRIMARY)
@@ -9,6 +9,7 @@
 	role_name = "random animal"
 	var/animals = 1
 	var/one = "one"
+	fakeable = TRUE

 /datum/round_event/ghost_role/sentience/announce(fake)
 	var/sentience_report = ""
@@ -135,7 +135,7 @@
 					new /obj/structure/spider/stickyweb(T)

 			if(ANTIDOTE_NEEDED)
-				var/obj/item/reagent_containers/glass/bottle/virus_type = pick(/obj/item/reagent_containers/glass/bottle/beesease, /obj/item/reagent_containers/glass/bottle/brainrot, /obj/item/reagent_containers/glass/bottle/fluspanish)
+				var/obj/effect/mob_spawn/human/corpse/assistant/infected_assistant = pick(/obj/effect/mob_spawn/human/corpse/assistant/beesease_infection, /obj/effect/mob_spawn/human/corpse/assistant/brainrot_infection, /obj/effect/mob_spawn/human/corpse/assistant/spanishflu_infection)
 				var/turf/T
 				for(var/i=0, i<10, i++)
 					if(prob(15))
@@ -145,7 +145,7 @@
 					else if(prob(25))
 						shuttle_spawns.Add(/obj/item/shard)
 					T = pick_n_take(empty_shuttle_turfs)
-					new virus_type(T)
+					new infected_assistant(T)
 				shuttle_spawns.Add(/obj/structure/closet/crate)
 				shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle/pierrot_throat)
 				shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle/magnitis)
@@ -26,4 +26,4 @@

 		var/datum/disease/D = new /datum/disease/appendicitis
 		H.ForceContractDisease(D)
-		break
+		break
@@ -28,3 +28,5 @@

 	if(announceWhen >= 0)
 		command_alert("Artificial gravity arrays are now functioning within normal parameters. Please report any irregularities to your respective head of staff.")
+
+
@@ -44,6 +44,7 @@
 						citizens += H
 						SSticker.mode.traitors += M
 						M.special_role = "separatist"
+						M.add_antag_datum(/datum/antagonist/auto_custom)
 						H.log_message("<font color='red'>Was made into a separatist, long live [nation]!</font>", INDIVIDUAL_ATTACK_LOG)
 						to_chat(H, "<B>You are a separatist! [nation] forever! Protect the sovereignty of your newfound land with your comrades in arms!</B>")
 	if(citizens.len)
@@ -67,6 +67,7 @@
 		O.completed = 1 //YES!
 		O.owner = new_holder.mind
 		new_holder.mind.objectives += O
+		new_holder.mind.add_antag_datum(/datum/antagonist/auto_custom)
 		new_holder.log_message("<font color='green'>Won with greentext!!!</font>", INDIVIDUAL_ATTACK_LOG)
 		color_altered_mobs -= new_holder
 		resistance_flags |= ON_FIRE