cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Holodeck no longer loads at startup so there's no risk of it loading before the rest of the map and failing

Browse Source 
Updates changelog.html

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3343 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
VivianFoxfoot@gmail.com
2012-03-23 05:16:23 +00:00
parent 0c7cc70a36
commit 1de7567433
3 changed files with 8417 additions and 8427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/machinery/computer/HolodeckControl.dm
View File

@@ -127,10 +127,10 @@
/obj/machinery/computer/HolodeckControl/New() /obj/machinery/computer/HolodeckControl/New()
..() ..()
linkedholodeck = locate(/area/holodeck/alphadeck) linkedholodeck = locate(/area/holodeck/alphadeck)
if(linkedholodeck) //if(linkedholodeck)
target = locate(/area/holodeck/source_emptycourt) // target = locate(/area/holodeck/source_emptycourt)
if(target) // if(target)
loadProgram(target) // loadProgram(target)
/obj/machinery/computer/HolodeckControl/process() /obj/machinery/computer/HolodeckControl/process()

5
html/changelog.html
View File

@@ -99,6 +99,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
<li class="rscadd">Medical Lockers, Security Lockers, Research Lockers, Warden Locker, CMO Locker, and RD locker all have new sprites.</li> <li class="rscadd">Medical Lockers, Security Lockers, Research Lockers, Warden Locker, CMO Locker, and RD locker all have new sprites.</li>
<li class="rscadd">Encryption keys now each have their own invidual sprites.</li> <li class="rscadd">Encryption keys now each have their own invidual sprites.</li>
</ul> </ul>
<h3 class="author">PolymorphBlue updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added a prototype holodeck to fitness!</li>
<li class="bugfix">Assorted tensioner fixes</li>
</div> </div>
<div class="commit sansserif"> <div class="commit sansserif">

16831
maps/tgstation.2.0.8.dmm
View File

File diff suppressed because it is too large Load Diff