Merge pull request #3782 from VOREStation/upstream-merge-5306

[MIRROR] Move space/New to space/initialize
This commit is contained in:
Aronai Sieyes
2018-05-28 20:58:59 -04:00
committed by GitHub
3 changed files with 6 additions and 5 deletions

View File

@@ -6,6 +6,7 @@
desc = "Rough sand with a huge crack. It probably leads out into the void."
icon_state = "asteroid_cracked"
dynamic_lighting = TRUE
keep_sprite = TRUE
/turf/space/cracked_asteroid/is_space() // So people don't start floating when standing on it.
return FALSE

View File

@@ -6,14 +6,14 @@
temperature = T20C
thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
var/keep_sprite = 0
var/keep_sprite = FALSE
// heat_capacity = 700000 No.
/turf/space/New()
if(!istype(src, /turf/space/transit) && !istype(src, /turf/space/cracked_asteroid))
/turf/space/initialize()
. = ..()
if(!keep_sprite)
icon_state = "[((x + y) ^ ~(x * y) + z) % 25]"
update_starlight()
..()
/turf/space/is_space()
return 1

View File

@@ -1,5 +1,5 @@
/turf/space/transit
keep_sprite = 1
keep_sprite = TRUE
var/pushdirection // push things that get caught in the transit tile this direction
//Overwrite because we dont want people building rods in space.