diff --git a/code/__DEFINES/clothing.dm b/code/__DEFINES/clothing.dm
index 672a58facdd..8f6e457c2c5 100644
--- a/code/__DEFINES/clothing.dm
+++ b/code/__DEFINES/clothing.dm
@@ -44,6 +44,7 @@
 #define slot_s_store		17
 #define slot_in_backpack	18
 #define slot_legcuffed		19
+#define slot_drone_storage	20
 
 //Cant seem to find a mob bitflags area other than the powers one
 
diff --git a/code/_onclick/hud/drones.dm b/code/_onclick/hud/drones.dm
index 0b00b430506..a07958db7aa 100644
--- a/code/_onclick/hud/drones.dm
+++ b/code/_onclick/hud/drones.dm
@@ -44,7 +44,7 @@
 	inv_box.icon = ui_style
 	inv_box.icon_state = "suit_storage"
 	inv_box.screen_loc = ui_drone_storage
-	inv_box.slot_id = "drone_storage_slot"
+	inv_box.slot_id = slot_drone_storage
 	inv_box.layer = 19
 	adding += inv_box
 
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index c09a46a43f7..1f9159c480e 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -25,7 +25,7 @@
 /obj/item/weapon/watertank/verb/toggle_mister()
 	set name = "Toggle Mister"
 	set category = "Object"
-	if (usr.get_item_by_slot(slot_back) != src && usr.get_item_by_slot("drone_storage_slot") != src)
+	if (usr.get_item_by_slot(slot_back) != src && usr.get_item_by_slot(slot_drone_storage) != src)
 		usr << "<span class='warning'>The watertank needs to be on your back to use!</span>"
 		return
 	if(usr.incapacitated())
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index 5eb3a58c4ff..c18d8443a6f 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -71,7 +71,7 @@
 
 	if(default_storage)
 		var/obj/item/I = new default_storage(src)
-		equip_to_slot_or_del(I, "drone_storage_slot")
+		equip_to_slot_or_del(I, slot_drone_storage)
 	if(default_hatmask)
 		var/obj/item/I = new default_hatmask(src)
 		equip_to_slot_or_del(I, slot_head)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
index a739daac976..11f9609b0fa 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
@@ -64,7 +64,7 @@
 			if(!((I.slot_flags & SLOT_HEAD) || (I.slot_flags & SLOT_MASK)))
 				return 0
 			return 1
-		if("drone_storage_slot")
+		if(slot_drone_storage)
 			if(internal_storage)
 				return 0
 			return 1
@@ -75,7 +75,7 @@
 	switch(slot_id)
 		if(slot_head)
 			return head
-		if("drone_storage_slot")
+		if(slot_drone_storage)
 			return internal_storage
 	..()
 
@@ -99,7 +99,7 @@
 		if(slot_head)
 			head = I
 			update_inv_head()
-		if("drone_storage_slot")
+		if(slot_drone_storage)
 			internal_storage = I
 			update_inv_internal_storage()
 		else