From 883bcb7c3a33157b2605205c8b5b6386a75a9123 Mon Sep 17 00:00:00 2001 From: AlManiak Date: Sun, 10 Nov 2024 18:16:27 +0100 Subject: [PATCH 1/6] Added CE gloves --- GainStation13/code/clothing/gloves.dm | 15 +++++++++++++++ GainStation13/icons/obj/clothing/gloves.dmi | Bin 0 -> 401 bytes .../crates_lockers/closets/secure/engineering.dm | 2 +- tgstation.dme | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 GainStation13/code/clothing/gloves.dm create mode 100644 GainStation13/icons/obj/clothing/gloves.dmi diff --git a/GainStation13/code/clothing/gloves.dm b/GainStation13/code/clothing/gloves.dm new file mode 100644 index 0000000000..23b760d049 --- /dev/null +++ b/GainStation13/code/clothing/gloves.dm @@ -0,0 +1,15 @@ +// GS13 - Port CE Gloves +/obj/item/clothing/gloves/color/yellow/ce //funky looking, basically combat gloves + desc = "Special Insulated gloves with pricy thermal shielding normally only found in combat gloves." + name = "Chief Engineer Insulated Gloves" + icon = 'GainStation13/icons/obj/clothing/gloves.dmi' + icon_state = "ce_insuls" + item_state = "blackgloves" + siemens_coefficient = 0 + permeability_coefficient = 0.05 + strip_delay = 80 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT + resistance_flags = NONE diff --git a/GainStation13/icons/obj/clothing/gloves.dmi b/GainStation13/icons/obj/clothing/gloves.dmi new file mode 100644 index 0000000000000000000000000000000000000000..300dbd4da6df22150619f96109c70d0293e3659a GIT binary patch literal 401 zcmV;C0dD?@P)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB zGg33tGfE(w;*!LYR3K9+IW;~rueda)Sc!`>C9|j)C}zmTnO2mTn+jnoE4cc(fQ<$K zy~P{Qg|W(?0001}Nkl^YaM|QV-k9S_y(1FfvTK=bPEefFVLtX zOIvP>2_Sla4p<)E`{X~FvA+)}R)z!PMy-Ifg|s#Ns#~MXsj*)IrmU>24chk@PO3G# z22ouyxJksa+7mvEp1fGDq|cyHjd3Q>r$wR$0s0u{L?HI*uEC25hIz;>u6NLR@$j*W v8KfzZ69Z+)TY~d~l1%s<_L6?{XKfu%!!aemgB8e;00000NkvXXu0mjfhM}f% literal 0 HcmV?d00001 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 289599efb9..f0e7784496 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -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) diff --git a/tgstation.dme b/tgstation.dme index dfc174ddc5..7ba4d39826 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3909,6 +3909,7 @@ #include "GainStation13\code\clothing\backpacks.dm" #include "GainStation13\code\clothing\calorite_collar.dm" #include "GainStation13\code\clothing\fat_mask.dm" +#include "GainStation13\code\clothing\gloves.dm" #include "GainStation13\code\clothing\haydee_suit.dm" #include "GainStation13\code\clothing\head.dm" #include "GainStation13\code\clothing\shoes.dm" From ce1081a8dcd2298f76ad59b68ce573a65abb06d2 Mon Sep 17 00:00:00 2001 From: AlManiak Date: Sun, 10 Nov 2024 18:35:14 +0100 Subject: [PATCH 2/6] Added Vegetarian quirk --- GainStation13/code/datums/traits.dm | 23 +++++++++++++++++++ .../subsystem/processing/quirks.dm | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/GainStation13/code/datums/traits.dm b/GainStation13/code/datums/traits.dm index ef7e361a9c..7cccdaea5d 100644 --- a/GainStation13/code/datums/traits.dm +++ b/GainStation13/code/datums/traits.dm @@ -125,3 +125,26 @@ mob_trait = TRAIT_DISTANT value = 0 medical_record_text = "Patient cares little with or dislikes being touched." + +/datum/quirk/vegetarian + name = "Vegetarian" + desc = "You find the idea of eating meat morally and physically repulsive." + value = 0 + gain_text = "You feel repulsion at the idea of eating meat." + lose_text = "You feel like eating meat isn't that bad." + medical_record_text = "Patient reports a vegetarian diet." + +/datum/quirk/vegetarian/add() + var/mob/living/carbon/human/H = quirk_holder + var/datum/species/species = H.dna.species + species.liked_food &= ~MEAT + species.disliked_food |= MEAT + +/datum/quirk/vegetarian/remove() + var/mob/living/carbon/human/H = quirk_holder + if(H) + var/datum/species/species = H.dna.species + if(initial(species.liked_food) & MEAT) + species.liked_food |= MEAT + if(!initial(species.disliked_food) & MEAT) + species.disliked_food &= ~MEAT diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index b8c303db96..f448e9dc7a 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -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() From 02c80c15c63e039132685f7716905db5e2667d85 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Wed, 13 Nov 2024 21:06:52 -0500 Subject: [PATCH 3/6] fixes runtime? --- GainStation13/code/clothing/haydee_suit.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/GainStation13/code/clothing/haydee_suit.dm b/GainStation13/code/clothing/haydee_suit.dm index f293f6c13d..207018cde5 100644 --- a/GainStation13/code/clothing/haydee_suit.dm +++ b/GainStation13/code/clothing/haydee_suit.dm @@ -13,6 +13,7 @@ /obj/item/clothing/suit/space/hardsuit/engine/haydee name = "Haydee Suit" desc = "A strangely voluptous suit. Offers little to no protection. It also appears to have minor flab-compressing properties." + icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' mob_overlay_icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' anthro_mob_worn_overlay = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' icon_state = "haydee_suit" From c7dd9ca68e750852bfb13eae945a834484a5cf0b Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Wed, 13 Nov 2024 21:23:04 -0500 Subject: [PATCH 4/6] Update haydee_suit.dm --- GainStation13/code/clothing/haydee_suit.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/GainStation13/code/clothing/haydee_suit.dm b/GainStation13/code/clothing/haydee_suit.dm index 207018cde5..89592fe5ef 100644 --- a/GainStation13/code/clothing/haydee_suit.dm +++ b/GainStation13/code/clothing/haydee_suit.dm @@ -4,7 +4,6 @@ icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' mob_overlay_icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' icon_state = "haydee_helmet" - item_state = "item_haydee_helmet" armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 25, "fire" = 25, "acid" = 25) slowdown = 0 mutantrace_variation = NONE @@ -14,10 +13,9 @@ name = "Haydee Suit" desc = "A strangely voluptous suit. Offers little to no protection. It also appears to have minor flab-compressing properties." icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' - mob_overlay_icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' + mob_overlay_icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' anthro_mob_worn_overlay = 'GainStation13/icons/obj/clothing/haydee_modular.dmi' - icon_state = "haydee_suit" - item_state = "item_haydee" + icon_state = "haydee_suit1" armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 25, "fire" = 5, "acid" = 5) allowed = list(/obj/item/flashlight, /obj/item/tank/internals) actions_types = list(/datum/action/item_action/toggle_helmet) From e5c1aa922f059462abac9988b60830144b809791 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Wed, 13 Nov 2024 21:37:13 -0500 Subject: [PATCH 5/6] Update traits.dm --- GainStation13/code/datums/traits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GainStation13/code/datums/traits.dm b/GainStation13/code/datums/traits.dm index 7cccdaea5d..89484a7b25 100644 --- a/GainStation13/code/datums/traits.dm +++ b/GainStation13/code/datums/traits.dm @@ -146,5 +146,5 @@ var/datum/species/species = H.dna.species if(initial(species.liked_food) & MEAT) species.liked_food |= MEAT - if(!initial(species.disliked_food) & MEAT) + else species.disliked_food &= ~MEAT From 31d94f18e9bc9efecd26b40deeb566c7c2a0ba89 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:15:05 -0500 Subject: [PATCH 6/6] fixes organ shrinkage --- GainStation13/code/modules/mob/living/belly.dm | 3 ++- code/modules/arousal/genitals.dm | 1 + code/modules/arousal/organs/breasts.dm | 3 ++- code/modules/arousal/organs/butt.dm | 7 +++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/GainStation13/code/modules/mob/living/belly.dm b/GainStation13/code/modules/mob/living/belly.dm index 81f65276c1..c6d539bf1d 100644 --- a/GainStation13/code/modules/mob/living/belly.dm +++ b/GainStation13/code/modules/mob/living/belly.dm @@ -18,7 +18,7 @@ layer_index = BELLY_LAYER_INDEX /obj/item/organ/genital/belly/modify_size(modifier, min = BELLY_SIZE_DEF, max = BELLY_SIZE_MAX) - var/new_value = clamp(size_cached + modifier, min, max) + var/new_value = clamp(size_cached + modifier, starting_size, max) if(new_value == size_cached) return prev_size = size_cached @@ -64,6 +64,7 @@ else color = "#[D.features["belly_color"]]" size = D.features["belly_size"] + starting_size = D.features["belly_size"] shape = D.features["belly_shape"] inflatable = D.features["inflatable_belly"] toggle_visibility(D.features["belly_visibility"], FALSE) diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index ed94324ec8..3e0c85ddb0 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -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) diff --git a/code/modules/arousal/organs/breasts.dm b/code/modules/arousal/organs/breasts.dm index 69020da4f3..fb21d944bd 100644 --- a/code/modules/arousal/organs/breasts.dm +++ b/code/modules/arousal/organs/breasts.dm @@ -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) diff --git a/code/modules/arousal/organs/butt.dm b/code/modules/arousal/organs/butt.dm index 6cb32488a5..fd20703168 100644 --- a/code/modules/arousal/organs/butt.dm +++ b/code/modules/arousal/organs/butt.dm @@ -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)