From b201e549286ac0db097bc79dfbdb5e9d46bedc32 Mon Sep 17 00:00:00 2001
From: ToasterBiome <baiomurang@gmail.com>
Date: Tue, 14 Jun 2022 20:24:46 -0500
Subject: [PATCH 1/2] hmm yes

---
 .../inhands/equipment/fishing_lefthand.dmi    | Bin 453 -> 0 bytes
 yogstation/code/datums/components/fishable.dm |  61 ++++++++++++---
 .../code/game/objects/items/fishing/rods.dm   |  71 ++++++++++++++++--
 .../inhands/equipment/fishing_lefthand.dmi    | Bin 0 -> 433 bytes
 .../inhands/equipment/fishing_righthand.dmi   | Bin 0 -> 431 bytes
 yogstation/icons/obj/fishing/fishing.dmi      | Bin 3439 -> 7068 bytes
 6 files changed, 114 insertions(+), 18 deletions(-)
 delete mode 100644 icons/mob/inhands/equipment/fishing_lefthand.dmi
 create mode 100644 yogstation/icons/mob/inhands/equipment/fishing_lefthand.dmi
 create mode 100644 yogstation/icons/mob/inhands/equipment/fishing_righthand.dmi

diff --git a/icons/mob/inhands/equipment/fishing_lefthand.dmi b/icons/mob/inhands/equipment/fishing_lefthand.dmi
deleted file mode 100644
index 0571e36445c36bb8024f55dc7cd010688b4cbe76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 453
zcmV;$0XqJPP)<h;3K|Lk000e1NJLTq003YB002M)0{{R37aDIp0000LP)t-sz`(#}
zIWbBo7$P7v|NsAGWo5v?z$BB@PXGV_0d!JMQvg8b*k%9#0Csv*Sad{Xb7OL8aCB*J
zZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#
zlEji!AX6zVvp6F&FFn2}KSha)GbOXA7^IbpGp#5wHx<M-M5sk5Fho(Htl;YB0=69h
zU1KFUdj@Y90002oNkl<ZNQv#0VG6?_427L~fWdYEp&r1^^}pMWu>0R-(6JIVsLvvU
z(f2Dc`AD8nE5t_!k?5EnERt(<NlPalaNp>jmd-3-*GTg#Yz1WK2XYgfEQyBzGLWRj
z1PoY564e6G388L61{8SGOw|Fas0Uv+F~upprtIrjHVSd>4XLq!kMsFj+vpYN)R7U4
zCeNJ~fI=H@0R`X*rJ<(Kv<cW%lmYt{3W&#WK%3FPUzkwnP8tT_oo*nY9DK30mpBt_
vg8m(vG`o6FJOS+QkwJmhH@+X(^-H}0!4(fBvVv4$00000NkvXXu0mjf&po)-

diff --git a/yogstation/code/datums/components/fishable.dm b/yogstation/code/datums/components/fishable.dm
index 49c2f0c7b07b..274d5214dd8d 100644
--- a/yogstation/code/datums/components/fishable.dm
+++ b/yogstation/code/datums/components/fishable.dm
@@ -1,28 +1,67 @@
+#define FISHING_LOOT_NOTHING "nothing"
+#define FISHING_LOOT_JUNK "junk"
+#define FISHING_LOOT_COMMON "common"
+#define FISHING_LOOT_UNCOMMON "uncommon"
+#define FISHING_LOOT_RARE "rare"
+
 /datum/component/fishable
 	dupe_mode = COMPONENT_DUPE_UNIQUE
-	var/datum/fishing_loot/common_loot = new /datum/fishing_loot/water/common
+	var/datum/fishing_loot/loot = new /datum/fishing_loot/water
 
-/datum/component/fishable/proc/getCommonLoot()
-	return pick(common_loot.rewards)
 
 /datum/component/fishable/Initialize()
 	if(!istype(parent, /turf))
 		return COMPONENT_INCOMPATIBLE
 
+/datum/component/fishable/proc/get_reward(var/fishing_power = 0)
+	var/chance = list(
+		FISHING_LOOT_NOTHING = min(max(0,100 - fishing_power),50),
+		FISHING_LOOT_JUNK = min(max(0,50 - fishing_power),25),
+		FISHING_LOOT_COMMON = min(fishing_power / 5,50),
+		FISHING_LOOT_UNCOMMON = min(fishing_power / 10,33),
+		FISHING_LOOT_RARE = min(fishing_power / 20,25)
+		)
+
+	var/chosen_rank = pickweight(chance)
+	switch(chosen_rank)
+		if(FISHING_LOOT_JUNK)
+			return pick(loot.junk_loot)
+		if(FISHING_LOOT_COMMON)
+			return pick(loot.common_loot)
+		if(FISHING_LOOT_UNCOMMON)
+			return pick(loot.uncommon_loot)
+		if(FISHING_LOOT_RARE)
+			return pick(loot.rare_loot)
+	return FISHING_LOOT_NOTHING
+
+
 //LOOT TABLES
 
 /datum/fishing_loot
-	var/list/rewards = list()
+	var/list/junk_loot
+	var/list/common_loot
+	var/list/uncommon_loot
+	var/list/rare_loot
 
-/datum/fishing_loot/water/common
-	rewards = list(
+/datum/fishing_loot/water
+	junk_loot = list(
+		/obj/item/trash/plate,
+		/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+		/obj/item/shard
+	)
+	common_loot = list(
 		/obj/item/reagent_containers/food/snacks/fish/goldfish,
-		/obj/item/reagent_containers/food/snacks/fish/goldfish/giant,
 		/obj/item/reagent_containers/food/snacks/fish/salmon,
 		/obj/item/reagent_containers/food/snacks/fish/bass,
-		/obj/item/reagent_containers/food/snacks/fish/tuna,
-		/obj/item/reagent_containers/food/snacks/fish/shrimp,
-		/obj/item/reagent_containers/food/snacks/fish/squid,
-		/obj/item/reagent_containers/food/snacks/fish/puffer,
 		/obj/item/reagent_containers/food/snacks/bait/leech
 		)
+	uncommon_loot = list(
+		/obj/item/reagent_containers/food/snacks/fish/goldfish/giant,
+		/obj/item/reagent_containers/food/snacks/fish/shrimp,
+		/obj/item/reagent_containers/food/snacks/fish/puffer,
+		/obj/item/reagent_containers/food/snacks/fish/tuna
+	)
+	rare_loot = list(
+		/obj/item/reagent_containers/food/snacks/fish/squid,
+		/obj/item/stack/sheet/bluespace_crystal
+	)
diff --git a/yogstation/code/game/objects/items/fishing/rods.dm b/yogstation/code/game/objects/items/fishing/rods.dm
index 953479b95eab..73783df8aee9 100644
--- a/yogstation/code/game/objects/items/fishing/rods.dm
+++ b/yogstation/code/game/objects/items/fishing/rods.dm
@@ -3,13 +3,13 @@
 	desc = "A rod used for fishing. Despite ordinary appearances, fishing has evolved to suit the cosmos with various features, like auto-reeling."
 	icon = 'yogstation/icons/obj/fishing/fishing.dmi'
 	icon_state = "fishing_rod"
-	lefthand_file = 'icons/mob/inhands/equipment/fishing_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+	lefthand_file = 'yogstation/icons/mob/inhands/equipment/fishing_lefthand.dmi'
+	righthand_file = 'yogstation/icons/mob/inhands/equipment/fishing_righthand.dmi'
 	usesound = 'sound/items/crowbar.ogg'
 	slot_flags = ITEM_SLOT_BACK
 	force = 2
 	throwforce = 5
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_BULKY
 	materials = list(/datum/material/iron=50)
 
 	var/fishing_power = 10
@@ -78,7 +78,11 @@
 /obj/item/twohanded/fishingrod/proc/reel_in(var/forced = FALSE)
 	if(!forced && bite) // we got something!!!
 		playsound(fishing_component, 'sound/effects/water_emerge.ogg', 50, FALSE, -5)
-		spawn_reward()
+		var/power = 0
+		if(iscarbon(fisher)) //sorry, non-carbons don't get to wear cool fishing outfits
+			var/mob/living/carbon/carbonfisher = fisher
+			power = carbonfisher.fishing_power
+		spawn_reward(fishing_power + power)
 		if(bait && prob(max(50 - bait.fishing_power,0))) //50 - bait.fishing_power% chance to lose your bait
 			to_chat(fisher, span_notice("Your [bait] is lost!"))
 			cut_overlays()
@@ -112,15 +116,18 @@
 	I.alpha = 0
 	animate(I, pixel_z = 32, alpha = 255, time = 2, easing = ELASTIC_EASING)
 
-/obj/item/twohanded/fishingrod/proc/spawn_reward()
-	var/obj/picked_reward = fishing_component.getCommonLoot()
+/obj/item/twohanded/fishingrod/proc/spawn_reward(var/fishing_power = 0)
+	var/picked_reward = fishing_component.get_reward(fishing_power)
+	if(!picked_reward || picked_reward == FISHING_LOOT_NOTHING) //nothing or something messed up
+		fisher.visible_message(span_notice("[fisher] reels in ... nothing!"), span_notice("You reel in... nothing! Better luck next time!"))
+		return
 	var/obj/reward_item = new picked_reward(fishing_component.parent)
 	reward_item.alpha = 0
 	reward_item.pixel_y = -12
 	animate(reward_item,time = 0.25 SECONDS,pixel_y = 0,alpha = 255,easing = SINE_EASING)
 	if(!fisher) //uh oh
 		return
-	fisher.visible_message(span_notice("[fisher] reels in a [reward_item]!"), span_notice("You reel in a [reward_item]!"))
+	fisher.visible_message(span_notice("[fisher] reels in [reward_item]!"), span_notice("You reel in [reward_item]!"))
 	if(fisher.Adjacent(fishing_component.parent))
 		unwield(fisher,show_message = FALSE)
 		if(fisher.put_in_hands(reward_item))
@@ -147,6 +154,7 @@
 	if(bait)
 		user.put_in_hands(bait)
 		to_chat(user, span_notice("You take the [bait] off the fishing rod."))
+		cut_overlays()
 		bait = null
 		recalculate_power()
 
@@ -154,3 +162,52 @@
 	fishing_power = initial(fishing_power)
 	if(bait)
 		fishing_power += bait.fishing_power
+
+/obj/item/twohanded/fishingrod/collapsable
+	name = "collapsable fishing rod"
+	icon_state = "fishing_rod_collapse_c"
+	desc = "A collapsable fishing rod! This one can fit into your backpack for space hikes and the like."
+	var/opened = FALSE
+	fishing_power = 15
+
+/obj/item/twohanded/fishingrod/collapsable/attackby(obj/item/B, mob/user, params)
+	if(!istype(B,/obj/item/reagent_containers/food/snacks/bait))
+		return
+	if(!opened)
+		to_chat(user,"You can't put bait on a collapsed rod!")
+		return
+	..()
+
+/obj/item/twohanded/fishingrod/collapsable/AltClick(mob/living/user)
+	if(bait)
+		return ..()
+	toggle(user)
+
+/obj/item/twohanded/fishingrod/collapsable/proc/toggle(mob/user)
+	if(wielded)
+		to_chat(user,"You can't collapse the rod if you are holding it with both hands")
+		return
+	if(fishing)
+		to_chat(user,"You can't collapse the fishing rod if you are currently using it!")
+		return
+	if(!user.is_holding(src)) //no uncollapsing in your backpack or pockets
+		return
+	opened = !opened
+	w_class = opened ? WEIGHT_CLASS_BULKY : WEIGHT_CLASS_SMALL
+	playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE)
+	update_icon()
+
+/obj/item/twohanded/fishingrod/collapsable/update_icon()
+	icon_state = "fishing_rod_collapse[opened ? "" : "_c"]"
+
+/obj/item/twohanded/fishingrod/collapsable/attack_self(mob/user)
+	if(!opened)
+		toggle(user)
+		return
+	..()
+
+/obj/item/twohanded/fishingrod/collapsable/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+	if(!opened)
+		to_chat(user,"The collapsable rod has to be open before you can do anything!")
+		return
+	..()
diff --git a/yogstation/icons/mob/inhands/equipment/fishing_lefthand.dmi b/yogstation/icons/mob/inhands/equipment/fishing_lefthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..eecb088c76d0f82ff4325a2f3e7c8e6cbc395301
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000IP)t-sz`(#}
zIWZz2H2?qqN+=j*Wo3~9y)Xa(00DGTPE!Ct=GbNc003}$R9JLGWpiV4X>fFDZ*Bkp
zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY
zR3K9+EweZyGcP^9C_hDsi!&v&s2HS`i!-e#F*g;&Hsn%PaP@Nm8x8;gs~no!C%%OM
z007ZRL_t(YiRF_~4#FS|hLLdqqZdGQ@6&hyGH&4g52InE!|pGQZco|=Xvw$!f0Nai
zDRzd%p4BG~99Vtjz>(D*Z^>glur#qfu->KBfI%~%0#*ZpYN8%v@pt4Fan2nA`imlA
z{hUV$QUH2}7B&IsU9g}7KNHiWu>ttkVH-fo=ly%Y4f*Os4HZb`7Bw`WD99QrkbFt3
zppmEp2HZdZ)^ImU&k#toebz&bvC7dV(~#K(&~TwD0szKGRrDSJZykUKE%-_U6YUQ^
b2mULb4Ehiv5nH)p00000NkvXXu0mjf7QC!Q

