From 9b19d7dacf4c7f69ba25beac66d7af6c95fd8a92 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Mon, 7 Apr 2014 17:28:09 +0100 Subject: [PATCH] atmos: remove a few force-deletes in merge code Removes del(giver) from pipeline/merge(), turf/assume_air() and atom/assume_air(). Thanks to valzargaming on reddit/github for pointing it out. fixes #4717 Signed-off-by: Mloc-Argent --- code/ATMOSPHERICS/datum_pipe_network.dm | 2 -- code/ZAS/Turf.dm | 1 - code/game/atoms.dm | 1 - 3 files changed, 4 deletions(-) diff --git a/code/ATMOSPHERICS/datum_pipe_network.dm b/code/ATMOSPHERICS/datum_pipe_network.dm index bff2d0ee5e..83b269f660 100644 --- a/code/ATMOSPHERICS/datum_pipe_network.dm +++ b/code/ATMOSPHERICS/datum_pipe_network.dm @@ -54,8 +54,6 @@ datum/pipe_network for(var/datum/pipeline/line_member in giver.line_members) line_member.network = src - del(giver) - update_network_gases() return 1 diff --git a/code/ZAS/Turf.dm b/code/ZAS/Turf.dm index fece782aa7..e989d65455 100644 --- a/code/ZAS/Turf.dm +++ b/code/ZAS/Turf.dm @@ -173,7 +173,6 @@ if(connections) connections.update_all() /turf/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air - del(giver) return 0 /turf/return_air() diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 0799d9faa0..917ecfe9a3 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -44,7 +44,6 @@ /atom/proc/assume_air(datum/gas_mixture/giver) - del(giver) return null /atom/proc/remove_air(amount)