From 2867e0156350f57f71d4d5582583cf4a6c86dd34 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sun, 17 Mar 2024 21:58:42 +0100 Subject: [PATCH 1/3] fixes carpets being invisible silly man forgot base icon states --- code/game/turfs/open/_open.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index 6994d4df97ad..4c71d6b75602 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -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 @@ -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 From b02f59d62148347d1df949df92b1592c41bc9065 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sun, 17 Mar 2024 22:09:18 +0100 Subject: [PATCH 2/3] fixes cog grille icons --- code/game/objects/structures/grille.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 29c265e7d88c..e22153ff390f 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -326,6 +326,12 @@ desc = "A strangely-shaped grille." broken_type = /obj/structure/grille/ratvar/broken + // These don't smooth + base_icon_state = null + smoothing_flags = NONE + smoothing_groups = null + canSmoothWith = null + /obj/structure/grille/ratvar/Initialize(mapload) . = ..() if(broken) From dca959974d8fc6250a1c7c2092092717d0663eee Mon Sep 17 00:00:00 2001 From: AMyriad Date: Sun, 17 Mar 2024 22:45:17 +0100 Subject: [PATCH 3/3] ye --- code/game/objects/structures/grille.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index e22153ff390f..bca62264764c 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -326,7 +326,7 @@ desc = "A strangely-shaped grille." broken_type = /obj/structure/grille/ratvar/broken - // These don't smooth + // These ones are too cool to smooth base_icon_state = null smoothing_flags = NONE smoothing_groups = null