Skip to content

Commit

Permalink
Merge pull request CleverRaven#69454 from tjlaxs/multiple_addicting_s…
Browse files Browse the repository at this point in the history
…ubstances

Adding multiple addictions to some alcohol drinks
  • Loading branch information
Maleclypse authored Nov 17, 2023
2 parents 725161a + 9114c42 commit 07205b4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions data/json/items/comestibles/alcohol.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"name": { "str_sp": "Marloss wine" },
"weight": "50 g",
"color": "pink",
"addiction_type": "marloss_r",
"addiction_type": [ "marloss_r", { "addiction": "alcohol", "potential": 5 } ],
"use_action": [ "MARLOSS" ],
"stim": -12,
"container": "bottle_glass",
Expand Down Expand Up @@ -659,7 +659,7 @@
"name": { "str_sp": "Irish coffee" },
"weight": "252 g",
"color": "brown",
"addiction_type": "alcohol",
"addiction_type": [ "alcohol", { "addiction": "caffeine", "potential": 3 } ],
"use_action": [ "ALCOHOL" ],
"stim": 12,
"container": "bottle_glass",
Expand Down Expand Up @@ -687,7 +687,7 @@
"name": { "str_sp": "karsk" },
"weight": "252 g",
"color": "brown",
"addiction_type": "alcohol",
"addiction_type": [ "alcohol", { "addiction": "caffeine", "potential": 3 } ],
"use_action": [ "ALCOHOL" ],
"stim": 12,
"container": "bottle_glass",
Expand Down

0 comments on commit 07205b4

Please sign in to comment.