From a1a49d1c7ca22fcc7c679aaa0df2272f1718ae5b Mon Sep 17 00:00:00 2001 From: Warfan1815 Date: Sat, 26 Aug 2023 16:22:18 +0100 Subject: [PATCH] Map compatability fixes --- .../modules/mob/new_player/sprite_accessories/undershirt.dm | 2 +- code/modules/mob/new_player/sprite_accessories/underwear.dm | 2 +- code/modules/projectiles/gun_attachables.dm | 6 +++--- maps/khami_barrens.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories/undershirt.dm b/code/modules/mob/new_player/sprite_accessories/undershirt.dm index cc2281f5e848..a96303fbebd8 100644 --- a/code/modules/mob/new_player/sprite_accessories/undershirt.dm +++ b/code/modules/mob/new_player/sprite_accessories/undershirt.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_INIT_TYPED(undershirt_f, /datum/sprite_accessory/undershirt, setup_u selected_icon_state = "c_" + selected_icon_state if(MAP_LV_624, MAP_RUNTIME, MAP_NEW_VARADERO) selected_icon_state = "j_" + selected_icon_state - if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO) + if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO, MAP_KHAMI_BARRENS) selected_icon_state = "d_" + selected_icon_state if(MAP_CORSAT, MAP_SOROKYNE_STRATA, MAP_ICE_COLONY, MAP_ICE_COLONY_V3) selected_icon_state = "s_" + selected_icon_state diff --git a/code/modules/mob/new_player/sprite_accessories/underwear.dm b/code/modules/mob/new_player/sprite_accessories/underwear.dm index a558b9459d25..4853a7ede337 100644 --- a/code/modules/mob/new_player/sprite_accessories/underwear.dm +++ b/code/modules/mob/new_player/sprite_accessories/underwear.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_INIT_TYPED(underwear_f, /datum/sprite_accessory/underwear, setup_und selected_icon_state = "c_" + selected_icon_state if(MAP_LV_624, MAP_RUNTIME, MAP_NEW_VARADERO) selected_icon_state = "j_" + selected_icon_state - if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO) + if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO, MAP_KHAMI_BARRENS) selected_icon_state = "d_" + selected_icon_state if(MAP_CORSAT, MAP_SOROKYNE_STRATA, MAP_ICE_COLONY, MAP_ICE_COLONY_V3) selected_icon_state = "s_" + selected_icon_state diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 7d2dbf5288be..0afbd3613448 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -815,7 +815,7 @@ Defined in conflicts.dm of the #defines folder. switch(SSmapping.configs[GROUND_MAP].map_name) // maploader TODO: json if(MAP_ICE_COLONY, MAP_ICE_COLONY_V3, MAP_CORSAT, MAP_SOROKYNE_STRATA) attach_icon = new_attach_icon ? new_attach_icon : "s_" + attach_icon - if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO) + if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO, MAP_KHAMI_BARRENS) attach_icon = new_attach_icon ? new_attach_icon : "d_" + attach_icon if(MAP_PRISON_STATION, MAP_PRISON_STATION_V3, MAP_LV522_CHANCES_CLAIM) attach_icon = new_attach_icon ? new_attach_icon : "c_" + attach_icon @@ -1623,7 +1623,7 @@ Defined in conflicts.dm of the #defines folder. switch(SSmapping.configs[GROUND_MAP].map_name) // maploader TODO: json if(MAP_ICE_COLONY, MAP_ICE_COLONY_V3, MAP_CORSAT, MAP_SOROKYNE_STRATA) attach_icon = new_attach_icon ? new_attach_icon : "s_" + attach_icon - if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO) + if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO, MAP_KHAMI_BARRENS) attach_icon = new_attach_icon ? new_attach_icon : "d_" + attach_icon if(MAP_PRISON_STATION, MAP_PRISON_STATION_V3, MAP_LV522_CHANCES_CLAIM) attach_icon = new_attach_icon ? new_attach_icon : "c_" + attach_icon @@ -1650,7 +1650,7 @@ Defined in conflicts.dm of the #defines folder. switch(SSmapping.configs[GROUND_MAP].map_name) // maploader TODO: json if(MAP_ICE_COLONY, MAP_ICE_COLONY_V3, MAP_CORSAT, MAP_SOROKYNE_STRATA) attach_icon = new_attach_icon ? new_attach_icon : "s_" + attach_icon - if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO) + if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO, MAP_KHAMI_BARRENS) attach_icon = new_attach_icon ? new_attach_icon : "d_" + attach_icon if(MAP_PRISON_STATION, MAP_PRISON_STATION_V3, MAP_LV522_CHANCES_CLAIM) attach_icon = new_attach_icon ? new_attach_icon : "c_" + attach_icon diff --git a/maps/khami_barrens.json b/maps/khami_barrens.json index 0ab6e49b9679..6b29701209b1 100644 --- a/maps/khami_barrens.json +++ b/maps/khami_barrens.json @@ -1,7 +1,7 @@ { "map_name": "Khami Barrens", - "map_path": "map_files/Khami Barrens", - "map_file": "Khami Barrens.dmm", + "map_path": "map_files/Khami_Barrens", + "map_file": "Khami_Barrens.dmm", "webmap_url": "Khami_Barrens", "survivor_types": [