Removed the tensioner. It was buggy and really only served to ruin rounds. The original purpose of the tensioner before Poly reworked it was to act as a stat tracker, which is now meaningless since erro has a fully operational stat tracker in place.

As a result, cyborg death squads were also removed.

This also fixes meteors and space dust so that they properly take into account the borders of the map. Please do not hardcode numbers when we have defines in place.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4374 316c924e-a436-60f5-8080-3fe189b3f50e

code/datums/configuration.dm

@@ -30,7 +30,6 @@
 	var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
 	var/traitor_scaling = 0 			//if amount of traitors scales based on amount of players
 	var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other
-	var/Tensioner_Active = 0			// If the tensioner is running.
 	var/allow_Metadata = 0				// Metadata is supported.
 	var/popup_admin_pm = 0				//adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
 	var/Ticklag = 0.9
@@ -251,9 +250,6 @@
 				if("protect_roles_from_antagonist")
 					config.protect_roles_from_antagonist = 1
 
-				if("tensioner_active")
-					config.Tensioner_Active = 1
-
 				if ("probability")
 					var/prob_pos = findtext(value, " ")
 					var/prob_name = null

code/datums/helper_datums/getrev.dm

@@ -90,9 +90,6 @@ client/verb/showrevinfo()
 		output = revdata.showInfo()
 
 		output += "Current Infomational Settings: <br>"
-		output += "Tensioner Status: [config.Tensioner_Active]<br>"
-		//output += "Current Tension: [tension_master.score]<br>"
-		//output += "Tensioner Debug Data:  R1:[tension_master.round1] R2:[tension_master.round2] R3:[tension_master.round3] R4:[tension_master.round4] ES: [tension_master.eversupressed] CD: [tension_master.cooldown]<br>"
 		output += "Protect Authority Roles From Tratior: [config.protect_roles_from_antagonist]<br>"
 	usr << browse(output,"window=revdata");
 	return

code/defines/area/Space Station 13 areas.dm

@@ -466,22 +466,6 @@ proc/process_ghost_teleport_locs()
 
 
 
-/area/borg_deathsquad
-	name = "\improper Borg Deathsquad"
-	icon_state = "yellow"
-	requires_power = 0
-
-/area/borg_deathsquad/start
-	name = "\improper Borg Deathsquad - Ready"
-
-
-/area/borg_deathsquad/station
-	name = "\improper Borg Deathsquad - Arrived"
-
-
-
-
-
 
 
 

code/game/gamemodes/events/dust.dm

@@ -61,25 +61,25 @@ The "dust" will damage the hull of the station causin minor hull breaches.
 
 		switch(startside)
 			if(NORTH)
-				starty = world.maxy-8
-				startx = rand(8, world.maxx-8)
-				endy = 8
-				endx = rand(8, world.maxx-8)
+				starty = world.maxy-(TRANSITIONEDGE+1)
+				startx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
+				endy = TRANSITIONEDGE
+				endx = rand(TRANSITIONEDGE, world.maxx-TRANSITIONEDGE)
 			if(EAST)
-				starty = rand(8,world.maxy-8)
-				startx = world.maxx-8
-				endy = rand(8, world.maxy-8)
-				endx = 8
+				starty = rand((TRANSITIONEDGE+1),world.maxy-(TRANSITIONEDGE+1))
+				startx = world.maxx-(TRANSITIONEDGE+1)
+				endy = rand(TRANSITIONEDGE, world.maxy-TRANSITIONEDGE)
+				endx = TRANSITIONEDGE
 			if(SOUTH)
-				starty = 8
-				startx = rand(8, world.maxx-8)
-				endy = world.maxy-8
-				endx = rand(1, world.maxx-8)
+				starty = (TRANSITIONEDGE+1)
+				startx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
+				endy = world.maxy-TRANSITIONEDGE
+				endx = rand(TRANSITIONEDGE, world.maxx-TRANSITIONEDGE)
 			if(WEST)
-				starty = rand(8, world.maxy-8)
-				startx = 8
-				endy = rand(8,world.maxy-8)
-				endx = world.maxx-8
+				starty = rand((TRANSITIONEDGE+1), world.maxy-(TRANSITIONEDGE+1))
+				startx = (TRANSITIONEDGE+1)
+				endy = rand(TRANSITIONEDGE,world.maxy-TRANSITIONEDGE)
+				endx = world.maxx-TRANSITIONEDGE
 		var/goal = locate(endx, endy, 1)
 		src.x = startx
 		src.y = starty

