From e20e76cf2a1328814e7c68dc31bc8994813bbf46 Mon Sep 17 00:00:00 2001 From: ParadoxSpace Date: Fri, 29 Mar 2019 16:44:35 -0600 Subject: [PATCH] Adds Beetle Milk (#6223) The sheer amount of Offworlders that ICly talk about beetle milk without being able to slurp it made me sad. Sprite by Wezzy. --- code/game/machinery/vending_types.dm | 6 ++- .../Chemistry-Reagents-Food-Drinks.dm | 11 +++++ .../reagents/reagent_containers/food/cans.dm | 12 ++++- .../reagents/reagent_containers/food/lunch.dm | 3 +- html/changelogs/paradoxspace-buggalos.yml | 41 ++++++++++++++++++ icons/obj/drinks.dmi | Bin 100013 -> 100424 bytes 6 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/paradoxspace-buggalos.yml diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index c76c31aa43b..14d81da4f1e 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -209,7 +209,8 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 10, - /obj/item/weapon/reagent_containers/food/drinks/cans/koispunch = 5 + /obj/item/weapon/reagent_containers/food/drinks/cans/koispunch = 5, + /obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk = 10 ) contraband = list( /obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko = 5, @@ -225,7 +226,8 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 15, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 113, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 16, - /obj/item/weapon/reagent_containers/food/drinks/cans/koispunch = 50 + /obj/item/weapon/reagent_containers/food/drinks/cans/koispunch = 50, + /obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk = 5 ) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. temperature_setting = -1 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 52fee808eb2..ab7c9dd9ac6 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -991,6 +991,17 @@ if(alien != IS_TAJARA && prob(5)) H.delayed_vomit() +/datum/reagent/drink/milk/beetle + name = "Hakhma Milk" + id = "beetle_milk" + description = "A milky substance extracted from the brood sac of the viviparous Hakhma, often consumed by Offworlders and Scarabs." + nutrition = 4 + color = "#FFF8AD" + taste_description = "alien milk" + + glass_name = "glass of hakhma milk" + glass_desc = "A milky substance extracted from the brood sac of the viviparous Hakhma, often consumed by Offworlders and Scarabs." + /datum/reagent/drink/tea name = "Tea" id = "tea" diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 69efb1e2757..cf5a6dfe311 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -254,4 +254,14 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/adhomai_milk/Initialize() . = ..() - reagents.add_reagent("adhomai_milk", 30) \ No newline at end of file + reagents.add_reagent("adhomai_milk", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk + name = "\improper Hakhma Milk" + desc = "A can of Hakhma beetle milk, sourced from Scarab and Drifter communities." + icon_state = "beetlemilk" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk/Initialize() + . = ..() + reagents.add_reagent("beetle_milk", 30) diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 148a0bb8fbd..4c699794e9c 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -64,7 +64,8 @@ var/list/lunchables_drinks_ = list( /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice, /obj/item/weapon/reagent_containers/food/drinks/cans/tonic, /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater, - /obj/item/weapon/reagent_containers/food/drinks/cans/adhomai_milk + /obj/item/weapon/reagent_containers/food/drinks/cans/adhomai_milk, + /obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk ) // This default list is a bit different, it contains items we don't want diff --git a/html/changelogs/paradoxspace-buggalos.yml b/html/changelogs/paradoxspace-buggalos.yml new file mode 100644 index 00000000000..67df08c3ff4 --- /dev/null +++ b/html/changelogs/paradoxspace-buggalos.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ParadoxSpace + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds the nutrient-rich milk of the small-car sized Hakhma beetle to vendors and lunchboxes." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 99df283fbd94c3a19af9f8d3f7134ab8de0287de..c0385a6faa8e684a3a6ab26d6e186f7e12468214 100644 GIT binary patch delta 4886 zcmV+x6Y1=&jRwe&29P9wJ$h7FbVOxyV{&P5bZKvH004NLom)+BBR3K~+rL6cfW-!A zFUB5w278#xBEceu#M-hhdTd%Qz}*7eB1ogYxJC3 zH;q4CUwN^z`L?;ezSAX^34{9XGH`CZ&f^U;f zxsv2|FWJLG)e~-Ft)sjOteVBGqMSxr1&x!9k)c_|aa) zx^7)|B^#uiFs2VoVx87FX}*b)*3Z5-8o8)nKL=B-ZO4Frl{{~}^}_3$a)ENsQF33Z z;X=*#%%bnt40%IyVd|rS6fVd{QG9*z5q@ z&dGM1HT6cNtn0Ie$vQ}K(5Lh<=lPKh}?>CM=^r%eULKn;YZMS>k*&& z0rhOXWDvO%SJe)^tlNasK9fUNpwSl>BK2!A&Z~t|HAUC$j1zl4?6_9csCH~gry4-` zKp{@3#w-6dNrXd>y<~LN`yiDsz>gPT|Czk~(i@F`{5XkQ$5U4%*MN$jVYU0_cYVnCnp*AtCM|Jxkm7Q^d?M!NATX)=@>A)FwX{H0O(_#rU0KPAB z((K58D&T$9DEHu%jFLcP)kIY>tTUz)fy*0z?)0XM6F?l%>5cLF*;90S(;EYdr|9%% zAEbiQyU2vZC{AxUjdeYwdIZEhlC_DesjTn)k*wVZS`Te2)2QpPPWsA(ln6kWv6LW{ zflP)HaDq;^TV_O!GZHDiw2>-c5ydo>AQ`xS3bbWV=vZRAekce z83<`|_cru5(f6ck>n!Dz1nRX@0 z@!-|AXU4y&Z5VTs$WkI@k4<{pyen3fKm&tplOzr$(15sFsu*&fA7bzsni!y`8HzD~ z^Ncm^fC5p_iXBcLsgxE|D;k@MV{CG9?B|Pc$zn0*G-EN%&e%E11;L%^ex0=!*!8S+ z1|yz-Mq;ji#?E09k_=bP;;`e`sUPS9{GKXX;s}IweNj)C)KR5q?%3=AhJlp>luK;H0<%Xf~uX7RhMYiN&T^zuaJ#}K(+PnE%w z8zm1f{%Sp6)R2qQ7$qZ?&YTxDGt9ZoC2H7H?9>k+p}iDLLHe80MJslSN`4-IyXN-; z)?*+sDZv>NzK6=s+yMqH&y{U|kWd%ggpC-)sEq7{PUK?elAJC|_9zuPwPDn81n%GS zU0Kf~pC56sttN?4G?N$?oz_>;#fdvHpsFdkvbDP1axSu4cQ_jTmP!!KNc1cz0#Csj z4{4lAQh+hs)KQeqK(2VX&}GUdD8Y15)gKZW$T41BRV$vO^xn<^eIPj4|D7-wm2;YY!?sQDLzDb}VruGMYS~jAKK^1tH2F zc`3qW&aE_PZDsBy03&q@aRLdOvZpu|Sx@DAvOaPbsnoL`e!&s%Sgv}?K#xF;FT$n^<+{(YH;N0RE~oX@dZN$J{9GD`P+Vf-&=UnT)L=wA{|~6&{3d7 zZKAZk%$H6#FrDe7GI-m&f2;?{MRGsIQ{}?D5BJ%8xMy)ZiUZoUbt;9~(H5w(SF%Fc zmufOHSkH3C3H6Tedh|eVHk!l|bPwFoH{GLX^un1u-dcIYqZiItpY=%PXl|G9Ae4IpVzgt+KIr@c(#kRW0cVUnENiah z>bX$)Dyok2r;jR8GeOVqD(gjrAm$}I@tjX>Wa$xD<~04jxqtKb_~}*fG#2sfb)U~P zXf3{(cYEL5-M{$?T31e7->7*y)TKSw7zPz)v=AFHD%r)}4FCqTC`R&hN zH^2Vz`}O|;(5rT;I;(c0gJB7`VF>|-U;-XOx9MpCP!tPENl8hG+D#w`LM4|(egS=d ztH1oG3Y`Q;5XnnS72vgY_`9506qqjvf<~!J;jOjfq>Dd9_?aLGid~A2{Nz{Df2yb* zK&DKYa#b=1Fj{_fm!BXA;#4^00KC=?{|qa%UCn>C3T(zqXaRLK7hqNTt;@4{OYQd^s8eble+CwkR?{e`Doq1uf;UCw_x_22Q}jp{z=cm9v6znIFwF*_{7#9tzzr1 zcc86~LN=~P7C#gi+8=C6M9@=t%fw*E*g2(@-#{O-NUR)6<#Fx7!U_mSMBm(BI!5ZTEV;dTI$F zbBxT)6O%LYTj-~s{)dqNt&r(*^PbNqA9ZA0mD|^{l_(`U61WxpVM%Jh0pCaJ$_&c<>iST6`6*^aIw2858zv#g{XZ37pu ztfU;hBRzO->GSy6;-8~;q=$a`=d}OZTR#T?Jo*0nsH>|(;kk3L*=!g+bqWA5^2~p9 z?*k!ZZjg3=01kZ7o6w>FngOq=uV)te>Ca_<+rWir=+Fj^e+>N{w*rH@y6LB1v>yO| zbmBTzzxysOZQcw3xc&O;ux#9j`7aC^;wOa64bl$4_l5=*#J6}K@p@*tH#CsYGR3c_ zo__j;_-hI#N}JlczkGAeaY-F{Qv*luNDpd$@B%D&~6gQQ_j^-FmADA#(_+y}f{9?>G&llFK?x?t*XtI(68w{m)#avxm-ivge{a2R;VZ$fG**`*iQka$#rlh_ z|M8aV%C4=y$G`w!wO)rThwnh`>iR7J;9vjVjK)1LPrDygRaJU)lMs>x%;YAxFzc=X zu1eVLK=?c8T3iUw9kzy|ECNi(t8qrUgO1{P@G@KOYceiQsc$g<@bo+kkQA8 zpY<15e*kED?R3)io|{3VxZrs;TO<NPBQ-h)5OXHU!Zo|V@#LxN*tpC1Uzk=Ovhb+s{e>R&9#tkxCnn)frLYY;jJjYc5Adh6?4&_NF;Q9Wpwy|()jZL z7#_Yfeo4C(;Aj0|eEqG(chL0OX~?pS=F=Ux()A6lbbW*V{(kh_45HNXKO?(C2+3l& z4lp5vkgUMva!J9_Ptkn3Bd)#YW)M&0kHGDA3;BbH5R!c`0MC+Ii#YdSP{Ho9@K%&x zyCufa8Z-}Uw*vf=+N}V;qTLFA@U#99Q-7DsB`wSw#KOEmSc~t#T6_oPPZu!!5<=2q z#;ZWca{Ro<$Z9l(vH!!^Jm6YOWF-g#S^b_VIuE$|JCT(T1o#mIMjj|R=a*%`iSQg; z=MCdOf9mJoc_X%O1jz!I+Gf-;T&dcOT81lCn^DW4rD|jSjhhbPa=93Pb_pS~BCU0R z-#X({&b)Ofypy;Ll#J*yQ0uqt#9k1m5I$RAw>jD8`0(Vssf{e+Or!gYWN z$z9SK0WMs;G`8cFDzWYwWM5?e{IiuwkINv*{QCv_SJN-lFZ%Omq@NH%2qBpv?I*$A zZ~tIH^BaFodCaeWw+H!uRcm#75*PjS=c=C&l36$cOi1pMRsaTo^MQQj-p~Lh{`)mX zh6Vrtg$R#&nHN5R!o^FmuIRpQmw)M}KbQT4kj%jVOi1pMb^um6AIP6_GlY@<@zYO# zF8c`~vxfngklba)0hka%2+3v`fCb%707*qo IM6N<$f^f3SVgLXD delta 4471 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 JPDHLkV1l%_>6icj