From 96627474b80f23bad2bc5fd2e52ef4529733fb22 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 30 Oct 2021 22:46:06 -0400 Subject: [PATCH] powder that makes you say yes --- code/modules/asset_cache/asset_list_items.dm | 53 ++------------------ 1 file changed, 3 insertions(+), 50 deletions(-) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 848e554a67..3ba164ffea 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -513,7 +513,6 @@ // It REALLY doesnt matter too much if these arent up to date // They are relatively big assets = list( -<<<<<<< HEAD // CHOMP Edit: Restored for chomp station. Removed Tether. "southern_cross_nanomap_z1.png" = 'icons/_nanomaps/southern_cross_nanomap_z1.png', "southern_cross_nanomap_z10.png" = 'icons/_nanomaps/southern_cross_nanomap_z10.png', @@ -538,54 +537,8 @@ //"tether_nanomap_z10.png" = 'icons/_nanomaps/tether_nanomap_z10.png', //"tether_nanomap_z13.png" = 'icons/_nanomaps/tether_nanomap_z13.png', //"tether_nanomap_z14.png" = 'icons/_nanomaps/tether_nanomap_z14.png', + //"stellardelight_nanomap_z1.png" = 'icons/_nanomaps/sd_deck1.png', + //"stellardelight_nanomap_z2.png" = 'icons/_nanomaps/sd_deck2.png', + //"stellardelight_nanomap_z3.png" = 'icons/_nanomaps/sd_deck3.png', // CHOMP Edit End ) -||||||| parent of 55ee669869... Merge pull request #11710 from Very-Soft/SDremaster - // VOREStation Edit: We don't need Southern Cross - // "southern_cross_nanomap_z1.png" = 'icons/_nanomaps/southern_cross_nanomap_z1.png', - // "southern_cross_nanomap_z10.png" = 'icons/_nanomaps/southern_cross_nanomap_z10.png', - // "southern_cross_nanomap_z2.png" = 'icons/_nanomaps/southern_cross_nanomap_z2.png', - // "southern_cross_nanomap_z3.png" = 'icons/_nanomaps/southern_cross_nanomap_z3.png', - // "southern_cross_nanomap_z5.png" = 'icons/_nanomaps/southern_cross_nanomap_z5.png', - // "southern_cross_nanomap_z6.png" = 'icons/_nanomaps/southern_cross_nanomap_z6.png', - "tether_nanomap_z1.png" = 'icons/_nanomaps/tether_nanomap_z1.png', - "tether_nanomap_z2.png" = 'icons/_nanomaps/tether_nanomap_z2.png', - "tether_nanomap_z3.png" = 'icons/_nanomaps/tether_nanomap_z3.png', - "tether_nanomap_z4.png" = 'icons/_nanomaps/tether_nanomap_z4.png', - "tether_nanomap_z5.png" = 'icons/_nanomaps/tether_nanomap_z5.png', - "tether_nanomap_z6.png" = 'icons/_nanomaps/tether_nanomap_z6.png', - "tether_nanomap_z7.png" = 'icons/_nanomaps/tether_nanomap_z7.png', - "tether_nanomap_z8.png" = 'icons/_nanomaps/tether_nanomap_z8.png', - "tether_nanomap_z9.png" = 'icons/_nanomaps/tether_nanomap_z9.png', - "tether_nanomap_z10.png" = 'icons/_nanomaps/tether_nanomap_z10.png', - "tether_nanomap_z13.png" = 'icons/_nanomaps/tether_nanomap_z13.png', - "tether_nanomap_z14.png" = 'icons/_nanomaps/tether_nanomap_z14.png', - // VOREStation Edit End - ) -======= - // VOREStation Edit: We don't need Southern Cross - // "southern_cross_nanomap_z1.png" = 'icons/_nanomaps/southern_cross_nanomap_z1.png', - // "southern_cross_nanomap_z10.png" = 'icons/_nanomaps/southern_cross_nanomap_z10.png', - // "southern_cross_nanomap_z2.png" = 'icons/_nanomaps/southern_cross_nanomap_z2.png', - // "southern_cross_nanomap_z3.png" = 'icons/_nanomaps/southern_cross_nanomap_z3.png', - // "southern_cross_nanomap_z5.png" = 'icons/_nanomaps/southern_cross_nanomap_z5.png', - // "southern_cross_nanomap_z6.png" = 'icons/_nanomaps/southern_cross_nanomap_z6.png', - "tether_nanomap_z1.png" = 'icons/_nanomaps/tether_nanomap_z1.png', - "tether_nanomap_z2.png" = 'icons/_nanomaps/tether_nanomap_z2.png', - "tether_nanomap_z3.png" = 'icons/_nanomaps/tether_nanomap_z3.png', - "tether_nanomap_z4.png" = 'icons/_nanomaps/tether_nanomap_z4.png', - "tether_nanomap_z5.png" = 'icons/_nanomaps/tether_nanomap_z5.png', - "tether_nanomap_z6.png" = 'icons/_nanomaps/tether_nanomap_z6.png', - "tether_nanomap_z7.png" = 'icons/_nanomaps/tether_nanomap_z7.png', - "tether_nanomap_z8.png" = 'icons/_nanomaps/tether_nanomap_z8.png', - "tether_nanomap_z9.png" = 'icons/_nanomaps/tether_nanomap_z9.png', - "tether_nanomap_z10.png" = 'icons/_nanomaps/tether_nanomap_z10.png', - "tether_nanomap_z13.png" = 'icons/_nanomaps/tether_nanomap_z13.png', - "tether_nanomap_z14.png" = 'icons/_nanomaps/tether_nanomap_z14.png', - "stellardelight_nanomap_z1.png" = 'icons/_nanomaps/sd_deck1.png', - "stellardelight_nanomap_z2.png" = 'icons/_nanomaps/sd_deck2.png', - "stellardelight_nanomap_z3.png" = 'icons/_nanomaps/sd_deck3.png', - - // VOREStation Edit End - ) ->>>>>>> 55ee669869... Merge pull request #11710 from Very-Soft/SDremaster