diff --git a/modular_skyrat/modules/borg_buffs/code/robot.dm b/modular_skyrat/modules/borg_buffs/code/robot.dm
index d3525cdda10..8a2dfb110c8 100644
--- a/modular_skyrat/modules/borg_buffs/code/robot.dm
+++ b/modular_skyrat/modules/borg_buffs/code/robot.dm
@@ -1,89 +1,89 @@
 #define BASE_SHAKER_JUICE_REAGENTS list(\
+		/datum/reagent/consumable/aloejuice,\
+		/datum/reagent/consumable/applejuice,\
+		/datum/reagent/consumable/banana,\
+		/datum/reagent/consumable/berryjuice,\
+		/datum/reagent/consumable/blumpkinjuice,\
+		/datum/reagent/consumable/carrotjuice,\
+		/datum/reagent/consumable/grapejuice,\
+		/datum/reagent/consumable/lemonjuice,\
+		/datum/reagent/consumable/lemon_lime,\
+		/datum/reagent/consumable/limejuice,\
+		/datum/reagent/consumable/parsnipjuice,\
+		/datum/reagent/consumable/peachjuice,\
+		/datum/reagent/consumable/pineapplejuice,\
+		/datum/reagent/consumable/potato_juice,\
+		/datum/reagent/consumable/pumpkinjuice,\
 		/datum/reagent/consumable/orangejuice,\
 		/datum/reagent/consumable/tomatojuice,\
-		/datum/reagent/consumable/limejuice,\
-		/datum/reagent/consumable/carrotjuice,\
-		/datum/reagent/consumable/berryjuice,\
-		/datum/reagent/consumable/applejuice,\
-		/datum/reagent/consumable/watermelonjuice,\
-		/datum/reagent/consumable/lemonjuice,\
-		/datum/reagent/consumable/banana,\
-		/datum/reagent/consumable/potato_juice,\
-		/datum/reagent/consumable/grapejuice,\
-		/datum/reagent/consumable/parsnipjuice,\
-		/datum/reagent/consumable/pineapplejuice,\
-		/datum/reagent/consumable/aloejuice,\
-		/datum/reagent/consumable/pumpkinjuice,\
-		/datum/reagent/consumable/blumpkinjuice,\
-		/datum/reagent/consumable/lemon_lime,\
-		/datum/reagent/consumable/peachjuice\
+		/datum/reagent/consumable/watermelonjuice\
 	)
 
 #define BASE_SHAKER_ALCOHOL_REAGENTS list(\
-		/datum/reagent/consumable/ethanol,\
-		/datum/reagent/consumable/ethanol/beer,\
-		/datum/reagent/consumable/ethanol/beer/maltliquor,\
-		/datum/reagent/consumable/ethanol/kahlua,\
-		/datum/reagent/consumable/ethanol/whiskey,\
-		/datum/reagent/consumable/ethanol/vodka,\
-		/datum/reagent/consumable/ethanol/gin,\
-		/datum/reagent/consumable/ethanol/rum,\
-		/datum/reagent/consumable/ethanol/tequila,\
-		/datum/reagent/consumable/ethanol/vermouth,\
-		/datum/reagent/consumable/ethanol/wine,\
-		/datum/reagent/consumable/ethanol/lizardwine,\
-		/datum/reagent/consumable/ethanol/amaretto,\
-		/datum/reagent/consumable/ethanol/cognac,\
 		/datum/reagent/consumable/ethanol/absinthe,\
-		/datum/reagent/consumable/ethanol/hooch,\
 		/datum/reagent/consumable/ethanol/ale,\
+		/datum/reagent/consumable/ethanol/amaretto,\
 		/datum/reagent/consumable/ethanol/applejack,\
+		/datum/reagent/consumable/ethanol/beer,\
+		/datum/reagent/consumable/ethanol/cognac,\
 		/datum/reagent/consumable/ethanol/champagne,\
-		/datum/reagent/consumable/ethanol/creme_de_menthe,\
 		/datum/reagent/consumable/ethanol/creme_de_cacao,\
-		/datum/reagent/consumable/ethanol/sake,\
-		/datum/reagent/consumable/ethanol/triple_sec,\
 		/datum/reagent/consumable/ethanol/creme_de_coconut,\
-		/datum/reagent/consumable/nothing,\
+		/datum/reagent/consumable/ethanol/creme_de_menthe,\
+		/datum/reagent/consumable/ethanol,\
+		/datum/reagent/consumable/ethanol/gin,\
+		/datum/reagent/consumable/ethanol/hooch,\
+		/datum/reagent/consumable/ethanol/kahlua,\
 		/datum/reagent/consumable/laughter,\
