Standardize LASER, NOCLONE, and HUSK

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/modules/mob/living/carbon/human/death.dm
	maps/RandomZLevels/wildwest.dm
This commit is contained in:
Rob Nelson
2014-01-21 22:59:53 -05:00
committed by ZomgPonies
parent f44ff1d7aa
commit 7892eeb7cc
23 changed files with 214 additions and 34 deletions
+2 -2
View File
@@ -62,8 +62,8 @@
M.mutations.Add(SKELETON)
if(M_FAT in old_mutations)
M.mutations.Add(M_FAT)
if(HUSK in old_mutations)
M.mutations.Add(HUSK)
if(M_HUSK in old_mutations)
M.mutations.Add(M_HUSK)
var/inj = (flags & MUTCHK_FROM_INJECTOR) == MUTCHK_FROM_INJECTOR
var/forced = (flags & MUTCHK_FORCED) == MUTCHK_FORCED
+2 -2
View File
@@ -504,7 +504,7 @@
occupantData["name"] = connected.occupant.name
occupantData["stat"] = connected.occupant.stat
occupantData["isViableSubject"] = 1
if (NOCLONE in connected.occupant.mutations || !src.connected.occupant.dna)
if (M_NOCLONE in connected.occupant.mutations || !src.connected.occupant.dna)
occupantData["isViableSubject"] = 0
occupantData["health"] = connected.occupant.health
occupantData["maxHealth"] = connected.occupant.maxHealth
@@ -843,7 +843,7 @@
return 1
if (bufferOption == "transfer")
if (!src.connected.occupant || (NOCLONE in src.connected.occupant.mutations) || !src.connected.occupant.dna)
if (!src.connected.occupant || (M_NOCLONE in src.connected.occupant.mutations) || !src.connected.occupant.dna)
return
irradiating = 2
@@ -83,7 +83,8 @@
src << "<span class='warning'>[T] is not compatible with our biology.</span>"
return
if((NOCLONE || SKELETON) in T.mutations)
if((M_NOCLONE || SKELETON) in T.mutations)
src << "<span class='warning'>This creature's DNA is ruined beyond useability!</span>"
return
@@ -727,7 +728,7 @@ var/list/datum/dna/hivemind_bank = list()
var/mob/living/carbon/T = changeling_sting(40,/mob/proc/changeling_transformation_sting)
if(!T) return 0
if((HUSK in T.mutations) || (!ishuman(T) && !ismonkey(T)))
if((M_HUSK in T.mutations) || (!ishuman(T) && !ismonkey(T)))
src << "<span class='warning'>Our sting appears ineffective against its DNA.</span>"
return 0
T.visible_message("<span class='warning'>[T] transforms!</span>")
+1 -1
View File
@@ -353,7 +353,7 @@
if ((!subject.ckey) || (!subject.client))
scantemp = "Error: Mental interface failure."
return
if (NOCLONE in subject.mutations)
if (M_NOCLONE in subject.mutations)
scantemp = "Error: Mental interface failure."
return
if (!isnull(find_record(subject.ckey)))
+1 -1
View File
@@ -103,7 +103,7 @@
if(!istype(T)) return
if(!T.dna)
return
if(NOCLONE in T.mutations)
if(M_NOCLONE in T.mutations)
return
if(T.species && T.species.flags & NO_BLOOD)
+2 -2
View File
@@ -39,8 +39,8 @@
if (!(M_HULK in user.mutations))
user.mutations.Add(M_HULK)
if (!(LASER in user.mutations))
user.mutations.Add(LASER)
if (!(M_LASER in user.mutations))
user.mutations.Add(M_LASER)
if (!(M_XRAY in user.mutations))
user.mutations.Add(M_XRAY)
+1 -1
View File
@@ -141,7 +141,7 @@
H.updatehealth() //forces a health update, otherwise the oxyloss adjustment wouldnt do anything
M.visible_message("\red [M]'s body convulses a bit.")
var/datum/organ/external/temp = H.get_organ("head")
if(H.health > -100 && !(temp.status & ORGAN_DESTROYED) && !(NOCLONE in H.mutations) && !H.suiciding)
if(H.health > -100 && !(temp.status & ORGAN_DESTROYED) && !(M_NOCLONE in H.mutations) && !H.suiciding)
viewers(M) << "\blue [src] beeps: Resuscitation successful."
spawn(0)
H.stat = 1
@@ -63,7 +63,7 @@
if(istype(M,/mob/living))
M.radiation += rand(5,20)
if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
if (!(M_NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
if (buf.types & DNA2_BUF_UI)
if (!block) //isolated block?
M.UpdateAppearance(buf.dna.UI.Copy())
@@ -399,7 +399,7 @@ LOOK FOR SURGERY.DM*/
if(!istype(M))
return ..()
//if(M.mutations & HUSK) return ..()
//if(M.mutations & M_HUSK) return ..()
if((M_CLUMSY in user.mutations) && prob(50))
M = user