diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm
index 513270ca65..cd1621e4c3 100644
--- a/code/game/machinery/seed_extractor.dm
+++ b/code/game/machinery/seed_extractor.dm
@@ -1,22 +1,21 @@
 /obj/machinery/seed_extractor
-	name = "Seed Extractor"
-	desc = "Extracts seeds from produce"
+	name = "seed extractor"
+	desc = "Extracts and bags seeds from produce."
 	icon = 'icons/obj/hydroponics.dmi'
 	icon_state = "sextractor"
 	density = 1
 	anchored = 1
 
 obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob)
-
-	//Called when mob user "attacks" it with object O
-	if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/))
+	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/))
 		var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O
-		user << "\blue You extract some seeds from the [F.name]"
+		user.drop_item()
+		user << "<span class='notice'>You extract some seeds from the [F.name].</span>"
 		var/seed = text2path(F.seed)
 		var/t_amount = 0
 		var/t_max = rand(1,4)
-		while ( t_amount < t_max)
-			var/obj/item/seeds/t_prod = new seed(src.loc)
+		while(t_amount < t_max)
+			var/obj/item/seeds/t_prod = new seed(loc)
 			t_prod.species = F.species
 			t_prod.lifespan = F.lifespan
 			t_prod.endurance = F.endurance
@@ -27,14 +26,15 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob
 			t_amount++
 		del(O)
 
-	else if (istype(O, /obj/item/weapon/grown/))
+	else if(istype(O, /obj/item/weapon/grown/))
 		var/obj/item/weapon/grown/F = O
-		user << "\blue You extract some seeds from the [F.name]"
+		user.drop_item()
+		user << "<span class='notice'>You extract some seeds from the [F.name].</span>"
 		var/seed = text2path(F.seed)
 		var/t_amount = 0
 		var/t_max = rand(1,4)
-		while ( t_amount < t_max)
-			var/obj/item/seeds/t_prod = new seed(src.loc)
+		while(t_amount < t_max)
+			var/obj/item/seeds/t_prod = new seed(loc)
 			t_prod.species = F.species
 			t_prod.lifespan = F.lifespan
 			t_prod.endurance = F.endurance
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 0b018d5187..a79eddfdf7 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -1,3 +1,10 @@
+/*
+CONTAINS:
+SAFES
+FLOOR SAFES
+*/
+
+//SAFES
 /obj/structure/safe
 	name = "safe"
 	desc = "A huge chunk of metal with a dial embedded in it. Fine print on the dial reads \"Scarborough Arms - 2 tumbler safe, guaranteed thermite resistant, explosion resistant, and assistant resistant.\""
@@ -16,11 +23,11 @@
 
 
 /obj/structure/safe/New()
-	tumbler_1_pos = round(rand(0, 72))
-	tumbler_1_open = round(rand(0, 72))
+	tumbler_1_pos = rand(0, 72)
+	tumbler_1_open = rand(0, 72)
 
-	tumbler_2_pos = round(rand(0, 72))
-	tumbler_2_open = round(rand(0, 72))
+	tumbler_2_pos = rand(0, 72)
+	tumbler_2_open = rand(0, 72)
 
 
 /obj/structure/safe/initialize()
@@ -161,4 +168,23 @@ obj/structure/safe/ex_act(severity)
 
 
 obj/structure/safe/meteorhit(obj/O as obj)
-	return
\ No newline at end of file
+	return
+
+
+//FLOOR SAFES
+/obj/structure/safe/floor
+	name = "floor safe"
+	icon_state = "floorsafe"
+	density = 0
+	level = 1	//underfloor
+	layer = 2.5
+
+
+/obj/structure/safe/floor/initialize()
+	..()
+	var/turf/T = loc
+	hide(T.intact)
+
+
+/obj/structure/safe/floor/hide(var/intact)
+	invisibility = intact ? 101 : 0
\ No newline at end of file
diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm
index eb4a702b02..2c046cc8bd 100644
--- a/code/modules/awaymissions/bluespaceartillery.dm
+++ b/code/modules/awaymissions/bluespaceartillery.dm
@@ -1,9 +1,9 @@
 
 /obj/machinery/artillerycontrol
 	var/reload = 180
-	name = "Bluespace Artillery Control"
+	name = "bluespace artillery control"
 	icon_state = "control_boxp1"
-	icon = 'particle_accelerator.dmi'
+	icon = 'icons/obj/machines/particle_accelerator.dmi'
 	density = 1
 	anchored = 1
 
@@ -13,7 +13,7 @@
 
 /obj/structure/artilleryplaceholder
 	name = "artillery"
-	icon = 'particle_accelerator.dmi'
+	icon = 'icons/obj/machines/particle_accelerator.dmi'
 	anchored = 1
 	density = 1
 
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 37aab81a3d..fe440f3de3 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