From ab74afd00f6e6720a0c3f5a038fbbeac01fa7f5f Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sun, 18 Aug 2024 17:53:54 +1000 Subject: [PATCH 1/2] Adjusting drying rack code and icons. --- code/game/objects/structures/drying_rack.dm | 2 +- code/modules/butchery/butchery_products.dm | 12 ++++++++ .../reagents/reagent_containers/food/jerky.dm | 28 +++++++----------- icons/obj/drying_rack.dmi | Bin 1190 -> 1396 bytes icons/obj/food_jerky.dmi | Bin 937 -> 373 bytes 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/code/game/objects/structures/drying_rack.dm b/code/game/objects/structures/drying_rack.dm index 7cec42d26fe..ae03e347048 100644 --- a/code/game/objects/structures/drying_rack.dm +++ b/code/game/objects/structures/drying_rack.dm @@ -2,7 +2,7 @@ name = "drying rack" desc = "A rack used to hold meat or vegetables for drying, or to stretch leather out and hold it taut during the tanning process." icon = 'icons/obj/drying_rack.dmi' - icon_state = "rack" + icon_state = ICON_STATE_WORLD material = /decl/material/solid/metal/steel material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_DESC var/obj/item/drying diff --git a/code/modules/butchery/butchery_products.dm b/code/modules/butchery/butchery_products.dm index a7533c84eb5..2eae59a29ca 100644 --- a/code/modules/butchery/butchery_products.dm +++ b/code/modules/butchery/butchery_products.dm @@ -33,6 +33,18 @@ if(meat_name) set_meat_name(meat_name) +/obj/item/food/butchery/get_drying_state(var/obj/rack) + return "meat" + +/obj/item/food/butchery/get_drying_overlay(var/obj/rack) + var/image/overlay = ..() + if(overlay && fat_material) + var/drying_state = "[get_drying_state(rack)]_fat" + if(check_state_in_icon(drying_state, 'icons/obj/drying_rack.dmi')) + var/decl/material/fat_material_data = GET_DECL(fat_material) + overlay.overlays += overlay_image('icons/obj/drying_rack.dmi', drying_state, fat_material_data.color, RESET_COLOR) + return overlay + /obj/item/food/butchery/on_update_icon() ..() underlays = null diff --git a/code/modules/reagents/reagent_containers/food/jerky.dm b/code/modules/reagents/reagent_containers/food/jerky.dm index d774c5fbddb..6a7c87e8d3c 100644 --- a/code/modules/reagents/reagent_containers/food/jerky.dm +++ b/code/modules/reagents/reagent_containers/food/jerky.dm @@ -1,13 +1,18 @@ /obj/item/food/jerky name = "dried meat" icon = 'icons/obj/food_jerky.dmi' + icon_state = "jerky" bitesize = 2 w_class = ITEM_SIZE_TINY dry = TRUE nutriment_type = /decl/material/solid/organic/meat nutriment_amt = 5 + color = "#81492e" var/meat_name = "meat" +/obj/item/food/jerky/get_drying_state() + return "meat" + /obj/item/food/jerky/Initialize(mapload, material_key, skip_plate = FALSE) . = ..() if(meat_name) @@ -19,43 +24,30 @@ /obj/item/food/jerky/fish desc = "A piece of dried fish, with a couple of scales still attached." - icon_state = "fishjerky" meat_name = "fish" - -/obj/item/food/jerky/fish/get_drying_state() - return "fish_dried" + color = "#ffd997" /obj/item/food/jerky/meat desc = "A piece of chewy dried meat. It has the texture of leather." - icon_state = "meatjerky" meat_name = "beef" -/obj/item/food/jerky/meat/get_drying_state() - return "meat_dried" - /obj/item/food/jerky/cutlet name = "dried meat stick" desc = "A stick of chewy dried meat. Great for travel rations." - icon_state = "smallmeatjerky" nutriment_amt = 2 + color = "#81492e" /obj/item/food/jerky/cutlet/set_meat_name(new_meat_name) . = ..() SetName("[name] stick") -/obj/item/food/jerky/cutlet/get_drying_state() - return "meat_dried_small" - /obj/item/food/jerky/spider - desc = "A piece of green, stringy dried meat, full of tubes. It smells faintly of acid." - icon_state = "spiderjerky_charred" + desc = "A piece of green, stringy, dried meat, full of tubes. It smells faintly of acid." meat_name = "spider meat" - -/obj/item/food/jerky/spider/get_drying_state() - return "meat_dried" + color = "#6f5b4a" /obj/item/food/jerky/spider/poison - icon_state = "spiderjerky" + color = "#546145" /obj/item/food/jerky/spider/poison/populate_reagents() . = ..() diff --git a/icons/obj/drying_rack.dmi b/icons/obj/drying_rack.dmi index 56ad6a627100e474f3f19aa6d756678a2525acfa..5e76ef26477455110e87f7a837900c4ec9edf3f6 100644 GIT binary patch literal 1396 zcmV-)1&jKLP)V=-0C=2@%DoE1AQXn-*>e>i$zJ-mx)eikNN%A>J&8i2aFlxc9Rl4-y1g$v zJ#NF@PB5dTH%o~*LF0Njl4{Y{0FBF;RN%OTx=pFBGBmoD<>fn4K1zYciPS7^<*mPJ z;lvW3`%ZF8yJ}@u|3Z)XH|#M?24=MM0gCZPoxfmgNdN!@rb$FWRCt{2o4s!0N)*Tc zW8Ef^@&XB>h>{4&WyD9bOYXg0+LTceMOozy5ZV`5gebQ|K@lKIT5HPy4LC|^$r4fu zMDhYi-c-yjl5q^d5D&(4hn-(z;Q@b~|Cw`U&J5)4?hdnP)C@ASfrHcYV;a`A){VdB zHI^&IajA66eeqoG64zIGjr#(B01J)Nw{0zx*13*RynyVGc_C;&kr=bjecQ%p5^dCsxe3+V9%d5%KVn%H z1pvo!plKQo4-dKCH&C2DyEu9M5!sj!VfypBV_6oB$K!~{O@v{5rAUbay)sA)b%;snh2dwY9`#bSuZ;}{GE+}Hb5 z2=X#*{6*)(h9!Bg2rT)hQoB(+0s!FU5lmRu zVR#Kc>-?%oBoY%Mc)dTU@qvIjKqSojfp@R(_AJ-?0elEeVKW+y=+@R2NhXuTahwU` z^X7q>6EW{3ER)u`;=4vRXt!qpSbj3*4Ltx*uQtIxvwN^-?e;A6Z5vSx2&TEezo$WS z!NML;uQs)y!%U5A(0aA00k26jY=%$I=-W2BJZU)u!8ic5#AS?h?!F;t+vv zEeODvz4S7*ptrGmD77Fq4;Vf@Bme!I`%J~c4UO$=19)E>kYzrwum{wuP3`RBn=r!;nWbu5)rvzB{9S$OyE5KV);|?Ql zTN8PI{zu>^z_?r~qExzFYKvj1bUQ9rinzYYj}c->S|>h?f*Li0mMcZHTCLCwmd$4A z^;KTF_#6ekdqWk`Ak9Qvbb5YF>eZ&OFyQxJH5pO!0KqIJ zfXF{XFl6russ{*$TL89QT$J~(OCDIN2Z&zblHK@#3PHkA0tiM4AQ&ZpV3YuYQ341? z2_P6HfMApWf>8npMhPGoC4gX*0D@5h2u2AYnEwDEJ7JTV{Ma!70000b5ROVP_whM$1E)C;>WNPAfOW_%3W6Db#1soEQ&1}UB@Ai)i5fd7T4F; z&(F`$(9k6zG!G9Sz`(#Za$o<}*8j4y|7K>_rjpvev;UH2kg;RF)1h#PPydmT|AKfFDZ*Bkpc$}5dy$Zu16b0Z} zpF)zo^l$A_5=w^V6-44SUP?4vrM`Zp8A_LGw{zg*+~Kz3+TVszboYTjfdYCbF5CteekwUHq&J3vqw)}-;@?L}c$I5`F=x1<1IF%jw zRKC7|id9HzLeNDTR@6XMs~=jqZ7|p>^n0%r{n)*K{{nz$mCh?7*R=ou0{=-wK~!jg z?U##|nlKQCqlj_|iYQ|3)>_(KkK(P`zW=Lrg4B}RP)ZlNr}=XLbFzE>FEe362>D0U z>+|XfnqLxx{C+HG@F^szc$SYBxDaCC7uA_4GvjYWv5djRQZCICoBGXX$4 zn$-hv6kkMT0$1@xR3`8gUqp2X9PuQ`R3dQ2lOR)xz*C(BYsSFH$f!^lPDjXa6h$-a z-{&A~JdWc9?w=%Kq9=%!?^f>-g89>j^+$vt-hA4m7(tkP{*r_Uz-k#`1oJgc5T~2x zP5OcXfd3RBjBtS83jqQ!4HH-dNvH={EpdSL6AqAW(s-*MPp05c68#^{R!hvE0bu@Q zk)iQN3 zMZmzoNk?2|Vs?s(p8x;m0QvPN3^{E!SpWb4lSxEDR5*?8 zkjoLnFbG5~DhQcL0s0jXOKKnr1sF^Hw-TLf@WII;NAHb&%);z6UHZ51cFrL$2gm3! z)Vq!_dUn+4sf-6%b)ffMBn)u*%`zcU%Z+y)`Z~*inR@bjB*enSiU1g#lG~h-7uAcQ ztT{1m``j2&aHt$#%YM>$EAd$9k*qB8SStAXrDw!beCZc`0Ds04P>dOgE&u=k07*qo IM6N<$g1Xa#LjV8( delta 884 zcmV-)1B?9i0;vaoiBL{Q4GJ0x0000DNk~Le0001B0000$2m=5B0MhD$JOBUyx=>71 zMZmzoI28^dCKn|k8CND2UoaSfNiJ|bBr`lGI7BQ|VMRw%IXX5eTS+-@TS{e8L0>Ky zIYcZ(F(X_^I9o_LNHr=}Lp4)CFG)8iW>P_DPd-yWFJVZ3H*i)(Uq?4xNjN|(AwoYd zP&X%4J1j{sBw0W&Of)4s9}FEP7bPSaz`($^cUIz{Z|<~r|Js`W%8Kr=cifw7?zDXW z*qQ3Bc>mRw|Jj%EwSMrnc>mRvwv1Bz!-eCbZ?||>*1r>;00001bW%=J06^y0W&i*H zk9t&CbVOy5RzrU`HL)ZswJ5t%iHkEOv#1y-X2`{vR+N~V3Sq-l78hiuq!y8^Ha1BXneksh2Y5)L zZo2l(ZPS0hMMDZrJaHH@=EYb@iHRpm63+b$3+bI``mP;@ySw*YgM_rw=U_jK&=OYq z0_-O#T7oG1z8i+7JGTv10*i8E|LG9V`3qzJ=@8HPZ~9?4w_VrQb%paYW*TN8*hl#} zHx2Uy>?8cQ=MSg4u4M&3B(SjdB(%}coQZQkDey=<*P;vK0000< KMNUMnLSTYuaf$u_ From c49499c6647fd5b77066e608fda8bf0d141dadcf Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sun, 18 Aug 2024 18:11:43 +1000 Subject: [PATCH 2/2] Cutlets are smaller and greyscaled. --- code/modules/butchery/butchery_hook.dm | 14 ++++++++------ code/modules/butchery/butchery_products.dm | 4 +++- .../butchery/butchery_products_cutlet.dm | 6 ++++-- icons/obj/items/butchery/cutlet.dmi | Bin 1049 -> 753 bytes icons/obj/items/butchery/rawcutlet.dmi | Bin 1073 -> 0 bytes 5 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 icons/obj/items/butchery/rawcutlet.dmi diff --git a/code/modules/butchery/butchery_hook.dm b/code/modules/butchery/butchery_hook.dm index 1cfceb0020b..97918430f92 100644 --- a/code/modules/butchery/butchery_hook.dm +++ b/code/modules/butchery/butchery_hook.dm @@ -215,14 +215,19 @@ return FALSE /obj/structure/meat_hook/attackby(var/obj/item/thing, var/mob/user) + if(!IS_KNIFE(thing)) return ..() + if(!occupant) to_chat(user, SPAN_WARNING("There is nothing on \the [src] to butcher.")) - return - if(!busy) - busy = TRUE + return TRUE + if(busy) + to_chat(user, SPAN_WARNING("\The [src] is already in use!")) + return TRUE + + busy = TRUE if(occupant_state == CARCASS_FRESH) if(occupant.currently_has_skin()) do_butchery_step(user, thing, CARCASS_SKINNED, "skinning") @@ -243,12 +248,9 @@ do_butchery_step(user, thing, CARCASS_EMPTY, "butchering") else set_carcass_state(CARCASS_EMPTY, apply_damage = FALSE) - busy = FALSE return TRUE - - #undef CARCASS_EMPTY #undef CARCASS_FRESH #undef CARCASS_SKINNED diff --git a/code/modules/butchery/butchery_products.dm b/code/modules/butchery/butchery_products.dm index 2eae59a29ca..82e883f4b0c 100644 --- a/code/modules/butchery/butchery_products.dm +++ b/code/modules/butchery/butchery_products.dm @@ -38,7 +38,9 @@ /obj/item/food/butchery/get_drying_overlay(var/obj/rack) var/image/overlay = ..() - if(overlay && fat_material) + if(fat_material) + if(istext(overlay)) + overlay = image('icons/obj/drying_rack.dmi', overlay) var/drying_state = "[get_drying_state(rack)]_fat" if(check_state_in_icon(drying_state, 'icons/obj/drying_rack.dmi')) var/decl/material/fat_material_data = GET_DECL(fat_material) diff --git a/code/modules/butchery/butchery_products_cutlet.dm b/code/modules/butchery/butchery_products_cutlet.dm index 17a95b32ae3..f925679fda8 100644 --- a/code/modules/butchery/butchery_products_cutlet.dm +++ b/code/modules/butchery/butchery_products_cutlet.dm @@ -5,18 +5,20 @@ bitesize = 2 nutriment_amt = 1 center_of_mass = @'{"x":17,"y":20}' - material_alteration = MAT_FLAG_ALTERATION_NONE slice_path = /obj/item/food/butchery/chopped slice_num = 1 cooked_food = FOOD_COOKED w_class = ITEM_SIZE_SMALL + color = "#81492e" + material_alteration = MAT_FLAG_ALTERATION_NONE + /obj/item/food/butchery/cutlet/raw desc = "A thin piece of raw meat." - icon = 'icons/obj/items/butchery/rawcutlet.dmi' cooked_food = FOOD_RAW backyard_grilling_product = /obj/item/food/butchery/cutlet backyard_grilling_announcement = "sizzles as it is grilled through." drying_wetness = 30 dried_type = /obj/item/food/jerky/cutlet nutriment_amt = 2 + material_alteration = MAT_FLAG_ALTERATION_COLOR diff --git a/icons/obj/items/butchery/cutlet.dmi b/icons/obj/items/butchery/cutlet.dmi index a72eb8d107e69f83466296a298952ae7d80dd775..ecbeecbfdd35f40ff738b4358f94c5c1d5935b0b 100644 GIT binary patch literal 753 zcmVV=-0C=2r$~g*vFcd}6I)4=ptre#>jYK4c?jew90uGRTbo&-o7Iyc-$tqrL)cMHLy}jq?3@SfLCzmbwR$>fgQp9d8Op0g5y|bhWUPg zjmKmB&v0xLu#Lh1+XQT*Fu*ne+b9gMO~5t^1JWL#)Iuw@&{>d40?v7_(P;Qd-~S=a zhby(v^DqPe%)?Nhou9Ha=fwr*yeFmnmgbDa2_W&Ub`w?4!*aF8a4>qeByi4qjIrMi za}$620Knq@7NEG3_&Tp4kO}~Bdvk~7YK_b8*W8jo!T~@C(FXvBx&E_$>L)obmI2Yo zx7tl}z0PX@fIzBTO`uvQ;aT9|9zgM~dLB-Wk1(0e(CK_ZAeBkLWID@=*DE;8^|KUi z&fRyza4^zJEi~0SiGRF*Kp>S7J( z&olP`*b<+|NZb_*05k^QdhHPGHQ?<0lnn4#i`bhWurb1h@H~*nfPV?a{{glM*hXQ1Z34DY j7+{-#Z4?IBCSV&cO}!>(C@_wv00000NkvXXu0mjfyZ2V% literal 1049 zcmV+!1m^pRP)V=-0C=1w$Gr-GAQT4B+4~e9xkrDiODN$`?;vO?RKiv2^&8sGk(kY5H|W*U z6S$;&Lt$z=5^wS~LSY<8#E_0y|CH)#fI{CNWf+B@nRsSAzKmUGVkcH}Axhmy4NX{ZiG-+73&{pV z7hJ@K3WS7=3hdahsl<{6tw=VNx&a9mumRMBOCcx`D1ky9L}NuxYEviiEpaY(CU)!@ zR+SLQiBqVu@%aJYd34_QJ^F-+i3tu<;-R`X007(n`IvuX$g)gO>@vw$zYy*zfPZAD zVwz@EktEr~M0Gd`_HA?^ymKQd(5?J|n$XbKKI2H6;R+d)=Q z6SFMuSO5e@hplvYd{2l21Nh!QW3?R(;O*)IyBiRwWLFS3RzXrQ`p*(nWCA~ZNFtRd zFgk3e!{aq~tuBDT=&)7Ut)i$3$NEBG0WKYiIW|+b(T2~1QD7%FjWhWR8_Ns09S&@^ zEeylhGXY`0BJy24ZRxs?)_{(n1;N)2(I1E#BCz8TeNkH33Scl3JBDQ1$mk2JIUc$f$J;a$}OVXWjzU1Cv)Ecmh`AEZ#~`EthEz z`iU=RsC5l{E}m;8|GoM%@|K_!ti@0YMr^Dk-#X^y-?J_R6m*}t45bQ;N^jSE20c|q@%TdZp zbJ#iO$u9hXB1^=R8DvGO8Tmg|UlEBEv|xve!YZZ67>P`t(1WL7ElDU8VsZ95(Wn`GElLDE{*2g6rew3QMnDb^RCPJF0sG_ezKUBWeIN02%-dfCj){yv9aZ TLboDG00000NkvXXu0mjfhv(qc diff --git a/icons/obj/items/butchery/rawcutlet.dmi b/icons/obj/items/butchery/rawcutlet.dmi deleted file mode 100644 index d443d822643a8f7b1fa2dc150e1bc35b3f6c789a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1073 zcmV-11kU@3P)V=-0C=1w$Gr-GAQT4B+4~e9xkrDiODN$`?;vO?RKiv2^&8sGk(kY5H|W*U z6S$;&Lt$z=5^wS~LSY<8#E_0y|CH)#fI{8p_jAM`uN(zMmrJO=bY3XS>uNU4d zDp0l=Zu-4`^L;+=^S;kFk2Eqe!a>S*pw+7Yfcz-U%)x#k1UMWjT=+!#UjfX){<39R z+p40dmax!to$%2X%yJn?l9(Or7wUVT?g{ZgPhbxA3x`9s*ZS+!7kZweqrH_A?QJv% z8t_VjOzH1)rJ(__m)E{KkiXO`LcvBJ3kGp2G9ZyR(rjfnkQ5cU`!vs3IpSkw=932I z(14{xhj+YaMF6Ft0Z}e*_^eyrsQ@D1Yg^@cZj%3^d@=G(27}i!;;Anl_wu4IFDfMrL9ZBeQ`e%S1v! zmQx1v3-{=JJj9=|1lyJca9D{BFIC=wkKVDoZcPeybdJ(maoN#_kY$lG8*;rKIU!QVEfMT&I$$lS^ zo)<}9`<82?b3EI7ftMq9iGOp2RE@?~sYJl%V=c8pt=En6>Umx{K7|yFkpJNeytO_i zX5x6v z+Tn|EDSoB8gn!P`yiD zPck<-&isnO$>UvQvspSLE&OpOMyXszi4IG8MTYlTSGthoFZULO5UTEU()GkqWShjY zk!E%wiR1mfGk+&l9L3tj&m92vkKYwGA-FLy&6a5jMV3!KXmQv_2kw{mvuG~UH{^Pl r!Vd-TD0Sc)Q5B#HPz9(0Q~~}1#Z*+}(