cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

LINDA -> MILLA (#25328)

Browse Source 
* LINDA -> MILLA

* Tiles now change their atmos mode properly.

* Fixed a bug that made walls generate supercold air when deconstructed/destroyed.

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Begone, var!

* MILLA -> milla

* Lint.

* More lint.

* Prevent negative/NaN atmos from spreading.

* Made fires start more reliably.

* Undef what the rest should not see.

* Enums are nice.

* Match LINDA better.

* Debugging verbs.

* Debug verb fixes.

* Labelled more lavaland stuff with ATMOS_MODE_LAVALAND

* Block superconductivity on a couple more things for Lavaland.

* Updated milla.dll

* Lavaland map fixes.

* Missed a spot.

* Begone, var! (again)

* Add libmilla_ci.so for continuous integration tests.

* Install/contributing instructions for MILLA.

* Directional plasmaglass windows on shuttles shouldn't stop protecting from heat after moving.

* Banish bad naming.

* Better naming and debug stats for SSair.

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Magic numbers and formatting.

* Don't screw up the temperature during reactions.

* Efficiency and readability.

* Fix hotspots.

* Removed redundant safety (MILLA will already output an error)

* Optimizations.

* oops

* TGS build script update.

* Change API of gas_mixture and how you get one from a turf.

* Get in there.

* so many vars

* MILLA binary updates.

* Lint

* Made MT cost more honest.

* Gave MILLA a read-only mode.

* More read-only vs synchronized mode work.

* Even more.

* Synchronize disposals.

* Updated a bunch of stuff to use SSair.synchronize or GM.synchronize.

* MILLA <3 Tracy

* lint

* cargo fmt

* more lint

* Test needed MILLA sync.

* Silence atmos machinery that's behaving as intended, but continue objecting to other potential failures to synchronize.

* Push new MILLA DLL

* Build MILLA

* Update PR instructions for MILLA.

* Add some fancy plasmaglass windows to the Lifebringers' ship.

* The golems remembered that they should insulate *all* their engines.

* First round of TM bugfixes.

* Build MILLA

* fix two lavaland ruin turf types

* bunch more maps

* fixes milla ci and makes the interesting turf verb better

* Solid turfs can no longer conduct heat (for now...)

* Made indoor tiles in beach and winter biodomes not lavaland air.

* Re-added random IT teleport, adjusted warning message

* Fixed a tinted window on Lavaland to be a plasglass window instead.

* Made firelocks and holofans heatproof

* Made RPD auto-wrench pipes if you have a wrench in your offhand.

* Runtime fixes.

* Made visuals update more reliably.

* Lint

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Build MILLA

* The Syndicate have installed tiny fans on their research base.

* The syndicate have figured out how to make plastitanium windows heatproof.

* This is getting out of hand. Now there are two of them.

* Un-break the auto-wrenching that I broke before committing.

* Build MILLA

* Build MILLA

* Massive MILLA refactor, assorted bugfixes.

* Build MILLA

* Explicit typing.

* Less sleeping/blocking.

* Build MILLA

* Yes, yes, this part can sleep.

* Build MILLA

* SSair reporting improvements.

* Build MILLA

* Please do not dock twice and splat yourself.

* Build MILLA

* Pls to not make SM go nuts.

* Build MILLA

* Build MILLA

* Added stricter lower bounds on plasmafire, fixing perpetually-burning SM.

* Build MILLA

* Lint

* Temporary logging, begone.

* Build MILLA

* Prevent hotspot strobing.

* Add in radiate_to_spess behavior.

* Build MILLA

* progress

* Compiling is good.

* bugfixes

* Progress.

* Ruins update.

* This one exists.

* Fixup temporary hotspots to last longer than one tick.

* Add/fix comments.

* Cut the slash.

* Fix test.

* No sleep for you.

* Build MILLA

* Prevent nested MILLA safety from runtiming.

* Build MILLA

* Runtime fix.

* Build MILLA

* Fix canisters not updating icon when gas contents change.

* Build MILLA

* Build MILLA

* Fixed an issue that made mechs very cold on environment air.

* Build MILLA

* oops

* Build MILLA

* Walls can make loud noises again.

* Build MILLA

* Fixes a rare runtime.

* Build MILLA

* Update .github/DOWNLOADING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Review suggestions

* Lint

* Build MILLA

* bound_mixtures now only contains mixtures that can be written

* Build MILLA

* Apply suggestions from code review

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Build MILLA

* Restore the original async behavior of pyro anomalies.

* Build MILLA

* Build MILLA

* Make the safety assertion in /datum/milla_safe safer.

* Build MILLA

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: GDN <Roanrichards1@Gmail.com>
This commit is contained in:
Charlie Nolan
2024-06-09 07:18:11 +00:00
committed by GitHub
co-authored by Burzah GDN AffectedArc07 FunnyMan3595 paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> warriorstar-orion GDN
parent 56b4da8ffc
commit d3584b1d1c
200 changed files with 7244 additions and 3918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/anomalies.dm
+21 -4
View File
@@ -355,7 +355,11 @@
ticks = 0
var/turf/simulated/T = get_turf(src)
if(istype(T))
T.atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS | LINDA_SPAWN_OXYGEN, 20)
var/datum/gas_mixture/air = new()
air.set_temperature(1000)
air.set_toxins(20)
air.set_oxygen(20)
T.blind_release_air(air)
/obj/effect/anomaly/pyro/detonate()
if(produces_slime)
@@ -364,7 +368,12 @@
/obj/effect/anomaly/pyro/proc/makepyroslime()
var/turf/simulated/T = get_turf(src)
if(istype(T))
T.atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS | LINDA_SPAWN_OXYGEN, 500) //Make it hot and burny for the new slime
//Make it hot and burny for the new slime
var/datum/gas_mixture/air = new()
air.set_temperature(1000)
air.set_toxins(500)
air.set_oxygen(500)
T.blind_release_air(air)
var/new_colour = pick("red", "orange")
var/mob/living/simple_animal/slime/S = new(T, new_colour)
S.rabid = TRUE
@@ -409,7 +418,11 @@
var/turf/simulated/T = get_turf(src)
if(istype(T))
T.atmos_spawn_air(LINDA_SPAWN_COLD | LINDA_SPAWN_N2O | LINDA_SPAWN_CO2, 20)
var/datum/gas_mixture/air = new()
air.set_temperature(TCMB)
air.set_sleeping_agent(20)
air.set_carbon_dioxide(20)
T.blind_release_air(air)
if(prob(10))
var/obj/effect/nanofrost_container/A = new /obj/effect/nanofrost_container(get_turf(src))
@@ -436,7 +449,11 @@
/obj/effect/anomaly/cryo/detonate()
var/turf/simulated/T = get_turf(src)
if(istype(T) && drops_core)
T.atmos_spawn_air(LINDA_SPAWN_COLD | LINDA_SPAWN_CO2, 1000)
var/datum/gas_mixture/air = new()
air.set_temperature(TCMB)
air.set_sleeping_agent(1000)
air.set_carbon_dioxide(1000)
T.blind_release_air(air)
/////////////////////
code/game/objects/effects/effect_system/effects_foam.dm
+3 -3
View File
@@ -178,12 +178,12 @@
/obj/structure/foamedmetal/Initialize()
. = ..()
air_update_turf(1)
recalculate_atmos_connectivity()
/obj/structure/foamedmetal/Destroy()
var/turf/T = get_turf(src)
. = ..()
T.air_update_turf(TRUE)
T.recalculate_atmos_connectivity()
/obj/structure/foamedmetal/Move()
var/turf/T = loc
@@ -221,5 +221,5 @@
/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target)
return !density
/obj/structure/foamedmetal/CanAtmosPass()
/obj/structure/foamedmetal/CanAtmosPass(direction)
return !density
code/game/objects/effects/effect_system/effects_smoke.dm
+15 -10
View File
@@ -152,16 +152,9 @@
/datum/effect_system/smoke_spread/freezing/proc/Chilled(atom/A)
if(issimulatedturf(A))
var/turf/simulated/T = A
if(T.air)
var/datum/gas_mixture/G = T.air
if(get_dist(T, src) < 2) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air
G.temperature = 2
T.air_update_turf()
for(var/obj/effect/hotspot/H in T)
qdel(H)
if(G.toxins)
G.nitrogen += (G.toxins)
G.toxins = 0
if(!T.blocks_air)
var/datum/milla_safe/smoke_spread_chill/milla = new()
milla.invoke_async(src, T)
for(var/obj/machinery/atmospherics/unary/vent_pump/V in T)
if(!isnull(V.welded) && !V.welded) //must be an unwelded vent pump.
V.welded = TRUE
@@ -177,6 +170,18 @@
for(var/obj/item/Item in T)
Item.extinguish()
/datum/milla_safe/smoke_spread_chill
/datum/milla_safe/smoke_spread_chill/on_run(datum/effect_system/smoke_spread/smoke, turf/T)
var/datum/gas_mixture/env = get_turf_air(T)
if(get_dist(T, smoke) < 2) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air
env.set_temperature(2)
for(var/obj/effect/hotspot/H in T)
qdel(H)
if(env.toxins())
env.set_nitrogen(env.nitrogen() + env.toxins())
env.set_toxins(0)
/datum/effect_system/smoke_spread/freezing/set_up(amount = 5, only_cardinals = FALSE, source, desired_direction, datum/reagents/chemicals, blasting = FALSE)
..()
blast = blasting
code/game/objects/effects/effects.dm
+2 -2
View File
@@ -31,8 +31,8 @@
/obj/effect/blob_act(obj/structure/blob/B)
return
/obj/effect/experience_pressure_difference()
return
/obj/effect/experience_pressure_difference(flow_x, flow_y)
return // Immune to gas flow.
/obj/effect/ex_act(severity)
switch(severity)
code/game/objects/effects/forcefields.dm
+4 -4
View File
@@ -12,7 +12,7 @@
if(lifetime)
QDEL_IN(src, lifetime)
/obj/effect/forcefield/CanAtmosPass(turf/T)
/obj/effect/forcefield/CanAtmosPass(direction)
return !density
/obj/effect/forcefield/wizard
@@ -40,15 +40,15 @@
/obj/structure/forcefield/Initialize(mapload)
. = ..()
if(blocks_atmos)
air_update_turf(TRUE)
recalculate_atmos_connectivity()
/obj/structure/forcefield/Destroy()
if(blocks_atmos)
blocks_atmos = FALSE
air_update_turf(TRUE)
recalculate_atmos_connectivity()
return ..()
/obj/structure/forcefield/CanAtmosPass(turf/T)
/obj/structure/forcefield/CanAtmosPass(direction)
return !blocks_atmos
/obj/structure/forcefield/mime
code/game/objects/effects/snowcloud.dm
+13 -16
View File
@@ -23,10 +23,8 @@
if(isspaceturf(T) || T.density) // Don't want snowclouds or snow on walls
qdel(src)
return
var/turf_hotness
if(issimulatedturf(T))
var/turf/simulated/S = T
turf_hotness = S.air.temperature
var/datum/gas_mixture/G = T.get_readonly_air()
var/turf_hotness = G.temperature()
if(turf_hotness > T0C && prob(10 * (turf_hotness - T0C))) //Cloud disappears if it's too warm
qdel(src)
return
@@ -36,16 +34,16 @@
return
try_to_snow()
try_to_spread_cloud()
parent_machine.affect_turf_temperature(T, 0.25 * parent_machine.cooling_speed)
var/datum/milla_safe/snow_machine_cooling/milla = new()
milla.invoke_async(parent_machine, 0.25 * parent_machine.cooling_speed)
/obj/effect/snowcloud/proc/try_to_snow()
var/turf/T = get_turf(src)
if(locate(/obj/effect/snow, T))
return
if(issimulatedturf(T))
var/turf/simulated/S = T
if(prob(75 + S.air.temperature - T0C)) //Colder turf = more chance of snow
return
var/datum/gas_mixture/G = T.get_readonly_air()
if(prob(75 + G.temperature() - T0C)) //Colder turf = more chance of snow
return
new /obj/effect/snow(T)
/obj/effect/snowcloud/proc/try_to_spread_cloud()
@@ -56,7 +54,7 @@
var/turf/T = get_turf(get_step(src, potential))
if(isspaceturf(T) || T.density)
continue
if(!T.CanAtmosPass(T))
if(!CanAtmosPass(potential) || !T.CanAtmosPass(turn(potential, 180)))
continue
if(parent_machine.make_snowcloud(T))
return
@@ -84,12 +82,11 @@
if(isspaceturf(T) || T.density) // Don't want snowclouds or snow on walls
qdel(src)
return
else if(issimulatedturf(T))
var/turf/simulated/S = T
if(S.air.temperature <= T0C)
return
if(prob(10 + S.air.temperature - T0C))
qdel(src)
var/datum/gas_mixture/G = T.get_readonly_air()
if(G.temperature() <= T0C)
return
if(prob(10 + G.temperature() - T0C))
qdel(src)
/obj/effect/snow/attack_hand(mob/living/carbon/human/user)
if(!istype(user)) //Nonhumans don't have the balls to fight in the snow
code/game/objects/effects/spawners/bombspawner.dm
+2 -2
View File
@@ -33,8 +33,8 @@
PT.master = V
OT.master = V
PT.air_contents.temperature = btemp1 + T0C
OT.air_contents.temperature = btemp2 + T0C
PT.air_contents.set_temperature(btemp1 + T0C)
OT.air_contents.set_temperature(btemp2 + T0C)
var/obj/item/assembly/S
code/game/objects/effects/spawners/windowspawner.dm
+1 -1
View File
@@ -32,7 +32,7 @@
if(useGrille)
new /obj/structure/grille(get_turf(src))
air_update_turf(TRUE) //atmos can pass otherwise
recalculate_atmos_connectivity() //atmos can pass otherwise
return INITIALIZE_HINT_QDEL
/obj/effect/spawner/window/grilled
code/game/objects/explosion.dm
+3 -1
View File
@@ -157,7 +157,9 @@
if(T)
if(flame_dist && prob(40) && !isspaceturf(T) && !T.density)
new /obj/effect/hotspot(T) //Mostly for ambience!
var/obj/effect/hotspot/hotspot = new /obj/effect/hotspot/fake(T) //Mostly for ambience!
hotspot.temperature = 1000
hotspot.recolor()
if(dist > 0)
if(issimulatedturf(T))
var/turf/simulated/S = T
code/game/objects/items/devices/scanners.dm
+46 -15
View File
@@ -599,8 +599,17 @@ SLIME SCANNER
* Outputs a message to the user describing the target's gasmixes.
* Used in chat-based gas scans.
*/
/proc/atmos_scan(mob/user, atom/target, silent = FALSE, print = TRUE)
var/mixture = target.return_analyzable_air()
/proc/atmos_scan(mob/user, atom/target, silent = FALSE, print = TRUE, milla_turf_details = FALSE)
var/mixture
var/list/milla = null
if(milla_turf_details)
milla = new/list(MILLA_TILE_SIZE)
get_tile_atmos(target, milla)
var/datum/gas_mixture/GM = new()
GM.copy_from_milla(milla)
mixture = GM
else
mixture = target.return_analyzable_air()
if(!mixture)
return FALSE
@@ -628,19 +637,19 @@ SLIME SCANNER
if(total_moles)
message += "<span class='info'>Total: [round(total_moles, 0.01)] moles</span>"
if(air.oxygen && air.oxygen / total_moles > 0.01)
message += " <span class='oxygen'>Oxygen: [round(air.oxygen, 0.01)] moles ([round(air.oxygen / total_moles * 100, 0.01)] %)</span>"
if(air.nitrogen && air.nitrogen / total_moles > 0.01)
message += " <span class='nitrogen'>Nitrogen: [round(air.nitrogen, 0.01)] moles ([round(air.nitrogen / total_moles * 100, 0.01)] %)</span>"
if(air.carbon_dioxide && air.carbon_dioxide / total_moles > 0.01)
message += " <span class='carbon_dioxide'>Carbon Dioxide: [round(air.carbon_dioxide, 0.01)] moles ([round(air.carbon_dioxide / total_moles * 100, 0.01)] %)</span>"
if(air.toxins && air.toxins / total_moles > 0.01)
message += " <span class='plasma'>Plasma: [round(air.toxins, 0.01)] moles ([round(air.toxins / total_moles * 100, 0.01)] %)</span>"
if(air.sleeping_agent && air.sleeping_agent / total_moles > 0.01)
message += " <span class='sleeping_agent'>Nitrous Oxide: [round(air.sleeping_agent, 0.01)] moles ([round(air.sleeping_agent / total_moles * 100, 0.01)] %)</span>"
if(air.agent_b && air.agent_b / total_moles > 0.01)
message += " <span class='agent_b'>Agent B: [round(air.agent_b, 0.01)] moles ([round(air.agent_b / total_moles * 100, 0.01)] %)</span>"
message += "<span class='info'>Temperature: [round(air.temperature-T0C)] &deg;C ([round(air.temperature)] K)</span>"
if(air.oxygen() && (milla_turf_details || air.oxygen() / total_moles > 0.01))
message += " <span class='oxygen'>Oxygen: [round(air.oxygen(), 0.01)] moles ([round(air.oxygen() / total_moles * 100, 0.01)] %)</span>"
if(air.nitrogen() && (milla_turf_details || air.nitrogen() / total_moles > 0.01))
message += " <span class='nitrogen'>Nitrogen: [round(air.nitrogen(), 0.01)] moles ([round(air.nitrogen() / total_moles * 100, 0.01)] %)</span>"
if(air.carbon_dioxide() && (milla_turf_details || air.carbon_dioxide() / total_moles > 0.01))
message += " <span class='carbon_dioxide'>Carbon Dioxide: [round(air.carbon_dioxide(), 0.01)] moles ([round(air.carbon_dioxide() / total_moles * 100, 0.01)] %)</span>"
if(air.toxins() && (milla_turf_details || air.toxins() / total_moles > 0.01))
message += " <span class='plasma'>Plasma: [round(air.toxins(), 0.01)] moles ([round(air.toxins() / total_moles * 100, 0.01)] %)</span>"
if(air.sleeping_agent() && (milla_turf_details || air.sleeping_agent() / total_moles > 0.01))
message += " <span class='sleeping_agent'>Nitrous Oxide: [round(air.sleeping_agent(), 0.01)] moles ([round(air.sleeping_agent() / total_moles * 100, 0.01)] %)</span>"
if(air.agent_b() && (milla_turf_details || air.agent_b() / total_moles > 0.01))
message += " <span class='agent_b'>Agent B: [round(air.agent_b(), 0.01)] moles ([round(air.agent_b() / total_moles * 100, 0.01)] %)</span>"
message += "<span class='info'>Temperature: [round(air.temperature()-T0C)] &deg;C ([round(air.temperature())] K)</span>"
message += "<span class='info'>Volume: [round(volume)] Liters</span>"
message += "<span class='info'>Pressure: [round(pressure, 0.1)] kPa</span>"
message += "<span class='info'>Heat Capacity: [DisplayJoules(heat_capacity)] / K</span>"
@@ -649,6 +658,28 @@ SLIME SCANNER
message += length(airs) > 1 ? "<span class='info'>This node is empty!</span>" : "<span class='info'>[target] is empty!</span>"
message += "<span class='info'>Volume: [round(volume)] Liters</span>" // don't want to change the order volume appears in, suck it
if(milla)
// Values from milla/src/lib.rs, +1 due to array indexing difference.
message += "<span class='info'>Airtight North: [(milla[MILLA_INDEX_AIRTIGHT_DIRECTIONS] & MILLA_NORTH) ? "yes" : "no"]</span>"
message += "<span class='info'>Airtight East: [(milla[MILLA_INDEX_AIRTIGHT_DIRECTIONS] & MILLA_EAST) ? "yes" : "no"]</span>"
message += "<span class='info'>Airtight South: [(milla[MILLA_INDEX_AIRTIGHT_DIRECTIONS] & MILLA_SOUTH) ? "yes" : "no"]</span>"
message += "<span class='info'>Airtight West: [(milla[MILLA_INDEX_AIRTIGHT_DIRECTIONS] & MILLA_WEST) ? "yes" : "no"]</span>"
switch(milla[MILLA_INDEX_ATMOS_MODE])
// These are enum values, so they don't get increased.
if(0)
message += "<span class='info'>Atmos Mode: Space</span>"
if(1)
message += "<span class='info'>Atmos Mode: Sealed</span>"
if(2)
message += "<span class='info'>Atmos Mode: Exposed to Environment (ID: [milla[MILLA_INDEX_ENVIRONMENT_ID]])</span>"
else
message += "<span class='info'>Atmos Mode: Unknown ([milla[MILLA_INDEX_ATMOS_MODE]]), contact a coder.</span>"
message += "<span class='info'>Superconductivity North: [milla[MILLA_INDEX_SUPERCONDUCTIVITY_NORTH]]</span>"
message += "<span class='info'>Superconductivity East: [milla[MILLA_INDEX_SUPERCONDUCTIVITY_EAST]]</span>"
message += "<span class='info'>Superconductivity South: [milla[MILLA_INDEX_SUPERCONDUCTIVITY_SOUTH]]</span>"
message += "<span class='info'>Superconductivity West: [milla[MILLA_INDEX_SUPERCONDUCTIVITY_WEST]]</span>"
message += "<span class='info'>Turf's Innate Heat Capacity: [milla[MILLA_INDEX_INNATE_HEAT_CAPACITY]]</span>"
to_chat(user, chat_box_examine(message.Join("\n")))
return TRUE
code/game/objects/items/latexballoon.dm
+2 -1
View File
@@ -35,7 +35,8 @@
var/mob/living/user = loc
user.update_inv_r_hand()
user.update_inv_l_hand()
loc.assume_air(air_contents)
var/turf/T = get_turf(src)
T.blind_release_air(air_contents)
/obj/item/latexballon/ex_act(severity)
burst()
code/game/objects/items/weapons/chrono_eraser.dm
+5 -7
View File
@@ -239,15 +239,13 @@
else
return 0
/obj/structure/chrono_field/assume_air()
return 0
/obj/structure/chrono_field/return_air() //we always have nominal air and temperature
/obj/structure/chrono_field/return_obj_air()
//we always have nominal air and temperature
RETURN_TYPE(/datum/gas_mixture)
var/datum/gas_mixture/GM = new
GM.oxygen = MOLES_O2STANDARD
GM.nitrogen = MOLES_N2STANDARD
GM.temperature = T20C
GM.set_oxygen(MOLES_O2STANDARD)
GM.set_nitrogen(MOLES_N2STANDARD)
GM.set_temperature(T20C)
return GM
/obj/structure/chrono_field/Move()
code/game/objects/items/weapons/flamethrower.dm
+6 -9
View File
@@ -207,11 +207,11 @@
operating = TRUE
var/turf/previousturf = get_turf(src)
for(var/turf/simulated/T in turflist)
if(!T.air)
if(T.blocks_air)
break
if(T == previousturf)
continue //so we don't burn the tile we be standin on
if(!T.CanAtmosPass(previousturf))
if(!T.CanAtmosPass(get_dir(T, previousturf)) || !previousturf.CanAtmosPass(get_dir(previousturf, T)))
break
if(igniter)
igniter.ignite_turf(src, T)
@@ -229,13 +229,10 @@
//TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this...
//Transfer 5% of current tank air contents to turf
var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(release_amount)
if(air_transfer.toxins)
air_transfer.toxins = air_transfer.toxins * 5
target.assume_air(air_transfer)
//Burn it based on transfered gas
target.hotspot_expose((ptank.air_contents.temperature*2) + 380, 500)
//location.hotspot_expose(1000,500,1)
SSair.add_to_active(target, 0)
if(air_transfer.toxins())
air_transfer.set_toxins(air_transfer.toxins() * 5)
target.blind_release_air(air_transfer)
target.hotspot_expose((ptank.air_contents.temperature() * 2) + 380, 500)
/obj/item/flamethrower/Initialize(mapload)
code/game/objects/items/weapons/grenades/atmosgrenade.dm
+7 -1
View File
@@ -12,7 +12,13 @@
var/turf/simulated/target_turf = get_turf(src)
if(istype(target_turf))
target_turf.atmos_spawn_air(spawn_contents, spawn_amount)
target_turf.air_update_turf()
/obj/item/grenade/gas/proc/release_air(turf/simulated/target_turf)
// Any proc that wants MILLA to be synchronous should not sleep.
SHOULD_NOT_SLEEP(TRUE)
target_turf.atmos_spawn_air(spawn_contents, spawn_amount)
qdel(src)
/obj/item/grenade/gas/plasma
code/game/objects/items/weapons/grenades/flashbang.dm
+2 -2
View File
@@ -61,8 +61,8 @@
var/ear_safety = M.check_ear_prot()
//Atmosphere affects sound
var/pressure_factor = 1
var/datum/gas_mixture/hearer_env = source_turf.return_air()
var/datum/gas_mixture/source_env = T.return_air()
var/datum/gas_mixture/hearer_env = source_turf.get_readonly_air()
var/datum/gas_mixture/source_env = T.get_readonly_air()
if(hearer_env && source_env)
var/pressure = min(hearer_env.return_pressure(), source_env.return_pressure())
code/game/objects/items/weapons/powerfist.dm
+1 -1
View File
@@ -93,7 +93,7 @@
if(!tank)
to_chat(user, "<span class='warning'>[src] can't operate without a source of gas!</span>")
return
if(tank && !tank.air_contents.boolean_remove(((gasperfist * fisto_setting) * tank.air_contents.return_volume()) / (R_IDEAL_GAS_EQUATION * tank.air_contents.return_temperature())))
if(tank && !tank.air_contents.boolean_remove(((gasperfist * fisto_setting) * tank.air_contents.return_volume()) / (R_IDEAL_GAS_EQUATION * tank.air_contents.temperature())))
to_chat(user, "<span class='warning'>[src]'s piston-ram lets out a weak hiss, it needs more gas!</span>")
playsound(loc, 'sound/effects/refill.ogg', 50, 1)
return
code/game/objects/items/weapons/rpd.dm
+6
View File
@@ -114,6 +114,8 @@
else if(!iconrotation) //If user selected a rotation
P.dir = user.dir
to_chat(user, "<span class='notice'>[src] rapidly dispenses [P]!</span>")
if(istype(user.get_inactive_hand(), /obj/item/wrench) && (user.can_reach(P, user.get_inactive_hand())))
P.wrench_act(user, user.get_inactive_hand())
activate_rpd(TRUE)
/obj/item/rpd/proc/create_disposals_pipe(mob/user, turf/T) //Make a disposals pipe / construct
@@ -125,6 +127,8 @@
if(!iconrotation && whatdpipe != PIPE_DISPOSALS_JUNCTION_RIGHT) //Disposals pipes are in the opposite direction to atmos pipes, so we need to flip them. Junctions don't have this quirk though
P.flip()
to_chat(user, "<span class='notice'>[src] rapidly dispenses [P]!</span>")
if(istype(user.get_inactive_hand(), /obj/item/wrench) && (user.can_reach(P, user.get_inactive_hand())))
P.attackby(user.get_inactive_hand(), user)
activate_rpd(TRUE)
/obj/item/rpd/proc/create_transit_tube(mob/user, turf/dest)
@@ -140,6 +144,8 @@
S.dir = iconrotation ? iconrotation : user.dir
to_chat(user, "<span class='notice'>[src] rapidly dispenses [S]!</span>")
if(istype(user.get_inactive_hand(), /obj/item/wrench) && (user.can_reach(S, user.get_inactive_hand())))
S.wrench_act(user, user.get_inactive_hand())
activate_rpd(TRUE)
/obj/item/rpd/proc/rotate_all_pipes(mob/user, turf/T) //Rotate all pipes on a turf
code/game/objects/items/weapons/tanks/jetpack.dm
+3 -3
View File
@@ -17,9 +17,9 @@
if(gas_type)
switch(gas_type)
if("oxygen")
air_contents.oxygen = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
air_contents.set_oxygen(((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)))
if("carbon dioxide")
air_contents.carbon_dioxide = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
air_contents.set_carbon_dioxide(((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)))
/obj/item/tank/jetpack/on_mob_move(direction, mob/user)
if(on)
@@ -77,7 +77,7 @@
return 0
var/turf/T = get_turf(user)
T.assume_air(removed)
T.blind_release_air(removed)
return 1
/obj/item/tank/jetpack/improvised
code/game/objects/items/weapons/tanks/tank_types.dm
+15 -15
View File
@@ -20,7 +20,7 @@
dog_fashion = /datum/dog_fashion/back
/obj/item/tank/internals/oxygen/populate_gas()
air_contents.oxygen = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_oxygen((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/obj/item/tank/internals/oxygen/yellow
desc = "A tank of oxygen, this one is yellow."
@@ -46,8 +46,8 @@
force = 10
/obj/item/tank/internals/anesthetic/populate_gas()
air_contents.oxygen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD
air_contents.sleeping_agent = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD
air_contents.set_oxygen((3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD)
air_contents.set_sleeping_agent((3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD)
/*
* Plasma
@@ -61,7 +61,7 @@
force = 8
/obj/item/tank/internals/plasma/populate_gas()
air_contents.toxins = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_toxins((3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/obj/item/tank/internals/plasma/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/flamethrower))
@@ -77,7 +77,7 @@
return ..()
/obj/item/tank/internals/plasma/full/populate_gas()
air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_toxins((10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/obj/item/tank/internals/plasma/empty/populate_gas()
return
@@ -94,10 +94,10 @@
distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
/obj/item/tank/internals/plasmaman/populate_gas()
air_contents.toxins = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_toxins((3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/obj/item/tank/internals/plasmaman/full/populate_gas()
air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_toxins((10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/obj/item/tank/internals/plasmaman/belt
@@ -110,7 +110,7 @@
w_class = WEIGHT_CLASS_SMALL
/obj/item/tank/internals/plasmaman/belt/full/populate_gas()
air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_toxins((10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/obj/item/tank/internals/plasmaman/belt/empty/populate_gas()
return
@@ -121,7 +121,7 @@
icon_state = "emergency_p"
/obj/item/tank/internals/emergency_oxygen/plasma/populate_gas()
air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_toxins((10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/*
* Emergency Oxygen
@@ -139,7 +139,7 @@
volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
/obj/item/tank/internals/emergency_oxygen/populate_gas()
air_contents.oxygen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_oxygen((10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/obj/item/tank/internals/emergency_oxygen/empty/populate_gas()
return
@@ -175,7 +175,7 @@
distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
/obj/item/tank/internals/nitrogen/populate_gas()
air_contents.nitrogen = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_nitrogen((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/obj/item/tank/internals/emergency_oxygen/nitrogen
name = "emergency nitrogen tank"
@@ -183,7 +183,7 @@
icon_state = "emergency_nitrogen"
/obj/item/tank/internals/emergency_oxygen/nitrogen/populate_gas()
air_contents.nitrogen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_nitrogen((10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/obj/item/tank/internals/emergency_oxygen/double/vox
name = "vox specialized nitrogen tank"
@@ -192,7 +192,7 @@
volume = 35
/obj/item/tank/internals/emergency_oxygen/double/vox/populate_gas()
air_contents.nitrogen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.set_nitrogen((10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/*
* Air Mix
@@ -205,8 +205,8 @@
distribute_pressure = ONE_ATMOSPHERE
/obj/item/tank/internals/air/populate_gas()
air_contents.oxygen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD
air_contents.nitrogen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD
air_contents.set_oxygen((3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD)
air_contents.set_nitrogen((3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD)
/*
* Generic
code/game/objects/items/weapons/tanks/tanks.dm
+10 -20
View File
@@ -22,7 +22,7 @@
air_contents = new /datum/gas_mixture()
air_contents.volume = volume //liters
air_contents.temperature = T20C
air_contents.set_temperature(T20C)
populate_gas()
@@ -85,7 +85,7 @@
. += "<span class='notice'>It's [p_a()] [bicon(icon)] [name]! If you want any more information you'll need to get closer.</span>"
return
var/celsius_temperature = air_contents.temperature - T0C
var/celsius_temperature = air_contents.temperature() - T0C
var/descriptive
if(celsius_temperature < 20)
@@ -111,7 +111,7 @@
qdel(src)
if(air_contents)
location.assume_air(air_contents)
location.blind_release_air(air_contents)
qdel(src)
@@ -133,8 +133,7 @@
if(!disassembled)
var/turf/T = get_turf(src)
if(T)
T.assume_air(air_contents)
air_update_turf()
T.blind_release_air(air_contents)
playsound(src.loc, 'sound/effects/spray.ogg', 10, TRUE, -3)
qdel(src)
@@ -205,22 +204,13 @@
if(.)
add_fingerprint(usr)
/obj/item/tank/remove_air(amount)
return air_contents.remove(amount)
/obj/item/tank/return_air()
/obj/item/tank/return_obj_air()
RETURN_TYPE(/datum/gas_mixture)
return air_contents
/obj/item/tank/return_analyzable_air()
return air_contents
/obj/item/tank/assume_air(datum/gas_mixture/giver)
air_contents.merge(giver)
check_status()
return 1
/obj/item/tank/proc/remove_air_volume(volume_to_return)
if(!air_contents)
return null
@@ -228,9 +218,9 @@
var/tank_pressure = air_contents.return_pressure()
var/actual_distribute_pressure = clamp(tank_pressure, 0, distribute_pressure)
var/moles_needed = actual_distribute_pressure * volume_to_return / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
var/moles_needed = actual_distribute_pressure * volume_to_return / (R_IDEAL_GAS_EQUATION * air_contents.temperature())
return remove_air(moles_needed)
return air_contents.remove(moles_needed)
/obj/item/tank/process()
//Allow for reactions
@@ -272,8 +262,8 @@
var/turf/simulated/T = get_turf(src)
if(!T)
return
T.assume_air(air_contents)
playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3)
T.blind_release_air(air_contents)
playsound(loc, 'sound/effects/spray.ogg', 10, TRUE, -3)
qdel(src)
else
integrity--
@@ -285,7 +275,7 @@
if(!T)
return
var/datum/gas_mixture/leaked_gas = air_contents.remove_ratio(0.25)
T.assume_air(leaked_gas)
T.blind_release_air(leaked_gas)
else
integrity--
code/game/objects/objs.dm
+17 -23
View File
@@ -103,35 +103,21 @@
/obj/proc/suicide_act(mob/user)
return FALSE
/obj/assume_air(datum/gas_mixture/giver)
if(loc)
return loc.assume_air(giver)
else
return null
/obj/remove_air(amount)
if(loc)
return loc.remove_air(amount)
else
return null
/obj/return_air()
RETURN_TYPE(/datum/gas_mixture)
if(loc)
return loc.return_air()
else
return null
/obj/proc/handle_internal_lifeform(mob/lifeform_inside_me, breath_request)
/obj/proc/handle_internal_lifeform(mob/lifeform_inside_me, breath_request, datum/gas_mixture/environment)
//Return: (NONSTANDARD)
// null if object handles breathing logic for lifeform
// datum/air_group to tell lifeform to process using that breath return
//DEFAULT: Take air from turf to give to have mob process
if(breath_request > 0)
var/datum/gas_mixture/environment = return_air()
var/breath_percentage = BREATH_VOLUME / environment.return_volume()
return remove_air(environment.total_moles() * breath_percentage)
var/datum/gas_mixture/air = return_obj_air()
if(isnull(air))
air = environment
if(isnull(air))
return
var/breath_percentage = BREATH_VOLUME / air.return_volume()
return air.remove(air.total_moles() * breath_percentage)
else
return null
@@ -316,3 +302,11 @@
C.Weaken(3 SECONDS)
else
C.KnockDown(3 SECONDS)
/obj/proc/return_obj_air()
RETURN_TYPE(/datum/gas_mixture)
if(isobj(loc))
var/obj/O = loc
return O.return_obj_air()
else
return null
code/game/objects/structures/aliens.dm
+8 -8
View File
@@ -55,7 +55,7 @@
var/is_alien = TRUE
/obj/structure/alien/resin/Initialize(mapload)
air_update_turf(1)
recalculate_atmos_connectivity()
if(!is_alien)
return ..()
for(var/obj/structure/alien/weeds/node/W in get_turf(src))
@@ -69,14 +69,14 @@
var/turf/T = get_turf(src)
playsound(loc, 'sound/effects/alien_resin_break2.ogg', 100, TRUE)
. = ..()
T.air_update_turf(TRUE)
T.recalculate_atmos_connectivity()
/obj/structure/alien/resin/Move()
var/turf/T = loc
..()
move_update_air(T)
/obj/structure/alien/resin/CanAtmosPass()
/obj/structure/alien/resin/CanAtmosPass(direction)
return !density
/obj/structure/alien/resin/attack_alien(mob/living/carbon/alien/humanoid/user)
@@ -96,8 +96,8 @@
smoothing_groups = list(SMOOTH_GROUP_ALIEN_RESIN, SMOOTH_GROUP_ALIEN_WALLS)
canSmoothWith = list(SMOOTH_GROUP_ALIEN_WALLS)
/obj/structure/alien/resin/wall/BlockSuperconductivity()
return TRUE
/obj/structure/alien/resin/wall/get_superconductivity(direction)
return FALSE
/*
*Resin-Door - Borrows its code from Mineral-Door, not a subtype due to needing many overrides if so
@@ -135,7 +135,7 @@
/obj/structure/alien/resin/door/Destroy()
density = FALSE
QUEUE_SMOOTH_NEIGHBORS(src)
air_update_turf(1)
recalculate_atmos_connectivity()
return ..()
/obj/structure/alien/resin/door/Move()
@@ -153,7 +153,7 @@
if(user.can_advanced_admin_interact())
operate()
/obj/structure/alien/resin/door/CanAtmosPass(turf/T)
/obj/structure/alien/resin/door/CanAtmosPass(direction)
return !density
/obj/structure/alien/resin/door/proc/try_to_operate(mob/user, bumped_open = FALSE)
@@ -197,7 +197,7 @@
addtimer(CALLBACK(src, PROC_REF(operate_update), bumped_open), 1 SECONDS)
/obj/structure/alien/resin/door/proc/operate_update(bumped_open)
air_update_turf(1)
recalculate_atmos_connectivity()
update_icon(UPDATE_ICON_STATE)
is_operating = FALSE
code/game/objects/structures/crates_lockers/crates.dm
+14 -12
View File
@@ -383,23 +383,25 @@
var/target_temp = T0C - 40
var/cooling_power = 40
/obj/structure/closet/crate/freezer/return_air()
/obj/structure/closet/crate/freezer/return_obj_air()
RETURN_TYPE(/datum/gas_mixture)
var/datum/gas_mixture/gas = (..())
if(!gas) return null
var/datum/gas_mixture/gas = ..()
if(!gas)
var/turf/T = get_turf(src)
gas = T.get_readonly_air()
var/datum/gas_mixture/newgas = new/datum/gas_mixture()
newgas.oxygen = gas.oxygen
newgas.carbon_dioxide = gas.carbon_dioxide
newgas.nitrogen = gas.nitrogen
newgas.toxins = gas.toxins
newgas.set_oxygen(gas.oxygen())
newgas.set_carbon_dioxide(gas.carbon_dioxide())
newgas.set_nitrogen(gas.nitrogen())
newgas.set_toxins(gas.toxins())
newgas.volume = gas.volume
newgas.temperature = gas.temperature
if(newgas.temperature <= target_temp) return
newgas.set_temperature(gas.temperature())
if(newgas.temperature() <= target_temp) return
if((newgas.temperature - cooling_power) > target_temp)
newgas.temperature -= cooling_power
if((newgas.temperature() - cooling_power) > target_temp)
newgas.set_temperature(newgas.temperature() - cooling_power)
else
newgas.temperature = target_temp
newgas.set_temperature(target_temp)
return newgas
/obj/structure/closet/crate/freezer/iv_storage
code/game/objects/structures/false_walls.dm
+4 -4
View File
@@ -35,7 +35,7 @@
/obj/structure/falsewall/Initialize(mapload)
. = ..()
air_update_turf(1)
recalculate_atmos_connectivity()
/obj/structure/falsewall/examine_status(mob/user)
var/healthpercent = (obj_integrity/max_integrity) * 100
@@ -52,10 +52,10 @@
/obj/structure/falsewall/Destroy()
density = FALSE
air_update_turf(1)
recalculate_atmos_connectivity()
return ..()
/obj/structure/falsewall/CanAtmosPass(turf/T)
/obj/structure/falsewall/CanAtmosPass(direction)
return !density
/obj/structure/falsewall/attack_ghost(mob/user)
@@ -84,7 +84,7 @@
density = TRUE
set_opacity(TRUE)
icon_state = "fwall_closing"
air_update_turf(TRUE)
recalculate_atmos_connectivity()
opening = FALSE
update_icon()
code/game/objects/structures/grey_autocloner.dm
+3 -3
View File
@@ -15,9 +15,9 @@
/obj/machinery/grey_autocloner/Initialize(mapload)
. = ..()
air_contents = new()
air_contents.oxygen = MOLES_O2STANDARD * 2
air_contents.nitrogen = MOLES_N2STANDARD
air_contents.temperature = T20C
air_contents.set_oxygen(MOLES_O2STANDARD * 2)
air_contents.set_nitrogen(MOLES_N2STANDARD)
air_contents.set_temperature(T20C)
/obj/machinery/grey_autocloner/Destroy() //These will only be not null if deleted with someone in it
occupant = null
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -205,7 +205,7 @@
W.setDir(dir_to_set)
W.ini_dir = dir_to_set
W.anchored = FALSE
air_update_turf(TRUE)
recalculate_atmos_connectivity()
W.update_nearby_icons()
W.state = WINDOW_OUT_OF_FRAME
S.use(2)
code/game/objects/structures/holosigns.dm
+8 -3
View File
@@ -85,15 +85,20 @@
/obj/structure/holosign/barrier/atmos/Initialize(mapload)
. = ..()
air_update_turf(TRUE)
recalculate_atmos_connectivity()
/obj/structure/holosign/barrier/atmos/CanAtmosPass(turf/T)
// Airtight.
/obj/structure/holosign/barrier/atmos/CanAtmosPass(direction)
return FALSE
// Heatproof.
/obj/structure/holosign/barrier/atmos/get_superconductivity(direction)
return 0
/obj/structure/holosign/barrier/atmos/Destroy()
var/turf/T = get_turf(src)
. = ..()
T.air_update_turf(TRUE)
T.recalculate_atmos_connectivity()
/obj/structure/holosign/barrier/cyborg
name = "Energy Field"
code/game/objects/structures/inflatable.dm
+5 -5
View File
@@ -35,17 +35,17 @@
/obj/structure/inflatable/Initialize(location)
..()
air_update_turf(TRUE)
recalculate_atmos_connectivity()
/obj/structure/inflatable/Destroy()
var/turf/T = get_turf(src)
. = ..()
T.air_update_turf(TRUE)
T.recalculate_atmos_connectivity()
/obj/structure/inflatable/CanPass(atom/movable/mover, turf/target, height=0)
return
/obj/structure/inflatable/CanAtmosPass(turf/T)
/obj/structure/inflatable/CanAtmosPass(direction)
return !density
/obj/structure/inflatable/attack_hand(mob/user)
@@ -121,7 +121,7 @@
return !opacity
return !density
/obj/structure/inflatable/door/CanAtmosPass(turf/T)
/obj/structure/inflatable/door/CanAtmosPass(direction)
return !density
/obj/structure/inflatable/door/proc/try_to_operate(atom/user)
@@ -151,7 +151,7 @@
state_open = !state_open
update_icon(UPDATE_ICON_STATE)
is_operating = FALSE
air_update_turf(1)
recalculate_atmos_connectivity()
/obj/structure/inflatable/door/update_icon_state()
if(state_open)
code/game/objects/structures/mineral_doors.dm
+5 -5
View File
@@ -26,12 +26,12 @@
/obj/structure/mineral_door/Initialize()
. = ..()
initial_state = icon_state
air_update_turf(1)
recalculate_atmos_connectivity()
AddComponent(/datum/component/debris, DEBRIS_SPARKS, -20, 10)
/obj/structure/mineral_door/Destroy()
density = FALSE
air_update_turf(1)
recalculate_atmos_connectivity()
return ..()
/obj/structure/mineral_door/Move()
@@ -62,7 +62,7 @@
return !opacity
return !density
/obj/structure/mineral_door/CanAtmosPass(turf/T)
/obj/structure/mineral_door/CanAtmosPass(direction)
return !density
/obj/structure/mineral_door/proc/try_to_operate(atom/user)
@@ -98,7 +98,7 @@
density = !density
opacity = !opacity
state_open = !state_open
air_update_turf(1)
recalculate_atmos_connectivity()
update_icon(UPDATE_ICON_STATE)
is_operating = FALSE
@@ -168,7 +168,7 @@
/obj/structure/mineral_door/transparent/operate_update()
density = !density
state_open = !state_open
air_update_turf(TRUE)
recalculate_atmos_connectivity()
update_icon(UPDATE_ICON_STATE)
is_operating = FALSE
code/game/objects/structures/plasticflaps.dm
+3 -3
View File
@@ -101,12 +101,12 @@
/obj/structure/plasticflaps/mining/Initialize()
. = ..()
air_update_turf(TRUE)
recalculate_atmos_connectivity()
/obj/structure/plasticflaps/mining/Destroy()
var/turf/T = get_turf(src)
. = ..()
T.air_update_turf(TRUE)
T.recalculate_atmos_connectivity()
/obj/structure/plasticflaps/mining/CanAtmosPass(turf/T)
/obj/structure/plasticflaps/mining/CanAtmosPass(direction)
return FALSE
code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+24 -26
View File
@@ -29,9 +29,9 @@
/obj/structure/transit_tube_pod/Initialize(mapload)
. = ..()
air_contents.oxygen = MOLES_O2STANDARD * 2
air_contents.nitrogen = MOLES_N2STANDARD
air_contents.temperature = T20C
air_contents.set_oxygen(MOLES_O2STANDARD * 2)
air_contents.set_nitrogen(MOLES_N2STANDARD)
air_contents.set_temperature(T20C)
for(var/obj/structure/transit_tube/tube in loc)
dir = pick(tube.directions())
@@ -171,32 +171,30 @@
else
moving = FALSE
// Should I return a copy here? If the caller edits or qdel()s the returned
// datum, there might be problems if I don't...
/obj/structure/transit_tube_pod/return_air()
/obj/structure/transit_tube_pod/return_obj_air()
RETURN_TYPE(/datum/gas_mixture)
var/datum/gas_mixture/GM = new()
GM.copy_from(air_contents)
return GM
// For now, copying what I found in an unused FEA file (and almost identical in a
// used ZAS file). Means that assume_air and remove_air don't actually alter the
// air contents.
/obj/structure/transit_tube_pod/assume_air(datum/gas_mixture/giver)
return air_contents.merge(giver)
/obj/structure/transit_tube_pod/remove_air(amount)
return air_contents.remove(amount)
return air_contents
// Called when a pod arrives at, and before a pod departs from a station,
// giving it a chance to mix its internal air supply with the turf it is
// currently on.
/obj/structure/transit_tube_pod/proc/mix_air()
var/datum/gas_mixture/environment = loc.return_air()
var/datum/milla_safe/transit_pod_mix/milla = new()
milla.invoke_async(src)
/datum/milla_safe/transit_pod_mix
/datum/milla_safe/transit_pod_mix/on_run(obj/structure/transit_tube_pod/pod)
var/datum/gas_mixture/environment = null
if(isobj(pod.loc))
var/obj/O = pod.loc
environment = O.return_obj_air()
if(isnull(environment))
var/turf/T = get_turf(pod)
environment = get_turf_air(T)
var/env_pressure = environment.return_pressure()
var/int_pressure = air_contents.return_pressure()
var/int_pressure = pod.air_contents.return_pressure()
var/total_pressure = env_pressure + int_pressure
if(total_pressure == 0)
@@ -211,11 +209,11 @@
var/transfer_in = max(0.1, 0.5 * (env_pressure - int_pressure) / total_pressure)
var/transfer_out = max(0.1, 0.3 * (int_pressure - env_pressure) / total_pressure)
var/datum/gas_mixture/from_env = loc.remove_air(environment.total_moles() * transfer_in)
var/datum/gas_mixture/from_int = air_contents.remove(air_contents.total_moles() * transfer_out)
var/datum/gas_mixture/from_env = environment.remove(environment.total_moles() * transfer_in)
var/datum/gas_mixture/from_int = pod.air_contents.remove(pod.air_contents.total_moles() * transfer_out)
loc.assume_air(from_int)
air_contents.merge(from_env)
environment.merge(from_int)
pod.air_contents.merge(from_env)
code/game/objects/structures/windoor_assembly.dm
+6 -6
View File
@@ -55,12 +55,12 @@
if(set_dir)
dir = set_dir
ini_dir = dir
air_update_turf(1)
recalculate_atmos_connectivity()
/obj/structure/windoor_assembly/Destroy()
density = FALSE
QDEL_NULL(electronics)
air_update_turf(1)
recalculate_atmos_connectivity()
return ..()
/obj/structure/windoor_assembly/Move()
@@ -87,13 +87,13 @@
return FALSE
else if(istype(mover, /obj/machinery/door/window) && !valid_window_location(loc, mover.dir))
return FALSE
return 1
return TRUE
/obj/structure/windoor_assembly/CanAtmosPass(turf/T)
if(get_dir(loc, T) == dir)
/obj/structure/windoor_assembly/CanAtmosPass(direction)
if(direction == dir)
return !density
else
return 1
return TRUE
/obj/structure/windoor_assembly/CheckExit(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
code/game/objects/structures/window.dm
+20 -18
View File
@@ -35,6 +35,8 @@
var/mutable_appearance/edge_overlay
/// Minimum environment smash level (found on simple animals) to break through this instantly
var/env_smash_level = ENVIRONMENT_SMASH_STRUCTURES
/// How well this window resists superconductivity.
var/superconductivity = WINDOW_HEAT_TRANSFER_COEFFICIENT
/obj/structure/window/examine(mob/user)
. = ..()
@@ -75,7 +77,7 @@
real_explosion_block = explosion_block
explosion_block = EXPLOSION_BLOCK_PROC
air_update_turf(TRUE)
recalculate_atmos_connectivity()
/obj/structure/window/proc/toggle_polarization()
if(opacity)
@@ -266,7 +268,7 @@
if(!I.use_tool(src, user, decon_speed, volume = I.tool_volume, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored)))
return
anchored = !anchored
air_update_turf(TRUE)
recalculate_atmos_connectivity()
update_nearby_icons()
to_chat(user, "<span class='notice'>You [anchored ? "fasten the frame to":"unfasten the frame from"] the floor.</span>")
@@ -276,7 +278,7 @@
if(!I.use_tool(src, user, decon_speed, volume = I.tool_volume, extra_checks = CALLBACK(src, PROC_REF(check_anchored), anchored)))
return
anchored = !anchored
air_update_turf(TRUE)
recalculate_atmos_connectivity()
update_nearby_icons()
to_chat(user, "<span class='notice'>You [anchored ? "fasten the window to":"unfasten the window from"] the floor.</span>")
@@ -398,7 +400,7 @@
/obj/structure/window/Destroy()
density = FALSE
air_update_turf(1)
recalculate_atmos_connectivity()
update_nearby_icons()
return ..()
@@ -413,10 +415,15 @@
anchored = FALSE
QUEUE_SMOOTH_NEIGHBORS(src)
/obj/structure/window/CanAtmosPass(turf/T)
/obj/structure/window/CanAtmosPass(direction)
if(!anchored || !density)
return TRUE
return !(FULLTILE_WINDOW_DIR == dir || (dir & get_dir(loc, T)))
return !(FULLTILE_WINDOW_DIR == dir || (dir & direction))
/obj/structure/window/get_superconductivity(direction)
if(dir == FULLTILE_WINDOW_DIR || dir & direction)
return superconductivity
return ..()
//This proc is used to update the icons of nearby windows.
/obj/structure/window/proc/update_nearby_icons()
@@ -619,9 +626,7 @@
explosion_block = 1
armor = list(MELEE = 75, BULLET = 5, LASER = 0, ENERGY = 0, BOMB = 45, RAD = 100, FIRE = 99, ACID = 100)
rad_insulation = RAD_NO_INSULATION
/obj/structure/window/plasmabasic/BlockSuperconductivity()
return 1
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
/obj/structure/window/plasmareinforced
name = "reinforced plasma window"
@@ -638,13 +643,11 @@
rad_insulation = RAD_NO_INSULATION
damage_deflection = 21
env_smash_level = ENVIRONMENT_SMASH_WALLS // these windows are a fair bit tougher
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
/obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return
/obj/structure/window/plasmareinforced/BlockSuperconductivity()
return 1 //okay this SHOULD MAKE THE TOXINS CHAMBER WORK
/obj/structure/window/full
glass_amount = 2
dir = FULLTILE_WINDOW_DIR
@@ -679,9 +682,7 @@
rad_insulation = RAD_NO_INSULATION
edge_overlay_file = 'icons/obj/smooth_structures/windows/window_edges.dmi'
env_smash_level = ENVIRONMENT_SMASH_WALLS // these windows are a fair bit tougher
/obj/structure/window/full/plasmabasic/BlockSuperconductivity()
return TRUE
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
/obj/structure/window/full/plasmareinforced
name = "reinforced plasma window"
@@ -700,13 +701,11 @@
rad_insulation = RAD_NO_INSULATION
edge_overlay_file = 'icons/obj/smooth_structures/windows/reinforced_window_edges.dmi'
env_smash_level = ENVIRONMENT_SMASH_RWALLS // these ones are insanely tough
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
/obj/structure/window/full/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return
/obj/structure/window/full/plasmareinforced/BlockSuperconductivity()
return TRUE
/obj/structure/window/full/reinforced
name = "reinforced window"
desc = "It looks rather strong. Might take a few good hits to shatter it."
@@ -751,6 +750,8 @@
canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE, SMOOTH_GROUP_TITANIUM_WALLS)
glass_type = /obj/item/stack/sheet/titaniumglass
env_smash_level = ENVIRONMENT_SMASH_RWALLS // shuttle windows should probably be a bit stronger, too
// Mostly for the mining shuttle.
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
/obj/structure/window/full/shuttle/narsie_act()
color = "#3C3434"
@@ -773,6 +774,7 @@
glass_type = /obj/item/stack/sheet/plastitaniumglass
smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_PLASTITANIUM_WALLS)
canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS)
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
/obj/structure/window/reinforced/clockwork
name = "brass window"