cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ambient occlusion on xeno weeds and wall corners (#37987)

Browse Source
This commit is contained in:
Tad Hardesty
2018-05-24 02:28:51 -07:00
committed by vuonojenmustaturska
parent 60238ecd51
commit 21c9dd86a5
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/__HELPERS/icon_smoothing.dm
View File

@@ -117,7 +117,7 @@
return return
if(QDELETED(A)) if(QDELETED(A))
return return
if((A.smooth & SMOOTH_TRUE) || (A.smooth & SMOOTH_MORE)) if(A.smooth & (SMOOTH_TRUE | SMOOTH_MORE))
var/adjacencies = calculate_adjacencies(A) var/adjacencies = calculate_adjacencies(A)
if(A.smooth & SMOOTH_DIAGONAL) if(A.smooth & SMOOTH_DIAGONAL)
@@ -156,7 +156,7 @@
/turf/closed/wall/diagonal_smooth(adjacencies) /turf/closed/wall/diagonal_smooth(adjacencies)
adjacencies = reverse_ndir(..()) adjacencies = reverse_ndir(..())
if(adjacencies) if(adjacencies)
var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER) var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, plane = FLOOR_PLANE)
var/list/U = list(underlay_appearance) var/list/U = list(underlay_appearance)
if(fixed_underlay) if(fixed_underlay)
if(fixed_underlay["space"]) if(fixed_underlay["space"])

11
code/_globalvars/bitfields.dm
View File

@@ -130,12 +130,19 @@ GLOBAL_LIST_INIT(bitfields, list(
"MASKINTERNALS" = MASKINTERNALS, "MASKINTERNALS" = MASKINTERNALS,
"NOSLIP" = NOSLIP, "NOSLIP" = NOSLIP,
"THICKMATERIAL" = THICKMATERIAL, "THICKMATERIAL" = THICKMATERIAL,
), ),
"tesla_flags" = list( "tesla_flags" = list(
"TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE, "TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE,
"TESLA_OBJ_DAMAGE" = TESLA_OBJ_DAMAGE, "TESLA_OBJ_DAMAGE" = TESLA_OBJ_DAMAGE,
"TESLA_MOB_STUN" = TESLA_MOB_STUN, "TESLA_MOB_STUN" = TESLA_MOB_STUN,
"TESLA_ALLOW_DUPLICATES" = TESLA_ALLOW_DUPLICATES, "TESLA_ALLOW_DUPLICATES" = TESLA_ALLOW_DUPLICATES,
"TESLA_MACHINE_EXPLOSIVE" = TESLA_MACHINE_EXPLOSIVE, "TESLA_MACHINE_EXPLOSIVE" = TESLA_MACHINE_EXPLOSIVE,
) ),
"smooth" = list(
"SMOOTH_TRUE" = SMOOTH_TRUE,
"SMOOTH_MORE" = SMOOTH_MORE,
"SMOOTH_DIAGONAL" = SMOOTH_DIAGONAL,
"SMOOTH_BORDER" = SMOOTH_BORDER,
"SMOOTH_QUEUED" = SMOOTH_QUEUED,
),
)) ))

1
code/game/objects/structures/aliens.dm
View File

@@ -115,6 +115,7 @@
anchored = TRUE anchored = TRUE
density = FALSE density = FALSE
layer = TURF_LAYER layer = TURF_LAYER
plane = FLOOR_PLANE
icon_state = "weeds" icon_state = "weeds"
max_integrity = 15 max_integrity = 15
canSmoothWith = list(/obj/structure/alien/weeds, /turf/closed/wall) canSmoothWith = list(/obj/structure/alien/weeds, /turf/closed/wall)