mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 16:47:13 +01:00
Fixes #9311, Fixes destroyed pipes still being in pipe vision, Pipe vision now appears above darkness.
This commit is contained in:
@@ -25,12 +25,7 @@ Pipelines + Other Objects -> Pipe network
|
||||
var/global/list/pipeimages = list()
|
||||
var/datum/pipeline/parent = null
|
||||
|
||||
|
||||
/obj/machinery/atmospherics/Destroy()
|
||||
for(var/mob/living/L in src)
|
||||
L.remove_ventcrawl()
|
||||
L.forceMove(get_turf(src))
|
||||
..()
|
||||
var/image/pipe_vision_img = null
|
||||
|
||||
|
||||
/obj/machinery/atmospherics/New()
|
||||
@@ -45,6 +40,13 @@ Pipelines + Other Objects -> Pipe network
|
||||
if (stored)
|
||||
qdel(stored)
|
||||
stored = null
|
||||
|
||||
for(var/mob/living/L in src)
|
||||
L.remove_ventcrawl()
|
||||
L.forceMove(get_turf(src))
|
||||
if(pipe_vision_img)
|
||||
qdel(pipe_vision_img)
|
||||
|
||||
..()
|
||||
|
||||
//this is called just after the air controller sets up turfs
|
||||
@@ -128,6 +130,7 @@ Pipelines + Other Objects -> Pipe network
|
||||
var/turf/T = loc
|
||||
stored.loc = T
|
||||
transfer_fingerprints_to(stored)
|
||||
stored = null
|
||||
|
||||
qdel(src)
|
||||
|
||||
@@ -200,17 +203,6 @@ Pipelines + Other Objects -> Pipe network
|
||||
else if(target_move.can_crawl_through())
|
||||
if(returnPipenet() != target_move.returnPipenet())
|
||||
user.update_pipe_vision(target_move)
|
||||
|
||||
/*
|
||||
var/list/myPipenets = getAllPipenets()
|
||||
var/list/targetAllPipenets = target_move.getAllPipenets()
|
||||
for(var/datum/pipeline/I in targetAllPipenets)
|
||||
for(var/datum/pipeline/J in myPipenets)
|
||||
if(I != J)
|
||||
update_pipe_vision(target_move)
|
||||
break
|
||||
*/
|
||||
|
||||
user.loc = target_move
|
||||
user.client.eye = target_move //Byond only updates the eye every tick, This smooths out the movement
|
||||
if(world.time - user.last_played_vent > VENT_SOUND_DELAY)
|
||||
|
||||
@@ -68,11 +68,14 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
|
||||
var/list/totalMembers = list()
|
||||
totalMembers |= starting_machine.parent.members
|
||||
totalMembers |= starting_machine.parent.other_atmosmch
|
||||
for(var/atom/A in totalMembers)
|
||||
var/image/new_image = image(A, A.loc, dir = A.dir)
|
||||
pipes_shown += new_image
|
||||
|
||||
for(var/obj/machinery/atmospherics/A in totalMembers)
|
||||
if(!A.pipe_vision_img)
|
||||
A.pipe_vision_img = image(A, A.loc, layer = 20, dir = A.dir)
|
||||
//20 for being above darkness
|
||||
pipes_shown |= A.pipe_vision_img
|
||||
if(client)
|
||||
client.images += new_image
|
||||
client.images |= A.pipe_vision_img
|
||||
|
||||
|
||||
/mob/living/proc/remove_ventcrawl()
|
||||
|
||||
Reference in New Issue
Block a user