added new LING_PROTECT flag and gave it to plasmamen, allowed Slime People to be clings and removed NO_SCAN and NO_BLOOD absorb/sting restriction

This commit is contained in:
uraniummeltdown
2016-09-23 13:53:49 +04:00
parent 4a0c9f7e74
commit efb92fda84
6 changed files with 8 additions and 14 deletions
+1
View File
@@ -43,6 +43,7 @@
#define RADIMMUNE 2048
#define ALL_RPARTS 4096
#define NOGUNS 8192
#define LING_PROTECT 16384
//Species clothing flags
#define HAS_UNDERWEAR 1
+3 -7
View File
@@ -9,7 +9,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
config_tag = "changeling"
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer")
protected_species = list("Machine", "Slime People", "Plasmaman")
protected_species = list("Machine", "Plasmaman")
required_players = 15
required_enemies = 1
recommended_enemies = 4
@@ -313,18 +313,14 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
to_chat(user, "<span class='warning'>This creature does not have DNA!</span>")
return
if(T.species.flags & NO_SCAN)
if(T.species.flags & LING_PROTECT)
to_chat(user, "<span class='warning'>We do not know how to parse this creature's DNA!</span>")
return
if(T.species.flags & NO_BLOOD)
to_chat(user, "<span class='warning'>We are not able to use the DNA of a creature without a circulatory system.</span>")
return
if(has_dna(target.dna))
to_chat(user, "<span class='warning'>We already have this DNA in storage!</span>")
return 1
/proc/check_species_absorb(datum/species/S)
return !((S.flags & NO_DNA) || (S.flags & NO_SCAN) || (S.flags & NO_BLOOD))
return !((S.flags & NO_DNA) || (S.flags & LING_PROTECT))
@@ -17,7 +17,7 @@
if((NOCLONE || SKELETON || HUSK) in target.mutations)
to_chat(user, "<span class='warning'>DNA of [target] is ruined beyond usability!</span>")
return
if(!istype(target) || issmall(target) || target.species.flags & NO_DNA || target.species.flags & NO_SCAN || target.species.flags & NO_BLOOD)
if(!istype(target) || issmall(target) || target.species.flags & NO_DNA || target.species.flags & LING_PROTECT)
to_chat(user, "<span class='warning'>[target] is not compatible with this ability.</span>")
return
return 1
@@ -90,12 +90,9 @@
return 0
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.species.flags & NO_SCAN) //Prevents transforming slimes and killing them instantly
if(H.species.flags & LING_PROTECT)
to_chat(user, "<span class='warning'>This won't work on a creature with abnormal genetic material.</span>")
return 0
if(H.species.flags & NO_BLOOD)
to_chat(user, "<span class='warning'>This won't work on a creature without a circulatory system.</span>")
return 0
if(H.species.flags & NO_DNA)
to_chat(user, "<span class='warning'>This won't work on a creature without DNA.</span>")
return 0
@@ -6,7 +6,7 @@
required_players = 10
required_enemies = 1 // how many of each type are required
recommended_enemies = 3
var/protected_species_changeling = list("Machine", "Slime People")
var/protected_species_changeling = list("Machine", "Plasmaman")
/datum/game_mode/traitor/changeling/announce()
to_chat(world, "<B>The current game mode is - Traitor+Changeling!</B>")
@@ -6,7 +6,7 @@
//language = "Clatter"
unarmed_type = /datum/unarmed_attack/punch
flags = IS_WHITELISTED | NO_BLOOD
flags = IS_WHITELISTED | NO_BLOOD | LING_PROTECT
dietflags = DIET_OMNI
reagent_tag = PROCESS_ORG