From 74e451e7cebf0dbc358c467e4d49992843ec7af7 Mon Sep 17 00:00:00 2001
From: KorPhaeron <korphaeron@users.noreply.github.com>
Date: Sun, 19 Jun 2016 14:39:39 -0500
Subject: [PATCH] Sneaking Mission

---
 _maps/map_files/BirdStation/BirdStation.dmm   | 152 +++++++++---------
 .../map_files/DreamStation/dreamstation04.dmm |   2 +-
 .../EfficiencyStation/EfficiencyStation.dmm   |  24 +--
 _maps/map_files/MetaStation/MetaStation.dmm   |  72 ++++-----
 _maps/map_files/TgStation/tgstation.2.1.3.dmm |   2 +-
 _maps/map_files/generic/z2.dmm                |   6 +-
 code/game/asteroid.dm                         |   2 +-
 code/game/objects/structures/flora.dm         |  24 ++-
 code/modules/cargo/packs.dm                   |  10 +-
 9 files changed, 154 insertions(+), 140 deletions(-)

diff --git a/_maps/map_files/BirdStation/BirdStation.dmm b/_maps/map_files/BirdStation/BirdStation.dmm
index 12428390c64..7ae92f26c6e 100644
--- a/_maps/map_files/BirdStation/BirdStation.dmm
+++ b/_maps/map_files/BirdStation/BirdStation.dmm
@@ -2006,7 +2006,7 @@
 /turf/open/space,
 /area/space)
 "afl" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-17";
 	layer = 4.1
 	},
@@ -2829,7 +2829,7 @@
 	control_area = "AI Core Lobby";
 	pixel_x = 24
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-17";
 	layer = 4.1
 	},
@@ -3166,7 +3166,7 @@
 	name = "\improper Telecommunications Chamber"
 	})
 "aif" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -3448,7 +3448,7 @@
 	name = "\improper Command Hallway"
 	})
 "aiP" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-05";
 	layer = 4.1;
@@ -3885,7 +3885,7 @@
 	name = "\improper Command Hallway"
 	})
 "ajQ" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-17";
 	layer = 4.1
 	},
@@ -4227,7 +4227,7 @@
 /turf/open/floor/plasteel/black,
 /area/turret_protected/ai_upload)
 "akD" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -4265,7 +4265,7 @@
 	},
 /area/gateway)
 "akI" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -4279,7 +4279,7 @@
 /turf/open/floor/plasteel/black,
 /area/maintenance/fsmaint)
 "akK" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -4372,7 +4372,7 @@
 /turf/open/floor/bluegrid,
 /area/turret_protected/ai_upload)
 "akY" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-05";
 	layer = 4.1;
@@ -4387,7 +4387,7 @@
 /turf/closed/wall/r_wall,
 /area/maintenance/fsmaint)
 "ala" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-05";
 	layer = 4.1;
@@ -4499,7 +4499,7 @@
 /turf/open/floor/plating,
 /area/engine/engineering)
 "alq" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-16";
 	layer = 4.1
 	},
@@ -4508,7 +4508,7 @@
 	name = "\improper Command Hallway"
 	})
 "alr" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-16";
 	layer = 4.1
 	},
@@ -4546,7 +4546,7 @@
 /turf/open/floor/bluegrid,
 /area/turret_protected/ai_upload)
 "alu" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-05";
 	layer = 4.1;
@@ -4596,7 +4596,7 @@
 	name = "\improper Command Hallway"
 	})
 "alz" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-04";
 	layer = 4.1
 	},
@@ -5199,13 +5199,13 @@
 	name = "\improper Northwest Hallway"
 	})
 "anc" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /turf/open/floor/plasteel,
 /area/hallway/primary/port{
 	name = "\improper Northwest Hallway"
 	})
 "and" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /obj/machinery/camera/autoname{
 	dir = 8
 	},
@@ -5347,7 +5347,7 @@
 /turf/open/floor/wood,
 /area/maintenance/fsmaint)
 "ant" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-05";
 	layer = 4.1;
@@ -6093,7 +6093,7 @@
 	name = "Emergency Air Pumps"
 	})
 "apd" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-16";
 	layer = 4.1
 	},
