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

Mutiny fix prereqs for directives

Browse Source 
Conflicts:
	code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
	code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
	code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
	code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
	code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
	code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
	code/game/gamemodes/mutiny/directives/terminations_directive.dm
	code/game/gamemodes/mutiny/directives/test_directive.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
This commit is contained in:
Jeremy Liberman
2014-05-25 22:34:39 +02:00
committed by alex-gh
parent f3d04ab657
commit b3d3f5df8c
11 changed files with 114 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
+30 -1
View File
@@ -374,7 +374,8 @@
if(client.prefs.species)
chosen_species = all_species[client.prefs.species]
if(chosen_species)
if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & IS_WHITELISTED) || (client.holder.rights & R_ADMIN) )// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
if(is_species_whitelisted(chosen_species) || has_admin_rights())
switch(chosen_species.name)
if("Slime People")
new_character = new /mob/living/carbon/human/slime(loc)
@@ -477,3 +478,31 @@
src << browse(null, "window=preferences") //closes job selection
src << browse(null, "window=mob_occupation")
src << browse(null, "window=latechoices") //closes late job selection
proc/has_admin_rights()
return client.holder.rights & R_ADMIN
proc/is_species_whitelisted(datum/species/S)
if(!S) return 1
return is_alien_whitelisted(src, S.name) || !config.usealienwhitelist || !(S.flags & IS_WHITELISTED)
/mob/new_player/get_species()
var/datum/species/chosen_species
if(client.prefs.species)
chosen_species = all_species[client.prefs.species]
if(!chosen_species)
return "Human"
if(is_species_whitelisted(chosen_species) || has_admin_rights())
return chosen_species.name
return "Human"
/mob/new_player/get_gender()
if(!client || !client.prefs) ..()
return client.prefs.gender
/mob/new_player/is_ready()
return ready && !!client