diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 8d5376c3131..754e65924d7 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -792,10 +792,6 @@ datum/preferences if(is_alien_whitelisted(user, "Skrell")) //Check for Skrell and admins new_species += "Skrell" whitelisted = 1 - if(is_alien_whitelisted(user, "Vox")) //Check for Skrell and admins - new_species += "Vox" - whitelisted = 1 - if(!whitelisted) alert(user, "You cannot change your species as you need to be whitelisted. If you wish to be whitelisted contact an admin in-game, on the forums, or on IRC.") @@ -803,7 +799,7 @@ datum/preferences new_species += "Tajaran" new_species += "Unathi" new_species += "Skrell" - new_species += "Vox" + species = input("Please select a species", "Character Generation", null) in new_species if(prev_species != species) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 551783798ae..b59c0d2bcd2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1154,7 +1154,7 @@ mob/living/carbon/human/verb/yank_out_object() src << "You attempt to get a good grip on the [selection] in your [affected] with bloody fingers." bloody_hands(S) - if(!do_after(80)) + if(!do_after(U, 80)) return if(!selection || !affected || !S || !U) @@ -1193,7 +1193,7 @@ mob/living/carbon/human/verb/yank_out_object() U << "You attempt to get a good grip on the [selection] in [S]'s [affected] with bloody fingers." U.bloody_hands(S) - if(!do_after(80)) + if(!do_after(U, 80)) return if(!selection || !affected || !S || !U) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 686007c7173..5ba8a959b9c 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -349,10 +349,6 @@ if(is_alien_whitelisted(src, "Skrell"|| !config.usealienwhitelist)) new_character.dna.mutantrace = "skrell" new_character.skrell_talk_understand = 1 - if(client.prefs.species == "Vox") - if(is_alien_whitelisted(src, "Vox"|| !config.usealienwhitelist)) - new_character.dna.mutantrace = "vox" - new_character.vox_talk_understand = 1 if(ticker.random_players) new_character.gender = pick(MALE, FEMALE)