From e127655b5de471eef1cf2320a337cf6b3f38c1f0 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Sun, 8 Nov 2020 17:05:55 +0000 Subject: [PATCH 1/2] [MIRROR] Adds the Frostbelle --- code/game/objects/structures/flora/flora.dm | 46 +++++++++++++++++++- code/game/turfs/simulated/outdoors/grass.dm | 13 ++++++ code/modules/food/food/snacks.dm | 34 +++++++++++++++ code/modules/food/recipes_fryer.dm | 7 ++- icons/obj/flora/sifflora.dmi | Bin 6638 -> 8093 bytes icons/obj/food_ingredients.dmi | Bin 5698 -> 5989 bytes icons/obj/food_syn.dmi | Bin 51617 -> 52207 bytes 7 files changed, 98 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm index b4bad46142..cc5c5b510f 100644 --- a/code/game/objects/structures/flora/flora.dm +++ b/code/game/objects/structures/flora/flora.dm @@ -235,7 +235,7 @@ /obj/structure/flora/pottedplant/attackby(obj/item/I, mob/user) if(issilicon(user)) return // Don't try to put modules in here, you're a borg. TODO: Inventory refactor to not be ass. - + if(stored_item) to_chat(user, "[I] won't fit in. There already appears to be something in here...") return @@ -494,3 +494,47 @@ /obj/structure/flora/sif/tendrils/get_harvestable_desc() return "\The [src] seems to be growing over something." + +/datum/category_item/catalogue/flora/frostbelle + name = "Sivian Flora - Frostbelle" + desc = "A rare plant native to Sif, with very peculiar growing requirements. Rarely seen outside of their original habitat,\ + or the homes of the wealthy, the plant's unique vein structure is actually used to carry the plant's reproductive material \ + to forming buds, the petals of which secrete the luminescent sap containing the pollen at the time of blooming. Certain \ + horticulturists have found ways of halting this process prior to the secretion of the sap, leaving the flower's petals \ + bright, at the cost of making that bud sterile." + value = CATALOGUER_REWARD_HARD + +/obj/structure/flora/sif/frostbelle + name = "gnarly shrub" + desc = "A stocky plant with fins bearing luminescent veins along its branches." + icon_state = "grass" + randomize_size = TRUE + catalogue_data = list(/datum/category_item/catalogue/flora/frostbelle) + + harvest_tool = /obj/item/weapon/material/knife + max_harvests = 2 + min_harvests = -4 + harvest_loot = list( + /obj/item/weapon/reagent_containers/food/snacks/frostbelle = 1 + ) + + var/variantnum = null + +/obj/structure/flora/sif/frostbelle/Initialize() + . = ..() + + variantnum = rand(1,3) + + update_icon() + +/obj/structure/flora/sif/frostbelle/update_icon() + ..() + + if(max_harvests > 0 && harvest_count < max_harvests) + icon_state = "[initial(icon_state)][variantnum]" + + else + icon_state = initial(icon_state) + +/obj/structure/flora/sif/frostbelle/get_harvestable_desc() + return "\The [src] seems to be budding." diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm index 87d3d5192b..925bf945e2 100644 --- a/code/game/turfs/simulated/outdoors/grass.dm +++ b/code/game/turfs/simulated/outdoors/grass.dm @@ -89,6 +89,19 @@ var/list/grass_types = list( name = "thick growth" icon_state = "grass_sif_dark0" edge_blending_priority = 5 +<<<<<<< HEAD tree_chance = 4 grass_chance = 0 +||||||| parent of d771a57663... Merge pull request #9288 from VOREStation/upstream-merge-7701 + tree_chance = 10 + grass_chance = 0 +======= + tree_chance = 10 + grass_chance = 1 +>>>>>>> d771a57663... Merge pull request #9288 from VOREStation/upstream-merge-7701 + grass_types = list( + /obj/structure/flora/sif/frostbelle = 1, + /obj/structure/flora/sif/eyes = 5, + /obj/structure/flora/sif/tendrils = 30 + ) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index ad30c244f2..f5ca36f229 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -4039,6 +4039,40 @@ /obj/item/weapon/reagent_containers/food/snacks/rawsunflower/Initialize() . = ..() +/obj/item/weapon/reagent_containers/food/snacks/frostbelle + name = "frostbelle bud" + desc = "A frostbelle flower from Sif. Its petals shimmer with an inner light." + icon = 'icons/obj/food_ingredients.dmi' + icon_state = "frostbelle" + bitesize = 1 + nutriment_amt = 1 + nutriment_desc = list("another world" = 2) + catalogue_data = list(/datum/category_item/catalogue/flora/frostbelle) + filling_color = "#5dadcf" + +/obj/item/weapon/reagent_containers/food/snacks/frostbelle/Initialize() + . = ..() + set_light(1, 1, "#5dadcf") + + reagents.add_reagent("oxycodone", 1) + reagents.add_reagent("sifsap", 5) + reagents.add_reagent("space_drugs", 5) + +/obj/item/weapon/reagent_containers/food/snacks/bellefritter + name = "frostbelle fritters" + desc = "Frostbelles, prepared traditionally." + icon = 'icons/obj/food_syn.dmi' + icon_state = "bellefritter" + filling_color = "#5dadcf" + center_of_mass = list("x"=16, "y"=12) + do_coating_prefix = 0 + +/obj/item/weapon/reagent_containers/food/snacks/bellefritter/Initialize() + . = ..() + reagents.add_reagent("batter", 10) + reagents.add_reagent("sugar", 5) + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/roastedsunflower name = "sunflower seeds" desc = "Sunflower seeds!" diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index a5a3fee6e7..1d739ec69d 100644 --- a/code/modules/food/recipes_fryer.dm +++ b/code/modules/food/recipes_fryer.dm @@ -27,6 +27,11 @@ reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/weapon/reagent_containers/food/snacks/risottoballs +/datum/recipe/bellefritter + appliance = FRYER + reagents = list("sugar" = 5, "batter" = 10) + items = list(/obj/item/weapon/reagent_containers/food/snacks/frostbelle) + result = /obj/item/weapon/reagent_containers/food/snacks/bellefritter //Meaty Recipes //==================== @@ -93,7 +98,7 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly result_quantity = 2 - + /datum/recipe/jellydonut/poisonberry reagents = list("poisonberryjuice" = 5, "sugar" = 5) items = list( diff --git a/icons/obj/flora/sifflora.dmi b/icons/obj/flora/sifflora.dmi index 654ca02db958d95659b71d1e7196e1e4a698cac1..ae29d4c0f4d4074eda4fefac15f2b1bfa3cd5d45 100644 GIT binary patch literal 8093 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 Sz(1w|K=tWMrAkGMp#K7GZh{g3 literal 6638 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 F{{XGUpcMcB diff --git a/icons/obj/food_ingredients.dmi b/icons/obj/food_ingredients.dmi index 0dd553ec94ce26c45dd5ca8a1857b9c4356116be..4795180c2f4db2d2678a81421405a82ca148978b 100644 GIT binary patch literal 5989 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 DDtSTc delta 2103 zcmbW0dpOe#8^?z><-D*QGBqJZVVXnF=*gVsd}?^s%;PL`2n)lHA&1RaLWQI(Nm%2l zMNTP_974{ghz-v6I3WQ2?g>sGo*0C;bkr>|y z@5_N?eGX5C4xr;`iIPVKZ zPQ6fz1C6guQWlmm;UAl}-;Lvc|3Qk~*^Z1;tI~`yvITyvtwkF|1cdLM2}W?l+QD&t zIVwP}`2H2RhYHJ~^a#%F^W>V8+hXJ`I3vy7>)x+T$tFvUGSlF1hR)~RrgxZaUVt&p zN#7jV)Tw4_=@hnb8Y}Y6PF)1|x(k7gk*C=7#VM=DvaDybM6!{;s6###Vpgp;1bj3WqSD1N5&{zMs1lPaE3-HD_&5g5AoTcCOjh(Qj+zgamU{SBE$MRgpx{bWbp|*2?zsuv&)EeBm zW%)VuBU?gzXg5bk@C`RQz#X5o(_qUh*Sg_+cSfqtps>cIaAX73wPk(BtLT(N8+uki zwP8#SXWAg`dig7v?S71$q4)jl;&Hc)Sw)w|UJ={JmUhCU4^$>&n;TJdWT*ugrvSH0LPxSfO z`ef{Yaqrc__d-}yHSXE7s@~cU(c%>Zx-r(T({-C0oca0d z{BI$p;z4B&Wl3Hq?uiVG#2nU0t+kDJ^kEUbA-e)JYBm8$w64?adE{sFb3NYOLlSjE-8ZK~zK{sZub z)zCT-^W+Sub6&k)mQjoj5^Y1CD0nowbF|x@9%pvPu9&v(yP6`N_vsvh=mk)h=*cLpus|!~>lWL{$IlGE zY`H$*F;D|~%K^&;EdzN+V7r4a7{1Piz=FuDO9^TwCcwz^~b$wG`_V>1i!2qcgY_bdKk(V=R(tG7-)QSG6YFg1DxplOml}w@)XO=XmO3{q?A=b~BZ~$pIe( zxkF+D3*7M*AOCsl&F&sLuOc2H-oYUhh}!L+HW_{yK(7J8m`88k5B#*S;N;|V-qTar zzlpE6*tGscnN?Ml#pm;(X`%S%a7EyRxEk1_AEry76+q4FA<=q!wrH=tRUzR|Zu<-s zc3PI4r&0Q6l)C@>QeL!Fwz5gW>&3>##vhxTxrK$a>0RzLG>1!HOf!ifHEIr1vC+}P%t|^-9n}X0U+RxAX<7f=6~q_ z2bqsNt*&qT^{u`U-zO*lvKc5V-RLOW=>3{ihCtLjqze=&a7$c5)nGJ77Z;2s>>iul z2Q>Q0LFP{mH4JBFW*WGxlbirBC*6`$2V$6iB|!+~aZ#7=Of_7QY@W9NB%B+)yeb>l zWD#Q&GGSmd5Lx4%p9dSUZP*<9IN>NoOBch6%mkE8F@!&5e6Ik#HJVO7t)MEkpC|`u zQdyp8q!du8f=^3G<8Jw{Qj)8_z1?aBl7%OBmoC<4TRbD6lD;=r*CV}C+3A*V3c{*L zN-zJ^saLnN36ha??c!*QC0AIWynk+U6HdPQ`wz!za%BG$*|18J`FS=iRGRiGfV3D* zC^5r)WX)a*4z@9Z*8IvR?Z6Yyo_(S{?<1PJc;OlnnZnF9#o-R+O2nBiS}0Bc3DU6? z?!;&-Wyq8bVTWuEpuHhVC#QsG{N|00G{O!`q?L@PNke0pEb!{T#i|FfX>o5W#$Ke3 z#_YKiYT4U6N{J_$ov*SXU1AsGB_~nsJAc{%J775>(7z2U7Ied;92JzC8RVnM^Izw` zg_i*d>~7)>iLN&SM_iy}`}fOJ9TTj|{-9Qesu(d03oT6*o$)~06wZYR<(7l` z;%kv}2|*>6ZI9`d%6k#gz2J)%#vgvTYNk*W8DAV8Gq+JCu%iI+(Y1GaDn?W2wdt+s0 Khp9eKr2Yc{Q}34m From 308a8ac9d40090acc338b53572cc7387f589a3d9 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 11 Nov 2020 19:01:02 -0700 Subject: [PATCH 2/2] Update grass.dm --- code/game/turfs/simulated/outdoors/grass.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm index 925bf945e2..a234c66f8c 100644 --- a/code/game/turfs/simulated/outdoors/grass.dm +++ b/code/game/turfs/simulated/outdoors/grass.dm @@ -89,16 +89,8 @@ var/list/grass_types = list( name = "thick growth" icon_state = "grass_sif_dark0" edge_blending_priority = 5 -<<<<<<< HEAD tree_chance = 4 - grass_chance = 0 -||||||| parent of d771a57663... Merge pull request #9288 from VOREStation/upstream-merge-7701 - tree_chance = 10 - grass_chance = 0 -======= - tree_chance = 10 grass_chance = 1 ->>>>>>> d771a57663... Merge pull request #9288 from VOREStation/upstream-merge-7701 grass_types = list( /obj/structure/flora/sif/frostbelle = 1,