diff --git a/code/game/gamemodes/abduction/gland.dm b/code/game/gamemodes/abduction/gland.dm index 2e53255218f..6fed6acfe05 100644 --- a/code/game/gamemodes/abduction/gland.dm +++ b/code/game/gamemodes/abduction/gland.dm @@ -108,7 +108,7 @@ /obj/item/organ/internal/gland/pop/activate() owner << "You feel unlike yourself." - var/species = pick(list(/datum/species/lizard,/datum/species/slime,/datum/species/plant/pod,/datum/species/fly)) + var/species = pick(list(/datum/species/lizard,/datum/species/slime,/datum/species/pod,/datum/species/fly)) owner.set_species(species) /obj/item/organ/internal/gland/ventcrawling diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 082ed238267..b45639c8e00 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -897,7 +897,7 @@ podman.faction |= factions if(!features["mcolor"]) features["mcolor"] = "#59CE00" - podman.hardset_dna(null,null,podman.real_name,blood_type,/datum/species/plant/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman + podman.hardset_dna(null,null,podman.real_name,blood_type,/datum/species/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman podman.set_cloned_appearance() else //else, one packet of seeds. maybe two diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 95105c87bdc..653231a999e 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -96,13 +96,13 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) H.endTailWag() /* - PLANTPEOPLE + PODPEOPLE */ -/datum/species/plant - // Creatures made of leaves and plant matter. - name = "Plant" - id = "plant" +/datum/species/pod + // A mutation caused by a human being ressurected in a revival pod. These regain health in light, and begin to wither in darkness. + name = "Podperson" + id = "pod" default_color = "59CE00" specflags = list(MUTCOLORS,EYECOLOR) attack_verb = "slash" @@ -112,42 +112,8 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) heatmod = 1.5 meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant -/datum/species/plant/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) - if(chem.id == "plantbgone") - H.adjustToxLoss(3) - H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM) - return 1 -/datum/species/plant/on_hit(proj_type, mob/living/carbon/human/H) - switch(proj_type) - if(/obj/item/projectile/energy/floramut) - if(prob(15)) - H.rad_act(rand(30,80)) - H.Weaken(5) - H.visible_message("[H] writhes in pain as \his vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.") - if(prob(80)) - randmutb(H) - else - randmutg(H) - H.domutcheck() - else - H.adjustFireLoss(rand(5,15)) - H.show_message("The radiation beam singes you!") - if(/obj/item/projectile/energy/florayield) - H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL) - return - -/* - PODPEOPLE -*/ - -/datum/species/plant/pod - // A mutation caused by a human being ressurected in a revival pod. These regain health in light, and begin to wither in darkness. - name = "Podperson" - id = "pod" - specflags = list(MUTCOLORS,EYECOLOR) - -/datum/species/plant/pod/spec_life(mob/living/carbon/human/H) +/datum/species/pod/spec_life(mob/living/carbon/human/H) var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing if(isturf(H.loc)) //else, there's considered to be no light var/turf/T = H.loc @@ -166,6 +132,31 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) H.take_overall_damage(2,0) +/datum/species/pod/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) + if(chem.id == "plantbgone") + H.adjustToxLoss(3) + H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM) + return 1 + +/datum/species/pod/on_hit(proj_type, mob/living/carbon/human/H) + switch(proj_type) + if(/obj/item/projectile/energy/floramut) + if(prob(15)) + H.rad_act(rand(30,80)) + H.Weaken(5) + H.visible_message("[H] writhes in pain as \his vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.") + if(prob(80)) + randmutb(H) + else + randmutg(H) + H.domutcheck() + else + H.adjustFireLoss(rand(5,15)) + H.show_message("The radiation beam singes you!") + if(/obj/item/projectile/energy/florayield) + H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL) + return + /* SHADOWPEOPLE */