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

Merge remote-tracking branch 'upstream/master' into FeedingTubePolish

Browse Source
This commit is contained in:
ReoDaProtovali
2024-11-14 02:40:28 -06:00
parent 6b43f1fe7a 31d94f18e9
commit 0f2a8f1865
11 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystem/processing/quirks.dm
View File

@@ -17,7 +17,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
/datum/controller/subsystem/processing/quirks/Initialize(timeofday)
if(!quirks.len)
SetupQuirks()
quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Alcohol Intolerance"),list("Alcohol Intolerance","Drunken Resilience"), list("Weak Legs", "Strong Legs"), list("Fat Affinity","Fat Aversion")) //GS13 EDIT
quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia", "Vegetarian", "Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Alcohol Intolerance"),list("Alcohol Intolerance","Drunken Resilience"), list("Weak Legs", "Strong Legs"), list("Fat Affinity","Fat Aversion")) //GS13 EDIT
return ..()
/datum/controller/subsystem/processing/quirks/proc/SetupQuirks()

2
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
View File

@@ -11,7 +11,7 @@
new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/hardhat/weldhat/white(src)
new /obj/item/clothing/gloves/color/yellow(src)
new /obj/item/clothing/gloves/color/yellow/ce(src)
new /obj/item/tank/jetpack/suit(src)
new /obj/item/cartridge/ce(src)
new /obj/item/radio/headset/heads/ce(src)

1
code/modules/arousal/genitals.dm
View File

@@ -32,6 +32,7 @@
var/obj/item/equipment //for fun stuff that goes on the gentials/maybe rings down the line
var/dontlist = FALSE
var/nochange = FALSE //stops people changing visablity.
var/starting_size //GS13 EDIT
/obj/item/organ/genital/Initialize(mapload, do_update = TRUE)

3
code/modules/arousal/organs/breasts.dm
View File

@@ -75,7 +75,7 @@
//this is far too lewd wah
/obj/item/organ/genital/breasts/modify_size(modifier, min = -INFINITY, max = INFINITY)
var/new_value = clamp(cached_size + modifier, min, max)
var/new_value = clamp(cached_size + modifier, starting_size, max) //GS13 EDIT
if(new_value == cached_size)
return
prev_size = cached_size
@@ -115,6 +115,7 @@
else
color = "#[D.features["breasts_color"]]"
size = D.features["breasts_size"]
starting_size = D.features["breasts_size"]
shape = D.features["breasts_shape"]
if(!D.features["breasts_producing"])
genital_flags &= ~ (GENITAL_FUID_PRODUCTION|CAN_CLIMAX_WITH|CAN_MASTURBATE_WITH)

7
code/modules/arousal/organs/butt.dm
View File

@@ -16,7 +16,7 @@
layer_index = BUTT_LAYER_INDEX
/obj/item/organ/genital/butt/modify_size(modifier, min = -INFINITY, max = BUTT_SIZE_MAX)
var/new_value = clamp(size_cached + modifier, min, max)
var/new_value = clamp(size_cached + modifier, starting_size, max) //GS13 EDIT
if(new_value == size_cached)
return
prev_size = size_cached
@@ -47,6 +47,8 @@
//Reflect the size of dat ass on examine.
switch(round(size))
if(0)
size_name = "nonexistent" // GS13 EDIT
if(1)
size_name = "average"
if(2)
@@ -58,7 +60,7 @@
if(5)
size_name = pick("massive","extreme","enormous","very generous","humongous","big bubbly","dummy thicc")
else
size_name = "nonexistent"
size_name = "oversized" //GS13 edit
desc = "You see a [lowershape] of [size_name] asscheeks."
@@ -82,5 +84,6 @@
else
color = "#[D.features["butt_color"]]"
size = D.features["butt_size"]
starting_size = D.features["butt_size"] // GS13 EDIT
prev_size = size
toggle_visibility(D.features["butt_visibility"], FALSE)