Merge branch 'master' into blank-forms

shiptest-ss13 · Sep 1, 2023 · f4bbc96 · f4bbc96
2 parents aebdbbc + 5141298
commit f4bbc96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml
@@ -0,0 +1,3 @@
+2023-09-01:
+  spockye:
+  - bugfix: fixed the jukebox/boombox/discomachine inactive sprite being invisisble
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi