This commit is contained in:
Kugamo
2022-07-04 21:02:30 -05:00
parent ad608c84e3
commit 69fb7ad265
2 changed files with 9 additions and 7 deletions
@@ -297,7 +297,7 @@ Pipelines + Other Objects -> Pipe network
user.forceMove(target_move.loc) //handles entering and so on
user.visible_message("You hear something squeezing through the ducts.", "You climb out of the ventilation system.")
else if(target_move.can_crawl_through())
if(returnPipenet() != target_move.returnPipenet())
if(returnPipenet(target_move) != target_move.returnPipenet())
user.update_pipe_vision(target_move)
user.forceMove(target_move)
if(world.time - user.last_played_vent > VENT_SOUND_DELAY)
+8 -6
View File
@@ -514,10 +514,10 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
to_chat(src, "<span class='warning'>This ventilation duct is not connected to anything!</span>")
/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine)
if(!istype(starting_machine) || !starting_machine.returnPipenet() || !starting_machine.can_see_pipes())
/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine, var/obj/machinery/atmospherics/target_move)
if(!istype(starting_machine) || !starting_machine.returnPipenet(target_move) || !starting_machine.can_see_pipes())
return
var/datum/pipeline/pipeline = starting_machine.returnPipenet()
var/datum/pipeline/pipeline = starting_machine.returnPipenet(target_move)
var/list/totalMembers = list()
totalMembers |= pipeline.members
totalMembers |= pipeline.other_atmosmch
@@ -539,13 +539,15 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
/atom/proc/update_pipe_vision()
return
/mob/living/update_pipe_vision()
if(pipes_shown.len)
/mob/living/update_pipe_vision(obj/machinery/atmospherics/target_move)
if(pipes_shown.len && !(target_move))
if(!is_ventcrawling(src))
remove_ventcrawl()
else
if(is_ventcrawling(src))
add_ventcrawl(loc)
if(target_move)
remove_ventcrawl() //no more seeing the old pipe network if you are moving into a new one
add_ventcrawl(loc, target_move)
//Throwing stuff