diff --git a/src/chats/serenity.yaml b/src/chats/serenity.yaml
index 2f423d0..cab96c1 100644
--- a/src/chats/serenity.yaml
+++ b/src/chats/serenity.yaml
@@ -174,6 +174,7 @@
 - Time to loosen up! Find yourself a cozy place to drift.
 - Do you have a reservation?
 - label: reservation
+- include: generic_help_oxygen_entrypoint
 - if: ~$reservation
   ...Reservation? Is there not enough space for everybody?:
   - Ah, space there is.
@@ -229,6 +230,7 @@
 
 - label: eat
 - set: $eat
+- include: generic_help_oxygen_entrypoint
 - What's on the menu?:
   - set: $knows-menu
   - Today's special is Suspicious Spacefunghi.
@@ -328,7 +330,13 @@
 - label: generic_questions
 - include: generic_questions_serenity
 - See you around!
+- goto: EXIT
 
+- include: generic_help_oxygen_handler
+- Is there anything else I can help you with?
+- if $reservation:
+  - goto: eat
+- goto: reservation
 
 ---
 
@@ -363,6 +371,45 @@
 ---
 
 
+# Here are two helper components for handling the generic "HELP I NEED OXYGEN"
+# chat option.
+# Use the first one as a converation option in every major conversation node by
+# simply including it, for example:
+#
+# - Hello Player!
+# - How are you doing?
+# - include: generic_help_oxygen_entrypoint
+# - Hello NPC, I'm good, how are you?:
+#   - ...
+#
+# THIS WILL NOT WORK UNLESS YOU ALSO INCLUDE "generic_help_oxygen_handler"
+# SOMEWHERE!!! (or implement your own handler for the "needoxygen" label)
+
+- chat: generic_help_oxygen_entrypoint
+- if: "$$player_oxygen_seconds <= 3600"
+  HELP! I NEED OXYGEN!:
+  - goto: generic_needoxygen
+---
+
+# Use the second one at some unreachable point in the conversation (e.g. right
+# after a "goto"), followed by some instructions that lead the conversation
+# flow back into the major conversation nodes.  Example:
+#
+# - See you around!
+# - goto: EXIT
+# - include: generic_help_oxygen_handler
+# - Is there anything else I can help you with?
+# - goto: help
+
+- chat: generic_help_oxygen_handler
+- label: generic_needoxygen
+- Sure thing, have some!
+- script: refilloxygen 1
+
+
+---
+
+
 - chat: Drifter
 - system: "Error: No response"
 - system: No life signs detected