Tensioner now requires a half an hour of round time before firing

Fix for the holodeck burn simulation cooling off over time.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3349 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
VivianFoxfoot@gmail.com
2012-03-24 00:38:04 +00:00
parent c0044d5e15
commit 4782ca36a4
2 changed files with 4 additions and 3 deletions

View File

@@ -4,6 +4,7 @@
#define EXPLO_SCORE -10000 //boum #define EXPLO_SCORE -10000 //boum
#define COOLDOWN_TIME 12000 // Twenty minutes #define COOLDOWN_TIME 12000 // Twenty minutes
#define MIN_ROUND_TIME 18000
//estimated stats //estimated stats
//80 minute round //80 minute round
@@ -66,7 +67,7 @@ var/global/datum/tension/tension_master
score += get_num_players()*PLAYER_WEIGHT score += get_num_players()*PLAYER_WEIGHT
if(config.Tensioner_Active) if(config.Tensioner_Active)
if(score > 100000) if(score > 100000 && world.time > MIN_ROUND_TIME)
round1++ round1++
if(!supress && !cooldown) if(!supress && !cooldown)
if(prob(1) || forcenexttick) if(prob(1) || forcenexttick)

View File

@@ -5621,13 +5621,13 @@
"cee" = (/turf/simulated/floor/engine{name = "Holodeck Projector Floor"},/area/holodeck/source_wildlife) "cee" = (/turf/simulated/floor/engine{name = "Holodeck Projector Floor"},/area/holodeck/source_wildlife)
"cef" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{tag = "icon-iron3"; icon = 'mineral_walls.dmi'; icon_state = "iron3"},/area) "cef" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{tag = "icon-iron3"; icon = 'mineral_walls.dmi'; icon_state = "iron3"},/area)
"ceg" = (/turf/simulated/floor/engine{name = "Holodeck Projector Floor"},/area/holodeck/source_plating) "ceg" = (/turf/simulated/floor/engine{name = "Holodeck Projector Floor"},/area/holodeck/source_plating)
"ceh" = (/turf/simulated/floor/engine{carbon_dioxide = 0; heat_capacity = 10000; name = "Burn-Mix floor"; nitrogen = 0; oxygen = 2500; temperature = 370; thermal_conductivity = 0.04; toxins = 5000},/area/holodeck/source_burntest) "ceh" = (/turf/simulated/floor/engine{carbon_dioxide = 0; heat_capacity = 10000; name = "Burn-Mix floor"; nitrogen = 0; oxygen = 2500; temperature = 370; thermal_conductivity = 0; toxins = 5000},/area/holodeck/source_burntest)
"cei" = (/turf/simulated/floor{icon_state = "red"; dir = 9},/area/holodeck/source_emptycourt) "cei" = (/turf/simulated/floor{icon_state = "red"; dir = 9},/area/holodeck/source_emptycourt)
"cej" = (/turf/simulated/floor{icon_state = "red"; dir = 5},/area/holodeck/source_emptycourt) "cej" = (/turf/simulated/floor{icon_state = "red"; dir = 5},/area/holodeck/source_emptycourt)
"cek" = (/turf/simulated/floor,/area/holodeck/source_emptycourt) "cek" = (/turf/simulated/floor,/area/holodeck/source_emptycourt)
"cel" = (/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{tag = "icon-iron3"; icon = 'mineral_walls.dmi'; icon_state = "iron3"},/area) "cel" = (/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{tag = "icon-iron3"; icon = 'mineral_walls.dmi'; icon_state = "iron3"},/area)
"cem" = (/obj/effect/critter/spesscarp/elite,/turf/simulated/floor/engine{name = "Holodeck Projector Floor"},/area/holodeck/source_wildlife) "cem" = (/obj/effect/critter/spesscarp/elite,/turf/simulated/floor/engine{name = "Holodeck Projector Floor"},/area/holodeck/source_wildlife)
"cen" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/engine{carbon_dioxide = 0; heat_capacity = 10000; name = "Burn-Mix floor"; nitrogen = 0; oxygen = 2500; temperature = 370; thermal_conductivity = 0.04; toxins = 5000},/area/holodeck/source_burntest) "cen" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/engine{carbon_dioxide = 0; heat_capacity = 10000; name = "Burn-Mix floor"; nitrogen = 0; oxygen = 2500; temperature = 370; thermal_conductivity = 0; toxins = 5000},/area/holodeck/source_burntest)
"ceo" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/holodeck/source_emptycourt) "ceo" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/holodeck/source_emptycourt)
"cep" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/holodeck/source_emptycourt) "cep" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/holodeck/source_emptycourt)
"ceq" = (/turf/simulated/floor{icon_state = "red"; dir = 1},/area/holodeck/source_emptycourt) "ceq" = (/turf/simulated/floor{icon_state = "red"; dir = 1},/area/holodeck/source_emptycourt)