From 83156ecec3a54fd97d0364caa90e7c3f7576e5be Mon Sep 17 00:00:00 2001
From: Brambor <tondadrd@seznam.cz>
Date: Wed, 5 Jun 2024 17:44:59 +0200
Subject: [PATCH] rename acetylene -> oxyacetylene to avoid name collision
 (#74325)

---
 data/json/items/ammo/weldgas.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/ammo/weldgas.json b/data/json/items/ammo/weldgas.json
index ebd66099754dd..1805b134b9d24 100644
--- a/data/json/items/ammo/weldgas.json
+++ b/data/json/items/ammo/weldgas.json
@@ -3,7 +3,7 @@
     "//": "roughly 35grams of acetylene per cubic foot at STP. Volume given is when compressed - B tank has 9.17 L tank and holds 40 cubic feet.",
     "id": "oxyacetylene",
     "type": "AMMO",
-    "name": { "str_sp": "acetylene" },
+    "name": { "str_sp": "oxyacetylene" },
     "description": "Pressurized, dangerous acetylene gas.  Can be used for welding or cutting with a torch.",
     "weight": "1 g",
     "volume": "250 ml",