cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 22:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5088 from VOREStation/port-vs-catchup

Browse Source 
VOREStation Ports Catchup
This commit is contained in:
Neerti
2018-03-22 22:32:09 -04:00
committed by GitHub
parent e91bb8f3b6 45ec49661d
commit 318762f091
22 changed files with 88 additions and 42 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

@@ -741,7 +741,15 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
dat += "<b>Language:</b> [current_species.species_language]<br/>"
dat += "<small>"
if(current_species.spawn_flags & SPECIES_CAN_JOIN)
dat += "</br><b>Often present on human stations.</b>"
switch(current_species.rarity_value)
if(1 to 2)
dat += "</br><b>Often present on human stations.</b>"
if(3 to 4)
dat += "</br><b>Rarely present on human stations.</b>"
if(5)
dat += "</br><b>Unheard of on human stations.</b>"
else
dat += "</br><b>May be present on human stations.</b>"
if(current_species.spawn_flags & SPECIES_IS_WHITELISTED)
dat += "</br><b>Whitelist restricted.</b>"
if(!current_species.has_organ[O_HEART])

6
code/modules/client/preference_setup/occupation/occupation.dm
View File

@@ -94,7 +94,7 @@
if(job.minimum_character_age && user.client && (user.client.prefs.age < job.minimum_character_age))
. += "<del>[rank]</del></td><td> \[MINIMUM CHARACTER AGE: [job.minimum_character_age]]</td></tr>"
continue
if((pref.job_civilian_low & ASSISTANT) && (rank != "Assistant"))
if((pref.job_civilian_low & ASSISTANT) && job.flag != ASSISTANT)
. += "<font color=grey>[rank]</font></td><td></td></tr>"
continue
if((rank in command_positions) || (rank == "AI"))//Bold head jobs
@@ -106,7 +106,7 @@
. += "<a href='?src=\ref[src];set_job=[rank]'>"
if(rank == "Assistant")//Assistant is special
if(job.flag == ASSISTANT)//Assistant is special
if(pref.job_civilian_low & ASSISTANT)
. += " <font color=55cc55>\[Yes]</font>"
else
@@ -180,7 +180,7 @@
if(!job)
return 0
if(role == "Assistant")
if(job.flag == ASSISTANT)
if(pref.job_civilian_low & job.flag)
pref.job_civilian_low &= ~job.flag
else