diff --git a/html/changelogs/nonno - changelog.yml b/html/changelogs/nonno - changelog.yml
new file mode 100644
index 00000000000..8d34c9a340d
--- /dev/null
+++ b/html/changelogs/nonno - changelog.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: nonno
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - imageadd: "Changing the chemmaster, chemheater, chemdispenser, coffee machine, booze dispenser, soda dispenser to the /tg/ ones which are in 3/4, are animated"
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index 2d895e623cb..9fe537679da 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index 19635345ae0..fa380d9d55a 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -741,6 +741,23 @@
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"abN" = (
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/obj/machinery/chem_master{
+ dir = 8;
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/effect/floor_decal/corner_wide/mauve/full{
+ icon_state = "wide_corner_full";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/rnd/xenobiology/xenoflora)
"abO" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
@@ -38343,22 +38360,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/test_range)
-"xSP" = (
-/obj/structure/window/reinforced{
- icon_state = "rwindow";
- dir = 4
- },
-/obj/structure/window/reinforced,
-/obj/machinery/chem_master{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/effect/floor_decal/corner_wide/mauve/full{
- icon_state = "wide_corner_full";
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/rnd/xenobiology/xenoflora)
"xUc" = (
/obj/machinery/door/firedoor,
/obj/structure/table/reinforced,
@@ -56712,7 +56713,7 @@ aba
kJR
aAo
rKS
-xSP
+abN
pdV
waa
bEO
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 6cdda792196..a0c9b7eefcb 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -7383,6 +7383,20 @@
},
/turf/simulated/floor/carpet,
/area/crew_quarters/bar)
+"ano" = (
+/obj/machinery/camera/network/research{
+ c_tag = "Research - Exploratory Chemistry";
+ dir = 1
+ },
+/obj/machinery/chemical_dispenser/full{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner_wide/mauve{
+ icon_state = "wide_corner";
+ dir = 10
+ },
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
"anp" = (
/obj/machinery/door/firedoor{
enable_smart_generation = 0
@@ -9398,6 +9412,16 @@
/obj/item/modular_computer/console/preset/engineering,
/turf/simulated/floor/tiled,
/area/bridge)
+"aqQ" = (
+/obj/machinery/chem_master{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner_wide/mauve{
+ icon_state = "wide_corner";
+ dir = 10
+ },
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
"aqR" = (
/obj/structure/cable/green{
d1 = 1;
@@ -12068,6 +12092,16 @@
},
/turf/simulated/floor/wood,
/area/lawoffice)
+"ava" = (
+/obj/machinery/chem_master{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/orange{
+ icon_state = "corner_white";
+ dir = 6
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/pharmacy)
"avb" = (
/obj/machinery/light{
dir = 8
@@ -14222,6 +14256,16 @@
},
/turf/simulated/floor/carpet,
/area/lawoffice)
+"ays" = (
+/obj/machinery/chemical_dispenser{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/green{
+ icon_state = "corner_white";
+ dir = 5
+ },
+/turf/simulated/floor/tiled,
+/area/hydroponics)
"ayt" = (
/obj/machinery/photocopier,
/turf/simulated/floor/wood,
@@ -33255,14 +33299,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/pharmacy)
-"bdv" = (
-/obj/machinery/chem_master,
-/obj/effect/floor_decal/corner/orange{
- icon_state = "corner_white";
- dir = 6
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/pharmacy)
"bdw" = (
/obj/structure/closet/wardrobe/pharmacy_white,
/obj/machinery/firealarm/east,
@@ -48763,26 +48799,6 @@
/obj/effect/floor_decal/corner_wide/mauve/full,
/turf/simulated/floor/tiled/white,
/area/rnd/chemistry)
-"bGc" = (
-/obj/machinery/camera/network/research{
- c_tag = "Research - Exploratory Chemistry";
- dir = 1
- },
-/obj/machinery/chemical_dispenser/full,
-/obj/effect/floor_decal/corner_wide/mauve{
- icon_state = "wide_corner";
- dir = 10
- },
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
-"bGd" = (
-/obj/machinery/chem_master,
-/obj/effect/floor_decal/corner_wide/mauve{
- icon_state = "wide_corner";
- dir = 10
- },
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
"bGe" = (
/obj/machinery/door/firedoor,
/obj/structure/window/reinforced{
@@ -51546,14 +51562,6 @@
/obj/item/reagent_containers/chem_disp_cartridge,
/turf/simulated/floor/tiled,
/area/hydroponics)
-"bMl" = (
-/obj/machinery/chemical_dispenser,
-/obj/effect/floor_decal/corner/green{
- icon_state = "corner_white";
- dir = 5
- },
-/turf/simulated/floor/tiled,
-/area/hydroponics)
"bMm" = (
/obj/effect/floor_decal/corner/green{
icon_state = "corner_white";
@@ -94742,7 +94750,7 @@ iPv
bDr
bFg
bFd
-bGc
+ano
iPv
bHW
avc
@@ -94999,7 +95007,7 @@ iPv
bDs
bFi
bFg
-bGd
+aqQ
iPv
pBN
awB
@@ -102942,7 +102950,7 @@ aZE
baL
bbQ
bdr
-bdv
+ava
dGq
bjR
biO
@@ -103487,7 +103495,7 @@ rWM
bKa
bKT
bLF
-bMl
+ays
rWM
bNJ
bGr