@@ -6263,7 +6263,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -6281,7 +6281,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -7323,7 +7323,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -7351,7 +7351,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -7592,7 +7592,7 @@
 	name = "\improper AI Core"
 	})
 "asG" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-17";
 	layer = 4.1
 	},
@@ -7851,7 +7851,7 @@
 	name = "Emergency Air Pumps"
 	})
 "atn" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -7988,7 +7988,7 @@
 /turf/open/floor/plating,
 /area/maintenance/fsmaint)
 "atC" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/wood,
@@ -8417,7 +8417,7 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/sleep)
 "auM" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-06";
 	level = 4.1
 	},
@@ -8642,7 +8642,7 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "avm" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -8809,7 +8809,7 @@
 	icon_state = "term";
 	dir = 4
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -9218,7 +9218,7 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/sleep)
 "awN" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-06";
 	level = 4.1
 	},
@@ -9371,7 +9371,7 @@
 /turf/open/floor/wood,
 /area/library)
 "axl" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/wood,
@@ -9402,7 +9402,7 @@
 /turf/closed/wall,
 /area/library)
 "axs" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-06";
 	level = 4.1
 	},
@@ -10160,7 +10160,7 @@
 /turf/open/floor/wood,
 /area/library)
 "azo" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-06";
 	level = 4.1
 	},
@@ -10458,7 +10458,7 @@
 /turf/open/floor/wood,
 /area/hallway/primary/central)
 "aAd" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /obj/machinery/camera/autoname{
@@ -11251,7 +11251,7 @@
 /turf/open/floor/plasteel/white,
 /area/maintenance/asmaint2)
 "aBW" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -11464,7 +11464,7 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/sleep)
 "aCu" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -12501,7 +12501,7 @@
 /turf/open/floor/plasteel/shuttle,
 /area/shuttle/escape)
 "aET" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/shuttle,
@@ -12831,7 +12831,7 @@
 /turf/open/floor/plating,
 /area/hallway/secondary/exit)
 "aFM" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-05";
 	layer = 4.1;
@@ -12982,7 +12982,7 @@
 	name = "\improper Bar and Kitchen"
 	})
 "aGc" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-16";
 	layer = 4.1
 	},
@@ -13219,7 +13219,7 @@
 /turf/open/floor/plasteel/stairs/right,
 /area/crew_quarters/theatre)
 "aGM" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-05";
 	layer = 4.1;
@@ -13465,7 +13465,7 @@
 	name = "\improper Bar and Kitchen"
 	})
 "aHt" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -13608,7 +13608,7 @@
 /turf/open/floor/plating,
 /area/maintenance/asmaint2)
 "aHS" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1
 	},
@@ -14429,7 +14429,7 @@
 	},
 /area/shuttle/escape)
 "aJO" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-05";
 	layer = 4.1;
@@ -14483,7 +14483,7 @@
 /turf/open/floor/plasteel/black,
 /area/hallway/secondary/exit)
 "aJV" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-21";
 	layer = 4.1;
@@ -14520,7 +14520,7 @@
 	icon_state = "tube1";
 	dir = 8
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -14530,7 +14530,7 @@
 /turf/open/floor/plasteel/black,
 /area/hallway/primary/central)
 "aKd" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -14690,7 +14690,7 @@
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "aKB" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-05";
 	layer = 4.1;
@@ -14714,7 +14714,7 @@
 /turf/open/floor/plasteel/black,
 /area/hallway/secondary/exit)
 "aKF" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-21";
 	layer = 4.1;
@@ -15009,7 +15009,7 @@
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "aLq" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -15023,7 +15023,7 @@
 /turf/open/floor/plasteel/black,
 /area/hallway/secondary/exit)
 "aLs" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -15035,7 +15035,7 @@
 /turf/open/floor/plasteel/black,
 /area/hallway/secondary/exit)
 "aLt" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-05";
 	layer = 4.1;
@@ -15045,7 +15045,7 @@
 /turf/open/floor/plasteel/black,
 /area/hallway/secondary/exit)
 "aLu" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	anchored = 1;
 	icon_state = "plant-21";
 	layer = 4.1;
