Skip to content

Commit

Permalink
Adds a small fishing pool on metastation (tgstation#82721)
Browse files Browse the repository at this point in the history 
## About The Pull Request

Firstly adds `var/datum/fish_source/fishing_datum` to
`/turf/open/water`, allowing a much easier way of adding lootpools to
water tiles, and sets its default to `/datum/fish_source/portal`

Secondly, adds a small pool for fishing in the metastation garden. This
sadly means Betsy had to move in with the chickens.

## Why It's Good For The Game

Should show more people that fishing actually exists, and give you
something more to do in the face of chaos and murder.


![image](https://github.com/tgstation/tgstation/assets/49160555/023ddebe-5938-402c-97af-d5def27069be)

This is mostly a test run. I plan on following up with more pools on
other stations if people like this one

## Changelog
:cl: @MrEmre12, @Majkl-J 
add: Fishing pool introduced to metastation garden
refactor: All water tiles now handle fishing through a unified
fishing_datum variable
/:cl:

---------

Co-authored-by: Vire <[email protected]>
  • Loading branch information
@Majkl-J @Maurukas
Majkl-J and Maurukas authored May 7, 2024
1 parent c3fc868 commit 42ec92f
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 54 deletions.
148 changes: 98 additions & 50 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5720,7 +5720,12 @@
/turf/open/floor/circuit,
/area/station/maintenance/port/aft)
"bYN" = (
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/obj/effect/turf_decal/siding/wideplating_new{
dir = 4
},
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 4
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"bZb" = (
Expand Down Expand Up @@ -14895,6 +14900,15 @@
/obj/structure/sign/warning/pods,
/turf/closed/wall,
/area/station/commons/locker)
"ftQ" = (
/obj/effect/turf_decal/siding/white{
dir = 4
},
/obj/structure/railing{
dir = 4
},
/turf/open/water,
/area/station/service/hydroponics/garden)
"fuc" = (
/obj/structure/frame/machine{
anchored = 1
Expand Down Expand Up @@ -17135,14 +17149,15 @@
/area/station/service/theater)
"gpk" = (
/obj/structure/table,
/obj/item/hatchet,
/obj/item/cultivator,
/obj/item/crowbar,
/obj/item/reagent_containers/cup/watering_can,
/obj/item/plant_analyzer,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/item/storage/bag/plants/portaseeder,
/obj/item/crowbar,
/obj/item/reagent_containers/cup/watering_can,
/obj/item/cultivator,
/obj/item/hatchet,
/obj/item/plant_analyzer,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"gpv" = (
Expand Down Expand Up @@ -23125,9 +23140,19 @@
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
"ivb" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
/obj/machinery/disposal/bin,
/obj/machinery/camera/directional/east{
c_tag = "Garden"
},
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/wideplating_new,
/obj/structure/railing,
/obj/effect/turf_decal/tile/green/half/contrasted,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"ivc" = (
Expand Down Expand Up @@ -26930,11 +26955,6 @@
/obj/structure/table/wood/poker,
/turf/open/floor/wood,
/area/station/commons/lounge)
"jGE" = (
/obj/structure/window/spawner/directional/west,
/obj/structure/window/spawner/directional/north,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"jGG" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/box/white{
Expand Down Expand Up @@ -28028,11 +28048,10 @@
/turf/open/floor/iron/dark,
/area/station/command/gateway)
"jYu" = (
/mob/living/basic/cow{
name = "Betsy";
real_name = "Betsy"
/obj/effect/turf_decal/siding/white{
dir = 9
},
/turf/open/floor/grass,
/turf/open/water,
/area/station/service/hydroponics/garden)
"jYv" = (
/obj/machinery/meter,
Expand Down Expand Up @@ -29001,13 +29020,21 @@
/turf/open/floor/iron/white,
/area/station/security/prison)
"krt" = (
/obj/item/storage/bag/plants/portaseeder,
/obj/structure/table,
/obj/item/plant_analyzer,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/light/directional/south,
/obj/structure/table/wood,
/obj/effect/turf_decal/siding/wideplating_new{
dir = 4
},
/obj/item/storage/toolbox/fishing,
/obj/item/storage/toolbox/fishing,
/obj/item/fishing_rod,
/obj/item/fishing_rod,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 4
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"krL" = (
Expand Down Expand Up @@ -30933,6 +30960,7 @@
name = "Featherbottom";
real_name = "Featherbottom"
},
/obj/structure/flora/bush/fullgrass,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"lbL" = (
Expand Down Expand Up @@ -31000,10 +31028,12 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/siding/wideplating_new/corner,
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"lds" = (
Expand Down Expand Up @@ -32381,9 +32411,6 @@
/obj/structure/chair/comfy/brown,
/turf/open/floor/engine/cult,
/area/station/service/library)
"lJa" = (
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"lJh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -33744,7 +33771,7 @@
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
"mie" = (
/obj/structure/window/spawner/directional/south,
/obj/structure/flora/bush/flowers_yw,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"mig" = (
Expand Down Expand Up @@ -40169,8 +40196,13 @@
/area/station/science/lab)
"otG" = (
/obj/item/radio/intercom/directional/east,
/obj/structure/window/spawner/directional/north,
/turf/open/floor/grass,
/obj/effect/turf_decal/siding/white{
dir = 5
},
/obj/structure/railing{
dir = 4
},
/turf/open/water,
/area/station/service/hydroponics/garden)
"otI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -40641,6 +40673,7 @@
name = "Kentucky";
real_name = "Kentucky"
},
/obj/structure/flora/grass/jungle/b/style_random,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"oCR" = (
Expand Down Expand Up @@ -44326,17 +44359,12 @@
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"pRM" = (
/obj/machinery/disposal/bin,
/obj/machinery/camera/directional/east{
c_tag = "Garden"
},
/obj/structure/disposalpipe/trunk{
dir = 8
/obj/structure/window/spawner/directional/south,
/mob/living/basic/cow{
name = "Betsy";
real_name = "Betsy"
},
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"pSa" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
Expand Down Expand Up @@ -59819,6 +59847,12 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
"vmU" = (
/obj/effect/turf_decal/siding/white{
dir = 8
},
/turf/open/water,
/area/station/service/hydroponics/garden)
"vmX" = (
/obj/machinery/light/directional/west,
/obj/structure/disposalpipe/segment,
Expand Down Expand Up @@ -64474,6 +64508,7 @@
/area/station/science/robotics/lab)
"wRF" = (
/obj/structure/window/spawner/directional/west,
/obj/structure/flora/rock/pile,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"wRL" = (
Expand Down Expand Up @@ -66110,6 +66145,15 @@
"xww" = (
/turf/closed/wall/r_wall,
/area/station/engineering/storage/tech)
"xwB" = (
/obj/effect/turf_decal/siding/white{
dir = 6
},
/obj/structure/railing{
dir = 4
},
/turf/open/water,
/area/station/service/hydroponics/garden)
"xwD" = (
/obj/effect/turf_decal/trimline/yellow/filled/corner,
/turf/open/floor/iron/white,
Expand Down Expand Up @@ -66293,10 +66337,14 @@
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"xyI" = (
/obj/machinery/door/window/left/directional/west{
name = "Animal Pen B"
/obj/effect/turf_decal/siding/white{
dir = 10
},
/turf/open/floor/grass,
/obj/structure/railing{
dir = 8
},
/obj/structure/sign/clock/directional/south,
/turf/open/water,
/area/station/service/hydroponics/garden)
"xyM" = (
/obj/structure/cable,
Expand Down Expand Up @@ -67394,11 +67442,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/wideplating_new,
/obj/structure/railing,
/obj/effect/turf_decal/tile/green/half/contrasted,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"xUH" = (
Expand Down Expand Up @@ -105544,7 +105592,7 @@ fzr
iCJ
qgy
ldg
ivb
bYN
bYN
krt
qXB
Expand Down Expand Up @@ -105801,9 +105849,9 @@ wRF
jzC
oCO
xUE
jGE
jYu
vmU
xyI
wRF
qXB
kbo
qXB
Expand Down Expand Up @@ -106055,12 +106103,12 @@ cUP
mil
lqQ
lbH
lJa
mie
pRM
ivb
otG
jYu
lJa
ftQ
xwB
qXB
psZ
qXB
Expand Down
10 changes: 6 additions & 4 deletions code/game/turfs/open/water.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@
*/
var/immerse_overlay_color = "#5AAA88"

/// Fishing element for this specific water tile
var/datum/fish_source/fishing_datum = /datum/fish_source/portal

/turf/open/water/Initialize(mapload)
. = ..()
AddElement(/datum/element/immerse, icon, icon_state, "immerse", immerse_overlay_color)
AddElement(/datum/element/watery_tile)
if(!isnull(fishing_datum))
AddElement(/datum/element/lazy_fishing_spot, fishing_datum)

/turf/open/water/jungle

Expand All @@ -36,7 +41,4 @@
base_icon_state = "water"
baseturfs = /turf/open/water/beach
immerse_overlay_color = "#7799AA"

/turf/open/water/beach/Initialize(mapload)
. = ..()
AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/ocean/beach)
fishing_datum = /datum/fish_source/ocean/beach

0 comments on commit 42ec92f

Please sign in to comment.