From 6058253dcf046a6bf99135194c27397ebd129453 Mon Sep 17 00:00:00 2001
From: Putnam <putnam3145@gmail.com>
Date: Tue, 24 Dec 2019 20:20:27 -0800
Subject: [PATCH] logging!

---
 .../dynamic/dynamic_rulesets_latejoin.dm      | 43 +++++++++++--------
 .../dynamic/dynamic_rulesets_midround.dm      | 33 ++------------
 2 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
index 68776b138f..52871004e5 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
@@ -70,9 +70,13 @@
 	repeatable = TRUE
 	flags = TRAITOR_RULESET
 	property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 1)
-
 	always_max_weight = TRUE
 
+/datum/dynamic_ruleset/latejoin/infiltrator/execute()
+	. = ..()
+	log_admin("[M] was made into a traitor by dynamic.")
+	message_admins("[M] was made into a traitor by dynamic.")
+
 //////////////////////////////////////////////
 //                                          //
 //       REVOLUTIONARY PROVOCATEUR          //
@@ -126,6 +130,8 @@
 		revolution.update_objectives()
 		revolution.update_heads()
 		SSshuttle.registerHostileEnvironment(src)
+		log_admin("[M.name] was made into a revolutionary by dynamic.")
+		message_admins("[M.name] was made into a revolutionary by dynamic.")
 		return TRUE
 	else
 		log_game("DYNAMIC: [ruletype] [name] discarded [M.name] from head revolutionary due to ineligibility.")
@@ -190,30 +196,31 @@
 
 //////////////////////////////////////////////
 //                                          //
-//                 VAMPIRE                  //
+//               BLOODSUCKERS               //
 //                                          //
 //////////////////////////////////////////////
 
-/*
-/datum/dynamic_ruleset/latejoin/vampire
-	name = "vampire"
-	config_tag = "vampire_latejoin"
-	antag_flag = ROLE_VAMPIRE
-	antag_datum = ANTAG_DATUM_VAMPIRE
-	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")
+/datum/dynamic_ruleset/latejoin/bloodsucker
+	name = "Bloodsucker Infiltrator"
+	config_tag = "latejoin_bloodsucker"
+	antag_datum = ANTAG_DATUM_BLOODSUCKER
+	antag_flag = ROLE_TRAITOR
 	restricted_roles = list("AI", "Cyborg")
+	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
 	required_candidates = 1
-	weight = 5
-	cost = 15
-	requirements = list(80,70,60,50,40,20,20,15,15,15)
+	weight = 3
+	cost = 10
+	property_weights = list("extended" = 2, "chaos" = -1, "trust" = -3, "story_potential" = -2, "conversion" = 1, "valid" = 1)
+	requirements = list(90,80,70,60,55,50,45,40,35,30)
+	high_population_requirement = 30
 	repeatable = TRUE
-	high_population_requirement = 15
 
-/datum/dynamic_ruleset/latejoin/vampire/pre_execute()
+/datum/dynamic_ruleset/latejoin/bloodsucker/execute()
 	var/mob/M = pick(candidates)
-	candidates -= M
 	assigned += M.mind
-	M.mind.restricted_roles = restricted_roles
-	M.mind.special_role = ROLE_VAMPIRE
+	M.mind.special_role = antag_flag
+	if(mode.make_bloodsucker(M.mind))
+		mode.bloodsuckers += M
+		log_admin("[M.name] was made into a bloodsucker by dynamic.")
+		message_admins("[M.name] was made into a bloodsucker by dynamic.")
 	return TRUE
-*/
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
index 54fbc75fe3..be01e620fe 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
@@ -219,6 +219,8 @@
 	living_players -= M
 	var/datum/antagonist/traitor/newTraitor = new
 	M.mind.add_antag_datum(newTraitor)
+	log_admin("[M] was made into a traitor by dynamic.")
+	message_admins("[M] was made into a traitor by dynamic.")
 	return TRUE
 
 
@@ -267,6 +269,8 @@
 	var/datum/antagonist/traitor/AI = new
 	M.mind.special_role = antag_flag
 	M.mind.add_antag_datum(AI)
+	log_admin("[M] was made into a malf AI by dynamic.")
+	message_admins("[M] was made into a malf AI by dynamic.")
 	if(prob(ion_announce))
 		priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", "ionstorm")
 		if(prob(removeDontImproveChance))
@@ -761,32 +765,3 @@
 
 #undef ABDUCTOR_MAX_TEAMS
 #undef REVENANT_SPAWN_THRESHOLD
-
-//////////////////////////////////////////////
-//                                          //
-//               BLOODSUCKERS               //
-//                                          //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/latejoin/bloodsucker
-	name = "Bloodsucker Infiltrator"
-	config_tag = "latejoin_bloodsucker"
-	antag_datum = ANTAG_DATUM_BLOODSUCKER
-	antag_flag = ROLE_TRAITOR
-	restricted_roles = list("AI", "Cyborg")
-	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
-	required_candidates = 1
-	weight = 3
-	cost = 10
-	property_weights = list("extended" = 2, "chaos" = -1, "trust" = -3, "story_potential" = -2, "conversion" = 1, "valid" = 1)
-	requirements = list(90,80,70,60,55,50,45,40,35,30)
-	high_population_requirement = 30
-	repeatable = TRUE
-
-/datum/dynamic_ruleset/latejoin/bloodsucker/execute()
-	var/mob/M = pick(candidates)
-	assigned += M.mind
-	M.mind.special_role = antag_flag
-	if(mode.make_bloodsucker(M.mind))
-		mode.bloodsuckers += M
-	return TRUE