Merge branch 'origin/HEAD'

code/modules/antagonists/cult/runes.dm

@@ -1023,9 +1023,9 @@ structure_check() searches for nearby cultist structures required for the invoca
 				var/datum/round_event_control/mice_migration/M = new()
 				D.runEvent()
 				M.runEvent()
-			if(11 to 20)
-				var/datum/round_event_control/radiation_storm/RS = new()
-				RS.runEvent()
+			// if(11 to 20)
+			// 	var/datum/round_event_control/radiation_storm/RS = new()
+			// 	RS.runEvent()
 			if(21 to 30)
 				var/datum/round_event_control/brand_intelligence/BI = new()
 				BI.runEvent()

code/modules/antagonists/disease/disease_abilities.dm

@@ -37,6 +37,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	new /datum/disease_ability/symptom/powerful/flesh_eating,
 //	new /datum/disease_ability/symptom/powerful/genetic_mutation,
 	new /datum/disease_ability/symptom/powerful/inorganic_adaptation,
+	new /datum/disease_ability/symptom/medium/undead_adaptation,
 	new /datum/disease_ability/symptom/powerful/heal/starlight,
 	new /datum/disease_ability/symptom/powerful/heal/oxygen,
 	new /datum/disease_ability/symptom/powerful/heal/chem,
@@ -47,7 +48,8 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	new /datum/disease_ability/symptom/powerful/heal/radiation,
 	new /datum/disease_ability/symptom/powerful/heal/coma,
 	new /datum/disease_ability/symptom/powerful/youth,
-	new /datum/disease_ability/symptom/medium/heal/weight_gain
+	new /datum/disease_ability/symptom/medium/heal/weight_gain, //GS13
+	new /datum/disease_ability/symptom/medium/robotic_adaptation //GS13
 	))
 
 /datum/disease_ability
@@ -411,6 +413,13 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 
 /datum/disease_ability/symptom/powerful/inorganic_adaptation
 	symptoms = list(/datum/symptom/inorganic_adaptation)
+	short_desc = "Allows to infect inorganic races."
+	long_desc = "Allows to infect inorganic races. Includes plasmamen and golems."
+
+/datum/disease_ability/symptom/medium/undead_adaptation
+	symptoms = list(/datum/symptom/undead_adaptation)
+	short_desc = "Allows to infect undead races."
+	long_desc = "Allows to infect undead races. Includes skeletons, zombies, and vampires."
 
 /datum/disease_ability/symptom/powerful/narcolepsy
 	symptoms = list(/datum/symptom/narcolepsy)
@@ -420,11 +429,18 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	short_desc = "Cause victims to become eternally young."
 	long_desc = "Cause victims to become eternally young. Provides boosts to all stats except transmissibility."
 
+//GS13 additions
 /datum/disease_ability/symptom/medium/heal/weight_gain
 	symptoms = list(/datum/symptom/weight_gain)
 	short_desc = "Cause victims to gain weight."
 	long_desc = "Cause victims to gain weight. Boosts stage speed, but weakens all other stats."
 
+/datum/disease_ability/symptom/medium/robotic_adaptation
+	symptoms = list(/datum/symptom/robotic_adaptation)
+	short_desc = "Allows to infect robotic races."
+	long_desc = "Allows to infect robotic races. Includes synthetic lizards and ipcs."
+//--end here
+
 /****HEALING SUBTYPE****/
 
 /datum/disease_ability/symptom/powerful/heal/starlight

code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm

@@ -1,6 +1,6 @@
 #define CHALLENGE_TELECRYSTALS 280
 #define PLAYER_SCALING 1.5
-#define CHALLENGE_TIME_LIMIT 3000
+#define CHALLENGE_TIME_LIMIT 10000
 #define CHALLENGE_PLAYERS_TARGET 50 //target players population. anything below is a malus to the challenge tc bonus.
 #define TELECRYSTALS_MALUS_SCALING 1 //the higher the value, the bigger the malus.
 #define CHALLENGE_SHUTTLE_DELAY 15000 // 25 minutes, so the ops have at least 5 minutes before the shuttle is callable.

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -662,8 +662,8 @@ This is here to make the tiles around the station mininuke change when it's arme
 			var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
 			if(istype(loneop))
 				loneop.weight += 1
-				if(loneop.weight % 5 == 0)
-					message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].")
+				// if(loneop.weight % 5 == 0)
+					// message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - Sono
 				log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].")
 	else
 		lastlocation = newturf