From 883bcb7c3a33157b2605205c8b5b6386a75a9123 Mon Sep 17 00:00:00 2001 From: AlManiak Date: Sun, 10 Nov 2024 18:16:27 +0100 Subject: [PATCH 1/2] 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/2] 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()