@@ -15860,7 +15860,7 @@
 /turf/open/floor/plasteel/black,
 /area/security/brig)
 "aNm" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -15880,7 +15880,7 @@
 /turf/open/floor/plasteel/bot,
 /area/security/brig)
 "aNp" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -16049,7 +16049,7 @@
 /turf/open/floor/plasteel/black,
 /area/toxins/misc_lab)
 "aNN" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -16080,7 +16080,7 @@
 /turf/open/floor/plasteel/white,
 /area/toxins/xenobiology)
 "aNR" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -16177,7 +16177,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -16898,7 +16898,7 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay)
 "aPX" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1
 	},
@@ -18299,7 +18299,7 @@
 /turf/open/floor/plasteel/white,
 /area/toxins/xenobiology)
 "aTe" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1
 	},
@@ -18414,7 +18414,7 @@
 /turf/open/floor/plating,
 /area/toxins/xenobiology)
 "aTs" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -18478,7 +18478,7 @@
 /turf/open/floor/plasteel,
 /area/security/brig)
 "aTz" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1
 	},
@@ -18672,7 +18672,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-06";
 	level = 4.1
 	},
@@ -18681,7 +18681,7 @@
 	name = "Security Maintenance"
 	})
 "aTZ" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-06";
 	level = 4.1
 	},
@@ -18800,7 +18800,7 @@
 /turf/open/floor/plasteel,
 /area/security/brig)
 "aUl" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -18973,7 +18973,7 @@
 /turf/open/space,
 /area/space)
 "aUI" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/whitebot,
@@ -19182,7 +19182,7 @@
 /turf/open/space,
 /area/space)
 "aVk" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -19354,7 +19354,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -19363,7 +19363,7 @@
 	name = "Security Maintenance"
 	})
 "aVF" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -19549,7 +19549,7 @@
 /turf/closed/wall/mineral/sandstone,
 /area/maintenance/asmaint2)
 "aWc" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-17";
 	layer = 4.1
 	},
@@ -19599,7 +19599,7 @@
 /area/maintenance/asmaint2)
 "aWk" = (
 /obj/structure/window/reinforced,
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-17";
 	layer = 4.1
 	},
@@ -19973,7 +19973,7 @@
 /obj/structure/cable/cyan{
 	icon_state = "1-8"
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -20206,7 +20206,7 @@
 	name = "Security Maintenance"
 	})
 "aXL" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -20307,7 +20307,7 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/maintenance/asmaint2)
 "aXY" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-16";
 	layer = 4.1
 	},
@@ -21089,7 +21089,7 @@
 	},
 /area/maintenance/asmaint2)
 "aZT" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-17";
 	layer = 4.1
 	},
@@ -22107,7 +22107,7 @@
 /turf/open/floor/plating,
 /area/maintenance/asmaint2)
 "bcd" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /turf/open/floor/wood,
 /area/maintenance/fore{
 	name = "Security Maintenance"
@@ -22179,7 +22179,7 @@
 /turf/open/floor/plating,
 /area/maintenance/asmaint2)
 "bcp" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
@@ -22971,7 +22971,7 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay)
 "ben" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02";
 	layer = 4.1
 	},
diff --git a/_maps/map_files/DreamStation/dreamstation04.dmm b/_maps/map_files/DreamStation/dreamstation04.dmm
index fb1c2508a8e..3b76d2e604b 100644
--- a/_maps/map_files/DreamStation/dreamstation04.dmm
+++ b/_maps/map_files/DreamStation/dreamstation04.dmm
@@ -64658,7 +64658,7 @@
 	},
 /area/crew_quarters/hor)
 "cxY" = (
-/obj/structure/flora/kirbyplants/dead,
+/obj/item/twohanded/weapon/required/kirbyplants/dead,
 /obj/structure/cable/pink{
 	tag = "icon-4-8";
 	icon_state = "4-8"
diff --git a/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm b/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
index d16cf0262b0..0b1c471a9f8 100644
--- a/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
+++ b/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
@@ -1620,7 +1620,7 @@
 /turf/open/floor/plasteel/shuttle/white,
 /area/shuttle/abandoned)
 "adl" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-07";
 	name = "Photosynthetic Potted plant";
 	pixel_y = 10
@@ -1651,7 +1651,7 @@
 /turf/open/floor/plasteel/black,
 /area/turret_protected/ai)
 "ado" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-09";
 	name = "Photosynthetic Potted plant";
 	pixel_y = 10
