From 706d720757d431c3d25584078c3aa888d482af2a Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 24 Jan 2016 00:35:23 +0000 Subject: [PATCH] Fight me etc. --- code/modules/hydroponics/seed.dm | 3 - code/modules/hydroponics/seed_datums.dm | 57 +++++++---------- .../living/simple_animal/friendly/mushroom.dm | 62 ------------------- code/modules/mob/transform_procs.dm | 2 - polaris.dme | 1 - 5 files changed, 21 insertions(+), 104 deletions(-) delete mode 100644 code/modules/mob/living/simple_animal/friendly/mushroom.dm diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index e9be2bf9938..4d98cad9ed3 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -709,9 +709,6 @@ if(istype(product,/mob/living)) product.visible_message("The pod disgorges [product]!") handle_living_product(product) - if(istype(product,/mob/living/simple_animal/mushroom)) // Gross. - var/mob/living/simple_animal/mushroom/mush = product - mush.seed = src // When the seed in this machine mutates/is modified, the tray seed value // is set to a new datum copied from the original. This datum won't actually diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 4d2e1cfbd2b..79a1f25bcaa 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -55,7 +55,7 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#FA1616") set_trait(TRAIT_PLANT_ICON,"bush") set_trait(TRAIT_WATER_CONSUMPTION, 6) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/berry/glow name = "glowberries" @@ -75,7 +75,7 @@ set_trait(TRAIT_POTENCY,10) set_trait(TRAIT_PRODUCT_COLOUR,"c9fa16") set_trait(TRAIT_WATER_CONSUMPTION, 3) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) /datum/seed/berry/poison name = "poisonberries" @@ -88,7 +88,7 @@ ..() set_trait(TRAIT_PRODUCT_COLOUR,"#6DC961") set_trait(TRAIT_WATER_CONSUMPTION, 3) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) /datum/seed/berry/poison/death name = "deathberries" @@ -102,7 +102,7 @@ set_trait(TRAIT_YIELD,3) set_trait(TRAIT_POTENCY,50) set_trait(TRAIT_PRODUCT_COLOUR,"#7A5454") - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.35) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.35) // Nettles/variants. /datum/seed/nettle @@ -161,9 +161,9 @@ set_trait(TRAIT_PRODUCT_ICON,"tomato") set_trait(TRAIT_PRODUCT_COLOUR,"#D10000") set_trait(TRAIT_PLANT_ICON,"bush3") - set_trait(TRAIT_IDEAL_LIGHT, 6) + set_trait(TRAIT_IDEAL_LIGHT, 6) set_trait(TRAIT_WATER_CONSUMPTION, 6) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) /datum/seed/tomato/blood name = "bloodtomato" @@ -237,7 +237,7 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#892694") set_trait(TRAIT_PLANT_ICON,"bush4") set_trait(TRAIT_IDEAL_HEAT, 298) - set_trait(TRAIT_IDEAL_LIGHT, 7) + set_trait(TRAIT_IDEAL_LIGHT, 7) //Apples/varieties. /datum/seed/apple @@ -301,7 +301,7 @@ set_trait(TRAIT_PRODUCT_ICON,"ambrosia") set_trait(TRAIT_PRODUCT_COLOUR,"#9FAD55") set_trait(TRAIT_PLANT_ICON,"ambrosia") - set_trait(TRAIT_IDEAL_LIGHT, 6) + set_trait(TRAIT_IDEAL_LIGHT, 6) /datum/seed/ambrosia/deus name = "ambrosiadeus" @@ -338,7 +338,7 @@ set_trait(TRAIT_PLANT_COLOUR,"#D9C94E") set_trait(TRAIT_PLANT_ICON,"mushroom") set_trait(TRAIT_WATER_CONSUMPTION, 6) - set_trait(TRAIT_IDEAL_HEAT, 288) + set_trait(TRAIT_IDEAL_HEAT, 288) set_trait(TRAIT_LIGHT_TOLERANCE, 6) /datum/seed/mushroom/mold @@ -375,21 +375,6 @@ set_trait(TRAIT_PLANT_COLOUR,"#9E4F9D") set_trait(TRAIT_PLANT_ICON,"mushroom2") -/datum/seed/mushroom/plump/walking - name = "walkingmushroom" - seed_name = "walking mushroom" - display_name = "walking mushrooms" - mutants = null - can_self_harvest = 1 - has_mob_product = /mob/living/simple_animal/mushroom - -/datum/seed/mushroom/plump/walking/New() - ..() - set_trait(TRAIT_MATURATION,5) - set_trait(TRAIT_YIELD,1) - set_trait(TRAIT_PRODUCT_COLOUR,"#FAC0F2") - set_trait(TRAIT_PLANT_COLOUR,"#C4B1C2") - /datum/seed/mushroom/hallucinogenic name = "reishi" seed_name = "reishi" @@ -561,9 +546,9 @@ set_trait(TRAIT_PRODUCT_ICON,"flower2") set_trait(TRAIT_PRODUCT_COLOUR,"#FFF700") set_trait(TRAIT_PLANT_ICON,"flower2") - set_trait(TRAIT_IDEAL_LIGHT, 7) + set_trait(TRAIT_IDEAL_LIGHT, 7) set_trait(TRAIT_WATER_CONSUMPTION, 6) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) //Grapes/varieties /datum/seed/grapes @@ -585,7 +570,7 @@ set_trait(TRAIT_PLANT_COLOUR,"#378F2E") set_trait(TRAIT_PLANT_ICON,"vine") set_trait(TRAIT_IDEAL_LIGHT, 6) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/grapes/green name = "greengrapes" @@ -615,7 +600,7 @@ set_trait(TRAIT_PRODUCT_ICON,"potato") set_trait(TRAIT_PRODUCT_COLOUR,"#C4AE7A") set_trait(TRAIT_PLANT_ICON,"bush2") - set_trait(TRAIT_IDEAL_LIGHT, 6) + set_trait(TRAIT_IDEAL_LIGHT, 6) /datum/seed/cabbage name = "cabbage" @@ -658,7 +643,7 @@ set_trait(TRAIT_PLANT_COLOUR,"#69AD50") set_trait(TRAIT_PLANT_ICON,"tree4") set_trait(TRAIT_IDEAL_HEAT, 298) - set_trait(TRAIT_IDEAL_LIGHT, 7) + set_trait(TRAIT_IDEAL_LIGHT, 7) set_trait(TRAIT_WATER_CONSUMPTION, 6) /datum/seed/corn @@ -680,7 +665,7 @@ set_trait(TRAIT_PLANT_COLOUR,"#87C969") set_trait(TRAIT_PLANT_ICON,"corn") set_trait(TRAIT_IDEAL_HEAT, 298) - set_trait(TRAIT_IDEAL_LIGHT, 6) + set_trait(TRAIT_IDEAL_LIGHT, 6) set_trait(TRAIT_WATER_CONSUMPTION, 6) /datum/seed/potato @@ -737,7 +722,7 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#DBD37D") set_trait(TRAIT_PLANT_COLOUR,"#BFAF82") set_trait(TRAIT_PLANT_ICON,"stalk2") - set_trait(TRAIT_IDEAL_LIGHT, 6) + set_trait(TRAIT_IDEAL_LIGHT, 6) set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/rice @@ -853,7 +838,7 @@ set_trait(TRAIT_PLANT_ICON,"vine2") set_trait(TRAIT_FLESH_COLOUR,"#F22C2C") set_trait(TRAIT_IDEAL_HEAT, 298) - set_trait(TRAIT_IDEAL_LIGHT, 6) + set_trait(TRAIT_IDEAL_LIGHT, 6) set_trait(TRAIT_WATER_CONSUMPTION, 6) /datum/seed/pumpkin @@ -908,7 +893,7 @@ set_trait(TRAIT_PRODUCES_POWER,1) set_trait(TRAIT_PRODUCT_COLOUR,"#F0E226") set_trait(TRAIT_FLESH_COLOUR,"#F0E226") - set_trait(TRAIT_IDEAL_LIGHT, 6) + set_trait(TRAIT_IDEAL_LIGHT, 6) /datum/seed/citrus/orange name = "orange" @@ -940,7 +925,7 @@ set_trait(TRAIT_PLANT_COLOUR,"#07D900") set_trait(TRAIT_PLANT_ICON,"grass") set_trait(TRAIT_WATER_CONSUMPTION, 0.5) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/cocoa name = "cocoa" @@ -1040,7 +1025,7 @@ set_trait(TRAIT_PLANT_COLOUR,"#378C61") set_trait(TRAIT_PLANT_ICON,"tree5") set_trait(TRAIT_IDEAL_HEAT, 283) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/mtear name = "mtear" @@ -1060,7 +1045,7 @@ set_trait(TRAIT_PLANT_COLOUR,"#4CC789") set_trait(TRAIT_PLANT_ICON,"bush7") set_trait(TRAIT_IDEAL_HEAT, 283) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/telriis name = "telriis" diff --git a/code/modules/mob/living/simple_animal/friendly/mushroom.dm b/code/modules/mob/living/simple_animal/friendly/mushroom.dm deleted file mode 100644 index 4d455e5050c..00000000000 --- a/code/modules/mob/living/simple_animal/friendly/mushroom.dm +++ /dev/null @@ -1,62 +0,0 @@ -/mob/living/simple_animal/mushroom - name = "walking mushroom" - desc = "It's a massive mushroom... with legs?" - icon_state = "mushroom" - icon_living = "mushroom" - icon_dead = "mushroom_dead" - mob_size = MOB_SMALL - speak_chance = 0 - turns_per_move = 1 - maxHealth = 5 - health = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice - response_help = "pets" - response_disarm = "gently pushes aside" - response_harm = "whacks" - harm_intent_damage = 5 - var/datum/seed/seed - var/harvest_time - var/min_explode_time = 1200 - -/mob/living/simple_animal/mushroom/New() - ..() - harvest_time = world.time - -/mob/living/simple_animal/mushroom/verb/spawn_spores() - - set name = "Explode" - set category = "Abilities" - set desc = "Spread your spores!" - set src = usr - - if(stat == 2) - usr << "You are dead; it is too late for that." - return - - if(!seed) - usr << "You are sterile!" - return - - if(world.time < harvest_time + min_explode_time) - usr << "You are not mature enough for that." - return - - spore_explode() - -/mob/living/simple_animal/mushroom/death() - if(prob(30)) - spore_explode() - return - ..() - -/mob/living/simple_animal/mushroom/proc/spore_explode() - if(!seed) - return - if(world.time < harvest_time + min_explode_time) - return - for(var/turf/simulated/target_turf in orange(1,src)) - if(prob(60) && !target_turf.density && src.Adjacent(target_turf)) - new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(target_turf,seed) - seed.thrown_at(src,get_turf(src),1) - if(src) - gib() diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index f200766179b..b0bc02f6858 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -326,8 +326,6 @@ return 1 if(ispath(MP, /mob/living/simple_animal/hostile/carp)) return 1 - if(ispath(MP, /mob/living/simple_animal/mushroom)) - return 1 if(ispath(MP, /mob/living/simple_animal/shade)) return 1 if(ispath(MP, /mob/living/simple_animal/tomato)) diff --git a/polaris.dme b/polaris.dme index f799edc636b..6281ef5668e 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1465,7 +1465,6 @@ #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm" #include "code\modules\mob\living\simple_animal\friendly\lizard.dm" #include "code\modules\mob\living\simple_animal\friendly\mouse.dm" -#include "code\modules\mob\living\simple_animal\friendly\mushroom.dm" #include "code\modules\mob\living\simple_animal\friendly\slime.dm" #include "code\modules\mob\living\simple_animal\friendly\spiderbot.dm" #include "code\modules\mob\living\simple_animal\friendly\tomato.dm"