Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Waypoint-14/Waypoint
Browse files Browse the repository at this point in the history
  • Loading branch information
DangerRevolution committed Oct 21, 2024
2 parents 0e1e6d3 + cb53803 commit 6e80c4b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Resources/Prototypes/Guidebook/species.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@
# - type: guideEntry
# id: Harpy
# name: species-name-harpy
# text: "/ServerInfo/Guidebook/Mobs/Harpy.xml"
# text: "/ServerInfo/Guidebook/Mobs/Harpy.xml"
4 changes: 2 additions & 2 deletions Resources/ServerInfo/Guidebook/Mobs/Diona.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Document>
<!-- <Document>
# Diona
<Box>
Expand Down Expand Up @@ -35,4 +35,4 @@
and there will be little to no evidence beyond their word about who they were before.
</Document>
</Document> -->
4 changes: 2 additions & 2 deletions Resources/ServerInfo/Guidebook/Mobs/Dwarf.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Document>
<!-- <Document>
# Dwarves
<Box>
Expand All @@ -8,4 +8,4 @@
Dwarves are similar to humans in most respect, but tolerate alcohol better and are healed by it.
</Document>
</Document> -->
4 changes: 2 additions & 2 deletions Resources/ServerInfo/Guidebook/Mobs/Moth.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Document>
<!-- <Document>
# Moth People
<Box>
Expand All @@ -12,4 +12,4 @@
They take [color=#1e90ff]30% less Cold damage[/color] but [color=#ffa500]30% more Heat damage, and catch on fire more easily[/color].
</Document>
</Document> -->

0 comments on commit 6e80c4b

Please sign in to comment.