diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
index b783a48b9b9..33244c6b016 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
@@ -516,7 +516,7 @@
 	},
 /area/ruin/powered)
 "bt" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /turf/open/floor/plasteel{
 	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
 	},
diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm
index 50c51949cf9..b40e2d86185 100644
--- a/_maps/RandomZLevels/centcomAway.dmm
+++ b/_maps/RandomZLevels/centcomAway.dmm
@@ -2519,7 +2519,7 @@
 /turf/open/floor/engine,
 /area/awaymission/centcomAway/general)
 "hW" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index ab20ffb5548..6bdfdaf1e86 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -7030,7 +7030,7 @@
 	name = "MO19 Research"
 	})
 "jq" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	desc = "A plastic potted plant.";
 	layer = 4.1;
 	pixel_y = 3
@@ -10176,7 +10176,7 @@
 	name = "MO19 Arrivals"
 	})
 "ob" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	desc = "A plastic potted plant.";
 	layer = 4.1;
 	pixel_y = 3
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index 452affb8ddf..be9f8f18488 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -123,7 +123,7 @@
 /turf/open/floor/plasteel/whiteyellow/side,
 /area/awaymission/research/interior/engineering)
 "ax" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-20";
 	layer = 4.1;
 	pixel_y = 3
@@ -1385,7 +1385,7 @@
 /turf/open/floor/plasteel/black,
 /area/awaymission/research/interior/secure)
 "dN" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-16";
 	layer = 4.1
 	},
@@ -3001,7 +3001,7 @@
 /turf/open/floor/plasteel/purple,
 /area/awaymission/research/interior/genetics)
 "hV" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-10";
 	layer = 4.1
 	},
@@ -3086,8 +3086,8 @@
 /turf/open/floor/plasteel/red,
 /area/awaymission/research/interior/security)
 "ii" = (
-/obj/structure/flora/kirbyplants/dead{
-	desc = "A potted plant, it doesn't look very healthy..";
+/obj/item/weapon/twohanded/required/kirbyplants{
+	desc = "A potted plant, it doesn't look very healthy...";
 	name = "dead potted plant"
 	},
 /turf/open/floor/plasteel/whitered/corner{
@@ -3508,7 +3508,7 @@
 /turf/open/floor/wood,
 /area/awaymission/research/interior/dorm)
 "jm" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-14";
 	layer = 4.1
 	},
@@ -3978,7 +3978,7 @@
 /turf/open/floor/plating,
 /area/awaymission/research/interior/medbay)
 "kC" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/yellowsiding{
@@ -4316,7 +4316,7 @@
 	},
 /area/awaymission/research/interior/medbay)
 "ly" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-16";
 	layer = 4.1
 	},
@@ -4773,7 +4773,7 @@
 	},
 /area/awaymission/research/interior/escapepods)
 "mJ" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	layer = 4.1
 	},
 /turf/open/floor/plasteel/whitegreen/side{
@@ -4809,7 +4809,7 @@
 /turf/open/floor/grass,
 /area/awaymission/research/interior/escapepods)
 "mN" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "applebush";
 	layer = 4.1
 	},
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 87b971c8f8d..f4bb019090d 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -2030,7 +2030,7 @@
 	name = "UO45 Central Hall"
 	})
 "do" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	layer = 5
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -3814,7 +3814,7 @@
 	name = "UO45 Central Hall"
 	})
 "fT" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	layer = 5
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -6672,7 +6672,7 @@
 	name = "UO45 Gateway"
 	})
 "kh" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	layer = 5
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -8742,7 +8742,7 @@
 	})
 "mQ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	layer = 5
 	},
 /turf/open/floor/plasteel/cafeteria{
@@ -10726,7 +10726,7 @@
 	name = "UO45 Research"
 	})
 "pl" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	layer = 5
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -12210,7 +12210,7 @@
 	name = "UO45 Engineering"
 	})
 "rk" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	layer = 5
 	},
 /turf/open/floor/plasteel/yellow/side{
@@ -16005,7 +16005,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	layer = 5
 	},
 /obj/effect/decal/cleanable/dirt,
diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm
index 5354fc8d39f..a4b2dd8075e 100644
--- a/_maps/shuttles/emergency_bar.dmm
+++ b/_maps/shuttles/emergency_bar.dmm
@@ -174,7 +174,7 @@
 	pixel_x = 6;
 	pixel_y = 24
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1;
 	pixel_x = -3;
@@ -324,7 +324,7 @@
 /turf/open/floor/plasteel/bar,
 /area/shuttle/escape)
 "bc" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1;
 	pixel_x = -3;
@@ -505,7 +505,7 @@
 /turf/open/floor/plasteel/shuttle/red,
 /area/shuttle/escape)
 "bG" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1;
 	pixel_x = -3;
diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm
index 129fd3bedd7..b664d550b02 100644
--- a/_maps/shuttles/emergency_birdboat.dmm
+++ b/_maps/shuttles/emergency_birdboat.dmm
@@ -98,7 +98,7 @@
 /turf/open/floor/plasteel/shuttle,
 /area/shuttle/escape)
 "ar" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/shuttle,
@@ -217,7 +217,7 @@
 	},
 /area/shuttle/escape)
 "aM" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1
 	},
diff --git a/_maps/shuttles/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency_imfedupwiththisworld.dmm
index 421d59794b5..ca6eada0932 100644
--- a/_maps/shuttles/emergency_imfedupwiththisworld.dmm
+++ b/_maps/shuttles/emergency_imfedupwiththisworld.dmm
@@ -136,7 +136,7 @@
 /turf/open/floor/carpet,
 /area/shuttle/escape)
 "y" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /turf/open/floor/wood,
 /area/shuttle/escape)
 "z" = (
diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm
index 407a6ecc12b..bce32374005 100644
--- a/_maps/shuttles/ferry_lighthouse.dmm
+++ b/_maps/shuttles/ferry_lighthouse.dmm
@@ -282,7 +282,7 @@
 /turf/open/floor/wood,
 /area/shuttle/transport)
 "bd" = (
-/obj/structure/flora/kirbyplants/dead{
+/obj/item/weapon/twohanded/required/kirbyplants/dead{
 	desc = "It doesn't look very healthy...";
 	name = "potted plant"
 	},
diff --git a/tools/travis/dm.sh b/tools/travis/dm.sh
index 167d494f851..8b3fb380114 100755
--- a/tools/travis/dm.sh
+++ b/tools/travis/dm.sh
@@ -50,7 +50,7 @@ done
 if [[ `uname` == MINGW* ]]
 then
 	dm=""
-	
+
 	if hash dm.exe 2>/dev/null
 	then
 		dm='dm.exe'
@@ -61,13 +61,13 @@ then
 	then
 		dm='/c/Program Files/BYOND/bin/dm.exe'
 	fi
-	
+
 	if [[ $dm == "" ]]
 	then
 		echo "Couldn't find the DreamMaker executable, aborting."
 		exit 3
 	fi
-	
+
 	"$dm" $dmepath.mdme 2>&1 | tee result.log
 	retval=$?
 	if ! grep '\- 0 errors, 0 warnings' result.log
@@ -79,7 +79,7 @@ else
 	then
 		DreamMaker $dmepath.mdme 2>&1 | tee result.log
 		retval=$?
-		if ! grep '0 errors, 0 warnings' result.log
+		if ! grep '\- 0 errors, 0 warnings' result.log
 		then
 			retval=1 #hard fail, due to warnings or errors
 		fi