Merge pull request #59 from Alphas00/master

Naga Tails coiling

code/modules/mob/living/carbon/human/innate_abilities/coiling.dm

@@ -9,6 +9,8 @@
 	var/currently_coiling = FALSE
 	var/mob/living/carbon/human/currently_coiled
 	var/mutable_appearance/tracked_overlay
+	//GS13 Edit
+	var/stored_tail
 
 /datum/action/innate/ability/coiling/Activate()
 	// make sure they meet the mobility/check flags
@@ -56,6 +58,8 @@
 
 	// set our overlay to new image
 	var/mob/living/carbon/human/user = owner
+	//GS13 Edit
+	stored_tail = user.dna.features["taur"]
 	user.dna.species.mutant_bodyparts["taur"] = "Naga (coiled)"
 	user.dna.features["taur"] = "Naga (coiled)"
 	user.update_mutant_bodyparts()
@@ -79,8 +83,9 @@
 	UnregisterSignal(owner, COMSIG_ATOM_DIR_CHANGE)
 
 	// change overlay back to original image
-	H.dna.species.mutant_bodyparts["taur"] = "Naga"
-	H.dna.features["taur"] = "Naga"
+	//GS13 Edit
+	H.dna.species.mutant_bodyparts["taur"] = stored_tail
+	H.dna.features["taur"] = stored_tail
 	H.update_mutant_bodyparts()
 
 	H.update_body()

code/modules/mob/living/carbon/human/species.dm

@@ -925,10 +925,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		if(A.type == /datum/action/innate/ability/coiling)
 			found_action = A
 
-	if(found_action && (!tauric || (H.dna.features["taur"] != "Naga" && H.dna.features["taur"] != "Naga (coiled)")))
+	//GS13 Edit - Adding action for other naga tails
+	if(found_action && (!tauric || ((H.dna.features["taur"] != "Naga" && H.dna.features["taur"] != "Fat Naga" && H.dna.features["taur"] != "Alt Naga") && H.dna.features["taur"] != "Naga (coiled)")))
 		found_action.Remove(H)
 
-	if(!found_action && tauric && H.dna.features["taur"] == "Naga")
+	//GS13 Edit - Adding action for other naga tails
+	if(!found_action && tauric && (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga"))
 		found_action = new /datum/action/innate/ability/coiling()
 		found_action.Grant(H)