code/game/gamemodes/meteor/meteors.dm

@@ -36,25 +36,25 @@
 	do
 		switch(pick(1,2,3,4))
 			if(1) //NORTH
-				starty = world.maxy-8
-				startx = rand(8, world.maxx-8)
-				endy = 8
-				endx = rand(8, world.maxx-8)
+				starty = world.maxy-(TRANSITIONEDGE+1)
+				startx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
+				endy = TRANSITIONEDGE
+				endx = rand(TRANSITIONEDGE, world.maxx-TRANSITIONEDGE)
 			if(2) //EAST
-				starty = rand(8,world.maxy-8)
-				startx = world.maxx-8
-				endy = rand(8, world.maxy-8)
-				endx = 8
+				starty = rand((TRANSITIONEDGE+1),world.maxy-(TRANSITIONEDGE+1))
+				startx = world.maxx-(TRANSITIONEDGE+1)
+				endy = rand(TRANSITIONEDGE, world.maxy-TRANSITIONEDGE)
+				endx = TRANSITIONEDGE
 			if(3) //SOUTH
-				starty = 8
-				startx = rand(8, world.maxx-8)
-				endy = world.maxy-8
-				endx = rand(8, world.maxx-8)
+				starty = (TRANSITIONEDGE+1)
+				startx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
+				endy = world.maxy-TRANSITIONEDGE
+				endx = rand(TRANSITIONEDGE, world.maxx-TRANSITIONEDGE)
 			if(4) //WEST
-				starty = rand(8, world.maxy-8)
-				startx = 8
-				endy = rand(8,world.maxy-8)
-				endx = world.maxx-8
+				starty = rand((TRANSITIONEDGE+1), world.maxy-(TRANSITIONEDGE+1))
+				startx = (TRANSITIONEDGE+1)
+				endy = rand(TRANSITIONEDGE,world.maxy-TRANSITIONEDGE)
+				endx = world.maxx-TRANSITIONEDGE
 
 		pickedstart = locate(startx, starty, 1)
 		pickedgoal = locate(endx, endy, 1)

code/game/machinery/alarm.dm

@@ -955,7 +955,6 @@ table tr:first-child th:first-child { border: none;}
 
 	if(alert_level==2)
 		alert_signal.data["alert"] = "severe"
-		tension_master.new_air_alarm() //log this for stats purposes
 	else if (alert_level==1)
 		alert_signal.data["alert"] = "minor"
 	else if (alert_level==0)

code/game/master_controller.dm

@@ -11,7 +11,6 @@ datum/controller/game_controller
 	var/processing = 1
 
 	var/global/air_master_ready = 0
-	var/global/tension_master_ready = 0
 	var/global/sun_ready = 0
 	var/global/mobs_ready = 0
 	var/global/diseases_ready = 0
@@ -44,9 +43,6 @@ datum/controller/game_controller
 				world << "\red \b Job setup complete"
 				job_master.LoadJobs("config/jobs.txt")
 
-		if(!tension_master)
-			tension_master = new /datum/tension()
-
 		world.tick_lag = config.Ticklag
 
 		createRandomZlevel()
@@ -113,7 +109,6 @@ datum/controller/game_controller
 		var/start_time = world.timeofday
 
 		air_master_ready = 0
-		tension_master_ready = 0
 		sun_ready = 0
 		mobs_ready = 0
 		diseases_ready = 0
@@ -126,9 +121,6 @@ datum/controller/game_controller
 		spawn(0)
 			air_master.process()
 			air_master_ready = 1
-		spawn(0)
-			tension_master.process()
-			tension_master_ready = 1
 
 		sleep(1)
 
@@ -193,10 +185,10 @@ datum/controller/game_controller
 		sleep(world.timeofday+12-start_time)
 
 		var/IL_check = 0 //Infinite loop check (To report when the master controller breaks.)
-		while(!air_master_ready || !tension_master_ready || !sun_ready || !mobs_ready || !diseases_ready || !machines_ready || !objects_ready || !networks_ready || !powernets_ready || !ticker_ready)
+		while(!air_master_ready || !sun_ready || !mobs_ready || !diseases_ready || !machines_ready || !objects_ready || !networks_ready || !powernets_ready || !ticker_ready)
 			IL_check++
 			if(IL_check > 600)
