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

Merge pull request #1551 from Zuhayr/master

Browse Source 
Makes slime people more interesting and thematic.
This commit is contained in:
Datraen
2016-05-11 02:34:50 -04:00
parent 5afebdbf27 6edb8b31f3
commit 4456f77d75
35 changed files with 721 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/new_player/new_player.dm
View File

@@ -155,7 +155,7 @@
return 0
var/datum/species/S = all_species[client.prefs.species]
if(!(S.spawn_flags & IS_WHITELISTED))
if(!(S.spawn_flags & SPECIES_IS_WHITELISTED))
src << alert("Your current species,[client.prefs.species], is not available for play on the station.")
return 0
@@ -179,7 +179,7 @@
return 0
var/datum/species/S = all_species[client.prefs.species]
if(!(S.spawn_flags & CAN_JOIN))
if(!(S.spawn_flags & SPECIES_CAN_JOIN))
src << alert("Your current species, [client.prefs.species], is not available for play on the station.")
return 0
@@ -484,7 +484,7 @@
/mob/new_player/proc/is_species_whitelisted(datum/species/S)
if(!S) return 1
return is_alien_whitelisted(src, S.name) || !config.usealienwhitelist || !(S.spawn_flags & IS_WHITELISTED)
return is_alien_whitelisted(src, S.name) || !config.usealienwhitelist || !(S.spawn_flags & SPECIES_IS_WHITELISTED)
/mob/new_player/get_species()
var/datum/species/chosen_species