Gib rewrite/resprite to allow for arbitrary blood and flesh colours.

This commit is contained in:
Zuhayr
2013-12-30 21:48:34 +10:30
parent 154717aef6
commit df6bd5d6c8
7 changed files with 56 additions and 10 deletions
@@ -20,7 +20,10 @@
E.droplimb(1,1)
flick("gibbed-h", animation)
hgibs(loc, viruses, dna)
if(species)
hgibs(loc, viruses, dna, species.flesh_color, species.blood_color)
else
hgibs(loc, viruses, dna)
spawn(15)
if(animation) del(animation)
+15 -2
View File
@@ -40,6 +40,7 @@
var/list/abilities = list() // For species-derived or admin-given powers
var/blood_color = "#A10808" //Red.
var/flesh_color = "#FFC896" //Pink.
/datum/species/human
name = "Human"
@@ -72,6 +73,8 @@
flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
flesh_color = "#34AF10"
/datum/species/tajaran
name = "Tajaran"
icobase = 'icons/mob/human_races/r_tajaran.dmi'
@@ -94,6 +97,8 @@
flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
flesh_color = "#AFA59E"
/datum/species/skrell
name = "Skrell"
icobase = 'icons/mob/human_races/r_skrell.dmi'
@@ -103,6 +108,8 @@
flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR
flesh_color = "#8CD7A3"
/datum/species/vox
name = "Vox"
icobase = 'icons/mob/human_races/r_vox.dmi'
@@ -121,6 +128,9 @@
flags = NO_SCAN
blood_color = "#2299FC"
flesh_color = "#808D11"
/datum/species/diona
name = "Diona"
icobase = 'icons/mob/human_races/r_plant.dmi'
@@ -130,7 +140,6 @@
punch_damage = 5
primitive = /mob/living/carbon/monkey/diona
blood_color = "rainbow"
warning_low_pressure = 50
hazard_low_pressure = -1
@@ -142,4 +151,8 @@
heat_level_2 = 3000
heat_level_3 = 4000
flags = WHITELISTED | NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT | RAD_ABSORB
flags = WHITELISTED | NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT | RAD_ABSORB
blood_color = "#004400"
flesh_color = "#907E4A"