diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 2d6dd466ff0..299f5c413ce 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -841,7 +841,7 @@ datum/preferences age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN) if("species") - var/list/new_species = list("Human","Tajaran","Skrell","Unathi","Diona","Skellington") + var/list/new_species = list("Human","Tajaran","Skrell","Unathi","Diona") var/prev_species = species // var/whitelisted = 0 diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ef869d917e8..8f0e5bf7fdd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -50,10 +50,6 @@ set_species("Grey") ..() -/mob/living/carbon/human/skellington/New() - species = new /datum/species/skellington(src) - ..() - /mob/living/carbon/human/human/New() species = new /datum/species/human(src) ..() diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 04422dc7069..42de10957c2 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -141,18 +141,6 @@ flags = NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT | RAD_ABSORB bloodflags = BLOOD_GREEN -/datum/species/skellington // /vg/ - name = "Skellington" - icobase = 'icons/mob/human_races/r_skeleton.dmi' - deform = 'icons/mob/human_races/r_skeleton.dmi' // TODO: Need deform. - path = /mob/living/carbon/human/skellington - language = "Clatter" - attack_verb = "punch" - - flags = HAS_LIPS | HAS_TAIL | NO_EAT | NO_BREATHE | NON_GENDERED - - - /datum/species/kidan name = "Kidan" icobase = 'icons/mob/human_races/r_kidan.dmi' diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 1b7f10db1ca..60a7b107081 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -369,8 +369,6 @@ new_character = new /mob/living/carbon/human/vox(loc) if("Kidan") new_character = new /mob/living/carbon/human/kidan(loc) - if("Skellington") - new_character = new /mob/living/carbon/human/skellington(loc) if("Grey") new_character = new /mob/living/carbon/human/grey(loc) if("Human") diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 316541ddb23..73a75b9545b 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -51,7 +51,7 @@ name = "Bald" icon_state = "bald" gender = MALE - species_allowed = list("Human","Unathi","Vox","Diona","Skellington","Kidan") + species_allowed = list("Human","Unathi","Vox","Diona","Kidan","Greys") short name = "Short Hair" // try to capatilize the names please~ @@ -305,7 +305,7 @@ name = "Shaved" icon_state = "bald" gender = NEUTER - species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Diona","Skellington","Kidan") + species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Diona","Kidan","Greys") watson name = "Watson Mustache"