From 2295c18a7cee0b2fea993158c4759a0ed2cc209c Mon Sep 17 00:00:00 2001
From: He4eT <He4eTHb1u@gmail.com>
Date: Tue, 17 Mar 2020 18:14:30 +0500
Subject: [PATCH] Bathroom locker content

---
 src/item/dentalFloss.t    |  4 ++--
 src/item/tape.t           | 11 +++++------
 src/room/orangeBathroom.t | 17 ++++++++++++-----
 src/room/yellowRoom.t     |  5 ++---
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/item/dentalFloss.t b/src/item/dentalFloss.t
index 3103489..2efb6d0 100644
--- a/src/item/dentalFloss.t
+++ b/src/item/dentalFloss.t
@@ -1,9 +1,9 @@
 dentalFloss: Bandage
   'dental floss'
   'dental floss'
-  @me
+  @bathroomLocker
   " A cord of thin filaments
     used to remove food and dental plaque
     from between teeth in areas
-    a toothbrush is unable to reach."
+    a toothbrush is unable to reach. "
 ;
diff --git a/src/item/tape.t b/src/item/tape.t
index 408e26c..e570d79 100644
--- a/src/item/tape.t
+++ b/src/item/tape.t
@@ -3,7 +3,7 @@ tapeWall: Thing, RoomPartItem
   'safety tape'
   " Many layers of strips of
     two-tone safety tape obscure the doorway.
-    <br>Looks like the black and yellow wall."
+    <br>Looks like the black and yellow wall. "
 
   location = cyanRoom
   specialNominalRoomPartLocation = defaultWestWall
@@ -14,7 +14,7 @@ tapeWall: Thing, RoomPartItem
   dobjFor (Remove) {
     action () {
       " After a while, you clear the doorway
-        and make a mess on the floor.";
+        and make a mess on the floor. ";
 
       isRagged = true;
 
@@ -34,9 +34,8 @@ tapeWall: Thing, RoomPartItem
   dobjFor (Take) {
     action () {
       tryImplicitAction(Remove, self);
-
-      "You take one strip.";
       pieceOfTape.moveInto(me);
+      "You take one strip. ";
     }
   }
 ;
@@ -46,7 +45,7 @@ pieceOfTape: PresentLater, Bandage
   'long strip of tape'
   @cyanRoom
   " Quite a long piece of safety tape.
-    It can serve as a rope."
+    <br>It can serve as a rope. "
 ;
 
 uselessTape: PresentLater, Decoration
@@ -54,6 +53,6 @@ uselessTape: PresentLater, Decoration
   'useless mess'
   @cyanRoom
   " Small pieces of black and yellow tape,
-    stuck together and crumpled."
+    stuck together and crumpled. "
   isListed = true
 ;
diff --git a/src/room/orangeBathroom.t b/src/room/orangeBathroom.t
index 6790efe..98d9a72 100644
--- a/src/room/orangeBathroom.t
+++ b/src/room/orangeBathroom.t
@@ -24,7 +24,7 @@ orangeBathroom: Room
   "There's a water faucet and a small sink."
 ;
 
-+ OpenableContainer, Fixture
++ bathroomLocker: OpenableContainer, Fixture
   'mirror/locker/door'
   'locker with mirror door'
   " <<isOpen
@@ -33,7 +33,14 @@ orangeBathroom: Room
     a locker for toiletries.<br>"
 ;
 
-++ painkillers: Thing
-  'pills/painkillers'
-  'painkillers'
-  "A small orange bottle of pills.";
+++ toothbrush: Thing
+  'brush/toothbrush'
+  'toothbrush'
+  "A small white toothbrush. "
+;
+
+++ toothpaste: Thing
+  'paste/toothpaste'
+  'toothpaste'
+  "An empty tube of toothpaste. "
+;
diff --git a/src/room/yellowRoom.t b/src/room/yellowRoom.t
index 2908a9e..c0a3208 100644
--- a/src/room/yellowRoom.t
+++ b/src/room/yellowRoom.t
@@ -2,11 +2,10 @@ yellowRoom: Room
   'Hallway'
   " This is another room which every surface
     covered with matte white panels.
-    <.p>
-    A bright screen on the wall attracts your attention.
+    <br>A bright screen on the wall attracts your attention.
     <.p>
     There are three doors in the north wall
-    and a wide doorway leading south."
+    and a wide doorway leading south. "
 
   south = cyanRoom