-		/datum/reagent/consumable/ethanol/synthanol\
+		/datum/reagent/consumable/ethanol/lizardwine,\
+		/datum/reagent/consumable/ethanol/beer/maltliquor,\
+		/datum/reagent/consumable/nothing,\
+		/datum/reagent/consumable/ethanol/rum,\
+		/datum/reagent/consumable/ethanol/sake,\
+		/datum/reagent/consumable/ethanol/synthanol,\
+		/datum/reagent/consumable/ethanol/tequila,\
+		/datum/reagent/consumable/ethanol/triple_sec,\
+		/datum/reagent/consumable/ethanol/vermouth,\
+		/datum/reagent/consumable/ethanol/vodka,\
+		/datum/reagent/consumable/ethanol/whiskey,\
+		/datum/reagent/consumable/ethanol/wine\
 	)
 
 #define BASE_SHAKER_SODA_REAGENTS list(\
-		/datum/reagent/consumable/space_cola,\
 		/datum/reagent/consumable/dr_gibb,\
-		/datum/reagent/consumable/space_up,\
-		/datum/reagent/consumable/sodawater,\
 		/datum/reagent/consumable/grape_soda,\
-		/datum/reagent/consumable/sol_dry,\
-		/datum/reagent/consumable/spacemountainwind,\
 		/datum/reagent/consumable/pwr_game,\
 		/datum/reagent/consumable/shamblers,\
-		/datum/reagent/consumable/sugar\
+		/datum/reagent/consumable/sodawater,\
+		/datum/reagent/consumable/sol_dry,\
+		/datum/reagent/consumable/space_up,\
+		/datum/reagent/consumable/space_cola,\
+		/datum/reagent/consumable/spacemountainwind\
 	)
 
 #define BASE_SHAKER_MISC_REAGENTS list(\
-		/datum/reagent/consumable/milk,\
-		/datum/reagent/consumable/soymilk,\
+		/datum/reagent/consumable/blackpepper,\
+		/datum/reagent/blood,\
+		/datum/reagent/pax/catnip,\
 		/datum/reagent/consumable/coco,\
-		/datum/reagent/consumable/cream,\
 		/datum/reagent/toxin/coffeepowder,\
-		/datum/reagent/toxin/teapowder,\
-		/datum/reagent/consumable/ice,\
-		/datum/reagent/consumable/menthol,\
+		/datum/reagent/consumable/cream,\
+		/datum/reagent/consumable/enzyme,\
+		/datum/reagent/consumable/eggyolk,\
+		/datum/reagent/consumable/honey,\
 		/datum/reagent/consumable/grenadine,\
+		/datum/reagent/consumable/ice,\
+		/datum/reagent/iron,\
+		/datum/reagent/consumable/menthol,\
+		/datum/reagent/consumable/milk,\
+		/datum/reagent/toxin/mushroom_powder,\
+		/datum/reagent/consumable/nutriment,\
+		/datum/reagent/consumable/soymilk,\
+		/datum/reagent/consumable/sugar,\
+		/datum/reagent/toxin/teapowder,\
 		/datum/reagent/consumable/tonic,\
 		/datum/reagent/consumable/vanilla,\
-		/datum/reagent/consumable/blackpepper,\
-		/datum/reagent/toxin/mushroom_powder,\
-		/datum/reagent/consumable/enzyme,\
-		/datum/reagent/blood,\
-		/datum/reagent/water,\
-		/datum/reagent/consumable/eggyolk,\
-		/datum/reagent/consumable/nutriment,\
-		/datum/reagent/consumable/honey,\
-		/datum/reagent/iron,\
-		/datum/reagent/pax/catnip\
+		/datum/reagent/water\
 	)
 
 
diff --git a/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm b/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm
index 123c58b8e94..089c61fc42a 100644
--- a/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm
+++ b/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm
@@ -1,6 +1,7 @@
 /obj/item/hilbertshotel/ghostdojo
 	name = "infinite dormitories"
 	anchored = TRUE
+	interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND
 
 /obj/item/hilbertshotel/ghostdojo/attack_hand(mob/user, list/modifiers)
 	. = ..()
@@ -8,6 +9,10 @@
 		return
 	return promptAndCheckIn(user, user)
 
+// borgos need love too
+/obj/item/hilbertshotel/ghostdojo/attack_robot(mob/living/user)
+	attack_hand(user)
+
 /datum/map_template/ghost_cafe_rooms
 	name = "Apartment"
 	mappath = "modular_skyrat/modules/hotel_rooms/apartment.dmm"