Skip to content

Commit

Permalink
Fixes fishing in pools (#6316)
Browse files Browse the repository at this point in the history
  • Loading branch information
Putnam3145 authored Feb 15, 2024
1 parent 7ce7813 commit 562cef6
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion code/game/turfs/simulated/floor_types/water.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

var/reagent_type = "water"

var/can_fish = TRUE

/turf/simulated/floor/water/Initialize(mapload)
. = ..()
var/singleton/flooring/F = get_flooring_data(/singleton/flooring/water)
Expand Down Expand Up @@ -92,7 +94,7 @@

/turf/simulated/floor/water/pre_fishing_query(obj/item/fishing_rod/rod, mob/user)
. = ..()
if(.)
if(!can_fish || .)
return
if(!GetComponent(/datum/component/fishing_spot))
AddComponent(/datum/component/fishing_spot, /datum/fish_source/ocean)
Expand All @@ -113,11 +115,13 @@
desc = "Don't worry, it's not closed."
under_state = "pool"
outdoors = FALSE
can_fish = FALSE

/turf/simulated/floor/water/deep/pool
name = "deep pool"
desc = "Don't worry, it's not closed."
outdoors = FALSE
can_fish = FALSE

/mob/living/proc/can_breathe_water()
return FALSE
Expand Down

0 comments on commit 562cef6

Please sign in to comment.