Adds the electric razor (#5415)

-adds the electric razor, that allow you to shave the hair or beard of your target
-fixes #5228 and any species transformation keeping the old hair in
This commit is contained in:
Alberyk
2018-10-27 20:54:37 +02:00
committed by Werner
parent da9a9619bb
commit 47b16ab8a3
10 changed files with 137 additions and 14 deletions
@@ -1319,7 +1319,9 @@
nutrition_loss = HUNGER_FACTOR * species.nutrition_loss_factor
hydration_loss = THIRST_FACTOR * species.hydration_loss_factor
species.set_default_hair(src)
if(species)
return 1
else
@@ -5,6 +5,7 @@
icobase = 'icons/mob/human_races/r_vox.dmi'
deform = 'icons/mob/human_races/r_def_vox.dmi'
language = LANGUAGE_VOX
name_language = LANGUAGE_VOX
num_alternate_languages = 1
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/strong, /datum/unarmed_attack/bite/strong)
rarity_value = 4
@@ -67,9 +68,7 @@
move_trail = /obj/effect/decal/cleanable/blood/tracks/claw
/datum/species/vox/get_random_name(var/gender)
var/datum/language/species_language = all_languages[default_language]
return species_language.get_random_name(gender)
default_h_style = "Short Vox Quills"
/datum/species/vox/equip_survival_gear(var/mob/living/carbon/human/H)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
@@ -196,6 +196,9 @@
var/obj/effect/decal/cleanable/blood/tracks/move_trail = /obj/effect/decal/cleanable/blood/tracks/footprints // What marks are left when walking
var/default_h_style = "Bald"
var/default_f_style = "Shaved"
/datum/species/proc/get_eyes(var/mob/living/carbon/human/H)
return
@@ -507,4 +510,9 @@
return move_trail
/datum/species/proc/bullet_act(var/obj/item/projectile/P, var/def_zone, var/mob/living/carbon/human/H)
return 0
return 0
/datum/species/proc/set_default_hair(var/mob/living/carbon/human/H)
H.h_style = H.species.default_h_style
H.f_style = H.species.default_f_style
H.update_hair()
@@ -189,6 +189,8 @@
move_trail = /obj/effect/decal/cleanable/blood/tracks/paw
default_h_style = "Tajaran Ears"
/datum/species/tajaran/equip_survival_gear(var/mob/living/carbon/human/H)
..()
var/obj/item/clothing/shoes/sandal/S = new /obj/item/clothing/shoes/sandal(H)
@@ -249,6 +251,13 @@
/datum/species/skrell/can_breathe_water()
return TRUE
/datum/species/skrell/set_default_hair(var/mob/living/carbon/human/H)
if(H.gender == MALE)
H.h_style = "Skrell Male Tentacles"
else
H.h_style = "Skrell Female Tentacles"
H.update_hair()
/datum/species/diona
name = "Diona"
short_name = "dio"