shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
silicons
2021-10-29 21:50:58 -07:00
parent 319c5e23fe
commit 186b552103
64 changed files with 208 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_savefile.dm
+14 -14
View File
@@ -126,29 +126,29 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
var/list/json_from_file = json_decode(file2text(vr_path))
if(json_from_file)
if(json_from_file["digestable"])
ENABLE_BITFIELD(vore_flags,DIGESTABLE)
vore_flags |= DIGESTABLE
if(json_from_file["devourable"])
ENABLE_BITFIELD(vore_flags,DEVOURABLE)
vore_flags |= DEVOURABLE
if(json_from_file["feeding"])
ENABLE_BITFIELD(vore_flags,FEEDING)
vore_flags |= FEEDING
if(json_from_file["lickable"])
ENABLE_BITFIELD(vore_flags,LICKABLE)
vore_flags |= LICKABLE
belly_prefs = json_from_file["belly_prefs"]
vore_taste = json_from_file["vore_taste"]
for(var/V in all_quirks) // quirk migration
switch(V)
if("Acute hepatic pharmacokinesis")
DISABLE_BITFIELD(cit_toggles, PENIS_ENLARGEMENT)
DISABLE_BITFIELD(cit_toggles, BREAST_ENLARGEMENT)
ENABLE_BITFIELD(cit_toggles,FORCED_FEM)
ENABLE_BITFIELD(cit_toggles,FORCED_MASC)
cit_toggles &= ~(PENIS_ENLARGEMENT)
cit_toggles &= ~(BREAST_ENLARGEMENT)
cit_toggles |= FORCED_FEM
cit_toggles |= FORCED_MASC
all_quirks -= V
if("Crocin Immunity")
ENABLE_BITFIELD(cit_toggles,NO_APHRO)
cit_toggles |= NO_APHRO
all_quirks -= V
if("Buns of Steel")
ENABLE_BITFIELD(cit_toggles,NO_ASS_SLAP)
cit_toggles |= NO_ASS_SLAP
all_quirks -= V
if(features["meat_type"] == "Inesct")
@@ -178,13 +178,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["feeding"] >> feeding
S["lickable"] >> lickable
if(digestable)
ENABLE_BITFIELD(vore_flags,DIGESTABLE)
vore_flags |= DIGESTABLE
if(devourable)
ENABLE_BITFIELD(vore_flags,DEVOURABLE)
vore_flags |= DEVOURABLE
if(feeding)
ENABLE_BITFIELD(vore_flags,FEEDING)
vore_flags |= FEEDING
if(lickable)
ENABLE_BITFIELD(vore_flags,LICKABLE)
vore_flags |= LICKABLE
if(current_version < 30)
switch(features["taur"])