cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[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
parent 304c8b6f6f 7bb11a071d
commit d4d4bf17f7
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/turfs/space/cracked_asteroid.dm
View File

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

8
code/game/turfs/space/space.dm
View File

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

2
code/game/turfs/space/transit.dm
View File

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