mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Merge pull request #3233 from Fox-McCloud/human-creation-fix
Fixes Human Creation and Cuts its Cost
This commit is contained in:
@@ -18,9 +18,9 @@
|
||||
|
||||
if(!species)
|
||||
if(new_species)
|
||||
set_species(new_species, 1)
|
||||
set_species(new_species, 1, delay_icon_update = 1)
|
||||
else
|
||||
set_species()
|
||||
set_species(delay_icon_update = 1)
|
||||
|
||||
if(species)
|
||||
name = species.get_random_name(gender)
|
||||
@@ -69,7 +69,7 @@
|
||||
..(new_loc, "Skrell")
|
||||
|
||||
/mob/living/carbon/human/tajaran/New(var/new_loc)
|
||||
h_style = "Tajaran Ears"
|
||||
ha_style = "Tajaran Ears"
|
||||
..(new_loc, "Tajaran")
|
||||
|
||||
/mob/living/carbon/human/vulpkanin/New(var/new_loc)
|
||||
@@ -1464,7 +1464,7 @@
|
||||
else
|
||||
usr << "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]."
|
||||
|
||||
/mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour)
|
||||
/mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour, var/delay_icon_update = 0)
|
||||
|
||||
var/datum/species/oldspecies = species
|
||||
if(!dna)
|
||||
@@ -1535,7 +1535,8 @@
|
||||
regenerate_icons()
|
||||
fixblood()
|
||||
|
||||
UpdateAppearance()
|
||||
if(!delay_icon_update)
|
||||
UpdateAppearance()
|
||||
|
||||
if(species)
|
||||
return 1
|
||||
|
||||
@@ -134,7 +134,7 @@
|
||||
dietflags = DIET_OMNI
|
||||
reagent_tag = PROCESS_ORG
|
||||
flesh_color = "#966464"
|
||||
base_color = "#BE8264"
|
||||
base_color = "#B43214"
|
||||
|
||||
/datum/species/vulpkanin/handle_death(var/mob/living/carbon/human/H)
|
||||
H.stop_tail_wagging(1)
|
||||
|
||||
Reference in New Issue
Block a user