cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup blob mode notices.

Browse Source 
Also add a missing script and clean up unused FEA shit
This commit is contained in:
Rob Nelson
2013-09-10 17:51:12 -07:00
parent 9e57401e78
commit 876e0e40b8
4 changed files with 54 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
code/FEA/FEA_gas_mixture.dm
View File

@@ -13,14 +13,6 @@ What are the archived variables for?
#define MINIMUM_HEAT_CAPACITY 0.0003
#define QUANTIZE(variable) (round(variable,0.0001))
#define TEMPERATURE_ICE_FORMATION 273.15 // 273 kelvin is the freezing point of water.
#define MIN_PRESSURE_ICE_FORMATION 10 // 10kPa should be okay
#define GRAPHICS_PLASMA 1
#define GRAPHICS_N2O 2
#define GRAPHICS_REAGENTS 4 // Not used. Yet.
#define GRAPHICS_COLD 8
/datum/gas
sleeping_agent
specific_heat = 40
@@ -51,8 +43,7 @@ What are the archived variables for?
//Size of the group this gas_mixture is representing.
//=1 for singletons
// BITFIELD, SEE GRAPHICS_*
var/graphics = 0
var/graphic
var/list/datum/gas/trace_gases = list()
@@ -64,7 +55,7 @@ What are the archived variables for?
var/tmp/temperature_archived
var/tmp/graphics_archived
var/tmp/graphic_archived
var/tmp/fuel_burnt = 0
//PV=nRT - related procedures
@@ -114,34 +105,19 @@ What are the archived variables for?
//Procedures used for very specific events
// N3X's new tile overlay logic
proc/check_tile_graphic()
//returns 1 if graphic changed
graphics = 0
// If configured and cold, maek ice
if(zas_settings.get(/datum/ZAS_Setting/ice_formation))
if(temperature <= TEMPERATURE_ICE_FORMATION && return_pressure()>MIN_PRESSURE_ICE_FORMATION)
// If we're just forming, do a probability check. Otherwise, KEEP IT ON~
// This ordering will hopefully keep it from sampling random noise every damn tick.
//if(was_icy || (!was_icy && prob(25)))
graphics |= GRAPHICS_COLD
graphic = null
if(toxins > MOLES_PLASMA_VISIBLE)
graphics |= GRAPHICS_PLASMA
graphic = "plasma"
else
var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in trace_gases
if(sleeping_agent && (sleeping_agent.moles > 1))
graphic = "sleeping_agent"
else
graphic = null
var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in trace_gases
if(sleeping_agent && (sleeping_agent.moles > 1))
graphics |= GRAPHICS_N2O
/*
var/datum/gas/reagent = exact_locate(/datum/gas/reagent,trace_gases)
if(reagent && (reagent.moles > 0.1))
graphics |= GRAPHICS_REAGENTS
*/
return graphics != graphics_archived
return graphic != graphic_archived
proc/react(atom/dump_location)
var/reacting = 0 //set to 1 if a notable reaction occured (used by pipe_network)
@@ -317,7 +293,7 @@ What are the archived variables for?
temperature_archived = temperature
graphics_archived = graphics
graphic_archived = graphic
return 1

47
code/FEA/FEA_turf_tile.dm
View File

@@ -105,10 +105,7 @@ turf/simulated
var/tmp/temperature_archived //USED ONLY FOR SOLIDS
var/tmp/being_superconductive = 0
var/tmp/was_icy=0
// N3X: Included my code that allows for multiple overlays at once.
// Also ice, if configured :3c
proc/update_visuals(datum/gas_mixture/model)
overlays.Cut()
@@ -116,44 +113,11 @@ turf/simulated
if(siding_icon_state)
overlays += image('icons/turf/floors.dmi',siding_icon_state)
// ONLY USED IF ZAS_SETTINGS SAYS SO.
if(model.graphics & GRAPHICS_COLD)
if(!was_icy)
wet=3 // Custom ice
was_icy=1
var/o=""
//if(is_plating())
// o="snowfloor_s"
//else
if(is_plasteel_floor())
o="snowfloor"
if(o!="")
overlays += image('icons/turf/overlays.dmi',o)
else
if(was_icy)
wet=0
was_icy=0
if(prob(10))
wet = 1
if(wet_overlay)
overlays -= wet_overlay
wet_overlay = null
wet_overlay = image('icons/effects/water.dmi',src,"wet_floor")
overlays += wet_overlay
spawn(800)
if (!istype(src)) return
if(wet >= 2) return
wet = 0
if(wet_overlay)
overlays -= wet_overlay
wet_overlay = null
if(model.graphics & GRAPHICS_PLASMA)
overlays.Add(plmaster)
if(model.graphics & GRAPHICS_N2O)
overlays.Add(slmaster)
//if(model.graphics & GRAPHICS_REAGENTS)
// overlays.Add(slmaster/*rlmaster*/)
switch(model.graphic)
if("plasma")
overlays.Add(plmaster)
if("sleeping_agent")
overlays.Add(slmaster)
@@ -170,7 +134,6 @@ turf/simulated
air.temperature = temperature
if(air_master)
air_master.tiles_to_update.Add(src)