From db9d7553c78220846daebb81bcc9dece2b33334b Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Thu, 22 Dec 2016 15:38:13 -0500 Subject: [PATCH] Fixes clockwork walls/floors losing double CV if removed in a particular way (#22365) --- code/game/turfs/simulated/floor/misc_floor.dm | 15 ++++----------- code/game/turfs/simulated/wall/misc_walls.dm | 16 +++++----------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 6189e068261..7754fdcdee6 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -76,19 +76,12 @@ change_construction_value(1) /turf/open/floor/clockwork/Destroy() - be_removed() - return ..() - -/turf/open/floor/clockwork/ChangeTurf(path, defer_change = FALSE) - if(path != type) - be_removed() - return ..() - -/turf/open/floor/clockwork/proc/be_removed() STOP_PROCESSING(SSobj, src) change_construction_value(-1) - qdel(realappearence) - realappearence = null + if(realappearence) + qdel(realappearence) + realappearence = null + return ..() /turf/open/floor/clockwork/Entered(atom/movable/AM) ..() diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm index d68be705fa7..3f970596163 100644 --- a/code/game/turfs/simulated/wall/misc_walls.dm +++ b/code/game/turfs/simulated/wall/misc_walls.dm @@ -63,21 +63,15 @@ user << "It is linked, generating components in a cache!" /turf/closed/wall/clockwork/Destroy() - be_removed() - return ..() - -/turf/closed/wall/clockwork/ChangeTurf(path, defer_change = FALSE) - if(path != type) - be_removed() - return ..() - -/turf/closed/wall/clockwork/proc/be_removed() if(linkedcache) linkedcache.linkedwall = null linkedcache = null change_construction_value(-5) - qdel(realappearence) - realappearence = null + if(realappearence) + qdel(realappearence) + realappearence = null + return ..() + /turf/closed/wall/clockwork/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/weapon/weldingtool))