From 1cfa9185138d1bbbfdfe7a1147ea166c54b319cc Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed, 3 Mar 2021 03:00:30 +0100
Subject: [PATCH] [MIRROR] Operating computers no longer link to stasis beds.
(#3775)
* Operating computers no longer link to stasis beds. (#57306)
* Operating computers no longer link to stasis beds.
Co-authored-by: Cimika/Lessie/KathyRyals <65850818+KathyRyals@users.noreply.github.com>
---
code/game/machinery/computer/Operating.dm | 23 +++--------------------
code/game/machinery/stasis.dm | 12 ------------
code/modules/surgery/surgery.dm | 5 -----
3 files changed, 3 insertions(+), 37 deletions(-)
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 6bd287263fa..d35971196c8 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -3,14 +3,13 @@
/obj/machinery/computer/operating
name = "operating computer"
- desc = "Monitors patient vitals and displays surgery steps. Can be loaded with surgery disks to perform experimental procedures. Automatically syncs to stasis beds within its line of sight for surgical tech advancement."
+ desc = "Monitors patient vitals and displays surgery steps. Can be loaded with surgery disks to perform experimental procedures. Automatically syncs to operating tables within its line of sight for surgical tech advancement."
icon_screen = "crew"
icon_keyboard = "med_key"
circuit = /obj/item/circuitboard/computer/operating
var/mob/living/carbon/human/patient
var/obj/structure/table/optable/table
- var/obj/machinery/stasis/sbed
var/list/advanced_surgeries = list()
var/datum/techweb/linked_techweb
light_color = LIGHT_COLOR_BLUE
@@ -25,10 +24,6 @@
table = locate(/obj/structure/table/optable) in get_step(src, direction)
if(table && table.computer == src)
table.computer = null
- else
- sbed = locate(/obj/machinery/stasis) in get_step(src, direction)
- if(sbed && sbed.op_computer == src)
- sbed.op_computer = null
. = ..()
/obj/machinery/computer/operating/attackby(obj/item/O, mob/user, params)
@@ -55,11 +50,6 @@
if(table)
table.computer = src
break
- else
- sbed = locate(/obj/machinery/stasis) in get_step(src, direction)
- if(sbed)
- sbed.op_computer = src
- break
/obj/machinery/computer/operating/ui_state(mob/user)
return GLOB.not_incapacitated_state
@@ -93,15 +83,8 @@
data["patient"] = list()
patient = table.patient
else
- if(sbed)
- data["table"] = sbed
- if(!ishuman(sbed.occupant))
- return data
- data["patient"] = list()
- patient = sbed.occupant
- else
- data["patient"] = null
- return data
+ data["patient"] = null
+ return data
switch(patient.stat)
if(CONSCIOUS)
data["patient"]["stat"] = "Conscious"
diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm
index 22fbd9ecfa8..42337a1202b 100644
--- a/code/game/machinery/stasis.dm
+++ b/code/game/machinery/stasis.dm
@@ -18,25 +18,13 @@
var/stasis_can_toggle = 0
var/mattress_state = "stasis_on"
var/obj/effect/overlay/vis/mattress_on
- var/obj/machinery/computer/operating/op_computer
-
-/obj/machinery/stasis/Initialize()
- . = ..()
- for(var/direction in GLOB.alldirs)
- op_computer = locate(/obj/machinery/computer/operating) in get_step(src, direction)
- if(op_computer)
- op_computer.sbed = src
- break
/obj/machinery/stasis/Destroy()
. = ..()
- if(op_computer && op_computer.sbed == src)
- op_computer.sbed = null
/obj/machinery/stasis/examine(mob/user)
. = ..()
. += "Alt-click to [stasis_enabled ? "turn off" : "turn on"] the machine."
- . += "\The [src] is [op_computer ? "linked" : "NOT linked"] to a nearby operating computer."
/obj/machinery/stasis/proc/play_power_sound()
var/_running = stasis_running()
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index c62b96e0902..a96dded4ecb 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -79,11 +79,6 @@
var/obj/structure/table/optable/table = locate(/obj/structure/table/optable, T)
if(table?.computer)
opcomputer = table.computer
- else
- var/obj/machinery/stasis/the_stasis_bed = locate(/obj/machinery/stasis, T)
- if(the_stasis_bed?.op_computer)
- opcomputer = the_stasis_bed.op_computer
-
if(!opcomputer)
return
if(opcomputer.machine_stat & (NOPOWER|BROKEN))