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

Merge pull request #16013 from SandPoot/change-preferences

Browse Source 
Preferences menu layout change
This commit is contained in:
BlueWildrose
2023-10-11 13:51:37 -06:00
committed by GitHub
parent 0c823be763 d4ea14c4ef
commit 9f29f08cd0
7 changed files with 985 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/arousal/genitals.dm
+2 -1
View File
@@ -41,7 +41,8 @@
return FALSE
if(!((HAS_TRAIT(owner,TRAIT_PERMABONER) && !new_state) || HAS_TRAIT(owner,TRAIT_NEVERBONER) && new_state))
aroused_state = new_state
owner.log_message("[src]'s arousal was [new_state ? "enabled" : "disabled"] due to [cause]", LOG_EMOTE)
if(cause)
owner.log_message("[src]'s arousal was [new_state ? "enabled" : "disabled"] due to [cause]", LOG_EMOTE)
return aroused_state
/obj/item/organ/genital/proc/update()
code/modules/client/preferences.dm
+942 -865
View File
File diff suppressed because it is too large Load Diff
code/modules/mob/dead/new_player/preferences_setup.dm
+19 -9
View File
@@ -30,7 +30,6 @@
age = rand(AGE_MIN,AGE_MAX)
/datum/preferences/proc/update_preview_icon(current_tab)
var/equip_job = (current_tab != APPEARANCE_TAB)
// Determine what job is marked as 'High' priority, and dress them up as such.
var/datum/job/previewJob = get_highest_job()
@@ -49,14 +48,25 @@
mannequin.add_overlay(mutable_appearance('modular_citadel/icons/ui/backgrounds.dmi', bgstate, layer = SPACE_LAYER))
copy_to(mannequin, initial_spawn = TRUE)
if(current_tab == LOADOUT_TAB)
//give it its loadout if not on the appearance tab
SSjob.equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE)
SSjob.post_equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE)
else
if(previewJob && equip_job)
mannequin.job = previewJob.title
previewJob.equip(mannequin, TRUE, preference_source = parent)
switch(preview_pref)
if(PREVIEW_PREF_JOB)
if(previewJob)
mannequin.job = previewJob.title
previewJob.equip(mannequin, TRUE, preference_source = parent)
if(PREVIEW_PREF_LOADOUT)
SSjob.equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE)
SSjob.post_equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE)
if(PREVIEW_PREF_NAKED)
mannequin.hidden_underwear = TRUE
mannequin.hidden_undershirt = TRUE
mannequin.hidden_socks = TRUE
if(PREVIEW_PREF_NAKED_AROUSED)
mannequin.hidden_underwear = TRUE
mannequin.hidden_undershirt = TRUE
mannequin.hidden_socks = TRUE
for(var/obj/item/organ/genital/genital in mannequin.internal_organs)
if(genital.genital_flags & GENITAL_CAN_AROUSE)
genital.set_aroused_state(TRUE, null)
mannequin.regenerate_icons()