Missing dmis, final fixes

This commit is contained in:
ZomgPonies
2015-05-25 20:35:35 -04:00
parent e056abfb82
commit fa5e97deb5
29 changed files with 43 additions and 214 deletions
+1 -1
View File
@@ -728,7 +728,7 @@
else
product = new /obj/item/weapon/reagent_containers/food/snacks/grown(get_turf(user),name)
if(get_trait(TRAIT_PRODUCT_COLOUR))
if(!has_mob_product || (has_mob_product && has_mob_product != /mob/living/carbon/alien/diona))
if(!has_mob_product || (has_mob_product && has_mob_product != /mob/living/carbon/primitive/diona))
product.color = get_trait(TRAIT_PRODUCT_COLOUR)
if(istype(product,/obj/item/weapon/reagent_containers/food))
var/obj/item/weapon/reagent_containers/food/food = product
+1 -1
View File
@@ -1055,7 +1055,7 @@
seed_noun = "nodes"
display_name = "replicant pods"
can_self_harvest = 1
has_mob_product = /mob/living/carbon/alien/diona
has_mob_product = /mob/living/carbon/primitive/diona
/datum/seed/diona/New()
..()
+1 -1
View File
@@ -69,7 +69,7 @@
host << "\green <B>You awaken slowly, stirring into sluggish motion as the air caresses you.</B>"
// This is a hack, replace with some kind of species blurb proc.
if(istype(host,/mob/living/carbon/alien/diona))
if(istype(host,/mob/living/carbon/primitive/diona))
host << "<B>You are [host], one of a race of drifting interstellar plantlike creatures that sometimes share their seeds with human traders.</B>"
host << "<B>Too much darkness will send you into shock and starve you, but light will help you heal.</B>"
+2 -2
View File
@@ -138,8 +138,8 @@
return ..()
/obj/machinery/portable_atmospherics/hydroponics/proc/attack_generic(var/mob/user)
if(istype(user,/mob/living/carbon/alien/diona))
var/mob/living/carbon/alien/diona/nymph = user
if(istype(user,/mob/living/carbon/primitive/diona))
var/mob/living/carbon/primitive/diona/nymph = user
if(nymph.stat == DEAD || nymph.paralysis || nymph.weakened || nymph.stunned || nymph.restrained())
return