Merge remote-tracking branch 'upstream/dev' into emergency-shuttle

Conflicts:
	code/setup.dm

code/game/gamemodes/autotraitor/autotraitor.dm

@@ -188,7 +188,8 @@
 			//message_admins("The probability of a new traitor is [traitor_prob]%")
 			if(prob(traitor_prob))
 				message_admins("New traitor roll passed.  Making a new Traitor.")
-				forge_traitor_objectives(character.mind)
+				if (!config.objectives_disabled)
+					forge_traitor_objectives(character.mind)
 				equip_traitor(character)
 				traitors += character.mind
 				character << "\red <B>You are the traitor.</B>"

code/game/gamemodes/blob/theblob.dm

@@ -87,7 +87,7 @@
 			return 1
 		return 0
 
-/*	temperature_expose(datum/gas_mixture/air, temperature, volume) Blob is currently fireproof
+/*	fire_act(datum/gas_mixture/air, temperature, volume) Blob is currently fireproof
 		if(temperature > T0C+200)
 			health -= 0.01 * temperature
 			update()

code/game/gamemodes/changeling/changeling.dm

@@ -88,6 +88,9 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 	//No escape alone because changelings aren't suited for it and it'd probably just lead to rampant robusting
 	//If it seems like they'd be able to do it in play, add a 10% chance to have to escape alone
 
+	if (config.objectives_disabled)
+		return
+
 	var/datum/objective/absorb/absorb_objective = new
 	absorb_objective.owner = changeling
 	absorb_objective.gen_amount_goal(2, 3)

code/game/gamemodes/cult/cult_items.dm

@@ -98,7 +98,7 @@
 	item_state = "cult_armour"
 	desc = "A bulky suit of armour, bristling with spikes. It looks space proof."
 	w_class = 3
-	allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency_oxygen)
+	allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/suit_cooling_unit)
 	slowdown = 1
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
 	siemens_coefficient = 0

code/game/gamemodes/events/biomass.dm

@@ -154,7 +154,7 @@
 				return
 	return
 
-/obj/effect/biomass/temperature_expose(null, temp, volume) //hotspots kill biomass
+/obj/effect/biomass/fire_act(null, temp, volume) //hotspots kill biomass
 	del src
 
 

code/game/gamemodes/events/ninja_equipment.dm

@@ -1367,17 +1367,20 @@ It is possible to destroy the net by the occupant or someone else.
 				playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1)
 				anim(M.loc,M,'icons/mob/mob.dmi',,"phaseout",,M.dir)
 
-			M.loc = pick(holdingfacility)//Throw mob in to the holding facility.
-			M << "\red You appear in a strange place!"
+			if(holdingfacility.len)
+				M.loc = pick(holdingfacility)//Throw mob in to the holding facility.
+				spawn(0)
+					var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+					spark_system.set_up(5, 0, M.loc)
+					spark_system.start()
+					playsound(M.loc, 'sound/effects/phasein.ogg', 25, 1)
+					playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1)
+					anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
+					del(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0).
+			else
+				M.loc = null
 
-			spawn(0)
-				var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
-				spark_system.set_up(5, 0, M.loc)
-				spark_system.start()
-				playsound(M.loc, 'sound/effects/phasein.ogg', 25, 1)
-				playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1)
-				anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
-				del(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0).
+			M << "\red You appear in a strange place!"
 
 			for(var/mob/O in viewers(src, 3))
 				O.show_message(text("[] vanished!", M), 1, text("You hear sparks flying!"), 2)

code/game/gamemodes/events/spacevines.dm

@@ -239,7 +239,7 @@
 				return
 	return
 
-/obj/effect/spacevine/temperature_expose(null, temp, volume) //hotspots kill vines
+/obj/effect/spacevine/fire_act(null, temp, volume) //hotspots kill vines
 	del src
 
 //Carn: Spacevines random event.

code/game/gamemodes/game_mode.dm

@@ -112,8 +112,6 @@ Implants;
 	feedback_set_details("round_start","[time2text(world.realtime)]")
 	if(ticker && ticker.mode)
 		feedback_set_details("game_mode","[ticker.mode]")
-	if(revdata)
-		feedback_set_details("revision","[revdata.revision]")
 	feedback_set_details("server_ip","[world.internet_address]:[world.port]")
 	return 1
 

code/game/gamemodes/meme/meme.dm

@@ -108,6 +108,9 @@
 
 
 /datum/game_mode/proc/forge_meme_objectives(var/datum/mind/meme, var/datum/mind/first_host)
+	if (config.objectives_disabled)
+		return
+
 	// meme always needs to attune X hosts
 	var/datum/objective/meme_attune/attune_objective = new
 	attune_objective.owner = meme

code/game/gamemodes/ninja/ninja.dm

@@ -85,6 +85,8 @@
 		return 1
 
 /datum/game_mode/ninja/proc/forge_ninja_objectives(var/datum/mind/ninja)
+	if (config.objectives_disabled)
+		return
 
 	var/objective_list = list(1,2,3,4,5)
 	for(var/i=rand(2,4),i>0,i--)

code/game/gamemodes/nuclear/nuclear.dm

@@ -186,6 +186,8 @@
 
 
 /datum/game_mode/proc/forge_syndicate_objectives(var/datum/mind/syndicate)
+	if (config.objectives_disabled)
+		return
 	var/datum/objective/nuclear/syndobj = new
 	syndobj.owner = syndicate
 	syndicate.objectives += syndobj

code/game/gamemodes/traitor/traitor.dm

@@ -78,6 +78,9 @@
 
 
 /datum/game_mode/proc/forge_traitor_objectives(var/datum/mind/traitor)
+	if (config.objectives_disabled)
+		return
+
 	if(istype(traitor.current, /mob/living/silicon))
 		var/datum/objective/assassinate/kill_objective = new
 		kill_objective.owner = traitor

code/game/gamemodes/wizard/wizard.dm

@@ -64,6 +64,9 @@
 
 
 /datum/game_mode/proc/forge_wizard_objectives(var/datum/mind/wizard)
+	if (config.objectives_disabled)
+		return
+
 	switch(rand(1,100))
 		if(1 to 30)