From a465733b1c43e0e85c09711147b7a4318ea7489d Mon Sep 17 00:00:00 2001 From: Emmett Gaines Date: Thu, 19 Apr 2018 06:44:55 -0400 Subject: [PATCH 1/2] Removes old decal system (#37281) --- code/game/turfs/ChangeTurf.dm | 2 -- code/game/turfs/turf.dm | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/code/game/turfs/ChangeTurf.dm b/code/game/turfs/ChangeTurf.dm index 5a3648488e..7394592c08 100644 --- a/code/game/turfs/ChangeTurf.dm +++ b/code/game/turfs/ChangeTurf.dm @@ -25,8 +25,6 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( O = new() O.underlays.Add(T) T.ChangeTurf(type) - for(var/group in decals) - T.add_decal(decals[group],group) if(underlays.len) T.underlays = O.underlays if(T.icon_state != icon_state) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 108075b5d5..0cb72716fb 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -26,7 +26,6 @@ var/explosion_level = 0 //for preventing explosion dodging var/explosion_id = 0 - var/list/decals var/requires_activation //add to air processing after initialize? var/changing_turf = FALSE @@ -413,18 +412,6 @@ playsound(src, "bodyfall", 50, 1) faller.drop_all_held_items() -/turf/proc/add_decal(decal,group) - LAZYINITLIST(decals) - if(!decals[group]) - decals[group] = list() - decals[group] += decal - add_overlay(decals[group]) - -/turf/proc/remove_decal(group) - LAZYINITLIST(decals) - cut_overlay(decals[group]) - decals[group] = null - /turf/proc/photograph(limit=20) var/image/I = new() I.add_overlay(src)