Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

plating with tiles removed now remember what icon the tile came from too instead of just the icon_state #12690

Merged
SomeguyManperson merged 1 commit into from
Nov 22, 2021
Merged

plating with tiles removed now remember what icon the tile came from too instead of just the icon_state #12690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions code/game/turfs/simulated/floor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY

var/icon_regular_floor = "floor" //used to remember what icon the tile should have by default
var/icon_state_regular_floor = "floor" //used to remember what icon state the tile should have by default
var/icon_regular_floor = 'icons/turf/floors.dmi' //used to remember what icon the tile should have by default
var/icon_plating = "plating"
thermal_conductivity = 0.040
heat_capacity = 10000
Expand Down Expand Up @@ -51,9 +52,11 @@
"ironsand6", "ironsand7", "ironsand8", "ironsand9", "ironsand10", "ironsand11",
"ironsand12", "ironsand13", "ironsand14", "ironsand15")
if(broken || burnt || (icon_state in icons_to_ignore_at_floor_init)) //so damaged/burned tiles or plating icons aren't saved as the default
icon_regular_floor = "floor"
icon_state_regular_floor = "floor"
icon_regular_floor = 'icons/turf/floors.dmi'
else
icon_regular_floor = icon_state
icon_state_regular_floor = icon_state
icon_regular_floor = icon
if(mapload && prob(33))
MakeDirty()
if(is_station_level(z))
Expand Down Expand Up @@ -152,9 +155,11 @@
if(!ispath(path, /turf/open/floor))
return ..()
var/old_icon = icon_regular_floor
var/old_icon_state = icon_state_regular_floor
var/old_dir = dir
var/turf/open/floor/W = ..()
W.icon_regular_floor = old_icon
W.icon_state_regular_floor = old_icon_state
W.setDir(old_dir)
W.update_icon()
return W
Expand Down
6 changes: 3 additions & 3 deletions code/game/turfs/simulated/floor/misc_floor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,17 @@
/turf/open/floor/pod
name = "pod floor"
icon_state = "podfloor"
icon_regular_floor = "podfloor"
icon_state_regular_floor = "podfloor"
floor_tile = /obj/item/stack/tile/pod

/turf/open/floor/pod/light
icon_state = "podfloor_light"
icon_regular_floor = "podfloor_light"
icon_state_regular_floor = "podfloor_light"
floor_tile = /obj/item/stack/tile/pod/light

/turf/open/floor/pod/dark
icon_state = "podfloor_dark"
icon_regular_floor = "podfloor_dark"
icon_state_regular_floor = "podfloor_dark"
floor_tile = /obj/item/stack/tile/pod/dark


Expand Down
3 changes: 2 additions & 1 deletion code/game/turfs/simulated/floor/plasteel_floor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
if(!..())
return 0
if(!broken && !burnt)
icon_state = icon_regular_floor
icon = icon_regular_floor
icon_state = icon_state_regular_floor


/turf/open/floor/plasteel/airless
Expand Down