From ef8f3705f36d4376162d50d2f11bd9130f923b65 Mon Sep 17 00:00:00 2001 From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com> Date: Sat, 22 Aug 2020 03:48:31 +0100 Subject: [PATCH] Prevents mapping multiple turfs per tile (#9703) --- code/modules/maps/reader.dm | 7 ++----- html/changelogs/prevent_multiturfs.yml | 6 ++++++ 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/prevent_multiturfs.yml diff --git a/code/modules/maps/reader.dm b/code/modules/maps/reader.dm index d7d995f344c..c36fd070540 100644 --- a/code/modules/maps/reader.dm +++ b/code/modules/maps/reader.dm @@ -300,7 +300,7 @@ var/global/dmm_suite/preloader/_preloader = new if(use_preloader && instance) _preloader.load(instance) - //then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect + //then instance the /turf var/first_turf_index = 1 while(!ispath(members[first_turf_index], /turf)) //find first /turf object in members @@ -314,12 +314,9 @@ var/global/dmm_suite/preloader/_preloader = new T = instance_atom(members[first_turf_index],members_attributes[first_turf_index],crds,no_changeturf) if(T) - //if others /turf are presents, simulates the underlays piling effect index = first_turf_index + 1 while(index <= members.len - 1) // Last item is an /area - var/underlay = T.appearance - T = instance_atom(members[index],members_attributes[index],crds,no_changeturf)//instance new turf - T.underlays += underlay + crash_with("Tried to load additional turf at [model_key].") index++ //finally instance all remainings objects/mobs diff --git a/html/changelogs/prevent_multiturfs.yml b/html/changelogs/prevent_multiturfs.yml new file mode 100644 index 00000000000..66595c9731c --- /dev/null +++ b/html/changelogs/prevent_multiturfs.yml @@ -0,0 +1,6 @@ +author: mikomyazaki + +delete-after: True + +changes: + - backend: "Prevents mapping multiple turfs per tile." \ No newline at end of file