Skip to content

Rewrites the prefs menu [dont merge yet!!!] #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Superlagg wants to merge 5 commits into
base: master
Choose a base branch
from
+19,932 −3,337
Draft

Rewrites the prefs menu [dont merge yet!!!] #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f95366
reimagines the prefs menu part 1
Superlagg Dec 31, 2024
578f110
oh yeah, thats why I stopped making UIs in html
Superlagg Jan 3, 2025
a7fe6a4
revert cool to what it was in the pic
Superlagg Jan 3, 2025
b2ac4e6
tug ma ui
Superlagg Jan 4, 2025
539db6d
my glands!
Superlagg Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions code/__DEFINES/citadel_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@
#define CAN_CUM_INTO (1<<21)

//DEfault genital flags, for preferences
#define DEF_BUTT_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESIZE | GENITAL_CAN_HAVE
#define DEF_VAG_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESHAPE | GENITAL_CAN_HAVE
#define DEF_WOMB_FLAGS GENITAL_CAN_HAVE
#define DEF_BALLS_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESHAPE | GENITAL_CAN_HAVE | GENITAL_CAN_RESIZE
#define DEF_PENIS_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESHAPE | GENITAL_CAN_RESIZE | GENITAL_CAN_HAVE
#define DEF_BREASTS_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESHAPE | GENITAL_CAN_RESIZE | GENITAL_CAN_HAVE
#define DEF_BELLY_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESHAPE | GENITAL_CAN_RESIZE | GENITAL_CAN_HAVE
#define DEF_WOMB_FLAGS GENITAL_CAN_HAVE | GENITAL_INTERNAL | GENITAL_FLUID_PRODUCTION
#define DEF_VAG_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESHAPE | GENITAL_CAN_HAVE | CAN_MASTURBATE_WITH | GENITAL_CAN_AROUSE
#define DEF_BALLS_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESHAPE | GENITAL_CAN_RESIZE | GENITAL_CAN_HAVE | CAN_MASTURBATE_WITH | MASTURBATE_LINKED_ORGAN | GENITAL_FLUID_PRODUCTION | UPDATE_OWNER_APPEARANCE
#define DEF_PENIS_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESHAPE | GENITAL_CAN_RESIZE | GENITAL_CAN_HAVE | CAN_MASTURBATE_WITH | CAN_CLIMAX_WITH | GENITAL_CAN_AROUSE | UPDATE_OWNER_APPEARANCE | GENITAL_CAN_TAUR
#define DEF_BREASTS_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESHAPE | GENITAL_CAN_RESIZE | GENITAL_CAN_HAVE | CAN_MASTURBATE_WITH | CAN_CLIMAX_WITH | GENITAL_FLUID_PRODUCTION | GENITAL_CAN_AROUSE | UPDATE_OWNER_APPEARANCE
#define DEF_BUTT_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESIZE | GENITAL_CAN_HAVE | UPDATE_OWNER_APPEARANCE
#define DEF_BELLY_FLAGS GENITAL_CAN_RECOLOR | GENITAL_CAN_RESHAPE | GENITAL_CAN_RESIZE | GENITAL_CAN_HAVE | UPDATE_OWNER_APPEARANCE

//NEW genital flags
#define GENITAL_NO_OVERRIDE (1<<0) // Not actually used, passed to the visibility toggle to unset the lower two
Expand Down Expand Up @@ -97,6 +97,8 @@
#define DEF_VAGINA_SHAPE "Human"

#define COCK_SIZE_DEF 6
#define COCK_SIZE_MIN 1
#define COCK_SIZE_MAX 100

#define COCK_DIAMETER_RATIO_MAX 0.42
#define COCK_DIAMETER_RATIO_DEF 0.25
Expand Down Expand Up @@ -177,7 +179,7 @@
#define HYPNO (1<<7)
#define NEVER_HYPNO (1<<8)
#define NO_APHRO (1<<9)
#define NO_ASS_SLAP (1<<10)
#define NO_BUTT_SLAP (1<<10)
#define BIMBOFICATION (1<<11)
#define NO_AUTO_WAG (1<<12)
#define GENITAL_EXAMINE (1<<13)
Expand Down
27 changes: 12 additions & 15 deletions code/__DEFINES/loadout.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,17 @@
#define LOADOUT_SUBCATEGORY_NONE "Miscellaneous"
#define LOADOUT_SUBCATEGORIES_NONE list("Miscellaneous")

//the names of the customization tabs
#define SETTINGS_TAB 0
#define GAME_PREFERENCES_TAB 1
#define APPEARANCE_TAB 2

#define CHAR_INFO_TAB 3
#define ERP_TAB 4
//#define SPEECH_TAB 3
#define LOADOUT_TAB 5
#define CONTENT_PREFERENCES_TAB 6
#define KEYBINDINGS_TAB 7
#define PPT_ADULT_PREFERENCES 6

//the names of the erp tabs - can be 0, 1, or "has_cock" thru "has_womb"
#define ERP_TAB_HOME 0
#define ERP_TAB_REARRANGE 1

#define GEAR_CAT_ALL_EQUIPPED "Your Stuff"
//backpack
#define LOADOUT_CATEGORY_BACKPACK "In backpack"
#define LOADOUT_SUBCATEGORY_BACKPACK_GENERAL "General" //basically anything that there's not enough of to have its own subcategory
Expand Down Expand Up @@ -113,19 +109,20 @@
#define LOADOUT_ALLOWED_LIMB_TARGETS list(BODY_ZONE_L_ARM,BODY_ZONE_R_ARM,BODY_ZONE_L_LEG,BODY_ZONE_R_LEG)

//options for modifiying limbs
#define LOADOUT_LIMB_NORMAL "Normal"
#define LOADOUT_LIMB_PROSTHETIC "Prosthetic"
#define LOADOUT_LIMB_AMPUTATED "Amputated"
#define LOADOUT_LIMB_NORMAL "Normal"
#define LOADOUT_LIMB_PROSTHETIC "Prosthetic"
#define LOADOUT_LIMB_AMPUTATED "Amputated"

#define LOADOUT_LIMBS list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though
#define LOADOUT_LIMBS list(/* LOADOUT_LIMB_NORMAL, */LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though

//loadout saving/loading specific defines
#define MAXIMUM_LOADOUT_SAVES 30 //Remember to increase this if more slots are added
#define LOADOUT_ITEM "loadout_item"
#define LOADOUT_COLOR "loadout_color"
#define LOADOUT_CUSTOM_NAME "loadout_custom_name"
#define LOADOUT_ITEM "loadout_item"
#define LOADOUT_COLOR "loadout_color"
#define LOADOUT_CUSTOM_NAME "loadout_custom_name"
#define LOADOUT_CUSTOM_DESCRIPTION "loadout_custom_description"
#define LOADOUT_CUSTOM_COLOR "loadout_custom_description"
#define LOADOUT_CUSTOM_COLOR "loadout_custom_description"
#define LOADOUT_UID "loadout_uid"

//loadout item flags
#define LOADOUT_CAN_NAME (1<<0) //renaming items
Expand Down
Loading