Merge remote-tracking branch 'upstream/master'

Core Mechanics/Navigation.i7x

@@ -238,7 +238,7 @@ carry out destinationcheck:
 			say "| [link][bracket]Phi Iota Gamma[close bracket][as]nav Phi Iota Gamma[end link] ";
 		LineBreak;
 	[start of the forest area]
-	if Urban Forest is known or Bunny House is known or Deep Forest is known or Happy Puppy Kennel is known [or Ironscale Hollow is known]: [What?]
+	if Urban Forest is known or Bunny House is known or Deep Forest is known or Happy Puppy Kennel is known or Ironscale Hollow is known:
 		say "[bold type]Urban Forest[roman type]: ";
 		if Urban Forest is known:
 			say "[link][bracket]Urban Forest[close bracket][as]nav Urban Forest[end link] ";
@@ -248,8 +248,8 @@ carry out destinationcheck:
 			say "| [link][bracket]Deep Forest[close bracket][as]nav Deep Forest[end link] ";
 		if Happy Puppy Kennel is known:
 			say "| [link][bracket]Happy Puppy Kennel[close bracket][as]nav Happy Puppy Kennel[end link] ";
-		[if Ironscale Hollow is known:
-			say "| [link][bracket]Ironscale Hollow[close bracket][as]nav Ironscale Hollow[end link] ";] [Not defined]
+		if Ironscale Hollow is known:
+			say "| [link][bracket]Ironscale Hollow[close bracket][as]nav Ironscale Hollow[end link] ";
 		LineBreak;
 	[start of the warehouse area]
 	if Warehouse District is known or Hyena Hideout is known or Mike's Home is known or Spider's Web is known or Wolfman Lair is known:

Kernog/Zoe.i7x

@@ -492,14 +492,9 @@ an everyturn rule:
 
 Part B - Suspicious Van
 
-<<<<<<< HEAD
-[The van is where Zoe will be if she is captured. It is a container, with specific rules. Locked until Zoe's quest is resolved, it is guarded by a Wolverine van guard, with which the player will interact]
-Suspicious van is a closed container. It is openable. It is lockable. It is locked.
-=======
 [The van is where Zoe will be if she is captured. It is a container, with specific rules. Locked until Zoe's quest is resolved, it is guarded by a Wolverine Pimp, with which the player will interact]
 Suspicious Van is a closed container. It is openable.
 Suspicious Van is locked.
->>>>>>> e4671837dc2edd8c48364e45a31a62710c688f50
 Suspicious Van is in Smith Haven Mall Lot West.
 The description of Suspicious Van is "[suspiciousVanDesc]".
 

Stripes/Orthas.i7x

@@ -34,6 +34,10 @@ to say OrthasNPCdesc:
 	say "     Orthas is a black-scaled dragoness with an overall hunanoid build that shows quite a few muscles while still being decidedly feminine. Her large F-cup breasts leave little doubt of that, making quite a distracting display with every breath she takes. She stands about six and a half feet tall and has a large set of wings folded aganst her back, completing the image of a strong woman that few would dare mess with. Behind her, a long reptilian tail sways slowly from left to right.";
 	say "     Being the guardian of the Trevor Labs building, most of Orthas's time is spent in its lobby, where she dutyfully guards the entrance and the stairs that lead up into the offices and labs.";
 
+Table of GameEventIDs (continued)
+Object	Name
+Meeting Orthas	"Meeting Orthas"
+
 Meeting Orthas is a situation.
 The sarea of Meeting Orthas is "Nowhere".
 

Wahn/Joshiro.i7x

@@ -556,6 +556,10 @@ When Play begins:
 
 Section 5 - NPCs
 
+Table of GameCharacterIDs (continued)
+object	name
+Joshiro	"Joshiro"
+
 Joshiro is a man.
 ScaleValue of Joshiro is 3. [human sized]
 Cocks of Joshiro is 1.

Wahn/Spike.i7x

@@ -81,6 +81,10 @@ to say SpikeAccepted:
 
 Section 2 - Combat Pet
 
+Table of GameCharacterIDs (continued)
+object	name
+doberman companion	"doberman companion"
+
 doberman companion is a pet. doberman companion is a part of the player.
 understand "Spike" as doberman companion.
 understand "doberman" as doberman companion.
@@ -112,6 +116,10 @@ to say DismissSpike:
 
 Section 3 - NPC
 
+Table of GameCharacterIDs (continued)
+object	name
+Spike	"Spike"
+
 Spike is a man.
 The description of Spike is "[SpikeDesc]".
 The conversation of Spike is { "<This is nothing but a placeholder!>" }.