Merge branch 'endless-sky:master' into experimental

endless-sky · Apr 18, 2024 · ec3b452 · ec3b452
2 parents 4791b94 + 20c25d4
commit ec3b452
Show file tree

Hide file tree

Showing 3 changed files with 302 additions and 191 deletions.
diff --git a/data/governments.txt b/data/governments.txt
@@ -1047,9 +1047,9 @@ government "Pirate"
 	"bribe" .05
 	"fine" 0
 	"friendly hail" "friendly pirate"
-	"friendly disabled hail" "friendly disabled"
+	"friendly disabled hail" "friendly disabled pirate"
 	"hostile hail" "hostile pirate"
-	"hostile disabled hail" "hostile disabled"
+	"hostile disabled hail" "hostile disabled pirate"
 	raid "pirate raid"
 
 government "Pirate (Devil-Run Gang)"
@@ -1070,9 +1070,9 @@ government "Pirate (Devil-Run Gang)"
 	"bribe" .05
 	"fine" 0
 	"friendly hail" "friendly pirate"
-	"friendly disabled hail" "friendly disabled"
+	"friendly disabled hail" "friendly disabled pirate"
 	"hostile hail" "hostile pirate"
-	"hostile disabled hail" "hostile disabled"
+	"hostile disabled hail" "hostile disabled pirate"
 
 government "Pirate (Rival)"
 	"display name" "Pirate"
@@ -1090,9 +1090,9 @@ government "Pirate (Rival)"
 	"bribe" 0
 	"fine" 0
 	"friendly hail" "friendly pirate"
-	"friendly disabled hail" "friendly disabled"
+	"friendly disabled hail" "friendly disabled pirate"
 	"hostile hail" "hostile pirate"
-	"hostile disabled hail" "hostile disabled"
+	"hostile disabled hail" "hostile disabled pirate"
 	raid "pirate raid"
 
 color "governments: Pug" .99 .89 .70