Merge pull request #83801 from John-Candlebury/afs-bugs

Author: GuardianDll

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"
   },
   {

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",

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"
   }

src/map.cpp

@@ -3581,7 +3581,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;
         }
     }