Cleans Up Rejected Mirror files (#414)
* bang * updates tgstation.dme * fixes missing stylesheet entries * updates the map includes backup map file * removes ten billion runtimes
This commit is contained in:
@@ -1,14 +0,0 @@
|
||||
diff a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm (rejected hunks)
|
||||
@@ -322,10 +322,10 @@
|
||||
|
||||
for(var/t in turf_list)
|
||||
var/turf/open/T = t
|
||||
- if (space_is_all_consuming && !space_in_group && istype(T.air, /datum/gas_mixture/space))
|
||||
+ if (space_is_all_consuming && !space_in_group && istype(T.air, /datum/gas_mixture/immutable/space))
|
||||
space_in_group = 1
|
||||
qdel(A)
|
||||
- A = new/datum/gas_mixture/space()
|
||||
+ A = new/datum/gas_mixture/immutable/space()
|
||||
A.merge(T.air)
|
||||
|
||||
for(var/id in A_gases)
|
||||
@@ -1,28 +0,0 @@
|
||||
diff a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm (rejected hunks)
|
||||
@@ -12,6 +12,9 @@
|
||||
..()
|
||||
reset_gas_mix()
|
||||
|
||||
+/datum/gas_mixture/immutable/garbage_collect()
|
||||
+ reset_gas_mix()
|
||||
+
|
||||
/datum/gas_mixture/immutable/archive()
|
||||
return 1 //nothing changes, so we do nothing and the archive is successful
|
||||
|
||||
@@ -63,3 +66,16 @@
|
||||
|
||||
/datum/gas_mixture/immutable/space/remove_ratio()
|
||||
return copy() //we're always empty, so we can just return a copy.
|
||||
+
|
||||
+
|
||||
+//used by cloners
|
||||
+/datum/gas_mixture/immutable/cloner
|
||||
+ initial_temperature = T20C
|
||||
+
|
||||
+/datum/gas_mixture/immutable/cloner/reset_gas_mix()
|
||||
+ assert_gas("n2")
|
||||
+ gases["n2"][MOLES] = MOLES_O2STANDARD + MOLES_N2STANDARD
|
||||
+ ..()
|
||||
+
|
||||
+/datum/gas_mixture/immutable/cloner/heat_capacity()
|
||||
+ return (MOLES_O2STANDARD + MOLES_N2STANDARD)*20 //specific heat of nitrogen is 20
|
||||
Reference in New Issue
Block a user