diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index b1e837c5197..ff84ca9e017 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -12,13 +12,13 @@ var/strapped = 0.0 var/obj/machinery/computer/operating/computer = null - var/id = 0.0 /obj/machinery/optable/New() ..() - for(var/obj/machinery/computer/operating/O in world) - if(src.id == O.id) - src.computer = O + for(dir in list(NORTH,EAST,SOUTH,WEST)) + computer = locate(/obj/machinery/computer/operating, get_step(src, dir)) + if (!isnull(computer)) + break spawn(100) process() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index dc7c4cb98eb..1701e61d6ea 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -7,15 +7,13 @@ var mob/living/carbon/human/victim = null obj/machinery/optable/table = null - id = 0.0 - /obj/machinery/computer/operating/New() ..() - for(var/obj/machinery/optable/O in world) - if(src.id == O.id) - src.table = O - + for(dir in list(NORTH,EAST,SOUTH,WEST)) + table = locate(/obj/machinery/optable, get_step(src, dir)) + if (!isnull(table)) + break /obj/machinery/computer/operating/attack_ai(mob/user) add_fingerprint(user) @@ -55,7 +53,7 @@ Toxins Damage: [src.victim.getToxLoss()]
Fire Damage: [src.victim.getFireLoss()]
Suffocation Damage: [src.victim.getOxyLoss()]
-Patient Status: [src.victim.stat ? "Non-responsive" : "Stable"]
+Patient Status: [src.victim.stat ? "Non-Responsive" : "Stable"]
"} else src.victim = null diff --git a/html/changelog.html b/html/changelog.html index 876ced39326..a7a1adb15f7 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -46,9 +46,20 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +
+

Thursday, May 3rd

+

Ikarrus updated:

+ +

Petethegoat updated:

+ +
-

5/1/2012

+

Tuesday, May 1st

PolymorphBlue updated: