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

Fixes invisible carpets and clockwork grilles #21687

Merged
ToasterBiome merged 3 commits into from
Mar 18, 2024
Merged

Fixes invisible carpets and clockwork grilles #21687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2867e01
fixes carpets being invisible
AMyriad Mar 17, 2024
b02f59d
fixes cog grille icons
AMyriad Mar 17, 2024
dca9599
ye
AMyriad Mar 17, 2024
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
6 changes: 6 additions & 0 deletions code/game/objects/structures/grille.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,12 @@
desc = "A strangely-shaped grille."
broken_type = /obj/structure/grille/ratvar/broken

// These ones are too cool to smooth
base_icon_state = null
smoothing_flags = NONE
smoothing_groups = null
canSmoothWith = null

/obj/structure/grille/ratvar/Initialize(mapload)
. = ..()
if(broken)
Expand Down
10 changes: 10 additions & 0 deletions code/game/turfs/open/_open.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
desc = "Soft velvet carpeting. Feels good between your toes."
icon = 'icons/turf/floors/carpet.dmi'
icon_state = "carpet-255"
base_icon_state = "carpet"
flags_1 = NONE
bullet_bounce_sound = null
footstep = FOOTSTEP_CARPET
Expand All @@ -184,54 +185,63 @@
/turf/open/indestructible/carpet/black
icon = 'icons/turf/floors/carpet_black.dmi'
icon_state = "carpet_black-255"
base_icon_state = "carpet_black"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_BLACK
canSmoothWith = SMOOTH_GROUP_CARPET_BLACK

/turf/open/indestructible/carpet/blue
icon = 'icons/turf/floors/carpet_blue.dmi'
icon_state = "carpet_blue-255"
base_icon_state = "carpet_blue"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_BLUE
canSmoothWith = SMOOTH_GROUP_CARPET_BLUE

/turf/open/indestructible/carpet/cyan
icon = 'icons/turf/floors/carpet_cyan.dmi'
icon_state = "carpet_cyan-255"
base_icon_state = "carpet_cyan"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_CYAN
canSmoothWith = SMOOTH_GROUP_CARPET_CYAN

/turf/open/indestructible/carpet/green
icon = 'icons/turf/floors/carpet_green.dmi'
icon_state = "carpet_green-255"
base_icon_state = "carpet_green"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_GREEN
canSmoothWith = SMOOTH_GROUP_CARPET_GREEN

/turf/open/indestructible/carpet/orange
icon = 'icons/turf/floors/carpet_orange.dmi'
icon_state = "carpet_orange-255"
base_icon_state = "carpet_orange"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_ORANGE
canSmoothWith = SMOOTH_GROUP_CARPET_ORANGE

/turf/open/indestructible/carpet/purple
icon = 'icons/turf/floors/carpet_purple.dmi'
icon_state = "carpet_purple-255"
base_icon_state = "carpet_purple"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_PURPLE
canSmoothWith = SMOOTH_GROUP_CARPET_PURPLE

/turf/open/indestructible/carpet/red
icon = 'icons/turf/floors/carpet_red.dmi'
icon_state = "carpet_red-255"
base_icon_state = "carpet_red"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_RED
canSmoothWith = SMOOTH_GROUP_CARPET_RED

/turf/open/indestructible/carpet/royalblack
icon = 'icons/turf/floors/carpet_royalblack.dmi'
icon_state = "carpet_royalblack-255"
base_icon_state = "carpet_royalblack"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_ROYAL_BLACK
canSmoothWith = SMOOTH_GROUP_CARPET_ROYAL_BLACK

/turf/open/indestructible/carpet/royalblue
icon = 'icons/turf/floors/carpet_royalblue.dmi'
icon_state = "carpet_royalblue-255"
base_icon_state = "carpet_royalblue"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_ROYAL_BLUE
canSmoothWith = SMOOTH_GROUP_CARPET_ROYAL_BLUE

Expand Down