Merge pull request #7586 from Zuhayr/dev-freeze

Fixes the remainder of #7567, plus other fixes.
This commit is contained in:
Zuhayr
2014-12-31 22:48:39 +10:30
10 changed files with 68 additions and 57 deletions

View File

@@ -16,7 +16,7 @@
if(!species)
if(new_species)
set_species(new_species)
set_species(new_species,1)
else
set_species()
@@ -1014,9 +1014,9 @@
if (!..())
return 0
//if this blood isn't already in the list, add it
if(blood_DNA[M.dna.unique_enzymes])
return 0 //already bloodied with this blood. Cannot add more.
blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
if(istype(M))
if(!blood_DNA[M.dna.unique_enzymes])
blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
hand_blood_color = blood_color
src.update_inv_gloves() //handles bloody hands overlays and updating
verbs += /mob/living/carbon/human/proc/bloody_doodle

View File

@@ -282,7 +282,7 @@ emp_act
forcesay(hit_appends) //forcesay checks stat already
//Melee weapon embedded object code.
if (I && I.damtype == BRUTE && !I.is_robot_module())
if (I && I.damtype == BRUTE && !I.anchored && !I.is_robot_module())
var/damage = I.force
if (armor)
damage /= armor+1

View File

@@ -94,6 +94,7 @@
flesh_color = "#8CD7A3"
blood_color = "#1D2CBF"
base_color = "#006666"
reagent_tag = IS_SKRELL