cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 22:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

plants

Browse Source
This commit is contained in:
Kashargul
2024-12-08 05:51:35 +01:00
parent 4e7742e3c8
commit 1a2c2c0764
84 changed files with 765 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/alraune.dm
+1 -1
View File
@@ -348,7 +348,7 @@
var/self_verb_descriptor = list("grab", "snatch", "pick")
var/short_emote_descriptor = list("picks", "grabs")
var/self_emote_descriptor = list("grab", "pick", "snatch")
var/fruit_type = "apple"
var/fruit_type = PLANT_APPLE
var/mob/living/organ_owner = null
var/gen_cost = 0.5
code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+3 -3
View File
@@ -660,12 +660,12 @@
total_material *= stack.get_amount()
if(material == MAT_STEEL && metal)
metal.add_charge(total_material)
if(material == "glass" && glass)
if(material == MAT_GLASS && glass)
glass.add_charge(total_material)
if(decompiler)
if(material == "plastic" && plastic)
if(material == MAT_PLASTIC && plastic)
plastic.add_charge(total_material)
if(material == "wood" && wood)
if(material == MAT_WOOD && wood)
wood.add_charge(total_material)
drain(-50 * digested)
else if(istype(target,/obj/effect/decal/remains))
code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
+1 -1
View File
@@ -50,7 +50,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
/mob/living/simple_mob/animal/passive/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) //feedin' dem chickens
var/obj/item/reagent_containers/food/snacks/grown/G = O
if(G.seed && G.seed.kitchen_tag == "wheat")
if(G.seed && G.seed.kitchen_tag == PLANT_WHEAT)
if(!stat && eggsleft < 8)
user.visible_message(span_blue("[user] feeds [O] to [name]! It clucks happily."),span_blue("You feed [O] to [name]! It clucks happily."))
user.drop_item()
code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
+1 -1
View File
@@ -96,7 +96,7 @@
if(istype(O, /obj/item/reagent_containers/food/snacks/grown))
var/obj/item/reagent_containers/food/snacks/grown/G = O
if(G.seed && G.seed.kitchen_tag == "berries")
if(G.seed && G.seed.kitchen_tag == PLANT_BERRIES)
return TRUE
return FALSE
code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/mob/living/simple_mob/tomato
name = "tomato"
name = PLANT_TOMATO
desc = "It's a horrifyingly enormous beef tomato, and it's packing extra beef!"
tt_desc = "X Solanum abominable"
icon_state = "tomato"