mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-11 23:23:28 +01:00
Mutiny fix prereqs for directives
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:
@@ -802,6 +802,17 @@ var/list/slot_equipment_priority = list( \
|
||||
/mob/proc/is_active()
|
||||
return (0 >= usr.stat)
|
||||
|
||||
/mob/proc/is_mechanical()
|
||||
if(mind && (mind.assigned_role == "Cyborg" || mind.assigned_role == "AI"))
|
||||
return 1
|
||||
return istype(src, /mob/living/silicon) || get_species() == "Machine"
|
||||
|
||||
/mob/proc/is_ready()
|
||||
return !!client
|
||||
|
||||
/mob/proc/get_gender()
|
||||
return gender
|
||||
|
||||
/mob/proc/see(message)
|
||||
if(!is_active())
|
||||
return 0
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user