cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 05:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

TG: Adds a dummy process() to /obj/machinery/door so that doors aren't removed from

Browse Source 
the machine list.  Best guess, all machines call process automatically, and
because doors didn't have an explicit one defined, they automatically called the
one that removed them from the list.
Adds a borg deathsquad to the map.
Few more fixes to the tensioner.
Revision: r3374

Includes door code cleanup from here http://code.google.com/p/tgstation13/source/detail?spec=svn2895&r=2895
This commit is contained in:
Ren Erthilo
2012-05-01 02:55:28 +01:00
parent f5c2a17237
commit 93403a15e5
7 changed files with 433 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/datums/helper_datums/tension.dm
View File

@@ -191,12 +191,12 @@ var/global/datum/tension/tension_master
forcenexttick = 1
else
potentialgames.Remove(thegame)
/*
if("POINTS_FOR_BORG_DEATHSQUAD")
if(!makeBorgDeathsquad())
forcenexttick = 1
else
potentialgames.Remove(thegame)*/
potentialgames.Remove(thegame)
proc/get_num_players()
@@ -268,8 +268,8 @@ var/global/datum/tension/tension_master
else if (href_list["makeDeathsquad"])
makeDeathsquad()
/* else if (href_list["makeBorgDeathsquad"])
makeBorgDeathsquad()*/
else if (href_list["makeBorgDeathsquad"])
makeBorgDeathsquad()
else if (href_list["Supress"])
supress = 1
@@ -728,7 +728,7 @@ var/global/datum/tension/tension_master
return 1 // Has to return one before it knows if there's a wizard to prevent the parent from automatically selecting another game mode.
/* proc/makeBorgDeathsquad()
proc/makeBorgDeathsquad()
var/list/mob/dead/observer/candidates = list()
var/mob/dead/observer/theghost = null
var/time_passed = world.time
@@ -795,7 +795,7 @@ var/global/datum/tension/tension_master
return 1 // Has to return one before it knows if there's a wizard to prevent the parent from automatically selecting another game mode.
*/
@@ -972,7 +972,7 @@ var/global/datum/tension/tension_master
//del(spawn_location) // Commenting this out for multiple commando teams.
return new_syndicate_commando
/* /proc/create_borg_death_commando(obj/spawn_location, name)
/proc/create_borg_death_commando(obj/spawn_location, name)
var/mob/living/silicon/robot/new_borg_deathsquad = new(spawn_location.loc, 1)
@@ -1035,4 +1035,4 @@ var/global/datum/tension/tension_master
for(var/obj/machinery/door/poddoor/P in end_location)
P.open()
jumpcomplete = 1
command_alert("DRADIS contact! Set condition one throughout the station!")*/
command_alert("DRADIS contact! Set condition one throughout the station!")