Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

516 Renderer update #20579

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions code/ZAS/Fire.dm
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,13 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin

return 0

/obj/heat
icon = 'icons/effects/fire.dmi'
icon_state = "3"
appearance_flags = PIXEL_SCALE | NO_CLIENT_COLOR
render_target = HEAT_EFFECT_TARGET
mouse_opacity = MOUSE_OPACITY_TRANSPARENT

/obj/fire
//Icon for fire on turfs.

Expand Down
14 changes: 8 additions & 6 deletions code/ZAS/Zone.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ Class Procs:

var/datum/gas_mixture/air = new

var/list/graphic_add = list()
var/list/graphic_remove = list()

/zone/New()
SSair.add_zone(src)
air.temperature = TCMB
Expand Down Expand Up @@ -148,21 +151,20 @@ Class Procs:
air.group_multiplier = contents.len+1

/zone/proc/tick()
// Update fires.
if(air.temperature >= PHORON_FLASHPOINT && !(src in SSair.active_fire_zones) && air.check_combustability() && contents.len)
var/turf/T = pick(contents)
if(istype(T))
T.create_fire(GLOB.vsc.fire_firelevel_multiplier)

var/world_time_counter = world.time
var/list/graphic_add = list()
var/list/graphic_remove = list()
// Update gas overlays.
if(air.check_tile_graphic(graphic_add, graphic_remove))
for(var/turf/simulated/T in contents)
T.update_graphic(graphic_add, graphic_remove)
var/delta_time = world.time - world_time_counter
if(delta_time > 5 SECONDS)
log_admin("AN AREA IS TAKING EXTREMELY LONG TO UPDATE: [name] WITH CONTENTS LENGTH [length(contents)] TELL MATT WITH THE ROUND ID!")
graphic_add.Cut()
graphic_remove.Cut()

// Update connected edges.
for(var/connection_edge/E in edges)
if(E.sleeping)
E.recheck()
Expand Down
5 changes: 5 additions & 0 deletions code/__DEFINES/atmos.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
#define CARBON_LIFEFORM_FIRE_RESISTANCE (T0C + 200)
#define CARBON_LIFEFORM_FIRE_DAMAGE 4

#define FOGGING_TEMPERATURE (T0C + 5)
#define MAX_FOG_TEMPERATURE (T0C - 50)

// Phoron fire properties.
#define PHORON_MINIMUM_BURN_TEMPERATURE (T0C + 126) //400 K - autoignite temperature in tanks and canisters - enclosed environments I guess
#define PHORON_FLASHPOINT (T0C + 246) //519 K - autoignite temperature in air if that ever gets implemented.
Expand Down Expand Up @@ -122,6 +125,8 @@
#define GAS_DEUTERIUM "deuterium"
#define GAS_TRITIUM "tritium"
#define GAS_BORON "boron"
#define GAS_HEAT "heat" //Not a real gas, used for visual effects
#define GAS_COLD "cold" //Not a real gas, used for visual effects

#define PIPE_COLOR_GREY "#ffffff" //yes white is grey
#define PIPE_COLOR_RED "#ff0000"
Expand Down
5 changes: 5 additions & 0 deletions code/__DEFINES/layers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@

#define OVER_OPENSPACE_PLANE -4

#define HEAT_EFFECT_PLANE -4
#define HEAT_EFFECT_TARGET "*heat"
#define COLD_EFFECT_TARGET "*cold"
#define COLD_EFFECT_BACK_TARGET "*coldb"
#define HEAT_COMPOSITE_TARGET "*heatc"
#define WARP_EFFECT_PLANE -3

#define BLACKNESS_PLANE 0 //Blackness plane as per DM documentation.
Expand Down
7 changes: 7 additions & 0 deletions code/__HELPERS/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ GLOBAL_LIST_EMPTY(contained_clothing_species_adaption_cache)
/// Cache for outfit selection.
GLOBAL_LIST_EMPTY(outfit_cache)

GLOBAL_LIST_EMPTY(all_particles)

//////////////////////////
/////Initial Building/////
//////////////////////////
Expand Down Expand Up @@ -240,6 +242,11 @@ GLOBAL_LIST_EMPTY(outfit_cache)
if(S.spawn_flags & IS_WHITELISTED)
GLOB.whitelisted_species += S.name

paths = typesof(/particles)
for (var/path in paths)
var/particles/P = new path()
GLOB.all_particles[P.name] = P

return TRUE

GLOBAL_LIST_INIT(correct_punctuation, list("!" = TRUE, "." = TRUE, "?" = TRUE, "-" = TRUE, "~" = TRUE, \
Expand Down
Loading
Loading