Skip to content

Commit

Permalink
Raising lobstrosities from chrabs is now a component. Adds in tadpole…
Browse files Browse the repository at this point in the history
…s which become frogs. (tgstation#85346)

## About The Pull Request
I've componentized part of the code that manages raising lobstrosities
from chrabs so that it can be added to other fish too. As proof of
concept, I've added tadpoles. Tadpoles are not fished like the rest,
instead you merely right-click a puddle and after 5 seconds you'll get
one. Tadpoles are fairly fragile, cannot be butchered, don't reproduce,
require lukewarm freshwater, need to be feed frequently, and become
frogs after about 3 minutes.

## Why It's Good For The Game
A small needed refactor for the chrab code, plus another small fish to
make it easier to complete the first fish scanning experiment.

## Changelog

:cl:
add: Added tadpoles, which can be scooped from puddles with right-click.
Functionally they're like most fish, which require an aquarium to
survive, and also need to be fed fairly frequently, however they quickly
become frogs after about 3 minutes of care.
add: Every station now has a couple puddles. One at the public garden
and the other in prison.
qol: Changed the name of an aquarium UI button from "Reproduction
Prevention" to "Reproduction and Growth", as it controls both fish
breeding and growth.
/:cl:
  • Loading branch information
Ghommie authored Jul 31, 2024
1 parent f0575ec commit 36ca9a8
Show file tree
Hide file tree
Showing 18 changed files with 298 additions and 144 deletions.
19 changes: 13 additions & 6 deletions _maps/map_files/Birdshot/birdshot.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20161,8 +20161,8 @@
},
/area/station/science/lobby)
"hqH" = (
/obj/structure/reagent_dispensers/watertank,
/obj/item/reagent_containers/cup/watering_can/wood,
/obj/structure/table,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
"hqM" = (
Expand Down Expand Up @@ -32189,6 +32189,10 @@
/obj/item/camera,
/turf/open/floor/iron,
/area/station/security/prison/workout)
"lhd" = (
/obj/structure/water_source/puddle,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"lhi" = (
/obj/machinery/airalarm/directional/north,
/obj/machinery/button/door/directional/north{
Expand Down Expand Up @@ -33927,7 +33931,6 @@
"lGO" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/sink/directional/west,
/turf/open/floor/iron,
/area/station/security/prison/garden)
"lGT" = (
Expand Down Expand Up @@ -54428,6 +54431,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/grimy,
/area/station/commons/vacant_room/office)
"sJf" = (
/obj/structure/water_source/puddle,
/turf/open/misc/asteroid,
/area/station/maintenance/starboard/greater)
"sJg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
/obj/machinery/door/airlock/command{
Expand Down Expand Up @@ -86198,7 +86205,7 @@ xjz
xjz
xjz
xjz
dDB
xjz
dDB
blb
blb
Expand Down Expand Up @@ -86454,7 +86461,7 @@ hJC
aHJ
wmy
tBm
xjz
tBm
xjz
blb
blb
Expand Down Expand Up @@ -86711,7 +86718,7 @@ aWt
sis
sis
sis
tBm
lhd
xjz
blb
dDB
Expand Down Expand Up @@ -129058,7 +129065,7 @@ ylD
hqH
vzv
brz
cgM
sJf
ylD
wyj
dYR
Expand Down
64 changes: 24 additions & 40 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -10390,14 +10390,12 @@
/area/station/command/corporate_showroom)
"czg" = (
/obj/machinery/hydroponics/soil,
/obj/effect/decal/cleanable/dirt,
/obj/item/plant_analyzer,
/obj/machinery/camera/directional/east{
c_tag = "Permabrig - Garden";
network = list("ss13","prison")
},
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/turf/open/misc/sandy_dirt,
/area/station/security/prison/garden)
"czi" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -19613,10 +19611,8 @@
/area/station/engineering/atmos)
"eQx" = (
/obj/machinery/hydroponics/soil,
/obj/effect/decal/cleanable/dirt,
/obj/item/shovel/spade,
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/turf/open/misc/sandy_dirt,
/area/station/security/prison/garden)
"eQB" = (
/obj/machinery/door/airlock/public/glass{
Expand Down Expand Up @@ -27561,10 +27557,8 @@
"gLT" = (
/obj/machinery/hydroponics/soil,
/obj/item/cultivator,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/warning/electric_shock/directional/west,
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/turf/open/misc/sandy_dirt,
/area/station/security/prison/garden)
"gMd" = (
/obj/structure/window/reinforced/spawner/directional/west,
Expand Down Expand Up @@ -30877,23 +30871,10 @@
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
"hHi" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/paper/guides/jobs/hydroponics,
/obj/item/seeds/onion,
/obj/item/seeds/garlic,
/obj/item/seeds/potato,
/obj/item/seeds/tomato,
/obj/item/seeds/carrot,
/obj/item/seeds/grass,
/obj/item/seeds/ambrosia,
/obj/item/seeds/wheat,
/obj/item/seeds/pumpkin,
/obj/effect/spawner/random/contraband/prison,
/obj/structure/window/spawner/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/item/seeds/tower,
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron,
/obj/structure/water_source/puddle,
/turf/open/misc/sandy_dirt,
/area/station/security/prison/garden)
"hHo" = (
/obj/structure/disposalpipe/trunk,
Expand Down Expand Up @@ -59532,13 +59513,23 @@
/area/station/service/chapel)
"oWp" = (
/obj/structure/window/spawner/directional/south,
/obj/structure/sink/directional/south,
/obj/structure/reagent_dispensers/watertank,
/obj/item/reagent_containers/cup/watering_can,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb,
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/closet/crate/hydroponics,
/obj/item/seeds/tower,
/obj/effect/spawner/random/contraband/prison,
/obj/item/seeds/pumpkin,
/obj/item/seeds/wheat,
/obj/item/seeds/ambrosia,
/obj/item/seeds/grass,
/obj/item/seeds/carrot,
/obj/item/seeds/tomato,
/obj/item/seeds/potato,
/obj/item/seeds/garlic,
/obj/item/seeds/onion,
/obj/item/paper/guides/jobs/hydroponics,
/turf/open/floor/iron,
/area/station/security/prison/garden)
"oWt" = (
Expand Down Expand Up @@ -78609,11 +78600,9 @@
/area/station/command/corporate_showroom)
"tGW" = (
/obj/machinery/hydroponics/soil,
/obj/effect/decal/cleanable/dirt,
/obj/item/radio/intercom/directional/east,
/obj/effect/mapping_helpers/burnt_floor,
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating,
/turf/open/misc/sandy_dirt,
/area/station/security/prison/garden)
"tHc" = (
/obj/structure/table/wood/fancy,
Expand Down Expand Up @@ -79874,10 +79863,8 @@
dir = 1
},
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/tile/green{
dir = 8
},
/turf/open/floor/iron,
/obj/structure/water_source/puddle,
/turf/open/misc/sandy_dirt,
/area/station/service/hydroponics/garden)
"tXe" = (
/obj/effect/turf_decal/loading_area/red{
Expand Down Expand Up @@ -84678,6 +84665,7 @@
/obj/machinery/hydroponics/constructable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/green,
/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron,
/area/station/security/prison/garden)
"veD" = (
Expand Down Expand Up @@ -90301,10 +90289,8 @@
"wAt" = (
/obj/machinery/hydroponics/soil,
/obj/item/cultivator,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/turf/open/misc/sandy_dirt,
/area/station/security/prison/garden)
"wAz" = (
/obj/structure/table/wood,
Expand Down Expand Up @@ -91828,11 +91814,9 @@
/area/space)
"wVy" = (
/obj/machinery/hydroponics/soil,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/west,
/obj/effect/mapping_helpers/burnt_floor,
/obj/structure/sign/poster/contraband/ambrosia_vulgaris/directional/west,
/turf/open/floor/plating,
/turf/open/misc/sandy_dirt,
/area/station/security/prison/garden)
"wVJ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
Expand Down
25 changes: 16 additions & 9 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9036,6 +9036,9 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"cBG" = (
Expand Down Expand Up @@ -43794,6 +43797,7 @@
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/item/radio/intercom/directional/west,
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"nhT" = (
Expand Down Expand Up @@ -49552,6 +49556,10 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/maintenance/aft/lesser)
"oNW" = (
/obj/structure/water_source/puddle,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"oNX" = (
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
Expand Down Expand Up @@ -52423,6 +52431,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/siding/wood{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/service/hydroponics/garden)
"pGJ" = (
Expand Down Expand Up @@ -54284,10 +54295,10 @@
/turf/open/floor/iron,
/area/station/command/heads_quarters/qm)
"qiT" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
dir = 4
},
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics/garden)
"qjb" = (
Expand Down Expand Up @@ -73913,7 +73924,6 @@
/turf/open/floor/iron/large,
/area/station/command/heads_quarters/ce)
"wcz" = (
/obj/structure/sink/directional/south,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
Expand Down Expand Up @@ -77700,15 +77710,12 @@
/turf/open/floor/carpet/blue,
/area/station/hallway/secondary/entry)
"xhg" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
},
/obj/machinery/camera/directional/east{
c_tag = "Garden"
},
/obj/item/kirbyplants/random,
/obj/machinery/status_display/ai/directional/east,
/turf/open/floor/iron/dark,
/obj/structure/water_source/puddle,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"xhk" = (
/turf/open/floor/iron/dark,
Expand Down Expand Up @@ -167765,7 +167772,7 @@ jlF
jNf
dpC
cGQ
whr
oNW
nmr
hVY
gjq
Expand Down Expand Up @@ -168280,7 +168287,7 @@ jNf
qIo
tau
dWK
ozX
whr
hVY
gjq
gjq
Expand Down
Loading

0 comments on commit 36ca9a8

Please sign in to comment.