shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

Browse Source
This commit is contained in:
Ghommie
2019-12-06 20:09:35 +01:00
parent 6484eea339 0598c35d70
commit 542c9007ee
1029 changed files with 34299 additions and 143444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor/plating/asteroid.dm
+5 -5
View File
@@ -103,7 +103,7 @@
/turf/open/floor/plating/asteroid/basalt/airless
baseturfs = /turf/open/floor/plating/asteroid/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plating/asteroid/basalt/Initialize()
. = ..()
@@ -131,7 +131,7 @@
/turf/open/floor/plating/asteroid/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
turf_type = /turf/open/floor/plating/asteroid/airless
@@ -307,7 +307,7 @@
baseturfs = /turf/open/floor/plating/asteroid/snow
icon_state = "snow"
icon_plating = "snow"
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
slowdown = 2
environment_type = "snow"
flags_1 = NONE
@@ -344,11 +344,11 @@
return FALSE
/turf/open/floor/plating/asteroid/snow/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plating/asteroid/snow/temperatre
initial_gas_mix = "o2=22;n2=82;TEMP=255.37"
/turf/open/floor/plating/asteroid/snow/atmosphere
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
planetary_atmos = FALSE
code/game/turfs/simulated/floor/plating/misc_plating.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/turf/open/floor/plating/airless
icon_state = "plating"
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plating/abductor
name = "alien floor"
@@ -172,7 +172,7 @@
desc = "A sheet of solid ice. Looks slippery."
icon = 'icons/turf/floors/ice_turf.dmi'
icon_state = "unsmooth"
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
temperature = 180
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/ice
@@ -215,7 +215,7 @@
desc = "A section of heated plating, helps keep the snow from stacking up too high."
icon = 'icons/turf/snow.dmi'
icon_state = "snowplating"
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
temperature = 180
attachment_holes = FALSE
planetary_atmos = TRUE