Merge pull request CleverRaven#81473 from flashing-blades/patch-1

Maleclypse · web-flow · commit 7fb2401294f3 · 2025-06-29T00:59:38.000-05:00
Smokes no longer mentions computers in evac shelters
diff --git a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk_fluff.json b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk_fluff.json
@@ -2,7 +2,7 @@
   {
     "id": "TALK_FREE_MERCHANTS_MERCHANT_AboutGreeting",
     "type": "talk_topic",
-    "dynamic_line": "A lot of the time, yes.  Our address is in the computers of most of the evac shelters around here, and people keep showing up that we have to turn away.  It gets easier when you have something you can read off a script.",
+    "dynamic_line": "A lot of the time, yes.  Our address is on the info boards of most of the evac shelters around here, and people keep showing up that we have to turn away.  It gets easier when you have something you can read off a script.",
     "responses": [
       { "text": "I'm sorry.", "topic": "TALK_FREE_MERCHANTS_MERCHANT_AboutGreeting_End" },
       { "text": "That sounds a little cruel.", "topic": "TALK_FREE_MERCHANTS_MERCHANT_AboutGreeting_Cruel" },

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`"id": "TALK_FREE_MERCHANTS_MERCHANT_AboutGreeting",`
`4`	`4`	`"type": "talk_topic",`
`5`		`- "dynamic_line": "A lot of the time, yes. Our address is in the computers of most of the evac shelters around here, and people keep showing up that we have to turn away. It gets easier when you have something you can read off a script.",`
	`5`	`+ "dynamic_line": "A lot of the time, yes. Our address is on the info boards of most of the evac shelters around here, and people keep showing up that we have to turn away. It gets easier when you have something you can read off a script.",`
`6`	`6`	`"responses": [`
`7`	`7`	`{ "text": "I'm sorry.", "topic": "TALK_FREE_MERCHANTS_MERCHANT_AboutGreeting_End" },`
`8`	`8`	`{ "text": "That sounds a little cruel.", "topic": "TALK_FREE_MERCHANTS_MERCHANT_AboutGreeting_Cruel" },`