@@ -12610,7 +12610,7 @@
 /obj/machinery/newscaster{
 	pixel_y = 30
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-17"
 	},
 /turf/open/floor/plasteel/cafeteria,
@@ -13584,7 +13584,7 @@
 	layer = 4;
 	pixel_y = 32
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/cafeteria,
@@ -25613,7 +25613,7 @@
 	dir = 4;
 	pixel_x = 24
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-10"
 	},
 /turf/open/floor/plasteel/white,
@@ -28708,7 +28708,7 @@
 	},
 /area/hallway/primary/central)
 "ben" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-04"
 	},
 /turf/open/floor/plasteel,
@@ -42034,7 +42034,7 @@
 /turf/open/floor/plasteel/black,
 /area/bridge)
 "bFN" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-12"
 	},
 /turf/open/floor/plasteel/darkblue/corner,
@@ -44831,7 +44831,7 @@
 	layer = 4;
 	pixel_x = -32
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21"
 	},
 /turf/open/floor/plasteel/black,
@@ -47187,7 +47187,7 @@
 /turf/open/floor/plasteel/black,
 /area/security/hos)
 "bPy" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-18"
 	},
 /turf/open/floor/plasteel/black,
@@ -47312,7 +47312,7 @@
 	name = "HIGH VOLTAGE";
 	pixel_y = -32
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/black,
@@ -52334,7 +52334,7 @@
 	dir = 4;
 	pixel_x = 24
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-02"
 	},
 /turf/open/floor/plasteel/escape{
@@ -57079,7 +57079,7 @@
 	name = "Medical Maintenance"
 	})
 "cku" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /turf/open/floor/plasteel/white,
 /area/medical/virology)
 "ckv" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 0bb24b992b1..8a935b08096 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -226,7 +226,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-03";
 	layer = 4.1
 	},
@@ -248,7 +248,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	layer = 4.1
 	},
 /turf/open/floor/plasteel/floorgrime,
@@ -1304,7 +1304,7 @@
 	dir = 1;
 	initialize_directions = 11
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-13"
 	},
 /turf/open/floor/plasteel/floorgrime,
@@ -2934,7 +2934,7 @@
 	dir = 9;
 	pixel_y = 0
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-16";
 	layer = 4.1
 	},
@@ -3222,7 +3222,7 @@
 /turf/open/floor/plating,
 /area/maintenance/auxsolarport)
 "afL" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "applebush";
 	layer = 4.1
 	},
@@ -14634,7 +14634,7 @@
 /turf/open/floor/plating/airless,
 /area/engine/engineering)
 "azv" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /obj/effect/decal/cleanable/cobweb2,
@@ -16184,7 +16184,7 @@
 /area/maintenance/starboard)
 "aBU" = (
 /obj/effect/decal/cleanable/cobweb,
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-20";
 	layer = 4.1;
 	pixel_y = 3
@@ -20904,7 +20904,7 @@
 	name = "Law Office APC";
 	pixel_y = 24
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1
 	},
@@ -22143,7 +22143,7 @@
 	c_tag = "AI Upload Chamber - Fore";
 	network = list("SS13","RD","AIUpload")
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-07";
 	name = "Photosynthetic Potted plant";
 	pixel_y = 10
@@ -25191,7 +25191,7 @@
 	pixel_x = -27;
 	pixel_y = 0
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-03";
 	layer = 4.1
 	},
@@ -27964,7 +27964,7 @@
 /turf/open/floor/plating,
 /area/hallway/secondary/entry)
 "aWN" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-13";
 	layer = 4.1
 	},
@@ -28361,7 +28361,7 @@
 /obj/machinery/airalarm{
 	pixel_y = 23
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "applebush";
 	layer = 4.1
 	},
@@ -28458,7 +28458,7 @@
 	pixel_x = 27;
 	pixel_y = 0
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-16";
 	layer = 4.1
 	},
@@ -29952,7 +29952,7 @@
 	name = "Arrivals"
 	})
 "bae" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-05";
 	layer = 4.1
 	},
@@ -43119,7 +43119,7 @@
 	name = "Arrivals"
 	})
 "bvU" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-18";
 	layer = 4.1
 	},
