Cloning-Genitalia-Fix (#277)
* Cloning-Genitalia-Fix Fixes the issue with genitals not being re-created with cloning. This should make it so other methods of coming back also gives the organs your DNA says you should have, such as podding people. * Sanity checks and fixes Removed the OLD sanity check for drawing eyes. It was refusing to draw eyes if you had ANY disability. 's far as I know, blind people still have eyes and so do mute people. Also, put a sanity check in give_genitals, just in case a species has DNA with genitals but is a NOGENITALS species. Somehow. IT COULD HAPPEN, ALRIGHT?! ^^ * TRAVIS LOVE ME AGAIN This commit fixes the problem that made Travis hate me previously. Even though THAT part of the code had not been changed... Anyway, it looks more neat now, so that's good.
This commit is contained in:
@@ -54,6 +54,7 @@
|
||||
|
||||
internal_organs += new dna.species.mutanteyes()
|
||||
internal_organs += new /obj/item/organ/brain
|
||||
give_genitals()
|
||||
..()
|
||||
|
||||
/mob/living/carbon/human/OpenCraftingMenu()
|
||||
@@ -628,6 +629,7 @@
|
||||
hair_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
|
||||
underwear = "Nude"
|
||||
update_body()
|
||||
update_genitals()
|
||||
update_hair()
|
||||
|
||||
/mob/living/carbon/human/singularity_pull(S, current_size)
|
||||
|
||||
@@ -311,13 +311,12 @@
|
||||
|
||||
|
||||
// eyes
|
||||
var/has_eyes = TRUE
|
||||
var/has_eyes = (H.getorgan(/obj/item/organ/eyes) && HD)
|
||||
|
||||
if(!H.getorgan(/obj/item/organ/eyes) && HD)
|
||||
if(!has_eyes)
|
||||
standing += image("icon"='icons/mob/human_face.dmi', "icon_state" = "eyes_missing", "layer" = -BODY_LAYER)
|
||||
has_eyes = FALSE
|
||||
|
||||
if(!(H.disabilities & HUSK))
|
||||
if(!HUSK)
|
||||
// lipstick
|
||||
if(H.lip_style && (LIPS in species_traits) && HD)
|
||||
var/image/lips = image("icon"='icons/mob/human_face.dmi', "icon_state"="lips_[H.lip_style]", "layer" = -BODY_LAYER)
|
||||
|
||||
Reference in New Issue
Block a user