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

Karma refactor (#17070)

Browse Source 
* Karma refactor

* This too

* Fixes recursion

* Fixes bugs

* Fixes bad usr

* Update code/modules/karma/karma_holder.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Logic tweak

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
This commit is contained in:
AffectedArc07
2021-11-15 13:52:56 +01:00
committed by GitHub
co-authored by SteelSlayer
parent 5e41a1e1d1
commit ab92435be0
20 changed files with 528 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/appearance.dm
+1 -1
View File
@@ -350,7 +350,7 @@
continue
if(blacklist.len && (current_species_name in blacklist))
continue
if((IS_WHITELISTED in current_species.species_traits) && !is_alien_whitelisted(src, current_species_name))
if((IS_WHITELISTED in current_species.species_traits) && !can_use_species(src, current_species_name))
continue
valid_species += current_species_name
code/modules/mob/new_player/new_player.dm
+3 -3
View File
@@ -214,7 +214,7 @@
return
if(client.prefs.active_character.species in GLOB.whitelisted_species)
if(!is_alien_whitelisted(src, client.prefs.active_character.species))
if(!can_use_species(src, client.prefs.active_character.species))
to_chat(src, alert("You are currently not whitelisted to play [client.prefs.active_character.species]."))
return FALSE
@@ -233,7 +233,7 @@
client.prefs.load_random_character_slot(client)
if(client.prefs.active_character.species in GLOB.whitelisted_species)
if(!is_alien_whitelisted(src, client.prefs.active_character.species))
if(!can_use_species(src, client.prefs.active_character.species))
to_chat(src, alert("You are currently not whitelisted to play [client.prefs.active_character.species]."))
return FALSE
@@ -603,7 +603,7 @@
/mob/new_player/proc/is_species_whitelisted(datum/species/S)
if(!S) return 1
return is_alien_whitelisted(src, S.name) || !(IS_WHITELISTED in S.species_traits)
return can_use_species(src, S.name) || !(IS_WHITELISTED in S.species_traits)
/mob/new_player/get_gender()
if(!client || !client.prefs) ..()