mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
Fix for #3683.
This commit is contained in:
@@ -103,21 +103,25 @@
|
|||||||
/obj/machinery/optable/process()
|
/obj/machinery/optable/process()
|
||||||
check_victim()
|
check_victim()
|
||||||
|
|
||||||
/obj/machinery/optable/proc/take_victim(mob/living/carbon/human/H, mob/living/carbon/user as mob)
|
/obj/machinery/optable/proc/take_victim(mob/living/carbon/C, mob/living/carbon/user as mob)
|
||||||
if (H == user)
|
if (C == user)
|
||||||
user.visible_message("[user] climbs on the operating table.","You climb on the operating table.")
|
user.visible_message("[user] climbs on the operating table.","You climb on the operating table.")
|
||||||
else
|
else
|
||||||
visible_message("\red [H] has been laid on the operating table by [user].", 3)
|
visible_message("\red [C] has been laid on the operating table by [user].", 3)
|
||||||
if (H.client)
|
if (C.client)
|
||||||
H.client.perspective = EYE_PERSPECTIVE
|
C.client.perspective = EYE_PERSPECTIVE
|
||||||
H.client.eye = src
|
C.client.eye = src
|
||||||
H.resting = 1
|
C.resting = 1
|
||||||
H.loc = src.loc
|
C.loc = src.loc
|
||||||
for(var/obj/O in src)
|
for(var/obj/O in src)
|
||||||
O.loc = src.loc
|
O.loc = src.loc
|
||||||
src.add_fingerprint(user)
|
src.add_fingerprint(user)
|
||||||
icon_state = H.pulse ? "table2-active" : "table2-idle"
|
if(ishuman(C))
|
||||||
src.victim = H
|
var/mob/living/carbon/human/H = C
|
||||||
|
src.victim = H
|
||||||
|
icon_state = H.pulse ? "table2-active" : "table2-idle"
|
||||||
|
else
|
||||||
|
icon_state = "table2-idle"
|
||||||
|
|
||||||
/obj/machinery/optable/verb/climb_on()
|
/obj/machinery/optable/verb/climb_on()
|
||||||
set name = "Climb On Table"
|
set name = "Climb On Table"
|
||||||
@@ -135,7 +139,7 @@
|
|||||||
|
|
||||||
/obj/machinery/optable/attackby(obj/item/weapon/W as obj, mob/living/carbon/user as mob)
|
/obj/machinery/optable/attackby(obj/item/weapon/W as obj, mob/living/carbon/user as mob)
|
||||||
if (istype(W, /obj/item/weapon/grab))
|
if (istype(W, /obj/item/weapon/grab))
|
||||||
if(ishuman(W:affecting))
|
if(iscarbon(W:affecting))
|
||||||
take_victim(W:affecting,usr)
|
take_victim(W:affecting,usr)
|
||||||
del(W)
|
del(W)
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user