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
This commit is contained in:
johnsonmt88@gmail.com
2012-08-11 20:02:31 +00:00
parent b9facf9e43
commit cc544acea0
17 changed files with 3771 additions and 3891 deletions

View File

@@ -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

View File

@@ -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")

View File

@@ -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!

View File

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

View File

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