cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 09:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Somgfkuf

Browse Source
This commit is contained in:
SkyMarshal
2013-05-20 23:54:01 -07:00
parent 3420b0a6fe
commit 46907066ba
3 changed files with 187 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dm
View File

@@ -135,9 +135,7 @@
Initialise() Initialise()
/obj/machinery/jungle_controller/proc/Initialise() /obj/machinery/jungle_controller/proc/Initialise()
set background = 1 world << "\red \b Setting up jungle, this may take a bleeding eternity..."
spawn(0)
world << "\red \b Setting up jungle, this may take a moment..."
//crash dat shuttle //crash dat shuttle
var/area/start_location = locate(/area/jungle/crash_ship_source) var/area/start_location = locate(/area/jungle/crash_ship_source)

21
code/ZAS/FEA_system.dm
View File

@@ -106,7 +106,6 @@ datum
var/current_cycle = 0 var/current_cycle = 0
var/update_delay = 5 //How long between check should it try to process atmos again. var/update_delay = 5 //How long between check should it try to process atmos again.
var/failed_ticks = 0 //How many ticks have runtimed? var/failed_ticks = 0 //How many ticks have runtimed?
var/next_stat_check = 10
var/tick_progress = 0 var/tick_progress = 0
@@ -137,7 +136,10 @@ datum
var/start_time = world.timeofday var/start_time = world.timeofday
var/simulated_turf_count = 0
for(var/turf/simulated/S in world) for(var/turf/simulated/S in world)
simulated_turf_count++
if(!S.zone && !S.blocks_air) if(!S.zone && !S.blocks_air)
if(S.CanPass(null, S, 0, 0)) if(S.CanPass(null, S, 0, 0))
new/zone(S) new/zone(S)
@@ -145,8 +147,12 @@ datum
for(var/turf/simulated/S in world) for(var/turf/simulated/S in world)
S.update_air_properties() S.update_air_properties()
world << "\red \b Geometry processed in [time2text(world.timeofday-start_time, "mm:ss")] minutes!" world << {"<font color='red'><b>Geometry initialized in [round(0.1*(world.timeofday-start_time),0.1)] seconds.</b>
// spawn start() Total Simulated Turfs: [simulated_turf_count]
Total Zones: [zones.len]
Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_count]</font>"}
/*
spawn start()
proc/start() proc/start()
//Purpose: This is kicked off by the master controller, and controls the processing of all atmosphere. //Purpose: This is kicked off by the master controller, and controls the processing of all atmosphere.
@@ -154,7 +160,7 @@ datum
//Inputs: None. //Inputs: None.
//Outputs: None. //Outputs: None.
/*
set background = 1 set background = 1
while(1) while(1)
@@ -172,13 +178,6 @@ datum
proc/tick() proc/tick()
. = 1 //Set the default return value, for runtime detection. . = 1 //Set the default return value, for runtime detection.
tick_progress = "next_stat_check (atmos statistics)"
if(current_cycle >= next_stat_check)
var/zone/z = pick(zones)
var/log_file = file("[time2text(world.timeofday, "statistics/DD-MM-YYYY-air.txt")]")
log_file << "\"\The [get_area(pick(z.contents))]\",[z.air.oxygen],[z.air.nitrogen],[z.air.carbon_dioxide],[z.air.toxins],[z.air.temperature],[z.air.group_multiplier * z.air.volume]"
next_stat_check = current_cycle + (rand(5,7)*60)
tick_progress = "update_air_properties" tick_progress = "update_air_properties"
if(tiles_to_update.len) //If there are tiles to update, do so. if(tiles_to_update.len) //If there are tiles to update, do so.
for(var/turf/simulated/T in tiles_to_update) for(var/turf/simulated/T in tiles_to_update)

5
code/ZAS/Plasma.dm
View File

@@ -68,8 +68,9 @@ obj/item/proc
if(!pl_head_protected()) if(!pl_head_protected())
if(prob(1)) suit_contamination() //Plasma can sometimes get through such an open suit. if(prob(1)) suit_contamination() //Plasma can sometimes get through such an open suit.
if(istype(back,/obj/item/weapon/storage/backpack)) //Cannot wash backpacks currently.
back.contaminate() // if(istype(back,/obj/item/weapon/storage/backpack))
// back.contaminate()
/mob/proc/pl_effects() /mob/proc/pl_effects()