@@ -43155,7 +43155,7 @@
 	name = "Arrivals"
 	})
 "bvX" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-08";
 	layer = 4.1
 	},
@@ -43168,7 +43168,7 @@
 /turf/open/floor/plasteel/grimy,
 /area/hallway/primary/port)
 "bvZ" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-03";
 	layer = 4.1
 	},
@@ -44075,7 +44075,7 @@
 	name = "\improper Telecoms Control Room"
 	})
 "bxE" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-20";
 	layer = 4.1
 	},
@@ -47386,7 +47386,7 @@
 /turf/open/floor/wood,
 /area/library)
 "bDC" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/wood,
@@ -51696,7 +51696,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/yellow/side{
@@ -51911,7 +51911,7 @@
 	},
 /area/tcommsat/server)
 "bLp" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1
 	},
@@ -52861,7 +52861,7 @@
 	name = "\improper MiniSat Exterior"
 	})
 "bNc" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-06";
 	level = 4.1
 	},
@@ -53869,7 +53869,7 @@
 	icon_state = "map-right-MS";
 	pixel_y = -32
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-03";
 	layer = 4.1
 	},
@@ -60397,7 +60397,7 @@
 	pixel_x = -27;
 	pixel_y = 0
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "applebush";
 	layer = 4.1
 	},
@@ -60503,7 +60503,7 @@
 	dir = 4;
 	pixel_x = 24
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-10";
 	layer = 4.1
 	},
@@ -64511,7 +64511,7 @@
 	name = "Medbay Central"
 	})
 "cgU" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-11"
 	},
 /turf/open/floor/plasteel/whiteyellow/side{
@@ -64632,7 +64632,7 @@
 	pixel_x = 0;
 	pixel_y = -30
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-08";
 	layer = 4.1
 	},
@@ -70065,7 +70065,7 @@
 	name = "Research Division"
 	})
 "cqv" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-10";
 	layer = 4.1
 	},
@@ -75397,7 +75397,7 @@
 	pixel_x = -23;
 	pixel_y = 0
 	},
-/obj/structure/flora/kirbyplants/dead,
+/obj/item/weapon/twohanded/required/kirbyplants/dead,
 /turf/open/floor/plasteel/cafeteria{
 	dir = 5
 	},
@@ -80773,7 +80773,7 @@
 	name = "Medbay Aft"
 	})
 "cIc" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1;
 	pixel_x = -3;
@@ -83329,7 +83329,7 @@
 	name = "Research Division"
 	})
 "cMc" = (
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-10";
 	layer = 4.1
 	},
@@ -84786,7 +84786,7 @@
 	pixel_x = 27;
 	pixel_y = 0
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-14";
 	layer = 4.1
 	},
@@ -86886,7 +86886,7 @@
 	pixel_x = -27;
 	pixel_y = 0
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-04";
 	layer = 4.1
 	},
@@ -86966,7 +86966,7 @@
 	name = "Station Intercom (General)";
 	pixel_x = 29
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-16";
 	layer = 4.1
 	},
@@ -87502,7 +87502,7 @@
 	dir = 4;
 	network = list("SS13")
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-24";
 	layer = 4.1
 	},
@@ -89927,7 +89927,7 @@
 	dir = 2;
 	initialize_directions = 11
 	},
-/obj/structure/flora/kirbyplants{
+/obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1
 	},
diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm
index 63ff1f7300c..a7f76b33f6d 100644
--- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm
+++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm
@@ -36235,7 +36235,7 @@
 /obj/machinery/light_switch{
 	pixel_y = -23
 	},
-/obj/structure/flora/kirbyplants/dead,
+/obj/item/weapon/twohanded/required/kirbyplants/dead,
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/hor)
 "bCg" = (
diff --git a/_maps/map_files/generic/z2.dmm b/_maps/map_files/generic/z2.dmm
index 8dc216d7bb7..a488db55f91 100644
--- a/_maps/map_files/generic/z2.dmm
+++ b/_maps/map_files/generic/z2.dmm
@@ -2144,7 +2144,7 @@
 /turf/open/floor/plasteel,
 /area/centcom/control)
 "gD" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /turf/open/floor/plasteel/red/side{
 	dir = 9
 	},
