Label GS13 changes

Since commit 5084020 on Jan 30, 2023
This commit is contained in:
psq95
2023-08-29 21:50:24 +01:00
parent 8e09f3b9ca
commit cb43bf0dfc
77 changed files with 253 additions and 247 deletions
@@ -25,6 +25,7 @@
var/lowershape = lowertext(shape)
//Reflect the size of dat ass on examine.
// GS13: Add normal and huge+
switch(round(size))
if(0)
size_name = "normal"
@@ -36,6 +37,7 @@
size_name = "squeezable"
if(4)
size_name = "hefty"
// GS13 TODO seems like 5 was lost in the merge
if(6)
size_name = "godly"
if(7)
@@ -466,60 +466,19 @@
if(G.size < 3) //is actually "less than 11 inches"
genital_overlay.layer = -GENITALS_UNDER_LAYER
//GS13 Commented out as it clashes with the Belly Sprites and its fucking stupid and looks dumb
//if(G.slot == "breasts")
// GS13: Remove breasts overlay
//var/obj/item/organ/genital/breasts/B = G
//if(B.cached_size < 8) //anything smaller than a g-cup
//genital_overlay.layer = -GENITALS_UNDER_LAYER
/* //Get the icon
genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]_[aroused_state]_[layertext]"
colourcode = S.color_src
if(G.slot == "belly") //we have a different size system
genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly.dmi'
genital_overlay.icon_state = "belly_[size]"
colourcode = "belly_color"
//sizecheck added to prevent rendering blank icons
if(G.slot == "anus" && G.size > 0) //we have a different size system
genital_overlay.icon = 'hyperstation/icons/obj/genitals/butt.dmi'
genital_overlay.icon_state = "butt_[round(size)]_OTHER"
genital_overlay.layer = -ID_LAYER //in front of suit, behind bellies.
//creates directional layering by rendering twice. North has higher layer priority to occlude hands.
genital_overlay_directional.icon = 'hyperstation/icons/obj/genitals/butt.dmi'
genital_overlay_directional.icon_state = "butt_[round(size)]_NORTH"
genital_overlay_directional.layer = -NECK_LAYER
colourcode = "butt_color"
if(use_skintones) //butts are forced a colour, either skin tones, or main colour. how ever, mutants use a darker version, because of their body tone.
genital_overlay.color = "#[skintone2hex(H.skin_tone)]"
genital_overlay.icon_state = "butt_[round(size)]_OTHER"
genital_overlay_directional.icon_state = "butt_[round(size)]_NORTH"
else
genital_overlay.color = "#[H.dna.features["mcolor"]]"
genital_overlay.icon_state = "butt_[round(size)]_OTHER_m"
genital_overlay_directional.icon_state = "butt_[round(size)]_NORTH_m"
*/
genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]_[aroused_state]_[layertext]"
colourcode = S.color_src
if(G.slot == "belly") //we have a different size system
if(G.slot == "belly") // GS13
genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly.dmi'
genital_overlay.icon_state = "belly_[size]"
genital_overlay.layer = -UNDER_BACK_LAYER
colourcode = "belly_color"
// if(HAS_TRAIT(src, TRAIT_BLOB))
// genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly.dmi'
// genital_overlay.icon_state = "belly_10"
//bellyfaticon
//sizecheck added to prevent rendering blank icons
if(G.slot == "anus" && G.size > 0) //we have a different size system
if(G.slot == "anus" && G.size > 0) // GS13
genital_overlay.icon = 'hyperstation/icons/obj/genitals/butt.dmi'
genital_overlay.icon_state = "butt_[round(size)]_OTHER"
genital_overlay.layer = -UNDER1_BACK_LAYER //in front of suit, behind bellies.