mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-11 18:11:35 +00:00
* Fixed antag randomizing
* Reworked job randomizing * Added some user feedback to recharger * Added a new preference setting in job preferences. This setting will make you get a random job if your picked occupations were already filled. This defaults to on to make less graypride. * Updated changelog I have tested the new job randomizing with friends and it works good, not sure about large scale however. Feel free to revert this change if it fucks up everything. (and notify me of problems) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3893 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -115,6 +115,9 @@ datum/preferences
|
||||
var/job_engsec_med = 0
|
||||
var/job_engsec_low = 0
|
||||
|
||||
// Want randomjob if preferences already filled - Donkie
|
||||
var/userandomjob = 1 // Defaults to 1 for less assistants!
|
||||
|
||||
// OOC Metadata:
|
||||
var/metadata = ""
|
||||
|
||||
@@ -297,7 +300,11 @@ datum/preferences
|
||||
|
||||
HTML += "</td'><tr></table>"
|
||||
|
||||
HTML += "</center></tt>"
|
||||
HTML += "</center></table>"
|
||||
|
||||
HTML += "<center><br><u><a href=\"byond://?src=\ref[user];preferences=1;togglerandjob=1\"><font color=[userandomjob ? "green>Get random job if preferences unavailable" : "red>Be assistant if preference unavailable"]</font></a></u></center>"
|
||||
|
||||
HTML += "</tt>"
|
||||
|
||||
user << browse(null, "window=preferences")
|
||||
user << browse(HTML, "window=mob_occupation;size=[width]x[height]")
|
||||
@@ -415,6 +422,12 @@ datum/preferences
|
||||
proc/process_link(mob/user, list/link_tags)
|
||||
if(!usr)
|
||||
return
|
||||
|
||||
if(link_tags["togglerandjob"])
|
||||
userandomjob = !userandomjob
|
||||
SetChoices(user)
|
||||
return 1
|
||||
|
||||
if(link_tags["occ"])
|
||||
if(link_tags["cancel"])
|
||||
user << browse(null, "window=\ref[user]occupation")
|
||||
@@ -700,6 +713,7 @@ datum/preferences
|
||||
UI_style = "Midnight"
|
||||
midis = 1
|
||||
ghost_ears = 1
|
||||
userandomjob = 1
|
||||
|
||||
ShowChoices(user)
|
||||
|
||||
|
||||
@@ -33,6 +33,8 @@ datum/preferences/proc/savefile_save(mob/user)
|
||||
F["job_engsec_med"] << src.job_engsec_med
|
||||
F["job_engsec_low"] << src.job_engsec_low
|
||||
|
||||
F["userandomjob"] << src.userandomjob
|
||||
|
||||
//Body data
|
||||
F["hair_red"] << src.r_hair
|
||||
F["hair_green"] << src.g_hair
|
||||
@@ -138,6 +140,8 @@ datum/preferences/proc/savefile_load(mob/user)
|
||||
F["job_engsec_med"] >> src.job_engsec_med
|
||||
F["job_engsec_low"] >> src.job_engsec_low
|
||||
|
||||
F["userandomjob"] >> src.userandomjob
|
||||
|
||||
F["OOC_Notes"] >> src.metadata
|
||||
|
||||
F["sound_adminhelp"] >> src.sound_adminhelp
|
||||
|
||||
Reference in New Issue
Block a user