cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-06-03 12:31:48 +01:00
parent c2d90f5c3f b88ba6f233
commit 7bb9c92c9a
68 changed files with 1990 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -383,6 +383,16 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!pref.species_preview || !(pref.species_preview in all_species))
return TOPIC_NOACTION
var/datum/species/setting_species
if(all_species[href_list["set_species"]])
setting_species = all_species[href_list["set_species"]]
else
return TOPIC_NOACTION
if(((!(setting_species.spawn_flags & SPECIES_CAN_JOIN)) || (!is_alien_whitelisted(preference_mob(),setting_species))) && !check_rights(R_ADMIN, 0))
return TOPIC_NOACTION
var/prev_species = pref.species
pref.species = href_list["set_species"]
if(prev_species != pref.species)