Skip to content

Commit

Permalink
Merge pull request #138 from felikatze/feli's-wip-branch-2
Browse files Browse the repository at this point in the history
Finished Locked Storage Room
  • Loading branch information
felikatze authored Sep 5, 2024
2 parents f488359 + d26363f commit f067641
Show file tree
Hide file tree
Showing 10 changed files with 4,420 additions and 153 deletions.
1,761 changes: 1,650 additions & 111 deletions public/acts/act3-4/loopquest.html

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions public/feed.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@
</lastBuildDate>
<ttl>20000</ttl>

<item>
<title>Locked Storage Room</title>
<description>
Text for the locked storage room on Floor 1.
</description>
<link>https://felicitations.neocities.org/rooms/floor1/stostorageroomoom.html</link>
<guid>https://felicitations.neocities.org/xml/item0047</guid>
<pubDate>
Thu, 05 Sep 2024 20:50:00 +0200
</pubDate>
</item>

<item>
<title>Head Housemaiden's Office</title>
<description>
Expand Down
5 changes: 3 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ <h3>ISAT Patch 1.0.6.3</h3>
<h2>New Events</h2>
<p>Recently finished stuff!</p>
<ol>
<li><a href="/rooms/floor1/stostorageroomoom.html">Locked Storage Room</a></li>
<li><a href="/rooms/floor2/admin.html">Head Housemaiden's Office</a></li>
<li><a href="/sasasap/knick-knacks.html">Knick-Knacks</a> (START AGAIN)</li>
<li><a href="/rooms/dormont/clocktower.html">Clocktower</a></li>
Expand All @@ -88,7 +89,6 @@ <h2>New Events</h2>
<li><a href="/rooms/king/kingfight-act5">King Fight (ACT 5)</a></li>
<li><a href="/rooms/floor3/mirrorroom.html">Mirror Room</a></li>
<li><a href="/random/dagger.html">Your Dagger</a></li>
<li><a href="/rooms/floor3/changeroom.html">Change Room</a></li>
</ol>

<hr>
Expand All @@ -101,8 +101,9 @@ <h2>Requests</h2>

<ol>
<li>ACT 6 Isabeau dialogue</li>
<li>Floor 1 Storage Room</li>
<li>Bonnie Beginning Talk</li>
<li>Color Theory</li>
<li>Tutorial</li>
</ol>

<br>
Expand Down
7 changes: 7 additions & 0 deletions public/overview/rooms.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ <h1>Floor 1</h1>
<li><a href="/rooms/floor1/deathcorridor.html">Death Corridor</a></li>
<li><a href="/rooms/floor1/snackbreak1.html">First Snack Break</a></li>
<li><a href="/rooms/floor1/midboss1">First Midboss</a> (WIP)</li>
<li><a href="/rooms/floor1/stostorageroomoom.html">Locked Storage Room</a> (Stostorage Roomoom)</li>
<li>Hallways
<ul>
<li><a href="/rooms/hallways.html#floor1R1">Right side (Level Difference)</a></li>
<li><a href="/rooms/hallways.html#floor1R2">Right side (First Tears)</a></li>
</ul>
</li>
</ul>

<hr>
Expand Down
2 changes: 1 addition & 1 deletion public/rooms/dormont/itemshop.html
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ <h2>First interaction in ACT 3</h2>

<hr>

<h2>If you found the locked Storage Room</h2>
<h2 id="openphrase">If you found the locked Storage Room</h2>

<div class="dialogue">
<p class="dialogue-line">
Expand Down
37 changes: 0 additions & 37 deletions public/rooms/floor1/storageroom.html

This file was deleted.

Loading

0 comments on commit f067641

Please sign in to comment.