Pull no longer works bad with medical machines

Mousedropping mobs into them now cancels your pull, so you don't, for
example, start pulling around your surgery patient on accident, or have a
funny pull that you need to use on something else, for sleepers.

Walking while inside of a sleeper will also let you exit it easily
This commit is contained in:
Crazylemon64
2015-12-05 02:38:06 -08:00
parent dc089e3146
commit b5bd0f1f0e
4 changed files with 10 additions and 15 deletions
+1 -5
View File
@@ -174,10 +174,6 @@
if(occupant)
user << "\blue <B>The DNA Scanner is already occupied!</B>"
return
/* if(isrobot(user))
if(!istype(user:module, /obj/item/weapon/robot_module/medical))
user << "<span class='warning'>You do not have the means to do this!</span>"
return*/
var/mob/living/L = O
if(!istype(L) || L.buckled)
return
@@ -193,7 +189,7 @@
visible_message("[user] puts [L.name] into the DNA Scanner.")
put_in(L)
if(user.pulling == L)
user.pulling = null
user.stop_pulling()
/obj/machinery/dna_scannernew/attackby(var/obj/item/weapon/item as obj, var/mob/user as mob, params)
if(istype(item, /obj/item/weapon/screwdriver))
+2
View File
@@ -98,6 +98,8 @@
C.client.eye = src
C.resting = 1
C.loc = src.loc
if (user.pulling == C)
user.stop_pulling()
for(var/obj/O in src)
O.loc = src.loc
src.add_fingerprint(user)
+6 -5
View File
@@ -322,6 +322,11 @@
max_chem = E * 20
min_health = -E * 25
/obj/machinery/sleeper/relaymove(mob/user as mob)
if(user.incapacitated())
return 0 //maybe they should be able to get out with cuffs, but whatever
go_out()
/obj/machinery/sleeper/process()
if(filtering > 0)
if(beaker)
@@ -566,10 +571,6 @@
if(occupant)
user << "<span class='boldnotice'>The sleeper is already occupied!</span>"
return
/* if(isrobot(user))
if(!istype(user:module, /obj/item/weapon/robot_module/medical))
user << "<span class='warning'>You do not have the means to do this!</span>"
return*/
var/mob/living/L = O
if(!istype(L) || L.buckled)
return
@@ -600,7 +601,7 @@
L << "<span class='boldnotice'>You feel cool air surround you. You go numb as your senses turn inward.</span>"
src.add_fingerprint(user)
if(user.pulling == L)
user.pulling = null
user.stop_pulling()
return
return
+1 -5
View File
@@ -97,10 +97,6 @@
if(occupant)
user << "\blue <B>The cryo cell is already occupied!</B>"
return
/* if(isrobot(user))
if(!istype(user:module, /obj/item/weapon/robot_module/medical))
user << "<span class='warning'>You do not have the means to do this!</span>"
return*/
var/mob/living/L = O
if(!istype(L) || L.buckled)
return
@@ -117,7 +113,7 @@
else
visible_message("[user] puts [L.name] into the cryo cell.")
if(user.pulling == L)
user.pulling = null
user.stop_pulling()
/obj/machinery/atmospherics/unary/cryo_cell/process()
..()