Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 8d9ff3e

Browse filesBrowse files
cowbot92cowbot92
authored
Fixes a critical smoothing error (yogstation13#22083)
* updates * yes
1 parent a2b36dd commit 8d9ff3e
Copy full SHA for 8d9ff3e

5 files changed

+8-6Lines changed: 8 additions & 6 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎code/game/turfs/open/_open.dm‎

Copy file name to clipboardExpand all lines: code/game/turfs/open/_open.dm
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,9 @@
554554
icon_state = "necro[rand(2,3)]"
555555

556556
/turf/open/indestructible/brazil/lostit
557-
icon = 'yogstation/icons/turf/floors/ballpit_smooth.dmi'
558-
icon_state = "smooth"
557+
icon = 'yogstation/icons/turf/floors/ballpit.dmi'
558+
icon_state = "ballpit-255"
559+
base_icon_state = "ballpit"
559560
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
560561
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_BRAZIL
561562
canSmoothWith = SMOOTH_GROUP_BRAZIL
Collapse file

‎yogstation/code/game/objects/items/stacks/tiles/tile_types.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/game/objects/items/stacks/tiles/tile_types.dm
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
name = "ball pit"
33
singular_name = "ball pit"
44
desc = "A bunch of balls compressed together to make a tile. Fun for the whole family!"
5-
icon = 'yogstation/icons/turf/floors/ballpit_smooth.dmi'
6-
icon_state = "smooth"
5+
icon = 'yogstation/icons/turf/floors/ballpit.dmi'
6+
icon_state = "ballpit"
77
turf_type = /turf/open/floor/ballpit
88
resistance_flags = FLAMMABLE
99
merge_type = /obj/item/stack/tile/ballpit
Collapse file

‎yogstation/code/game/turfs/simulated/floor/fancy_floor.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/game/turfs/simulated/floor/fancy_floor.dm
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/turf/open/floor/ballpit
22
desc = "A bunch of balls compressed together into a tile. Fun for the whole family!"
3-
icon = 'yogstation/icons/turf/floors/ballpit_smooth.dmi'
4-
icon_state = "smooth"
3+
icon = 'yogstation/icons/turf/floors/ballpit.dmi'
4+
icon_state = "ballpit-255"
5+
base_icon_state = "ballpit"
56
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
67
smoothing_groups = SMOOTH_GROUP_TURF_BALLPIT
78
canSmoothWith = SMOOTH_GROUP_TURF_BALLPIT
Collapse file

‎yogstation/icons/turf/floors/ballpit.dmi‎

Copy file name to clipboard
16.9 KB
Binary file not shown.
Collapse file

‎yogstation/icons/turf/floors/ballpit_smooth.dmi‎

Copy file name to clipboard
-13.1 KB
Binary file not shown.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.