cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47189 from nemvar/fixessurgeryduplicate

Browse Source 
Gets rid of duplicate code and fixes surgery start runtime.
This commit is contained in:
Jordie
2019-10-21 20:57:47 +11:00
committed by GitHub
parent 6f3d90e9f6 f2562026ac
commit 8a0058df3c
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/surgery.dm
+18 -16
View File
@@ -66,23 +66,25 @@
return TRUE
var/turf/T = get_turf(patient)
var/obj/structure/table/optable/table = locate(/obj/structure/table/optable, T)
if(table)
if(table.computer.stat & (NOPOWER|BROKEN))
return .
if(replaced_by in table.computer.advanced_surgeries)
return FALSE
if(type in table.computer.advanced_surgeries)
return TRUE
var/obj/machinery/stasis/the_stasis_bed = locate(/obj/machinery/stasis, T)
if(the_stasis_bed?.op_computer)
if(the_stasis_bed.op_computer.stat & (NOPOWER|BROKEN))
return .
if(replaced_by in the_stasis_bed.op_computer.advanced_surgeries)
return FALSE
if(type in the_stasis_bed.op_computer.advanced_surgeries)
return TRUE
//Get the relevant operating computer
var/obj/machinery/computer/operating/opcomputer
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.stat & (NOPOWER|BROKEN))
return .
if(replaced_by in opcomputer.advanced_surgeries)
return FALSE
if(type in opcomputer.advanced_surgeries)
return TRUE
/datum/surgery/proc/next_step(mob/user, intent)
if(location != user.zone_selected)