Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding a bong and its spawn conditions #78342

Merged
merged 28 commits into from
Dec 7, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1c53888
Adding a bong and its spawn conditions
SJTheNewOne Dec 4, 2024
408b9a9
Update data/json/itemgroups/stashes.json
SJTheNewOne Dec 4, 2024
dab6f27
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 4, 2024
b7d4dcc
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 4, 2024
467665b
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 4, 2024
2904070
Update data/json/mapgen/headshop.json
SJTheNewOne Dec 4, 2024
226d6c8
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 4, 2024
e17bf76
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 4, 2024
3833c47
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 4, 2024
a5716fa
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 4, 2024
6ce3843
Update smoking.json
SJTheNewOne Dec 5, 2024
4f4b03d
Update smoking.json
SJTheNewOne Dec 5, 2024
693fe9e
Update smoking.json
SJTheNewOne Dec 5, 2024
84056e5
Update misc.json
SJTheNewOne Dec 5, 2024
02ecab0
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 5, 2024
5eafabd
Update smoking.json
SJTheNewOne Dec 5, 2024
15577ed
Update smoking.json
SJTheNewOne Dec 5, 2024
672699c
Update smoking.json
SJTheNewOne Dec 5, 2024
95960ea
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 5, 2024
b65733c
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 5, 2024
11fe6ab
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 5, 2024
b57e31e
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 5, 2024
b793356
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 5, 2024
10e7bb3
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 5, 2024
766c91c
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 5, 2024
429d385
Update data/json/items/tool/smoking.json
SJTheNewOne Dec 5, 2024
386c680
Update smoking.json
SJTheNewOne Dec 5, 2024
db2ff67
Update smoking.json
SJTheNewOne Dec 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/itemgroups/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"id": "stoner",
"type": "item_group",
"//": "Processed weed and weed accessories",
"items": [ [ "joint", 100 ], [ "joint_roach", 20 ], [ "pipe_glass", 10 ] ]
"items": [ [ "joint", 100 ], [ "joint_roach", 20 ], [ "pipe_glass", 10 ], [ "pipe_water", 5 ] ]
},
{
"id": "butane_lighter_and_fuel",
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/stashes.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
{ "prob": 1, "group": "heroin_bag_zipper_1_4" },
{ "prob": 4, "group": "crack_bag_zipper_1_4" },
[ "crackpipe", 7 ],
[ "pipe_water", 5 ],
{ "prob": 1, "group": "antifungal_bottle_plastic_pill_prescription_1_5" },
{ "prob": 2, "group": "antiparasitic_bottle_plastic_pill_prescription_1_10" },
{ "prob": 1, "group": "diazepam_bottle_plastic_pill_prescription_1_10" },
Expand Down
30 changes: 30 additions & 0 deletions data/json/items/tool/smoking.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,36 @@
"qualities": [ [ "SMOKE_PIPE", 1 ] ],
"melee_damage": { "bash": 1 }
},
{
"id": "pipe_water",
"type": "TOOL",
"name": { "str": "water pipe" },
"looks_like": "bottle_plastic",
"description": "A mass-manufacured water-pipe, otherwise known as a 'bong.' Headshops often insist these are used solely for tobacco, despite their iconic status as cannabis paraphernalia.",
SJTheNewOne marked this conversation as resolved.
Show resolved Hide resolved
"weight": "750 g",
"volume": "900 ml",
"longest_side": "30 cm",
"flags": [ "FRAGILE_MELEE", "NONCONDUCTIVE" ],
"price": 2000,
"price_postapoc": 100,
SJTheNewOne marked this conversation as resolved.
Show resolved Hide resolved
"pocket_data": [
{
"pocket_type": "CONTAINER",
"watertight": true,
"rigid": true,
"max_contains_volume": "500 ml",
"max_item_volume": "500 ml",
"max_contains_weight": "1 kg",
"moves": 400
}
],
"to_hit": -2,
SJTheNewOne marked this conversation as resolved.
Show resolved Hide resolved
"material": [ "glass" ],
"symbol": ",",
"color": "cyan",
"qualities": [ [ "SMOKE_PIPE", 1 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
"melee_damage": { "bash": 4 }
},
{
"id": "pipe_tobacco",
"type": "TOOL",
Expand Down
2 changes: 2 additions & 0 deletions data/json/mapgen/headshop.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@
{ "item": "pipe_glass", "repeat": [ 1, 4 ], "x": 4, "y": 10 },
{ "item": "pipe_glass", "repeat": [ 1, 4 ], "x": 7, "y": 10 },
{ "item": "pipe_glass", "repeat": [ 1, 4 ], "x": 18, "y": 10 },
{ "item": "pipe_water", "repeat": [ 1, 2 ], "x": 4, "y": 10 },
{ "item": "pipe_water", "repeat": [ 1, 2 ], "x": 4, "y": 10 },
{ "item": "crackpipe", "repeat": [ 1, 2 ], "x": 21, "y": 10 }
],
"place_items": [
Expand Down
Loading