Merge pull request #982 from Erthilo/master

Increases max brig time to 60 minutes with changes to Space Law. Also Dormitory Antiqua updates. Changelog Updates too.

baystation12.dme

@@ -162,11 +162,9 @@
 #define FILE_DIR "code/WorkInProgress"
 #define FILE_DIR "code/WorkInProgress/Apples"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jumper"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/tajara_sprites"
 #define FILE_DIR "code/WorkInProgress/Chinsky"
 #define FILE_DIR "code/WorkInProgress/mapload"
 #define FILE_DIR "code/WorkInProgress/Mini"
@@ -203,6 +201,7 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
+#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
 #define FILE_DIR "sound/ambience"

code/game/machinery/doors/brigdoors.dm

@@ -141,7 +141,7 @@
 			dat += "<a href='?src=\ref[src];timing=1'>Activate Timer and close door</a><br/>"
 
 		dat += "Time Left: [(minute ? text("[minute]:") : null)][second] <br/>"
-		dat += "<a href='?src=\ref[src];tp=-60'>-</a> <a href='?src=\ref[src];tp=-1'>-</a> <a href='?src=\ref[src];tp=1'>+</a> <A href='?src=\ref[src];tp=60'>+</a><br/>"
+		dat += "<a href='?src=\ref[src];tp=-600'>-</a> <a href='?src=\ref[src];tp=-60'>-</a> <a href='?src=\ref[src];tp=-1'>-</a> <a href='?src=\ref[src];tp=1'>+</a> <A href='?src=\ref[src];tp=60'>+</a><br/> <A href='?src=\ref[src];tp=600'>+</a><br/>"
 
 		for(var/obj/machinery/flasher/F in targets)
 			if(F.last_flash && (F.last_flash + 150) > world.time)
@@ -176,7 +176,7 @@
 				var/tp = text2num(href_list["tp"])
 				var/timeleft = timeleft()
 				timeleft += tp
-				timeleft = min(max(round(timeleft), 0), 600)
+				timeleft = min(max(round(timeleft), 0), 3600)
 				timeset(timeleft)
 				//src.timing = 1
 				//src.closedoor()

html/changelog.html

@@ -47,6 +47,22 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">05 May 2012</h2>
+	<h3 class="author">Erthilo updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="experiment">Increases maximum brig timers to 60 minutes. This coincides with a new test version of Space Law. See here: http://baystation12.net/wiki/index.php/Space_Law or in-game Space Law books.</li>
+	</ul>
+</div>
+
+<div class="commit sansserif">
+	<h2 class="date">04 May 2012</h2>
+	<h3 class="author">dopeghoti updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Fixes AI-less Cyborgs having Asimov laws.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">03 May 2012</h2>
 	<h3 class="author">TG updated:</h3>