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

check emptiness (CleverRaven#36705) #40

Merged
merged 36 commits into from
Jan 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
68babf9
Revert "don't rebuild the item drop list (#36647)"
BevapDin Jan 3, 2020
2f4d528
Fix dropping only two or so items when selecting to drop all of a stack.
BevapDin Jan 3, 2020
a5fb48e
Routine i18n updates on 4 Jan 2019
BrettDong Jan 4, 2020
5e67b46
renovate house 04 (#36640)
curstwist Jan 4, 2020
175ddf5
Merge pull request #36683 from BrettDong/i18n
Rivet-the-Zombie Jan 4, 2020
c30844c
Prevent undefined behaviour modifying bionic power
anothersimulacrum Jan 4, 2020
5c02744
Prevent high eye encumbrance from blinding players
anothersimulacrum Jan 4, 2020
58ef4cd
Add an option to start the game window maximized
Qrox Jan 4, 2020
c4f6a89
Graphical Overmap update (#35792)
Larwck Jan 4, 2020
eb750c3
Fix Wgt/Vol position in pickup window (#36643)
8street Jan 4, 2020
235601a
Mi-go furnitures contain a fetid goop that can mask your scent (#36160)
Fris0uman Jan 4, 2020
c47e299
Speedup move test (#36664)
kevingranade Jan 4, 2020
7c22756
Aftershock: PrepNet mycus war (#36661)
Maleclypse Jan 4, 2020
9326ba6
Add title to info window in shift-v menu (#36648)
8street Jan 4, 2020
d0a3632
Merge pull request #36686 from anothersimulacrum/ub
ZhilkinSerg Jan 4, 2020
537fd02
Merge pull request #36687 from anothersimulacrum/vis
ZhilkinSerg Jan 4, 2020
9e6c9bf
Merge pull request #36688 from Qrox/maximize
ZhilkinSerg Jan 4, 2020
7399eec
Restore crafting results being put on the workbench.
BevapDin Jan 4, 2020
5f339eb
Fix accessing invalid item locations:
BevapDin Jan 4, 2020
1e7f02e
Fix monsters not being spawned on the map (#36691)
ZhilkinSerg Jan 4, 2020
0e04348
Add construction recipe to turn shallow water to dirt. (#36493)
Jan 4, 2020
6b4ae2c
renovate houses 06-10 (#36693)
curstwist Jan 4, 2020
5c8e01c
Magiclysm: Cooking with Poison (#36627)
Maleclypse Jan 4, 2020
f32f08b
Fix linting (#36701)
anothersimulacrum Jan 4, 2020
cf92e9c
Merge pull request #36694 from BevapDin/ouj
ZhilkinSerg Jan 4, 2020
525090e
Merge pull request #36673 from BevapDin/biy
ZhilkinSerg Jan 4, 2020
443da66
Fix garage door knockback crash (#36671)
Jan 4, 2020
c61070d
Lab snippet lore update (#36497)
I-am-Erk Jan 4, 2020
264b304
update houses 11-15 (#36698)
curstwist Jan 4, 2020
ca62787
Add reload wielded keybinding (#36658)
Ramza13 Jan 5, 2020
922b9a6
Cap fire age to prevent android overflow (#36676)
Jan 5, 2020
91d7b51
Monster reorganize add fungus json (#36684)
Maleclypse Jan 5, 2020
fdcae19
Add "repairs_like" for items without a recipe (#36700)
anothersimulacrum Jan 5, 2020
ada2433
Stop ant tunnels stomping over other map terrain underground and remo…
Jan 5, 2020
552ecbb
Prevent counterattacking with large/fragile items (#36704)
anothersimulacrum Jan 5, 2020
921a9f4
check emptiness (#36705)
Jan 5, 2020
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
22 changes: 22 additions & 0 deletions data/json/construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,28 @@
"pre_terrain": "t_door_frame",
"post_terrain": "t_door_c"
},
{
"type": "construction",
"description": "Fill Shallow Water With Dirt",
"category": "CONSTRUCT",
"required_skills": [ [ "survival", 1 ] ],
"time": "60 m",
"qualities": [ [ { "id": "DIG", "level": 2 } ] ],
"components": [ [ [ "material_soil", 60 ], [ "material_sand", 600 ] ] ],
"pre_terrain": "t_water_sh",
"post_terrain": "t_dirt"
},
{
"type": "construction",
"description": "Fill Salt Water With Dirt",
"category": "CONSTRUCT",
"required_skills": [ [ "survival", 1 ] ],
"time": "60 m",
"qualities": [ [ { "id": "DIG", "level": 2 } ] ],
"components": [ [ [ "material_soil", 60 ] ] ],
"pre_terrain": "t_swater_sh",
"post_terrain": "t_dirt"
},
{
"type": "construction",
"description": "Build Door",
Expand Down
23 changes: 23 additions & 0 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,12 @@
"name": [ "Assisted" ],
"desc": [ "You're receiving assistance to practice a surgery." ]
},
{
"type": "effect_type",
"id": "masked_scent",
"name": [ "Masked scent" ],
"desc": [ "Your scent is masked by another one." ]
},
{
"type": "effect_type",
"id": "got_checked",
Expand Down Expand Up @@ -1867,6 +1873,23 @@
},
"show_in_info": true
},
{
"type": "effect_type",
"id": "fetid_goop",
"name": [ "Covered in fetid goop" ],
"desc": [ "The feeling of the goop slowly sliding on your skin revulses you and the smell makes you gag." ],
"apply_message": "You're disgusted by the goop.",
"rating": "bad",
"base_mods": {
"str_mod": [ -1 ],
"per_mod": [ -1 ],
"dex_mod": [ -1 ],
"int_mod": [ -1 ],
"speed_mod": [ -10 ],
"vomit_chance": [ 100 ]
},
"show_in_info": true
},
{
"type": "effect_type",
"id": "has_og_comm_freq"
Expand Down
43 changes: 38 additions & 5 deletions data/json/furniture_and_terrain/furniture-migo.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@
"light_emitted": 15,
"required_str": -1,
"flags": [ "TRANSPARENT" ],
"bash": { "str_min": 8, "str_max": 20, "sound": "splorch!", "sound_fail": "whump!", "furn_set": "f_alien_scar" }
"bash": {
"str_min": 8,
"str_max": 20,
"sound": "splorch!",
"sound_fail": "whump!",
"furn_set": "f_alien_scar",
"items": [ { "item": "fetid_goop", "count": [ 3, 5 ], "prob": 100 } ]
}
},
{
"type": "furniture",
Expand All @@ -26,7 +33,14 @@
"light_emitted": 3,
"flags": [ "TRANSPARENT", "EMITTER" ],
"emissions": [ "emit_hot_air_migo_seep" ],
"bash": { "str_min": 13, "str_max": 26, "sound": "splorch!", "sound_fail": "whump!", "furn_set": "f_alien_scar" }
"bash": {
"str_min": 13,
"str_max": 26,
"sound": "splorch!",
"sound_fail": "whump!",
"furn_set": "f_alien_scar",
"items": [ { "item": "fetid_goop", "count": [ 3, 7 ], "prob": 100 } ]
}
},
{
"type": "furniture",
Expand All @@ -41,7 +55,14 @@
"flags": [ "TRANSPARENT", "EMITTER" ],
"emissions": [ "emit_migo_atmosphere", "emit_hot_air_migo_blast" ],
"//": "TODO: Make a custom toxic gas emission that is not visible to the player",
"bash": { "str_min": 30, "str_max": 60, "sound": "splorch!", "sound_fail": "whump!", "furn_set": "f_alien_scar" }
"bash": {
"str_min": 30,
"str_max": 60,
"sound": "splorch!",
"sound_fail": "whump!",
"furn_set": "f_alien_scar",
"items": [ { "item": "fetid_goop", "count": [ 15, 25 ], "prob": 100 } ]
}
},
{
"type": "furniture",
Expand Down Expand Up @@ -71,7 +92,13 @@
"flags": [ "TRANSPARENT", "EMITTER" ],
"emissions": [ "emit_hot_air_migo_seep", "emit_shock_burst" ],
"//": "TODO: Make a custom toxic gas emission that is not visible to the player",
"bash": { "str_min": 250, "str_max": 600, "sound": "splorch!", "sound_fail": "splat!" }
"bash": {
"str_min": 250,
"str_max": 600,
"sound": "splorch!",
"sound_fail": "splat!",
"items": [ { "item": "fetid_goop", "count": [ 6, 13 ], "prob": 100 } ]
}
},
{
"type": "furniture",
Expand All @@ -84,7 +111,13 @@
"coverage": 40,
"required_str": -1,
"flags": [ "TRANSPARENT" ],
"bash": { "str_min": 25, "str_max": 60, "sound": "splorch!", "sound_fail": "whump." }
"bash": {
"str_min": 25,
"str_max": 60,
"sound": "splorch!",
"sound_fail": "whump.",
"items": [ { "item": "fetid_goop", "count": [ 5, 10 ], "prob": 100 } ]
}
},
{
"type": "furniture",
Expand Down
5 changes: 5 additions & 0 deletions data/json/item_actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,11 @@
"id": "reveal_map",
"name": "Read"
},
{
"type": "item_action",
"id": "change_scent",
"name": "Mask scent"
},
{
"type": "item_action",
"id": "unfold_vehicle",
Expand Down
18 changes: 18 additions & 0 deletions data/json/items/biosignatures.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,23 @@
"name": "roach dirt",
"copy-from": "feces_bird",
"description": "Large black pellets of rotting material."
},
{
"type": "GENERIC",
"id": "fetid_goop",
"symbol": "~",
"color": "white",
"name": "fetid goop",
"weight": "750 g",
"volume": "1 L",
"description": "A foul smelling goop. It has a disgusting texture and a powerful smell that overrides every other smell around it.",
"use_action": {
"type": "change_scent",
"scent_typeid": "sc_fetid",
"moves": 200,
"duration": "1 h",
"charges_to_use": 1,
"effects": [ { "id": "fetid_goop", "duration": 3600 } ]
}
}
]
Loading