moved check up under Click()

This commit is contained in:
uraniummeltdown
2017-01-11 18:22:31 +04:00
parent a69a576c5c
commit 7374f0a296
@@ -80,6 +80,11 @@
selected_dna = changeling.select_dna("Select the target DNA: ", "Target DNA")
if(!selected_dna)
return
if(selected_dna)
var/datum/species/newspecies = all_species[selected_dna.species]
if((newspecies.flags & NOTRANSSTING) || newspecies.is_small)
to_chat(user, "<span class='warning'>The selected DNA is incompatible with our sting.</span>")
return FALSE
..()
/obj/effect/proc_holder/changeling/sting/transformation/can_sting(var/mob/user, var/mob/target)
@@ -88,11 +93,6 @@
if((HUSK in target.mutations) || (!ishuman(target)))
to_chat(user, "<span class='warning'>Our sting appears ineffective against its DNA.</span>")
return FALSE
if(selected_dna)
var/datum/species/newspecies = all_species[selected_dna.species]
if((newspecies.flags & NOTRANSSTING) || newspecies.is_small)
to_chat(user, "<span class='warning'>The selected DNA is incompatible with our sting.</span>")
return FALSE
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.species.flags & NO_DNA)
@@ -121,7 +121,7 @@
target.UpdateAppearance()
domutcheck(target, null)
feedback_add_details("changeling_powers","TS")
return 1
return TRUE
obj/effect/proc_holder/changeling/sting/extract_dna
name = "Extract DNA Sting"