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

Human genitals fix & Fat persistance

Browse Source 
Fixed sprites for human genitals (breasts, penis, vagina)
Moved fat permanence changes to the GS13 folder
Re-added fat permanence save on round end for all alive and present players
This commit is contained in:
Alphas00
2024-11-30 11:51:18 +01:00
parent 1133f46556
commit 702485b045
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/cryopod.dm
-6
View File
@@ -280,12 +280,6 @@ GLOBAL_LIST_EMPTY(cryopod_computers)
var/mob/living/mob_occupant = occupant
var/list/crew_member = list()
//GS13 Process permanent fat
if(iscarbon(mob_occupant))
var/mob/living/carbon/C = mob_occupant
if(C)
C.perma_fat_save(C)
crew_member["name"] = mob_occupant.real_name
if(mob_occupant.mind)
code/modules/arousal/genitals.dm
+12 -3
View File
@@ -359,13 +359,22 @@
if("belly_color")
genital_overlay.color = "#[dna.features["belly_color"]]"
//GS13 Port - Specific check for belly since we need organ values specifically and not sprite_accessories, maybe can rewrite this more generically later?
// In any case I don't want any specific calculations done here
//GS13 - Because each genital's file has different naming schemes for their icon_states,
// I've made it so each type is checked and the icon_state built based on which genital it is
if(G.slot == "belly")
genital_overlay.icon = G.icon
genital_overlay.icon_state = "[G.icon_state]_[aroused_state]_[layertext]"
else
genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][(dna.species.use_skintones && !dna.skin_tone_override) ? "_s" : ""]_[aroused_state]_[layertext]"
if(G.slot == "breasts")
genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][(dna.species.use_skintones && !dna.skin_tone_override) ? "-s" : ""]_[aroused_state]_[layertext]"
else
if(G.slot == "penis")
genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]_[aroused_state]_[layertext]"
else
if(G.slot == "vagina")
genital_overlay.icon_state = "[G.slot][(dna.species.use_skintones && !dna.skin_tone_override) ? "-s" : ""]_[S.icon_state]_[size]_[aroused_state]_[layertext]"
else
genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][(dna.species.use_skintones && !dna.skin_tone_override) ? "_s" : ""]_[aroused_state]_[layertext]"
if(layers_num[layer] == GENITALS_FRONT_LAYER && G.genital_flags & GENITAL_THROUGH_CLOTHES)
genital_overlay.layer = -GENITALS_EXPOSED_LAYER