Skip to content

Commit

Permalink
Merge pull request #38847 from snipercup/Crazy-Cataclysm-and-MMA-name…
Browse files Browse the repository at this point in the history
…-to-object

Crazy Cataclysm and MMA name to object
  • Loading branch information
ZhilkinSerg authored Mar 17, 2020
2 parents 4cbdcc1 + ec16820 commit 438c60b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
15 changes: 5 additions & 10 deletions data/mods/CrazyCataclysm/crazy_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@
"id": "firekatana_off",
"type": "TOOL",
"category": "weapons",
"name": "Rising Sun",
"name_plural": "Rising Suns",
"name": { "str": "Rising Sun" },
"description": "This is a katana with a nozzle just behind the cutting edge of the blade. People love fire, and people love katanas, so why not put them together? The gas burners attached to this blade can really turn up the heat on your foes. Use to ignite.",
"weight": "1400 g",
"volume": "2250 ml",
Expand Down Expand Up @@ -132,8 +131,7 @@
"id": "firekatana_on",
"type": "TOOL",
"category": "weapons",
"name": "Rising Sun",
"name_plural": "Rising Suns",
"name": { "str": "Rising Sun" },
"description": "This is a katana that glows with the fury and heat of the SUN! Well, okay it's not THAT hot, but getting hit with it still stings like the dickens. Use to shut off the gas.",
"weight": "1400 g",
"volume": "2250 ml",
Expand Down Expand Up @@ -165,8 +163,7 @@
"id": "zweifire_off",
"type": "TOOL",
"category": "weapons",
"name": "flammenschwert (aus)",
"name_plural": "flammenschwerter (aus)",
"name": { "str": "flammenschwert (aus)", "str_pl": "flammenschwerter (aus)" },
"//": "All of this is SUPPOSED to be in German.",
"description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.",
"weight": "3400 g",
Expand Down Expand Up @@ -196,8 +193,7 @@
"id": "zweifire_on",
"type": "TOOL",
"category": "weapons",
"name": "flammenschwert",
"name_plural": "flammenschwerter",
"name": { "str": "flammenschwert", "str_pl": "flammenschwerter" },
"//": "All of this is SUPPOSED to be in German.",
"description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.",
"weight": "3400 g",
Expand Down Expand Up @@ -274,8 +270,7 @@
"id": "battletorch_lit",
"type": "TOOL",
"category": "weapons",
"name": "Louisville Slaughterer",
"name_plural": "Louisville Slaughterers",
"name": { "str": "Louisville Slaughterer" },
"description": "This is a sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric. It is burning brightly, and makes it much easier to see the baselines at night games (It also makes the umpire FAR more likely to call a ball instead of a strike).",
"weight": "1485 g",
"volume": "2 L",
Expand Down
3 changes: 1 addition & 2 deletions data/mods/MMA/martial.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"copy-from": "book_martial",
"looks_like": "manual_karate",
"type": "GENERIC",
"name": "The Life and Work of Tiger Sauer",
"name_plural": "The Life and Work of Tiger Sauer",
"name": { "str": "The Life and Work of Tiger Sauer", "str_pl": "The Life and Work of Tiger Sauer" },
"description": "A biography of a combat cyborg agent detailing his philosophy and martial art.",
"book_data": { "martial_art": "style_mma_panzer" }
}
Expand Down

0 comments on commit 438c60b

Please sign in to comment.