From b5361ec52c3a34ba472e838d849af1e6caa093dd Mon Sep 17 00:00:00 2001 From: Kabra_men <46802162+Kabramen@users.noreply.github.com> Date: Sat, 13 Jun 2020 01:15:24 -0300 Subject: [PATCH 1/2] Cumburger --- .../food_and_drinks/food/snacks_burgers.dm | 8 ++++++++ .../recipes/tablecraft/recipes_burger.dm | 13 +++++++++++-- icons/obj/food/burgerbread.dmi | Bin 23999 -> 24428 bytes 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm index 814875d2..fc2a7feb 100644 --- a/code/modules/food_and_drinks/food/snacks_burgers.dm +++ b/code/modules/food_and_drinks/food/snacks_burgers.dm @@ -281,3 +281,11 @@ bonus_reagents = list("nutriment" = 8, "vitamin" = 1) tastes = list("bun" = 4, "bacon" = 2) foodtype = GRAIN | MEAT + +/obj/item/reagent_containers/food/snacks/burger/cumburger + name = "Cumburger" + desc = "A sticky and salty burger." + icon_state = "cumburger" + tastes = list("bun" = 4, "salt" = 5) + bonus_reagents = list("nutriment" = 3, "vitamin" = 10, "semen" = 10, "aphro+" = 5) + foodtype = GRAIN \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm index d7beebf4..733c6c48 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -176,7 +176,7 @@ ) result = /obj/item/reagent_containers/food/snacks/burger/purple subcategory = CAT_BURGER - + /datum/crafting_recipe/food/blackburger name = "Black burger" reqs = list( @@ -186,7 +186,7 @@ ) result = /obj/item/reagent_containers/food/snacks/burger/black subcategory = CAT_BURGER - + /datum/crafting_recipe/food/whiteburger name = "White burger" reqs = list( @@ -293,3 +293,12 @@ result = /obj/item/reagent_containers/food/snacks/burger/baconburger subcategory = CAT_BURGER + +/datum/crafting_recipe/food/burger + name = "Cumburger" + reqs = list( + /datum/reagent/consumable/semen = 10, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/cumburger + subcategory = CAT_BURGER \ No newline at end of file diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi index 9eafd6c218d3bad96ab27dcad6571f045385f878..6e6d9555848260b828649a29e4fad9291a1ce11a 100644 GIT binary patch delta 5483 zcmV-x6_o0~y8-OJ0gxmCq>&{ef8xf6UUVrO6h0)s5G<*cL}Nt~+Cwrw+Hn)&Pb%D7t8);z-C``|@Hpl;hKiZ~ep^NFvcJt@jZJsyV-;wGif4fFvOn+C+enzc3w1G_EzkM(X z5_AxUiV0syOxR_n*-gxaG5voFuwl*| zBHo-chqyxAQlLQKtlwBnyd>Xq#=YNo(EQa3eD++YczwmXfeMBGUVqjmXGa+sDYP{9V0VuC9DgQ{AKc}$cu_hDx)3haSY_z|@?!wkni||Ppaflr zyj@+j@BKk3pGQ`kNXdYP(_Qp5&Ek>OqG)4NZqRVL3xM8EJFzJ@=xGv_l9GYE-E{G% z6woW?Vt!J-3=l=~Y~e|F`Ai&sNslAeia^YQet%NFj7P0H)~_D(`4sl5RjWb({`99m zQC3z4APYwNr(6cHDBaT15|r#m!sT*>NaC5v;g^*8l$4Z^m6b(FNr}AN-rg=R2f}*G z?}Yvy@#`xtJ{q&uMOSApoyQ|^YD_roS8)u^!ZA1tLQLbYEg}x5{VGn4iR7zB;^L#x zTz@_<7l+3*DPDC#WqcT~@%;AVY97x?q`(r&fy!PERQ9^aG#1D7vf7S^v{&zUo40y^fa7q2jH#nZr>ynnT~ zS{{PL0bLa?0GunYiY-^&_U$|#A-1?MYhAqeSqqsUZT2aORR^@{*8;BvX-P(Q=@&SAX88uDXSt zzgtRo%P5V8Uwif1r1-nmeoGdJNv~mEVwgN6n~LPrSgy8>$otrxqx|fTkNOpVrj8%P z>&>cPd(JI><2yBzwo?|PrQzA73G&(UZW$dN9X@?7JjIua@ye`5S&VL~7l&QvPm1#K zCjKq21Nye(H-aP*m@K4M%zxwifBWH&dFR5@^0tp!b-cLzg}b`b-cJPc6ntv`kA!(E zp5m=-Z@PVpDnF1?I}znK?l*sJV4%t49_kSFm3ENNe zg|)kK0GPMpDV*(}u;+VKUhn_RPZy8>y`zlZ{CBZWugg>X*S~Sr>-}H&=cPf9zvp{Z zlf+}OSg_gL#~3fo8-ED+_(7CFSXdbI=g((&c$kAba=hMm+un0rxpIY(krAKeb0_2b zbtSYXltpHL>pd#|vvA=;p`xOK_3PJDQc@D|H9!@+whBe{{j4yG%P+r`!@P&)<8;{2 zM_F(>#7^hxZ$xWI#ns=)m?i~Rk645({g*N-uR(D;6lNHFK7S2<==)z4K5riiO8mzY z=CJwS|IerRo{oRjcbkB5=}grEyqVD+(D5r#iojd^$$DlYe$WJ@a(_{=YpVcIRNqf# zBt(Y6>26qIgiHg}^?P2FhXnoz2;lSfp@8BSW*D$LNBt6z^7xMq zC1A0L^-f7PLVrWK9RGt^+4AGkHs+CbzmMM&k_f`X!#%FQe*HQlBO`=`g`v@Cf}RB2 zj`*s8R6L?ALcad-c=0noLG0MxEK8lw-y-PIm%fHcuc4@Z{A`ym@g@0uYyX*mim*Em z^}1y_LPPnK@k7$G-Lj#V<_-9D{0|DMfK)u^7hAJQx z6_pu76_ARG%8a23NJT|u#!v;MG9@uFokI9vhY&v4A=Df$5_FCRq2_RruwX%~pc`rs z7A%Mrj(zxhdHL9fzZY~v4Q_vj4|b@t$*N3=Dt{mqj|^Y_TsXP!2%#YZgoX@|G*?Hz zqm87wIu7jKjd|Hhnky@Ka_bZP;h%nmdD%*y-1-Ec{P|P2ze7U?&oMqdL^{V zB*F(fgwT)y+UqY65oKh+(LJec?HHusg%_x|9!2XkFeXG08gg^4tYI)`ucW!W0(16C z4u9<4&GPIV2BXr{tAm5UtK0J@3H|4LeZS!u%>0Fjs(@77s5x9DB+b>yqS4OQ;~I9# zEkHz+c$coaS{uvPGcwp4-7Ws)YPS63^F{<ZA5`c)c4|D#* z6MRr5-iXat5vc-F2|7*x_P0W~UdMIkAb%-8_)o7tkh-A;L7DYTl#h0{9st*{lZYrI zb+tC^J-wJ>qnV!+&z06rSvFHHtC^5ryt+MKki?^pHlSUTh3kuR@_J$EJXu7(Na&sv z(2~Q?3nvtllIA6evp<4=GeD~GgG2Fa`NEntYca%V=)X2fPfI(O8tce^&ASg|&41w{ zA#;I6mJh&}m9_HvhtiUWG>l8AwPO%_PcOL-XL6;rQ)*h z@(8ICrvfrWkI(PZ-z(m*&Dq;|qs)8;N-v;~HelTRIKwB(nVpx-@QHGa zn;)n9(B}X=@?0Kpf>*ca3;x!H?j*MqkmLR51(L*Xd1;R9b2f3}HGr;8mw(&#aq-dQ zadS@W_n#Lau#Whk$Da;KJW|$k@o*#1$U~b_Iq>FRXsPRE&D*}+3t1X|DdnS_i(Z?$ zoWA~cA`N;uOHyVz(lQ_qzW{l?DK0Z1E6x#*^doDCsfj z@woVCd401>OO{0|FHbi){d7F&@uxx(&sTP?A>1&RE9Dn)c8dk#{%fPOT&nj=KDwa> zp|`0~&VDi;D{zw!fWzTnc54NZhVd-PSE(%8R2a~Ep_C1X!Wro9_J6qT_2Cg_EsSR5 z+T5VM{|jxqg|egP<>j0Wk031v`^!eJ*9&E@uaq-d6*-KZai_wLT&|Xc-s^Qb5i5)x={ZJQYGxXtnsCBrhtXNlOho!zFQZPz zO*m`UGZu4}yyu1ixbB+G7-v~gAg&Iz?H0;LW1zGoXfoRNZhs3O?MRk~VE|nRO94?x zlwNR?&$f44CQVs>w=(SzOxc;5UE`fhLOD%svrCIv>ykSvK-cB-94Ynxjd;-GODM&Y zm=P^!JDNEm=#6@6zql$Fo&A-MCnm~AYA-glvTE6aDfgQwBwqw2FlGb3+ty#Kr~RxlamA3j0|ofYVq0O9+ODv|6n!A#fj(Da8Y#thCzcr;omynD$EOxAs;8Vn>vU ztxC*Vm)pN)mzHLimUA|-Bfj^U=UD^1JezMq_&oJkUTC@qQ5IpMg5opg3h?%)$;HOL6((k(DQ7*x1wU#R$)bfc=yAQ z&^d(8Nq;0PGLx{#Opf;)CMqJ1sE9Zoi`|6Ll!eih1%NKbh%UxRUg9U@JvSuQ5&h(c z1uJnl9I}MAz1xDdt&j5`p1|7HC;yYyX|-A$4hKIh2u99*`-n>4 zd2)K?x4tK`ELsj!_HslqbxGK%{%QB|M7qU<)qiFWDE5+|G>ur>utFF2wpdt9~XO{57{%W}%x9#1@S+$h)I2;akKeHr&Xm^%rhhUZ} zCv}XAq^|nb^FlTCxa4`E>Z)6?R5@w)^nc{HplQFA4L?rj=+W_x>}&i_ZP!?qp1{Su zb;SI@_t&stgDEKSox?Z$cn3sclM^t+i2qGe)>Bh@h0!5_A=g;Y|OH@{GFP2V*JN`oDM*AyougUJ3URaNLvvnuWvZrMQq9qSvgN9CcI z^b?HrJ6_?XZ#>1;jjQFyTRR4+uC)>$XPoxAm35-+JHEqT$}Vv$0d-fE3IJN2PL`2t za1e_nna=KOlZw*-)z?B;5+l&rea&qjgAglmW0w!Q9}?Y3O> zM!PJZV9W~-EbK7o$;5YCs1h>2a-x5DN%|?+BT5*6ZzuBueud7gC!n`ef#zaiHV7f zj*c?RUL$8QX%-X5Y8r5~bjb3NvZOyBIXOu_o{G}jcYKHaM}NvN7z}7M8rs_0c=p+6 zy?XuKRi%O?5|}I`txhLzYo8U1=|+#d?Xa_t#MN5@dY_aM0^g^m4wihBNFsXgM5Ev0 zk+^FG1e2%6{dDnSHxVd1`b0@QWwi!$C~Z8qCI`M!HgYHF%5u?FO?h-B^w0ZGjC)U*$J{5y>#B7bN5 z9336Kt>Sr*nJA$LLO?1iDt8aT7>3QXfbOk{tW{K0WCE@K+zqHVrB_i=nK4uWsi>&T h7^;9&R8(e+{|Db5_y%%J!8QN@002ovPDHLkV1hR`-X#D4 delta 5051 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 Date: Sat, 13 Jun 2020 09:32:51 -0300 Subject: [PATCH 2/2] Update snacks_burgers.dm --- code/modules/food_and_drinks/food/snacks_burgers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm index fc2a7feb..f9169ca3 100644 --- a/code/modules/food_and_drinks/food/snacks_burgers.dm +++ b/code/modules/food_and_drinks/food/snacks_burgers.dm @@ -287,5 +287,5 @@ desc = "A sticky and salty burger." icon_state = "cumburger" tastes = list("bun" = 4, "salt" = 5) - bonus_reagents = list("nutriment" = 3, "vitamin" = 10, "semen" = 10, "aphro+" = 5) + bonus_reagents = list("nutriment" = 3, "vitamin" = 10, "semen" = 10, "aphro" = 5) foodtype = GRAIN \ No newline at end of file