cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allows species to be blocked from ever being roundstart, can now choose your Halloween species (#31877)

Browse Source 
* Hardlocked species, halloween now lets you choose your spooky race

* Code standards, moving procs around
This commit is contained in:
KorPhaeron
2017-10-20 11:10:54 -04:00
committed by Joan Lung
parent 3041494a4f
commit dcddc79e11
18 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+2 -2
View File
@@ -47,7 +47,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/allow_midround_antag = 1
var/preferred_map = null
var/pda_style = MONO
var/uses_glasses_colour = 0
//character preferences
@@ -968,7 +968,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("species")
var/result = input(user, "Select a species", "Species Selection") as null|anything in CONFIG_GET(keyed_flag_list/roundstart_races)
var/result = input(user, "Select a species", "Species Selection") as null|anything in GLOB.roundstart_races
if(result)
var/newtype = GLOB.species_list[result]
code/modules/client/preferences_savefile.dm
+3 -4
View File
@@ -252,12 +252,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//Species
var/species_id
S["species"] >> species_id
var/list/roundstart_races = CONFIG_GET(keyed_flag_list/roundstart_races)
if(species_id && (species_id in roundstart_races) && CONFIG_GET(flag/join_with_mutant_race))
if(species_id && (species_id in GLOB.roundstart_races) && CONFIG_GET(flag/join_with_mutant_race))
var/newtype = GLOB.species_list[species_id]
pref_species = new newtype()
else if (roundstart_races.len)
var/rando_race = pick(roundstart_races)
else if (GLOB.roundstart_races.len)
var/rando_race = pick(GLOB.roundstart_races)
if (rando_race)
pref_species = new rando_race()