From 1de756743347fd28bee77a6d39dd9004efbcd57c Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Fri, 23 Mar 2012 05:16:23 +0000 Subject: [PATCH] Holodeck no longer loads at startup so there's no risk of it loading before the rest of the map and failing Updates changelog.html git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3343 316c924e-a436-60f5-8080-3fe189b3f50e --- .../machinery/computer/HolodeckControl.dm | 8 +- html/changelog.html | 5 + maps/tgstation.2.0.8.dmm | 16831 ++++++++-------- 3 files changed, 8417 insertions(+), 8427 deletions(-) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index fafe322f910..4532352e04a 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -127,10 +127,10 @@ /obj/machinery/computer/HolodeckControl/New() ..() linkedholodeck = locate(/area/holodeck/alphadeck) - if(linkedholodeck) - target = locate(/area/holodeck/source_emptycourt) - if(target) - loadProgram(target) + //if(linkedholodeck) + // target = locate(/area/holodeck/source_emptycourt) + // if(target) + // loadProgram(target) /obj/machinery/computer/HolodeckControl/process() diff --git a/html/changelog.html b/html/changelog.html index c222efeac71..5ca143bb3b4 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -99,6 +99,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Medical Lockers, Security Lockers, Research Lockers, Warden Locker, CMO Locker, and RD locker all have new sprites.
  • Encryption keys now each have their own invidual sprites.
    • + +

    PolymorphBlue updated:

    +