@@ -2805,7 +2805,7 @@
 	},
 /area/tdome/tdomeobserve)
 "iH" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /turf/open/floor/plasteel/green/side{
 	dir = 10
 	},
@@ -5752,7 +5752,7 @@
 /turf/open/space/transit,
 /area/space)
 "rU" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm
index 58e09e821e8..42dbc1588a6 100644
--- a/code/game/asteroid.dm
+++ b/code/game/asteroid.dm
@@ -127,7 +127,7 @@ var/global/max_secret_rooms = 6
 			theme = "plantlab"
 			treasureitems = list(/obj/item/weapon/gun/energy/floragun=1,/obj/item/seeds/sunflower/novaflower=2,/obj/item/seeds/tomato/blue/bluespace=2,/obj/item/seeds/tomato/blue=2,
 			/obj/item/seeds/coffee/robusta=2, /obj/item/seeds/cash=2)
-			fluffitems = list(/obj/structure/flora/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics/constructable=1,
+			fluffitems = list(/obj/item/weapon/twohanded/required/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics/constructable=1,
 							  /obj/effect/glowshroom/single=2,/obj/item/weapon/reagent_containers/syringe/charcoal=2,
 							  /obj/item/weapon/reagent_containers/glass/bottle/diethylamine=3,/obj/item/weapon/reagent_containers/glass/bottle/ammonia=3)
 
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 63dcc5be5a5..fb9bab92603 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -226,21 +226,35 @@
 	icon_state = "fullgrass_[rand(1, 3)]"
 	..()
 
-/obj/structure/flora/kirbyplants
+/obj/item/weapon/twohanded/required/kirbyplants
 	name = "potted plant"
 	icon = 'icons/obj/flora/plants.dmi'
 	icon_state = "plant-01"
+	w_class = 5
+	force = 10
+	throwforce = 13
+	throw_speed = 2
+	throw_range = 4
 
-/obj/structure/flora/kirbyplants/random
+/obj/item/weapon/twohanded/flora/kirbyplants/equipped(mob/living/user)
+	var/image/I = image(icon = 'icons/obj/flora/plants.dmi' , icon_state = src.icon_state, loc = user)
+	I.override = 1
+	user.add_alt_appearance("sneaking_mission", I, player_list)
+
+/obj/item/weapon/twohanded/required/kirbyplants/dropped(mob/living/user)
+	..()
+	user.remove_alt_appearance("sneaking_mission")
+
+/obj/item/weapon/twohanded/required/kirbyplants/random
 	var/list/static/states
 
-/obj/structure/flora/kirbyplants/random/New()
+/obj/item/weapon/twohanded/required/kirbyplants/random/New()
 	. = ..()
 	if(!states)
 		generate_states()
 	icon_state = pick(states)
 
-/obj/structure/flora/kirbyplants/random/proc/generate_states()
+/obj/item/weapon/twohanded/required/kirbyplants/random/proc/generate_states()
 	states = list()
 	for(var/i in 1 to 25)
 		var/number
@@ -252,7 +266,7 @@
 	states += "applebush"
 
 
-/obj/structure/flora/kirbyplants/dead
+/obj/item/weapon/twohanded/required/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"
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 6598f404f52..510cbe0c0aa 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -978,11 +978,11 @@
 /datum/supply_pack/organic/potted_plants
 	name = "Potted Plants Crate"
 	cost = 700
-	contains = list(/obj/structure/flora/kirbyplants/random,
-					/obj/structure/flora/kirbyplants/random,
-					/obj/structure/flora/kirbyplants/random,
-					/obj/structure/flora/kirbyplants/random,
-					/obj/structure/flora/kirbyplants/random)
+	contains = list(/obj/item/weapon/twohanded/required/kirbyplants/random,
+					/obj/item/weapon/twohanded/required/kirbyplants/random,
+					/obj/item/weapon/twohanded/required/kirbyplants/random,
+					/obj/item/weapon/twohanded/required/kirbyplants/random,
+					/obj/item/weapon/twohanded/required/kirbyplants/random)
 	crate_name = "potted plants crate"
 	crate_type = /obj/structure/closet/crate/hydroponics