From 6b10c53be26ac67de65cc82fb2fbd021e69d22fa Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:16:41 -0400 Subject: [PATCH] requires a rooster to be around for fertile eggs to be laid --- _maps/map_files/BoxStation/BoxStation.dmm | 38 ++++++++--- .../map_files/Deltastation/DeltaStation2.dmm | 22 +++++-- .../map_files/IceBoxStation/IceBoxStation.dmm | 47 ++++++++++---- _maps/map_files/KiloStation/KiloStation.dmm | 51 ++++++++------- _maps/map_files/MetaStation/MetaStation.dmm | 22 ++++++- _maps/map_files/tramstation/tramstation.dmm | 63 +++++++++++++------ .../modules/ranching/chickens/_chicken.dm | 7 ++- .../ranching/chickens/_chicken_defines.dm | 2 + 8 files changed, 183 insertions(+), 69 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index ae145537147e..2eaef1ffc699 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -15050,6 +15050,12 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) +"eZt" = ( +/mob/living/basic/chicken{ + forced_gender = "female" + }, +/turf/open/floor/grass, +/area/station/service/hydroponics) "eZC" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -24392,6 +24398,12 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"igQ" = ( +/mob/living/basic/chicken{ + forced_gender = "male" + }, +/turf/open/floor/grass, +/area/station/service/hydroponics) "ihc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -25218,7 +25230,9 @@ dir = 1 }, /obj/structure/window/reinforced/spawner/directional/north, -/mob/living/basic/chicken, +/mob/living/basic/chicken{ + forced_gender = "male" + }, /turf/open/floor/grass, /area/station/service/hydroponics) "ita" = ( @@ -50217,7 +50231,9 @@ }, /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/south, -/mob/living/basic/chicken, +/mob/living/basic/chicken{ + forced_gender = "female" + }, /turf/open/floor/grass, /area/station/service/hydroponics) "qPo" = ( @@ -53089,7 +53105,9 @@ }, /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/north, -/mob/living/basic/chicken, +/mob/living/basic/chicken/brown{ + forced_gender = "female" + }, /turf/open/floor/grass, /area/station/service/hydroponics) "rJp" = ( @@ -61563,7 +61581,9 @@ }, /area/station/engineering/storage/tech) "uGS" = ( -/mob/living/basic/chicken, +/mob/living/basic/chicken/brown{ + forced_gender = "male" + }, /turf/open/floor/grass, /area/station/service/hydroponics) "uHf" = ( @@ -67898,7 +67918,9 @@ "wKr" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/window/reinforced/spawner/directional/south, -/mob/living/basic/chicken, +/mob/living/basic/chicken{ + forced_gender = "female" + }, /turf/open/floor/grass, /area/station/service/hydroponics) "wKv" = ( @@ -87074,7 +87096,7 @@ dNp nJa roR rCa -uGS +igQ wNw emg ohF @@ -87845,13 +87867,13 @@ dNp nJa roR rCa -uGS +igQ wNw emg sJH pig wKV -uGS +eZt bnl gAb fUs diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5820906dbbd8..c7948db6a1da 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -21156,6 +21156,9 @@ dir = 4 }, /obj/structure/window/reinforced/spawner/directional/east, +/mob/living/basic/chicken{ + forced_gender = "male" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "fam" = ( @@ -35975,7 +35978,9 @@ "iBc" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/nestbox, -/mob/living/basic/chicken, +/mob/living/basic/chicken{ + forced_gender = "female" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "iBf" = ( @@ -56878,7 +56883,9 @@ /turf/open/floor/iron, /area/station/maintenance/fore) "nzA" = ( -/mob/living/basic/chicken, +/mob/living/basic/chicken{ + forced_gender = "female" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "nzC" = ( @@ -77940,7 +77947,9 @@ /area/station/ai_monitored/turret_protected/ai_upload) "sGm" = ( /obj/structure/window/reinforced/spawner/directional/north, -/mob/living/basic/chicken/brown, +/mob/living/basic/chicken/brown{ + forced_gender = "male" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "sGx" = ( @@ -78422,6 +78431,9 @@ /obj/structure/railing{ dir = 8 }, +/mob/living/basic/chicken{ + forced_gender = "male" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "sLd" = ( @@ -81798,7 +81810,6 @@ /area/station/science/robotics/lab) "tCH" = ( /obj/machinery/light/directional/west, -/mob/living/basic/chicken/brown, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "tCI" = ( @@ -91979,6 +91990,9 @@ /obj/structure/railing{ dir = 4 }, +/mob/living/basic/chicken/brown{ + forced_gender = "female" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "vZV" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 7a95247762ac..23a73622637d 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -2530,7 +2530,9 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "aRO" = ( -/mob/living/basic/chicken/brown, +/mob/living/basic/chicken/brown{ + forced_gender = "female" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "aRR" = ( @@ -27945,8 +27947,10 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) "jai" = ( -/mob/living/basic/chicken/brown, /obj/machinery/light/directional/south, +/mob/living/basic/chicken{ + forced_gender = "female" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "jak" = ( @@ -33518,6 +33522,12 @@ }, /turf/open/floor/iron, /area/station/security/brig/upper) +"kOx" = ( +/mob/living/basic/chicken{ + forced_gender = "female" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "kOF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -37981,6 +37991,13 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"mnO" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/mob/living/basic/chicken{ + forced_gender = "male" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "mnT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -45316,11 +45333,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"ozm" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/mob/living/basic/chicken/brown, -/turf/open/floor/sandy_dirt, -/area/station/service/hydroponics) "ozn" = ( /obj/machinery/photocopier, /turf/open/floor/iron/dark, @@ -52435,6 +52447,13 @@ /obj/structure/lattice/catwalk, /turf/open/openspace/icemoon, /area/station/science/server) +"qOI" = ( +/obj/machinery/light/directional/south, +/mob/living/basic/chicken/brown{ + forced_gender = "female" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "qOP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65380,7 +65399,9 @@ /area/station/command/meeting_room) "vdn" = ( /obj/structure/window/reinforced/spawner/directional/west, -/mob/living/basic/chicken, +/mob/living/basic/chicken/brown{ + forced_gender = "male" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "vdo" = ( @@ -174301,7 +174322,7 @@ uiG sCZ uaa hPa -vdn +mnO eCw hmb iDt @@ -174559,7 +174580,7 @@ sCZ uaa cuU ism -aRO +kOx isW scw fna @@ -174815,7 +174836,7 @@ hmb sCZ uaa hPa -vdn +mnO eCw exw iZm @@ -175328,7 +175349,7 @@ dMS dMS feP hPa -ozm +vdn eCw exw exw @@ -175586,7 +175607,7 @@ dMS nXx xBw ism -jai +qOI exw iDt iDt diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 15b94c9fc7a0..212bcd17c757 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -8157,6 +8157,9 @@ /area/station/hallway/primary/central) "cGR" = ( /obj/machinery/light/small/directional/south, +/mob/living/basic/chicken{ + forced_gender = "female" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "cHg" = ( @@ -22288,6 +22291,13 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"hfR" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/mob/living/basic/chicken/brown{ + forced_gender = "female" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "hfV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -23757,6 +23767,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/security/prison/mess) +"hDP" = ( +/mob/living/basic/chicken/brown{ + forced_gender = "male" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "hDV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -53074,11 +53090,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/primary) -"rcd" = ( -/obj/structure/flora/bush/flowers_br/style_random, -/mob/living/basic/chicken, -/turf/open/floor/sandy_dirt, -/area/station/service/hydroponics) "rcj" = ( /obj/structure/toilet, /obj/effect/decal/cleanable/dirt, @@ -54345,16 +54356,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"rwp" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/mob/living/basic/chicken, -/turf/open/floor/sandy_dirt, -/area/station/service/hydroponics) "rwr" = ( /turf/closed/wall/rust, /area/station/medical/psychology) @@ -69153,6 +69154,15 @@ /mob/living/simple_animal/bot/secbot/beepsky/officer, /turf/open/floor/iron/dark, /area/station/security/office) +"vYu" = ( +/obj/structure/railing{ + dir = 1 + }, +/mob/living/basic/chicken{ + forced_gender = "male" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "vYx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -69518,7 +69528,6 @@ /turf/open/floor/iron, /area/station/cargo/storage) "wej" = ( -/mob/living/basic/chicken, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, @@ -110315,8 +110324,8 @@ jHT xWu eHZ ipq -doE -rcd +vYu +bNZ arl qHT lzv @@ -111343,7 +111352,7 @@ kDK fcR qDO irz -bNZ +hfR vcc arl arl @@ -111598,9 +111607,9 @@ eYd fmV pqu bKu -rwp +irz aUi -mqr +hDP mqr gQv abn diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6986bc98eaad..265f250e6c8c 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -4811,6 +4811,9 @@ "bJs" = ( /obj/machinery/light/directional/south, /obj/structure/window/reinforced/spawner/directional/west, +/mob/living/basic/chicken/brown{ + forced_gender = "male" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "bJQ" = ( @@ -35399,7 +35402,9 @@ /area/station/medical/pathology) "mFA" = ( /obj/structure/window/reinforced/spawner/directional/west, -/mob/living/basic/chicken/brown, +/mob/living/basic/chicken/brown{ + forced_gender = "female" + }, /obj/structure/railing{ dir = 1 }, @@ -62599,6 +62604,15 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/construction/storage_wing) +"wdU" = ( +/obj/structure/railing{ + dir = 1 + }, +/mob/living/basic/chicken{ + forced_gender = "male" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "wek" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/trash/mess, @@ -66848,7 +66862,9 @@ /obj/machinery/camera/directional/south{ c_tag = "Hydroponics - Aft" }, -/mob/living/basic/chicken, +/mob/living/basic/chicken{ + forced_gender = "female" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "xDD" = ( @@ -104317,7 +104333,7 @@ obC rwd vzf cOa -uAF +wdU xDC tUn tUn diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 1c0200b3ef6e..ed72c7942e6b 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -13082,6 +13082,12 @@ }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) +"ddq" = ( +/mob/living/basic/chicken{ + forced_gender = "male" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "ddz" = ( /obj/machinery/modular_computer/preset/cargochat/service{ dir = 1 @@ -19228,7 +19234,6 @@ /area/ruin/powered/clownplanet) "eZy" = ( /obj/machinery/light/directional/north, -/mob/living/basic/chicken/brown, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "eZC" = ( @@ -20713,6 +20718,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/escape) +"fxI" = ( +/obj/structure/cable, +/mob/living/basic/chicken{ + forced_gender = "male" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "fxK" = ( /obj/structure/chair/office{ dir = 4 @@ -31711,6 +31723,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"jgL" = ( +/mob/living/basic/chicken/brown{ + forced_gender = "female" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "jgM" = ( /obj/structure/stairs/south, /turf/open/floor/iron/stairs/medium, @@ -38953,10 +38971,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"lsR" = ( -/mob/living/basic/chicken, -/turf/open/floor/sandy_dirt, -/area/station/service/hydroponics) "lti" = ( /obj/structure/fans/tiny/invisible, /turf/open/misc/asteroid, @@ -40734,11 +40748,6 @@ /obj/effect/spawner/random/engineering/canister, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) -"lYE" = ( -/obj/structure/cable, -/mob/living/basic/chicken/brown, -/turf/open/floor/sandy_dirt, -/area/station/service/hydroponics) "lYT" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/west, @@ -41112,6 +41121,9 @@ "mey" = ( /obj/structure/railing, /obj/structure/window/reinforced/spawner/directional/east, +/mob/living/basic/chicken/brown{ + forced_gender = "female" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "meB" = ( @@ -43110,6 +43122,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) +"mLj" = ( +/obj/structure/railing, +/mob/living/basic/chicken{ + forced_gender = "female" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "mLu" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 @@ -58687,7 +58706,6 @@ /area/station/science/robotics/mechbay) "rKb" = ( /obj/structure/nestbox, -/mob/living/basic/chicken/brown, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "rKf" = ( @@ -62927,6 +62945,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/command/heads_quarters/ce) +"tcZ" = ( +/mob/living/basic/chicken/brown{ + forced_gender = "male" + }, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "tda" = ( /obj/structure/chair{ dir = 4 @@ -75067,6 +75091,9 @@ "wNL" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/south, +/mob/living/basic/chicken{ + forced_gender = "female" + }, /turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "wNV" = ( @@ -109610,7 +109637,7 @@ gvG gvG nUP rtn -lsR +tka tka hUC gMl @@ -109863,12 +109890,12 @@ aac aac nUP rKb -tka +tcZ xEE ntf ldt +fxI ebH -lYE xEE eSo syT @@ -110376,7 +110403,7 @@ aac aac aac nUP -tka +ddq dIN eVz eVz @@ -110634,7 +110661,7 @@ aac aac nUP eZy -dIN +mLj eVz jbf pKI @@ -111918,7 +111945,7 @@ aac aac aac nUP -tka +tcZ tka tiC eVz @@ -112176,7 +112203,7 @@ aac aac nUP rKb -tka +jgL kyb nSi fjI diff --git a/monkestation/code/modules/ranching/chickens/_chicken.dm b/monkestation/code/modules/ranching/chickens/_chicken.dm index 01def8874848..f2c6d13c9305 100644 --- a/monkestation/code/modules/ranching/chickens/_chicken.dm +++ b/monkestation/code/modules/ranching/chickens/_chicken.dm @@ -59,9 +59,12 @@ RegisterSignal(src, COMSIG_HUNGER_UPDATED, PROC_REF(handle_hunger_updates)) - if(prob(40)) + if(prob(40) && !forced_gender) gender = MALE + if(forced_gender) + gender = forced_gender + assign_chicken_icon() if(gender == MALE && breed_name) if(breed_name_male) @@ -118,7 +121,7 @@ rooster_nearby = TRUE break - if(prob(20 + (fertility_boosting * 0.1)) || length(layed_egg.possible_mutations)) //25 + if((prob(20 + (fertility_boosting * 0.1)) || length(layed_egg.possible_mutations)) && rooster_nearby) //25 if(mutant) layed_egg.AddComponent(/datum/component/hatching, 100, CALLBACK(layed_egg, TYPE_PROC_REF(/obj/item/food/egg, pre_hatch)), layed_egg.low_temp, layed_egg.high_temp, layed_egg.low_pressure, layed_egg.high_pressure, layed_egg.liquid_depth, layed_egg.turf_requirements, layed_egg.nearby_mob) else diff --git a/monkestation/code/modules/ranching/chickens/_chicken_defines.dm b/monkestation/code/modules/ranching/chickens/_chicken_defines.dm index 397fd2b2c598..2e85eb92aebf 100644 --- a/monkestation/code/modules/ranching/chickens/_chicken_defines.dm +++ b/monkestation/code/modules/ranching/chickens/_chicken_defines.dm @@ -123,3 +123,5 @@ var/instability = 0 ///modifier to the egg laying cooldown var/egg_laying_boosting = 0 + ///mapping helper gender + var/forced_gender