mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +01:00
Non-tiled floor dont have tiled water overlays (#93853)
## About The Pull Request changes tiled_dirt to just tiled_turf and expands its use slightly to be the "i have a 2x2 tile sprite" <img width="864" height="691" alt="image" src="https://github.com/user-attachments/assets/78a7ba96-fffe-42e1-9eef-35b96b22481b" /> https://github.com/user-attachments/assets/7a273302-a331-48b2-a06f-d65bddf13bfd ## Why It's Good For The Game its silly for things that arent visually tiled to use the tiled water sprite ## Changelog 🆑 fix: stuff like carpet and wood tiles dont use the 2x2 tiled sprite fix: similarly, floors that dont use the tiled sprite now can have permafrost sprites (as they are not tiled) /🆑
This commit is contained in:
@@ -54,28 +54,25 @@
|
||||
return ..()
|
||||
|
||||
/datum/component/wet_floor/proc/update_overlay()
|
||||
var/turf/parent_turf = parent
|
||||
if(!should_display_overlay)
|
||||
if(!current_overlay)
|
||||
return
|
||||
|
||||
var/turf/parent_turf = parent
|
||||
parent_turf.cut_overlay(current_overlay)
|
||||
current_overlay = null
|
||||
return
|
||||
|
||||
var/intended
|
||||
if(!isfloorturf(parent))
|
||||
intended = generic_turf_overlay
|
||||
else
|
||||
switch(highest_strength)
|
||||
if(TURF_WET_PERMAFROST)
|
||||
intended = permafrost_overlay
|
||||
if(TURF_WET_ICE)
|
||||
intended = ice_overlay
|
||||
else
|
||||
intended = water_overlay
|
||||
switch(highest_strength)
|
||||
if(TURF_WET_PERMAFROST)
|
||||
intended = permafrost_overlay
|
||||
if(TURF_WET_ICE)
|
||||
// Should really get someone to make a generic_ice_overlay.
|
||||
intended = parent_turf.tiled_turf ? ice_overlay : generic_turf_overlay
|
||||
else
|
||||
intended = parent_turf.tiled_turf ? water_overlay : generic_turf_overlay
|
||||
if(current_overlay != intended)
|
||||
var/turf/parent_turf = parent
|
||||
parent_turf.cut_overlay(current_overlay)
|
||||
parent_turf.add_overlay(intended)
|
||||
current_overlay = intended
|
||||
|
||||
Reference in New Issue
Block a user