cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-13 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Label GS13 changes

Browse Source 
Since commit 5084020 on Jan 30, 2023
This commit is contained in:
psq95
2023-08-29 21:05:42 +01:00
parent 8e09f3b9ca
commit cb43bf0dfc
77 changed files with 253 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/arousal/organs/anus.dm
+2
View File
@@ -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)
modular_citadel/code/modules/arousal/organs/genitals.dm
+3 -44
View File
@@ -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.
modular_citadel/code/modules/client/preferences_toggles.dm
+2 -2
View File
@@ -20,7 +20,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggledigestionnoise)()
/datum/verbs/menu/Settings/Sound/toggledigestionnoise/Get_checked(client/C)
return C.prefs.cit_toggles & DIGESTION_NOISES
TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleburpingnoise)()
TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleburpingnoise)() // GS13
set name = "Toggle Burping Noises"
set category = "Preferences"
set desc = "Hear Burping noises"
@@ -31,7 +31,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleburpingnoise)()
/datum/verbs/menu/Settings/Sound/toggleburpingnoise/Get_checked(client/C)
return C.prefs.cit_toggles & BURPING_NOISES
TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, togglefartingnoise)()
TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, togglefartingnoise)() // GS13
set name = "Toggle Farting Noises"
set category = "Preferences"
set desc = "Hear Farting noises"
modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+2
View File
@@ -747,6 +747,7 @@ datum/sprite_accessory/ears/human/gret
/datum/sprite_accessory/mam_snouts
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
// GS13: add pod
recommended_species = list("mammal", "slimeperson", "insect", "podweak", "avian", "aquatic", "pod")
/datum/sprite_accessory/mam_snouts/none
@@ -1825,6 +1826,7 @@ datum/sprite_accessory/mam_tails/insect
dimension_x = 64
var/taur_mode = NOT_TAURIC
color_src = MATRIXED
// GS13: add pod
recommended_species = list("human", "lizard", "insect", "mammal", "xeno", "jelly", "slimeperson", "podweak", "avian", "aquatic", "pod")
/datum/sprite_accessory/taur/none
modular_citadel/code/modules/vore/eating/belly_obj_vr.dm
+2 -2
View File
@@ -172,10 +172,10 @@
//Sound w/ antispam flag setting
if(is_wet && (world.time > recent_sound))
var/turf/source = get_turf(owner)
var/sound/eating = sound(GLOB.vore_sounds[vore_sound])
var/sound/eating = sound(GLOB.vore_sounds[vore_sound]) // GS13 fix
for(var/mob/living/M in get_hearers_in_view(3, source))
if(M.client && M.client?.prefs?.cit_toggles & EATING_NOISES)
M.playsound_local(source, vore_sound, 50, 1, S = eating)
M.playsound_local(source, vore_sound, 50, 1, S = eating) // GS13 fix
recent_sound = (world.time + 20 SECONDS)
//Messages if it's a mob
modular_citadel/code/modules/vore/eating/bellymodes_vr.dm
+3 -4
View File
@@ -107,16 +107,15 @@
M.visible_message("<span class='notice'>You watch as [owner]'s form loses its additions.</span>")
owner.nutrition += 400 // so eating dead mobs gives you *something*.
//GS13 EDIT
//GS13 edit
var/mob/living/carbon/gainer = owner
if(iscarbon(gainer) && owner?.client?.prefs?.weight_gain_food)
var/mob/living/carbon/prey = M
if(iscarbon(prey) && prey.fatness)
var/fatness_to_add = (prey.fatness * 0.75)
gainer.adjust_fatness(fatness_to_add, FATTENING_TYPE_FOOD)
//GS13 EDIT END
//GS13 edit end
if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
LAZYCLEARLIST(hearing_mobs)