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

Fix decals on plating disappearing when you put flooring on and pry it back off.

Browse Source 
* Previously floor decals were stored in old_decals when converting to plating, then restored.   Now the reverse is also true,  under-floor decals are stored in old_decals when converting to flooring and then restored.
This commit is contained in:
Leshana
2018-01-25 16:29:02 -05:00
parent 98ccd298a7
commit 48d154b112
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/game/turfs/simulated/floor.dm
View File

@@ -48,10 +48,10 @@
make_plating(defer_icon_update = 1) make_plating(defer_icon_update = 1)
flooring = newflooring flooring = newflooring
footstep_sounds = newflooring.footstep_sounds footstep_sounds = newflooring.footstep_sounds
// VOREStation Edit - Remember decals from before we were pried up // VOREStation Edit - We are plating switching to flooring, swap out old_decals for decals
if(islist(old_decals)) var/tmp/list/overfloor_decals = old_decals
decals = old_decals old_decals = decals
old_decals = null decals = overfloor_decals
// VOREStation Edit End // VOREStation Edit End
update_icon(1) update_icon(1)
levelupdate() levelupdate()
@@ -61,12 +61,12 @@
/turf/simulated/floor/proc/make_plating(var/place_product, var/defer_icon_update) /turf/simulated/floor/proc/make_plating(var/place_product, var/defer_icon_update)
overlays.Cut() overlays.Cut()
if(islist(decals)) // VOREStation Edit - We are flooring switching to plating, swap out old_decals for decals.
// VOREStation Edit - Don't forget decals when pried up if(flooring)
if(flooring) var/tmp/list/underfloor_decals = old_decals
old_decals = decals old_decals = decals
// VOREStation Edit End decals = underfloor_decals
decals = null // VOREStation Edit End
name = base_name name = base_name
desc = base_desc desc = base_desc