cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a duplicate definition bug with WHITELISTED.

Browse Source 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/new_player.dm
	code/setup.dm
This commit is contained in:
Zuhayr
2014-01-06 23:59:21 -05:00
committed by ZomgPonies
parent f66b5a3ccc
commit e09a00fe0e
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+1 -1
View File
@@ -957,7 +957,7 @@ datum/preferences
if(config.usealienwhitelist)
for(var/L in all_languages)
var/datum/language/lang = all_languages[L]
if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))))
if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & IS_WHITELISTED ))))
new_languages += lang
languages_available = 1
code/modules/mob/living/carbon/species.dm
+14 -5
View File
@@ -67,6 +67,14 @@
flags = HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
bodyflags = FEET_CLAWS
cold_level_1 = 280 //Default 260 - Lower is better
cold_level_2 = 220 //Default 200
cold_level_3 = 130 //Default 120
heat_level_1 = 420 //Default 360 - Higher is better
heat_level_2 = 480 //Default 400
heat_level_3 = 1100 //Default 1000
/datum/species/tajaran
name = "Tajaran"
icobase = 'icons/mob/human_races/r_tajaran.dmi'
@@ -117,7 +125,7 @@
eyes = "vox_eyes_s"
breath_type = "nitrogen"
flags = NO_SCAN | WHITELISTED
flags = NO_SCAN | IS_WHITELISTED
/datum/species/diona
name = "Diona"
@@ -139,9 +147,10 @@
heat_level_2 = 350
heat_level_3 = 700
flags = NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT | RAD_ABSORB | NO_BLOOD | IS_SLOW
flags = NO_BREATHE | REQUIRE_LIGHT | NO_SCAN | IS_PLANT | RAD_ABSORB | NO_BLOOD | IS_SLOW | NO_PAIN
bloodflags = BLOOD_GREEN
/datum/species/kidan
name = "Kidan"
icobase = 'icons/mob/human_races/r_kidan.dmi'
@@ -150,7 +159,7 @@
language = "Chittin"
attack_verb = "slash"
flags = WHITELISTED | HAS_CHITTIN
flags = IS_WHITELISTED | HAS_CHITTIN
bloodflags = BLOOD_GREEN
bodyflags = FEET_CLAWS
@@ -163,7 +172,7 @@
path = /mob/living/carbon/human/slime
primitive = /mob/living/carbon/slime/adult
flags = WHITELISTED | NO_BREATHE | HAS_LIPS | NO_INTORGANS
flags = IS_WHITELISTED | NO_BREATHE | HAS_LIPS | NO_INTORGANS
bloodflags = BLOOD_SLIME
bodyflags = FEET_NOSLIP
abilities = list(/mob/living/carbon/human/slime/proc/slimepeople_ventcrawl)
@@ -180,4 +189,4 @@
max_hurt_damage = 3 // From 5 (for humans)
// default_mutations=list(mRemotetalk) // TK is also another candidate, but TK is overpowered as fuck.
flags = WHITELISTED | HAS_LIPS | CAN_BE_FAT
flags = IS_WHITELISTED | HAS_LIPS | CAN_BE_FAT
code/modules/mob/new_player/new_player.dm
+2 -2
View File
@@ -374,7 +374,7 @@
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 & WHITELISTED) || (client.holder.rights & R_ADMIN) )// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
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.
switch(chosen_species.name)
if("Slime People")
new_character = new /mob/living/carbon/human/slime(loc)
@@ -468,4 +468,4 @@
src << browse(null, "window=playersetup") //closes the player setup window
src << browse(null, "window=preferences") //closes job selection
src << browse(null, "window=mob_occupation")
src << browse(null, "window=latechoices") //closes late job selection
src << browse(null, "window=latechoices") //closes late job selection