Skip to content

Commit

Permalink
Fixes reinforced walls reverting to the TG icon files when updating (#…
Browse files Browse the repository at this point in the history
…1088)

* Fixes hardcoded dmi file change

* Update reinf_walls.dm

* Update walls.dm

Co-authored-by: Bloop <[email protected]>
  • Loading branch information
Steals-The-PRs and vinylspiders authored Dec 12, 2023
1 parent 2dee69a commit 18e2469
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/game/turfs/closed/wall/reinf_walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,10 @@
// We don't react to smoothing changing here because this else exists only to "revert" intact changes
/turf/closed/wall/r_wall/update_icon_state()
if(d_state != INTACT)
icon = 'icons/turf/walls/reinforced_states.dmi'
icon = 'modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi' // SKYRAT EDIT CHANGE - ORIGINAL: icon = 'icons/turf/walls/reinforced_states.dmi'
icon_state = "[base_decon_state]-[d_state]"
else
icon = 'icons/turf/walls/reinforced_wall.dmi'
icon = 'modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi' // SKYRAT EDIT CHANGE - ORIGINAL: icon = 'icons/turf/walls/reinforced_wall.dmi'
icon_state = "[base_icon_state]-[smoothing_junction]"
return ..()

Expand Down
1 change: 1 addition & 0 deletions modular_skyrat/modules/aesthetics/walls/code/walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
icon = 'modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi'
icon_state = "reinforced_wall-0"
base_icon_state = "reinforced_wall"
base_decon_state = "r_wall"

/turf/closed/wall/material
icon = 'modular_skyrat/modules/aesthetics/walls/icons/material_wall.dmi'
Expand Down

0 comments on commit 18e2469

Please sign in to comment.