Skip to content

Commit

Permalink
Map compatability fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Warfan1815 committed Aug 26, 2023
1 parent 60ead50 commit a1a49d1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions maps/khami_barrens.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down

0 comments on commit a1a49d1

Please sign in to comment.