diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 2020686aff..3ef80aa27b 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -247,7 +247,7 @@
add_fingerprint(usr)
/obj/machinery/sleeper/MouseDrop_T(var/mob/target, var/mob/user)
- if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user)|| !ishuman(target))
+ if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target))
return
go_in(target, user)
@@ -281,7 +281,9 @@
if(occupant)
to_chat(user, "\The [src] is already occupied.")
return
-
+ if(!ishuman(M))
+ to_chat(user, "\The [src] is not designed for that organism!")
+ return
if(M == user)
visible_message("\The [user] starts climbing into \the [src].")
else
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 0d5ba44b67..a236b0dc50 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -39,20 +39,23 @@
else if(istype(G, /obj/item/weapon/grab))
var/obj/item/weapon/grab/H = G
if(panel_open)
- user << "Close the maintenance panel first."
+ to_chat(user, "Close the maintenance panel first.")
return
if(!ismob(H.affecting))
return
+ if(!ishuman(H.affecting))
+ to_chat(user, "\The [src] is not designed for that organism!")
+ return
if(occupant)
- user << "The scanner is already occupied!"
+ to_chat(user, "\The [src] is already occupied!")
return
for(var/mob/living/simple_animal/slime/M in range(1, H.affecting))
if(M.victim == H.affecting)
- user << "[H.affecting.name] has a fucking slime attached to them, deal with that first."
+ to_chat(user, "[H.affecting.name] has a slime attached to them, deal with that first.")
return
var/mob/M = H.affecting
if(M.abiotic())
- user << "Subject cannot have abiotic items on."
+ to_chat(user, "Subject cannot have abiotic items on.")
return
M.forceMove(src)
occupant = M
@@ -72,20 +75,20 @@
if(!ishuman(user) && !isrobot(user))
return 0 //not a borg or human
if(panel_open)
- user << "Close the maintenance panel first."
+ to_chat(user, "Close the maintenance panel first.")
return 0 //panel open
if(occupant)
- user << "\The [src] is already occupied."
+ to_chat(user, "\The [src] is already occupied.")
return 0 //occupied
if(O.buckled)
return 0
if(O.abiotic())
- user << "Subject cannot have abiotic items on."
+ to_chat(user, "Subject cannot have abiotic items on.")
return 0
for(var/mob/living/simple_animal/slime/M in range(1, O))
if(M.victim == O)
- user << "[O] has a fucking slime attached to them, deal with that first."
+ to_chat(user, "[O] has a slime attached to them, deal with that first.")
return 0
if(O == user)
@@ -185,9 +188,9 @@
var/obj/machinery/bodyscanner/C = P.connectable
scanner = C
C.console = src
- user << " You link the [src] to the [P.connectable]!"
+ to_chat(user, " You link the [src] to the [P.connectable]!")
else
- user << " You store the [src] in the [P]'s buffer!"
+ to_chat(user, " You store the [src] in the [P]'s buffer!")
P.connectable = src
return
else
@@ -240,7 +243,7 @@
return
if (scanner.panel_open)
- user << "Close the maintenance panel first."
+ to_chat(user, "Close the maintenance panel first.")
return
if(!scanner)
@@ -250,7 +253,7 @@
else if(scanner)
return ui_interact(user)
else
- user << "Scanner not found!"
+ to_chat(user, "Scanner not found!")
/obj/machinery/body_scanconsole/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
var/data[0]
@@ -584,4 +587,4 @@
else
dat = " Error: No Body Scanner connected."
- printing_text = dat
\ No newline at end of file
+ printing_text = dat