-				var/MC_report = "air_master_ready = [air_master_ready]; tension_master_ready = [tension_master_ready]; sun_ready = [sun_ready]; mobs_ready = [mobs_ready]; diseases_ready = [diseases_ready]; machines_ready = [machines_ready]; objects_ready = [objects_ready]; networks_ready = [networks_ready]; powernets_ready = [powernets_ready]; ticker_ready = [ticker_ready];"
+				var/MC_report = "air_master_ready = [air_master_ready]; sun_ready = [sun_ready]; mobs_ready = [mobs_ready]; diseases_ready = [diseases_ready]; machines_ready = [machines_ready]; objects_ready = [objects_ready]; networks_ready = [networks_ready]; powernets_ready = [powernets_ready]; ticker_ready = [ticker_ready];"
 				message_admins("<b><font color='red'>PROC BREAKAGE WARNING:</font> The game's master contorller appears to be stuck in one of it's cycles. It has looped through it's delaying loop [IL_check] times.</b>")
 				message_admins("<b>The master controller reports: [MC_report]</b>")
 				if(!diseases_ready)

code/game/objects/explosion.dm

@@ -20,8 +20,6 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 		playsound(epicenter, 'explosionfar.ogg', 100, 1, round(devastation_range*2,1) )
 		playsound(epicenter, "explosion", 100, 1, round(devastation_range,1) )
 
-		tension_master.explosion()
-
 		if(defer_powernet_rebuild != 2)
 			defer_powernet_rebuild = 1
 

code/game/turf.dm

@@ -1674,7 +1674,7 @@ turf/simulated/floor/proc/update_icon()
 
 		// Okay, so let's make it so that people can travel z levels but not nuke disks!
 		// if(ticker.mode.name == "nuclear emergency")	return
-		if (A.x <= TRANSITIONEDGE + 1 || A.x >= (world.maxx - TRANSITIONEDGE - 1) || A.y <= TRANSITIONEDGE + 1 || A.y >= (world.maxy - TRANSITIONEDGE - 1))
+		if (A.x <= TRANSITIONEDGE || A.x >= (world.maxx - TRANSITIONEDGE - 1) || A.y <= TRANSITIONEDGE || A.y >= (world.maxy - TRANSITIONEDGE - 1))
 			if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust))
 				del(A)
 				return

code/modules/admin/admin_verbs.dm

@@ -187,7 +187,6 @@
 			verbs += /client/proc/spawn_xeno
 			verbs += /client/proc/toggleprayers
 			verbs += /client/proc/deadmin_self
-			verbs += /client/proc/tension_report
 			verbs += /client/proc/toggleadminhelpsound
 			verbs += /proc/possess
 			verbs += /proc/release
@@ -398,7 +397,6 @@
 	verbs -= /client/proc/toggle_clickproc 								//TODO ERRORAGE (Temporary proc while the enw clickproc is being tested)
 	verbs -= /client/proc/toggle_hear_deadcast
 	verbs -= /client/proc/toggle_hear_radio
-	verbs -= /client/proc/tension_report
 	verbs -= /client/proc/player_panel_new
 	verbs -= /client/proc/toggle_gravity_on
 	verbs -= /client/proc/toggle_gravity_off

code/modules/admin/verbs/adminhelp.dm

@@ -123,8 +123,6 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 
 	src << "<font color='blue'>PM to-<b>Admins</b>: [original_msg]</font>"
 	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number] non-AFK admins.")
-	if(tension_master)
-		tension_master.new_adminhelp()
 	if((admin_number - admin_number_afk) <= 0)
 		if(!admin_number_afk)
 			send2irc(ckey, "[original_msg] - No admins online")

code/modules/admin/verbs/diagnostics.dm

