From 3becde30935afd70b0645ad92a10b35c020197fd Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Mon, 17 Nov 2025 21:21:20 +0000 Subject: [PATCH 1/2] Ship kitchenette can heat things --- .../maps/furniture_and_terrain/furniture_spaceship.json | 5 ++--- src/map.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/mods/aftershock_exoplanet/maps/furniture_and_terrain/furniture_spaceship.json b/data/mods/aftershock_exoplanet/maps/furniture_and_terrain/furniture_spaceship.json index 36de9e88afc57..bc1a93618b178 100644 --- a/data/mods/aftershock_exoplanet/maps/furniture_and_terrain/furniture_spaceship.json +++ b/data/mods/aftershock_exoplanet/maps/furniture_and_terrain/furniture_spaceship.json @@ -10,7 +10,7 @@ "move_cost_mod": -1, "coverage": 55, "required_str": -1, - "flags": [ "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "FLAT_SURF", "NO_SELF_CONNECT" ], + "flags": [ "FLAMMABLE_ASH", "USABLE_FIRE", "CONTAINER", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "FLAT_SURF", "NO_SELF_CONNECT" ], "connect_groups": "COUNTER", "connects_to": "COUNTER", "deconstruct": { @@ -19,8 +19,7 @@ { "item": "rigid_plastic_sheet", "count": 1 }, { "item": "polycarbonate_sheet", "count": [ 2, 8 ] } ] - }, - "crafting_pseudo_item": "fire" + } }, { "type": "furniture", diff --git a/src/map.cpp b/src/map.cpp index 2b177bb9b2584..710927515d29a 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -3512,7 +3512,7 @@ bool map::has_nearby_fire( const tripoint_bub_ms &p, int radius ) const if( has_field_at( pt, fd_fire ) ) { return true; } - if( has_flag_ter_or_furn( ter_furn_flag::TFLAG_USABLE_FIRE, p ) ) { + if( has_flag_ter_or_furn( ter_furn_flag::TFLAG_USABLE_FIRE, pt ) ) { return true; } } From 490aaeb6a44e316fb5724261d6387e204f294647 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Mon, 17 Nov 2025 21:21:23 +0000 Subject: [PATCH 2/2] Make water sources not freeze instantly. --- data/json/furniture_and_terrain/terrain-liquids.json | 2 +- .../maps/furniture_and_terrain/terrain_groundxeno.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-liquids.json b/data/json/furniture_and_terrain/terrain-liquids.json index dd8ae2ee6dc8a..d17e84336681a 100644 --- a/data/json/furniture_and_terrain/terrain-liquids.json +++ b/data/json/furniture_and_terrain/terrain-liquids.json @@ -484,7 +484,7 @@ "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "SHALLOW_WATER" ], "connect_groups": "WATER", "connects_to": "WATER", - "liquid_source": { "id": "water_murky" }, + "liquid_source": { "id": "water_murky", "min_temp": 70 }, "examine_action": "water_source" }, { diff --git a/data/mods/aftershock_exoplanet/maps/furniture_and_terrain/terrain_groundxeno.json b/data/mods/aftershock_exoplanet/maps/furniture_and_terrain/terrain_groundxeno.json index f5fc17fb2b531..bff9aca690977 100644 --- a/data/mods/aftershock_exoplanet/maps/furniture_and_terrain/terrain_groundxeno.json +++ b/data/mods/aftershock_exoplanet/maps/furniture_and_terrain/terrain_groundxeno.json @@ -493,7 +493,7 @@ "emissions": [ "weak_toxic_dust" ], "color": "light_red", "move_cost": 6, - "liquid_source": { "id": "water_sewage" }, + "liquid_source": { "id": "water_sewage", "min_temp": 18 }, "flags": [ "TRANSPARENT", "SWIMMABLE", "SHALLOW_WATER" ], "examine_action": "water_source" }