literal 0
HcmV?d00001

diff --git a/yogstation/icons/mob/inhands/equipment/fishing_righthand.dmi b/yogstation/icons/mob/inhands/equipment/fishing_righthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..083467251b9fa5a910768bdd6306524aa7ddaed3
GIT binary patch
literal 431
zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000IP)t-sz`(#}
zIWZz2H2?qqN+=j*Wo3~9y)Xa(00DGTPE!Ct=GbNc003}$R9JLGWpiV4X>fFDZ*Bkp
zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY
zR3K9+EweZyGcP^9C_hDsi!&v&s2HS`i!-e#F*g;&Hsn%PaP@Nm8x8;gs~no!C%%OM
z007TPL_t(YiRF}C4#F@9$7#m_jJp6<ecy}+Xx1Be|HGK5>G}bqW_?m#R?3h5AsGOC
z>;Rb=DD9ZLrwSNzcP`^*s#1CbqY~c_bZCOK5{BJ?B4NlW0M|tNhamTWPtMC@TLCOF
zm#8GAfWZ2Wfad{h2Y$f37<sp8HvoEl?jjJN4HzU1oEia9BS0%4Xha1au)Ic~_<{he
z608PJ>%5*>;1-XTIE|2w<Anj1)M1LiY-2bE$Tr5c*09;ea7+=((yFX1LLJL8;d|ik
Z><R915Ckme*LeT{002ovPDHLkV1kuBt)u_|

literal 0
HcmV?d00001

diff --git a/yogstation/icons/obj/fishing/fishing.dmi b/yogstation/icons/obj/fishing/fishing.dmi
index 2db5d8259da5cfa9f6b0accc86df95dae33395f1..ca4cf1a936ddd9603d4813aaf0c18896af65e6b1 100644
GIT binary patch
literal 7068
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
RZhzeXnyPv#HA=RT{|geLwvGS*

delta 3407
zcmV-V4Y2Z@H}4vd8Gi!+003nIoHYOd0Kia8R7JqRz&aTUA|NyX002rT7-eN;IyyT4
z|Nmw=G2d|}`|>uQpP!VPr8*h}KT&n+w2vb$P`+s{uS^Nqpk{b@crFAwH5Le139peR
z-`}vC%iH|s?*F=v>d${$OHo%dIX@mIEx%ncB_IYhD+pp-I%0KgKc%9ShmM&%Ol-<&
zCtyM)P)Q?dQ8=ZNhCg*}dSFJSdta<FGIerirGsLVkbaUdFi3J!MOI8aPD8~=NHP@w
zic$+wCIG*NJm0Qtz`(#j3*5v20004WQchC<K<3zHks&L8S$bGsfq?wVpP@LwHGBI>
z-C>Pg_}LA}_XUy9xGi6fucvc)cssFAa31YYK9^6A6)P^Nf}SV)9V;|or^7PwK?InG
zn-;ysq2tb~4J#BnKd;uTXr1U`8Q)`hV~r7`hkr@D$<nk9NnQ#JyryA08n&ll7wdW&
znLdR9Xf)}6-SEyD6$g1Vm)Ow^FHCO-8Y_kOG%`$sAnvan_9Kz~n2?q)AE&kjm%cA6
z<zLwRDJd}GD=t?Lb#*^lVvs8(9p_3(hx%KgH+HiLDf5+;PX0E}#@crvUS*VilFss$
zva^&Jc$N@5&wHqA?s-bAKFe6*Pbk~+cs^YJCEwY9XzFkmF``ER01GWiL_t(|ob6l-
zTN*hOr88@@sDpspX?+!Cz+&-*T6Dv}|NmKgZ<4`*xi_&4vp~Nb%0Nwob8;U^Zopb?
z=ke*2y*&uZy?z*$`+X-q{bg4W?3Ggxe%`nON4pE*UbPAWhXPl-3t`0y1l&IT%`<eh
zyHJOJTcrv_&Cbx(?!rF)3lFMOAZm7ou67sdHLt({p)V{$SG(>c1UF;s>q~VCgt>AI
zUF}&P!OR%@=31Eokv%XBbM4%Wrn?06j8WGQ+n^w@+DOkBghp)w%%&A92pkGr?Jfo3
zIuy`x_8VSAwTs*{G7i>fgW&LxQXuA!c7{%W1wn8?DcGMsIu%5btu;7oG#V8u2o4VR
z_DU&;j*e^!f@Y)9v^h~p1$zA9T4*<^$f+Qz*X<@~(){0@fMMur*ByerJsf_*2K(<%
z915)b`R!Fc4k?DN_RIwO^^5PapL<qGHWm4&1jD8F;xLH9PZqGBe_F-rS}Z&-?qC*w
z+lw=<ga14R^z-#ASd6>k9<10NSlWwNWL&`>Em&kwutA}HDNX~2f^d=X{<?Si%hOK)
zK9W~ZY+w8VJ$=0c=r0fsmw!+eCjGthIoMlJK(sH+S4-^$gr7g>`G$LY@c(rx2!e&g
zrw25rfNals%~E>-VYpD;(&Jy@PTvfFC|ga*<|{|!vM>gzQh^>&UV)jfR#u=5Qgy}a
zkElBCdg0f@!^6Yl4@DHYcF)@kAm0+L)($FA;|}awbrA`B0cI-!%v-H?t6c{OM+K=O
zlv?{lEg;@*;XlOj1_Xrvlu>{J6!|vK{|mtWDlx#qFtjZ&?X8BTCA&ms^zm|kObYn&
z_1m|vRt511fK?Elo}HcY97C4^OfS4|M|1CKw~t8y!2kT5QJ}{?KDmhF3r+#>7lKz1
zeg_w_IT13fe?&n2xZNfV@a_B?fD(Yr)%fG}f)j8i&H$`{PRDM6NTnDyIE_BE0Br!f
z03@xc!*g0ec&2W=fXmD8Ru@8le&o<D3W!<}6T)ASKj}hq>RJtL0}KI65QLYPosLC8
z6mhYc2~Zw%jE4wJFFuITdEz;7E)ltc_`6L23^35QO;7E%;%_?z;nOID?gcaOd5ZQl
z+UbB7aUG)8F?a?W06IfqgjhxLi0w1LhX77=$=X1zbC_Sm^$$dViSP}7E`mZd!tc+<
zxO~&ubMp(ha0LO%cOXEHne6%hB3wa$q8~+g-@JeoR-{o~F^{%k{8vIY?%Oc@9v&VZ
z9v&WBh&AjrHj4NIo4svDd~wCrnsx&52`E^jfG%K_4%xZA>%%Jrpa)%X#ij)$aB~2-
z^+f-gQP8z@2z~^L{XjH-$PWl3$fKcHRcub&5)uJ72mM~JFS>#e(CuS~9@8QCaR}@O
z0}%*DKos2o$bE@YVDX~_i6=kdmi>of-|Y>7W1r>U8}^2MfVd`l0RQHo*=RHdg8qnh
z4d~Zz+HH_P2|xvWD8tYv$t?mNX)_?b?y%SI-(6Gubca3)xF$P)1V5UC27b8t{*V?B
z-L&iV_6_XNS5olv_VxjBd;62+59Eg3$2*#TO{oJDSok*v&B1-M$?&fm0bxieh>^a<
zixN%$L4X8W01Php&+w5m0BS^q*ERt#{`dEs0l<H5+EGLc&}S!nBpU$`#+-mIdUyYE
zIOGH<{{3sNLxB8$?+=?Gff5jD-#I$M;w&Y=D2T5p1xaQAv;Zh5N>CBd?>=^sAsGS6
zgCKwQ$PSo3k$=!Qq(34bVQm?b=utF^NdDT3VnM}0B7SB99v(o<Q!$LY$^yW@-zCSl
zYvLCksSd%Qsre5Y%-2L91-094{DQ-%hIdjy9E*@vpe&GoJU=`?KPSmEnMZN_??4Be
zg1VT0m=0h7<PQ@8!(X}34H`g^&+f|#u1*9M$=U+R({-XE@P)7d4)NpN9UY)GJxQqi
z10Y>2K>iBMmn<*~sd-otAB{*O#3l?13eW=2$&(RKumG-Z41abV1kSG$P`5`4F#I7F
z7y&SaDHmdY{KqJWV>+8Ax6jv^0jS~cLH@iO((!8qB6;k<tmF)R{<E0M1nNsZi~}hF
zS66ZFFe@kE>BTqzC7`BO5g5Vr%c4LW`ytr@m!FV&@M>L#f(=G`A;dV4R&Wtt#PL!f
zC&|;3QSkEe#7tz&*y>gkh;c#+7{D3`xpUq#SMUpen7c~MK>y@o=`0%P1MTDm!L5a8
z&(5_gfpj16do}jXeL(c<mxF%{5qwhgAW)FtHF@G!qpn?yRbW7V!LA5ri63L&gopvf
z+`S*L!79+@JRb){Fpyu4ftucmePBnnD$0HiJO?!i>~@*O!^6YF!^6YF!(%sLD|u`;
z#$&vH^3{S}z<4|!osP8<ea*M&$E_4NR;0({*Vj`aPG4V_$>;iwMn+&k;iiG~-`-Hb
z+uM?axlLYQUq_&i6}TCg;Ya#!Z=-+z9pNL8oD<Kwu>!XPV<W-PALknIxoOn`<^nfI
zcL8}9QJ|Qy0=EfcgTjx^gH7P3u}quf$Oznj9$2_>X8AKv_A}Y8Zx62PuTO9Wit6N#
z-{Gj6emOt4DhNBZ6~6VcMg)iU+WQy!t7{p6f9-O^3LKSdy9<S#u+w3``?Lf2CtT%g
zD_e$L=kMX+;o;%ov0g~Pra7z*AU_e4$qp(|;|}a66CnjFz-gV0nGcyyQn;Z4#sb=Z
zI#Y(Abaki{hQAgtAvt8$Vfe|3qeHcj6GJ|w`QzB8z;VL!&&)TiPJqolWllhm0@9P%
zG@H`=WM;l8)1f@1vM?K*bMHyhA_Zy0$=QsdCyn|F`D=!50h4K(k_G@1%s2yNK{TyW
z0QxBV;yDWt6qND6e<<tBe_v~_Oh7GvRX)JA&IQ0g(-AO{Gf7!Tb&w|Zxen!lV`v*2
znWZ0)K&BuVe{3UP!>FIK9m+$~w=ED-O+nIOg5y5}9c&8HZ@_gZ53ntGhHZUd(myQ{
zT4ySNnE=rCRjAB^WR0h<v!{;mVlO36^XG@a@RwFAR|7fEp4=J-)B*pL3r{6~5XobQ
z-(Sg<{qxW!|Jf3_T17Cyp<f}zu}|p^7jUy66r!90sh18?g&^O_HnvJ&jZt`F?i@n?
zZ{K|k7~U8l*7V`>Y%P#6K+R!-vMyxa*Y3QoT?{YKWq~chE^neeJUl!+JgUWR7n{{;
zZ5M0Jb4Xh;Wfvf)6K1FJKl6}(+2e0IG<s0VZ)Wp7*<JHGpsG!d@;fOGe>k03_T%%8
z0&b;w@-MG;{MP!s+TD^ol>&<&sb7+*RJ-<SQWo%cl;5-32*neAdt$3u!qA)QCp=bT
z207K`_taURUrj+)nYNWr%Ruo*f><ABN@qqu7!nFh-N{y5pP0k3YBE-TCSb-LFz6E^
ztlp3U&;(OUWz7h{<H?Fru6l>rG{qwZx;#A5m0|7_Mk|m^aeR`q0G$WQ!IZc8^1D>g
z3;7aj_}mE!@Fz2X6z>tBP8!!9#=3Stvy|U41n_V~)@C)lldl2^CZrYU1U$nEu7n|2
zy9Ja1X14OXnF6Moe0E=d?vzdi70KEHssOJ;y@Et4)$yjK{EjA2^ROZgBT05LVL+aM
zq3_uvy$s~cQGUlDP%gyyPsUWz*;EZs#(!O;7v4A<8p{a-m_WTb<3OrYn(C!d@f2@5
z$J!$ppx@U%M?xnPevAX@PI%h5d<-e&{Di=|WLgbU&rlyIanCSfi8x;k$A9sa@O*1B
zH}d+|Li+gN1FJ;o<d0UI7ClHGO-LiGih1mVW_3$UQ2?btR=OWp-^rg;X^c3E*O$un
lGi$V}tZvWZ;o-52{{a4;KGV<9>hAym002ovPDHLkV1gGDLoNUS


From df7531835d9cb5ef168123a5a0a0537fd00c4a37 Mon Sep 17 00:00:00 2001
From: ToasterBiome <baiomurang@gmail.com>
Date: Wed, 15 Jun 2022 17:06:07 -0500
Subject: [PATCH 2/2] fixes

---
 yogstation/code/game/objects/items/fishing/fish.dm | 8 ++++----
 yogstation/code/modules/clothing/fishing.dm        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/yogstation/code/game/objects/items/fishing/fish.dm b/yogstation/code/game/objects/items/fishing/fish.dm
index 7b80d56ae097..6e72640a533c 100644
--- a/yogstation/code/game/objects/items/fishing/fish.dm
+++ b/yogstation/code/game/objects/items/fishing/fish.dm
@@ -23,17 +23,17 @@
 	var/mutable_appearance/showoff_overlay
 
 /obj/item/reagent_containers/food/snacks/fish/Initialize(mapload)
-	. = ..()
 	length = rand(min_length,max_length)
 	weight = rand(min_weight,max_weight)
 	list_reagents = list(/datum/reagent/consumable/nutriment = (3 * slices_num), /datum/reagent/consumable/nutriment/vitamin = (2 * slices_num))
+	. = ..()
 
 /obj/item/reagent_containers/food/snacks/fish/proc/GetChumValue()
 	return //not used yet
 
 /obj/item/reagent_containers/food/snacks/fish/examine(mob/user)
 	. = ..()
-	. += "It's [length] inches and [weight] ounces!"
+	. += "It's [length] inch[length > 1 ? "es" : ""] and [weight] ounce[weight > 1 ? "s" : ""]!"
 
 /obj/item/reagent_containers/food/snacks/fish/attack_self(mob/M)
 	if(showoff_overlay)
@@ -44,8 +44,8 @@
 	showoff_overlay = mutable_appearance(icon,icon_state)
 	M.add_overlay(showoff_overlay)
 	showoffer = M
-	M.visible_message("[M] shows off [src]. It's [length] inches long and weighs [weight] ounces!", \
-						 span_notice("You show off [src]. It's [length] inches long and weighs [weight] ounces!"))
+	M.visible_message("[M] shows off [src]. It's [length] inch[length > 1 ? "es" : ""] long and weighs [weight] ounce[weight > 1 ? "s" : ""]!", \
+						 span_notice("You show off [src]. It's [length] inch[length > 1 ? "es" : ""] long and weighs [weight] ounce[weight > 1 ? "s" : ""]!"))
 	RegisterSignal(M,COMSIG_ATOM_DIR_CHANGE,.proc/stop_overlay,TRUE)
 
 /obj/item/reagent_containers/food/snacks/fish/proc/stop_overlay()
diff --git a/yogstation/code/modules/clothing/fishing.dm b/yogstation/code/modules/clothing/fishing.dm
index 6f67c4ce613a..7db4e23128a9 100644
--- a/yogstation/code/modules/clothing/fishing.dm
+++ b/yogstation/code/modules/clothing/fishing.dm
@@ -6,7 +6,7 @@
 	alternate_worn_icon = 'yogstation/icons/mob/head.dmi'
 	icon = 'yogstation/icons/obj/clothing/hats.dmi'
 
-/obj/item/clothing/head/fishingcap/Initialize()
+/obj/item/clothing/head/fishing/Initialize()
 	. = ..()
 	AddComponent(/datum/component/fishingbonus,5)