Revert "Merge pull request #4739 from monster860/vg-parallax"

This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
This commit is contained in:
Tigercat2000
2016-07-28 15:48:27 -07:00
parent 794760dd27
commit 288af9f92c
23 changed files with 7 additions and 431 deletions

View File

@@ -104,8 +104,6 @@
if(. && buckled_mob && !handle_buckled_mob_movement(loc, direct)) //movement failed due to buckled mob
. = 0
update_client_hook(loc)
// Previously known as Crossed()
@@ -146,25 +144,9 @@
for(var/datum/light_source/L in light_sources)
L.source_atom.update_light()
update_client_hook(destination)
return 1
/atom/movable/proc/update_client_hook(atom/destination)
if(locate(/mob) in src)
for(var/client/C in parallax_on_clients)
if((get_turf(C.eye) == destination) && (C.mob.hud_used))
C.mob.hud_used.update_parallax()
/mob/update_client_hook(atom/destination)
if(locate(/mob) in src)
for(var/client/C in parallax_on_clients)
if((get_turf(C.eye) == destination) && (C.mob.hud_used))
C.mob.hud_used.update_parallax()
else if(client && hud_used)
hud_used.update_parallax()
//called when src is thrown into hit_atom
/atom/movable/proc/throw_impact(atom/hit_atom, var/speed)
if(istype(hit_atom,/mob/living))

View File

@@ -78,7 +78,7 @@
last_delay = current_tube.enter_delay(src, next_dir)
sleep(last_delay)
dir = next_dir
forceMove(next_loc) // When moving from one tube to another, skip collision and such.
loc = next_loc // When moving from one tube to another, skip collision and such.
density = current_tube.density
if(current_tube && current_tube.should_stop_pod(src, next_dir))

View File

@@ -4,8 +4,6 @@
icon_state = "0"
dynamic_lighting = 0
luminosity = 1
plane = PLANE_SPACE_BACKGROUND
temperature = TCMB
thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
@@ -20,11 +18,6 @@
if(!istype(src, /turf/space/transit))
icon_state = "[((x + y) ^ ~(x * y) + z) % 25]"
var/image/I = image('icons/turf/space_parallax1.dmi',"[icon_state]")
I.plane = PLANE_SPACE_DUST
I.alpha = 80
I.blend_mode = BLEND_ADD
overlays += I
update_starlight()
/turf/space/Destroy()

View File

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