diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index a250fd5bade..a5889f416ea 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -74,11 +74,13 @@
 		if(istype(charging, /obj/item/weapon/melee/baton))
 			var/obj/item/weapon/melee/baton/B = charging
 			if(B.bcell)
-				B.bcell.give(175)
-				icon_state = "recharger1"
-				use_power(200)
+				if(B.bcell.give(175))
+					icon_state = "recharger1"
+					use_power(200)
+				else
+					icon_state = "recharger2"
 			else
-				icon_state = "recharger2"
+				icon_state = "recharger3"
 
 
 /obj/machinery/recharger/emp_act(severity)
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index decfff21925..0a3c655ba23 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -188,4 +188,14 @@
 
 /obj/structure/flora/ausbushes/fullgrass/New()
 	icon_state = "fullgrass_[rand(1, 3)]"
-	..()
\ No newline at end of file
+	..()
+
+/obj/structure/flora/kirbyplants
+	name = "Potted plant"
+	icon = 'icons/obj/flora/plants.dmi'
+	icon_state = "plant-01"
+
+/obj/structure/flora/kirbyplants/dead
+	name = "RD's potted plant"
+	desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..."
+	icon_state = "plant-25"
\ No newline at end of file
diff --git a/icons/effects/plasma.dmi b/icons/effects/plasma.dmi
deleted file mode 100644
index bf287fde3ec..00000000000
Binary files a/icons/effects/plasma.dmi and /dev/null differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index b735fcd37e1..5898debbf06 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 0ab279a3c06..1204708ac70 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 4710aaf0662..b75d338d141 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