cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-09-22 20:58:42 -07:00
committed by GitHub
parent 6205444c9d
commit bc460d2ca0
1 changed files with 0 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
code/modules/asset_cache/asset_list_items.dm
View File

@@ -508,7 +508,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',
@@ -521,55 +520,5 @@
"southern_cross_nanomap_z9.png" = 'icons/_nanomaps/southern_cross_nanomap_z9.png',
"southern_cross_nanomap_z10.png" = 'icons/_nanomaps/southern_cross_nanomap_z10.png',
"southern_cross_nanomap_z11.png" = 'icons/_nanomaps/southern_cross_nanomap_z11.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',
// CHOMP 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',
"groundbase_nanomap_z1.png" = 'icons/_nanomaps/gb1.png',
"groundbase_nanomap_z2.png" = 'icons/_nanomaps/gb2.png',
"groundbase_nanomap_z3.png" = 'icons/_nanomaps/gb3.png',
"groundbase_nanomap_z4.png" = 'icons/_nanomaps/gbnorth.png',
"groundbase_nanomap_z5.png" = 'icons/_nanomaps/gbsouth.png',
"groundbase_nanomap_z6.png" = 'icons/_nanomaps/gbeast.png',
"groundbase_nanomap_z7.png" = 'icons/_nanomaps/gbwest.png',
"groundbase_nanomap_z10.png" = 'icons/_nanomaps/gbmining.png',
// VOREStation Edit End
>>>>>>> bfa1362da2... Merge pull request #13780 from ItsSelis/tooltips-stuff
)