cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Runtime fix (argh) and removal of vox from the station race whitelist.

Browse Source
This commit is contained in:
Zuhayr
2013-06-14 13:41:06 -07:00
parent 030290d3a7
commit 52433df154
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+1 -5
View File
@@ -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)
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -1154,7 +1154,7 @@ mob/living/carbon/human/verb/yank_out_object()
src << "<span class='warning'>You attempt to get a good grip on the [selection] in your [affected] with bloody fingers.</span>"
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 << "<span class='warning'>You attempt to get a good grip on the [selection] in [S]'s [affected] with bloody fingers.</span>"
U.bloody_hands(S)
if(!do_after(80))
if(!do_after(U, 80))
return
if(!selection || !affected || !S || !U)
code/modules/mob/new_player/new_player.dm
-4
View File
@@ -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)