Fix for flickering floor in room2_3 (by Vane), removed some unused ro…

…om files, SCP-294 loading screen, changing the number of itemtemplates doesn't break save file backwards compatibility
Regalis11 · Dec 30, 2016 · 8f015b3 · 8f015b3
1 parent aa9821d
commit 8f015b3
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 3 deletions.
diff --git a/GFX/map/room2_3.rmesh b/GFX/map/room2_3.rmesh
diff --git a/GFX/map/room2_3_lm1.png b/GFX/map/room2_3_lm1.png
diff --git a/GFX/map/room2_3_opt.rmesh b/GFX/map/room2_3_opt.rmesh
diff --git a/GFX/map/room2gw_b_lm2.png b/GFX/map/room2gw_b_lm2.png
diff --git a/GFX/map/room2gw_b_lm3.png b/GFX/map/room2gw_b_lm3.png
diff --git a/GFX/map/room2gw_b_lm4.png b/GFX/map/room2gw_b_lm4.png
diff --git a/GFX/map/room2gw_b_lm5.png b/GFX/map/room2gw_b_lm5.png
diff --git a/GFX/map/room2gw_b_lm6.png b/GFX/map/room2gw_b_lm6.png
diff --git a/GFX/map/room2gw_b_lm7.png b/GFX/map/room2gw_b_lm7.png
diff --git a/Loadingscreens/loadingscreens.ini b/Loadingscreens/loadingscreens.ini
@@ -101,6 +101,15 @@ disablebackground = true
 text1 = SCP-205 is a pair of flood lamps used in photography. The light emitted by each lamp behaves in a manner unique to SCP-205 and passes completely through any surface that is not colored white.
 text2 = If the light continues uninterrupted through any matter, otherwise casting no shadow, each lamp will display an unidentified young woman's shadow upon any flat white surface, such as the projection screen in Chamber 52.
 
+[SCP-294]
+image path = 294.jpg
+align x = center
+align y = bottom
+disablebackground = true
+text1 = Item SCP-294 appears to be a standard coffee vending machine, the only noticeable difference being an entry touchpad with buttons corresponding to an English QWERTY keyboard.
+text2 = Upon entering the name of any liquid using the touchpad, a standard 12-ounce paper drinking cup is placed and the liquid indicated is poured.
+text3 = Ninety-seven initial test runs were performed (including requests for water, coffee, beer, and soda, non-consumable liquids such as sulfuric acid, wiper fluid, and motor oil, as well as substances that do not usually exist in liquid state, such as nitrogen, iron and glass) and each one returned a success.
+
 [SCP-372]
 image path = 372.jpg
 align x = left

diff --git a/MapSystem.bb b/MapSystem.bb
@@ -4652,7 +4652,7 @@ Function FillRoom(r.Rooms)
 			r\RoomDoors[0] = CreateDoor(r\zone, r\x + 288.0*RoomScale, r\y, r\z + 576.0*RoomScale, 90, r, False, False, 3)
 			r\RoomDoors[0]\open = False : r\RoomDoors[0]\locked = True
 			d = CreateDoor(r\zone, r\x + 777.0*RoomScale, r\y, r\z + 671.0*RoomScale, 90, r, False, False, 4)
-			d = CreateDoor(r\zone, r\x + 556.0*RoomScale, r\y, r\z + 296.0*RoomScale, 0, r, False, False)
+			d = CreateDoor(r\zone, r\x + 556.0*RoomScale, r\y, r\z + 296.0*RoomScale, 0, r, False, False, 3)
 			r\Objects[0] = CreatePivot()
 			PositionEntity r\Objects[0],r\x + 576.0*RoomScale,r\y+160.0*RoomScale,r\z+632.0*RoomScale
 			EntityParent r\Objects[0],r\obj

diff --git a/Save.bb b/Save.bb
@@ -1047,7 +1047,7 @@ Function LoadGame(file$)
 		EndIf
 	Next
 
-	If ReadInt(f) <> 994 Then RuntimeError("Couldn't load the game, save file corrupted (error 4)")
+	;If ReadInt(f) <> 994 Then RuntimeError("Couldn't load the game, save file corrupted (error 4)")
 
 	CloseFile f
 
@@ -1680,7 +1680,7 @@ Function LoadGameQuick(file$)
 		EndIf
 	Next
 
-	If ReadInt(f) <> 994 Then RuntimeError("Couldn't load the game, save file corrupted (error 4)")
+	;If ReadInt(f) <> 994 Then RuntimeError("Couldn't load the game, save file corrupted (error 4)")
 
 	If 0 Then 
 		closestroom = Null