diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 1b217511146..2576748c3b3 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -214,8 +214,6 @@ if (glass) paintable |= AIRLOCK_PAINTABLE_WINDOW window_material = SSmaterials.get_material_by_name(init_material_window) - if (!window_color) - window_color = window_material.icon_colour opacity = FALSE update_icon() @@ -460,8 +458,6 @@ /obj/machinery/door/airlock/proc/paint_window(paint_color) if (paint_color) window_color = paint_color - else if (window_material?.icon_colour) - window_color = window_material.icon_colour else window_color = GLASS_COLOR update_icon() diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 5d5bfca4c94..95830717079 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -26,6 +26,7 @@ return icon_state = "[material.shard_icon][pick("large", "medium", "small")]" + randpixel_xy() update_icon() diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index 93f0915ec63..073ff032dc7 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -494,7 +494,7 @@ stack_type = /obj/item/stack/material/glass table_icon = 'icons/obj/structure/tables/glass_table.dmi' flags = MATERIAL_BRITTLE - icon_colour = null + icon_colour = "#00E1FF" opacity = 0.3 integrity = 100 shard_type = SHARD_SHARD diff --git a/html/changelogs/geeves-blue_shards.yml b/html/changelogs/geeves-blue_shards.yml new file mode 100644 index 00000000000..5249824824c --- /dev/null +++ b/html/changelogs/geeves-blue_shards.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed glass items, such as shards and ashtrays, not having the right color."