cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-23 04:36:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
SandPoot
2023-10-12 02:40:12 -03:00
parent 42d03cb5ae c4c57d3e26
commit ee163aae68
14 changed files with 177 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/new_player/new_player.dm
+1 -1
View File
@@ -539,7 +539,7 @@
if(humanc && CONFIG_GET(flag/roundstart_traits))
SSquirks.AssignQuirks(humanc, humanc.client, TRUE, FALSE, job, FALSE)
//skyrat change
//sandstorm change
if(humanc)
SSlanguage.AssignLanguage(humanc, humanc.client, TRUE, FALSE, job, FALSE)
code/modules/mob/dead/new_player/preferences_setup.dm
+7
View File
@@ -56,7 +56,14 @@
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(CHECK_BITFIELD(genital.genital_flags, GENITAL_CAN_AROUSE))
genital.set_aroused_state(TRUE, null)