From 2ba143a33263d21b4dc63801a2439bbaf1c5931d Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 28 May 2018 12:50:05 -0700 Subject: [PATCH 1/2] Merge pull request #5306 from VOREStation/aro-spaceinit Move space/New to space/initialize --- code/game/turfs/space/cracked_asteroid.dm | 1 + code/game/turfs/space/space.dm | 8 ++++---- code/game/turfs/space/transit.dm | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/space/cracked_asteroid.dm b/code/game/turfs/space/cracked_asteroid.dm index dae0d5a129..75cf25fd3f 100644 --- a/code/game/turfs/space/cracked_asteroid.dm +++ b/code/game/turfs/space/cracked_asteroid.dm @@ -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 diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 61ad8faddd..13368bb7ed 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -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 diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 236f94de82..79550c3f30 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -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.