@@ -222,61 +222,3 @@
 		else
 			usr << "Local airgroup is unsimulated!"
 		feedback_add_details("admin_verb","KLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-	tension_report()
-		set category = "Debug"
-		set name = "Show Tension Report"
-
-		if(!master_controller || !tension_master)
-			alert(usr,"Master_controller or tension_master not found.","Tension Report")
-			return 0
-
-		if (!tension_master.get_num_players())
-			alert(usr,"No players found.  How the fuck are you calling this?","Tension Report")
-			return 0
-
-		var/numghosts = 0
-
-		for(var/mob/dead/observer/theghost in world)
-			numghosts ++
-
-
-		var/output = {"<B>TENSION REPORT</B><HR>
-<B>General Statistics</B><BR>
-<B>Deaths:</B> [tension_master.deaths]<BR>
----- <I>Humans:</I> [tension_master.human_deaths]<BR>
-<B>Explosions:</B> [tension_master.explosions]<BR>
-<B>Air alarms:</B> [tension_master.air_alarms]<BR>
-<B>Adminhelps:</B> [tension_master.adminhelps]<BR>
-<B>Ghosts:</B> [numghosts]<BR>
-<BR>
-<B>Current Status</B><BR>
-<B>Tension:</B> [tension_master.score]<BR>
-<a href='?src=\ref[tension_master];addScore=1'>Increase Tension by 50000</a><br>
-<B>Tension per player:</B> [tension_master.score/tension_master.get_num_players()]<BR>
-<B>Tensioner Debug Data:</B>  R1:[tension_master.round1] R2:[tension_master.round2] R3:[tension_master.round3] R4:[tension_master.round4] ES: [tension_master.eversupressed] CD: [tension_master.cooldown]<br>
-<B>Current Tensioner Status:</B> [config.Tensioner_Active].  <a href='?src=\ref[tension_master];ToggleStatus=1'>Toggle?</a><br>
-<B>Recommendations:</B> All the modes.  All of them.  Press all of them.<BR>
-<BR>
-
-	<a href='?src=\ref[tension_master];makeTratior=1'>Make Tratiors</a><br>
-	<a href='?src=\ref[tension_master];makeChanglings=1'>Make Changlings</a><br>
-	<a href='?src=\ref[tension_master];makeRevs=1'>Make Revs</a><br>
-	<a href='?src=\ref[tension_master];makeWizard=1'>Make Wizard (Requires Ghosts)</a><br>
-	<a href='?src=\ref[tension_master];makeCult=1'>Make Cult</a><br>
-	<a href='?src=\ref[tension_master];makeNukeTeam=1'>Make Nuke Team (Requires Ghosts)</a><br>
-	<a href='?src=\ref[tension_master];makeMalf=1'>Make Malf AI</a><br>
-	<a href='?src=\ref[tension_master];makeSpaceNinja=1'>Make Space Ninja (Requires Ghosts)</a><br>
-	<a href='?src=\ref[tension_master];makeAliens=1'>Make Aliens (Requires Ghosts)</a><br>
-	<a href='?src=\ref[tension_master];makeDeathsquad=1'>Make Deathsquad (Syndicate) (Requires Ghosts)</a><br>
-	<a href='?src=\ref[tension_master];makeBorgDeathsquad=1'>Make Deathsquad (Borg) (Requires Ghosts)</a><br>
-
-	<br>
-
-"}
-
-		for(var/game in tension_master.antagonistmodes)
-			output += "<font size = 2>Points required/Probability for [game]: [tension_master.antagonistmodes[game]]<br></font>"
-		usr << browse(output,"window=tensionreport;size=480x480")
-		feedback_add_details("admin_verb","STR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/mob/living/carbon/human/death.dm

@@ -49,8 +49,6 @@
 	dizziness = 0
 	jitteriness = 0
 
-	tension_master.death(src)
-
 	if(!gibbed)
 		emote("deathgasp") //let the world KNOW WE ARE DEAD
 

code/modules/mob/living/silicon/robot/death.dm

@@ -49,8 +49,6 @@
 		emote("deathgasp")
 	stat = DEAD
 	update_canmove()
-
-	tension_master.death(src)
 	if(camera)
 		camera.status = 0
 

config/config.txt

@@ -77,9 +77,6 @@ ALLOW_RANDOM_EVENTS
 ## If security is prohibited from being most antagonists
 #PROTECT_ROLES_FROM_ANTAGONIST
 
-## If the auto-tensioner is active by default.  It creates more tratiors/other antagonists if it consideers the round slowing down.
-#TENSIONER_ACTIVE
-
 ## If metadata is supported
 ALLOW_METADATA
 

tgstation.dme

@@ -279,7 +279,6 @@
 #include "code\datums\helper_datums\getrev.dm"
 #include "code\datums\helper_datums\global_iterator.dm"
 #include "code\datums\helper_datums\teleport.dm"
-#include "code\datums\helper_datums\tension.dm"
 #include "code\datums\helper_datums\topic_input.dm"
 #include "code\datums\spells\area_teleport.dm"
 #include "code\datums\spells\conjure.dm"