From a9ca3bebb47a1d260973fa73762abce334da31bf Mon Sep 17 00:00:00 2001 From: GDLW Date: Thu, 11 May 2023 18:12:21 +0200 Subject: [PATCH] lipolicide tolerance + small fixes - added new lipolicide tolerance - fixed missing sound in the chocoslime - fixed unused variable in respawn mechanic - nerfed lipolicide: it metabolizes a little more quickly, and it's twice less powerful (also delicately raised OD threshold, so you can have 100u of it in the organism) - commented and categorized some of the GS quirks - fixed some doors in CC --- GainStation13/code/mobs/chocoslime.dm | 2 +- GainStation13/code/obj/items/minor_items.dm | 10 +++++----- _maps/map_files/generic/CentCom.dmm | 5 +++-- code/__DEFINES/traits.dm | 9 ++++++--- code/controllers/subsystem/processing/quirks.dm | 4 ++-- code/datums/traits/good.dm | 2 +- code/datums/traits/negative.dm | 2 +- code/datums/traits/neutral.dm | 14 ++++++++++++-- code/modules/mob/mob.dm | 4 ++-- .../reagents/chemistry/reagents/toxin_reagents.dm | 8 +++++--- 10 files changed, 38 insertions(+), 22 deletions(-) diff --git a/GainStation13/code/mobs/chocoslime.dm b/GainStation13/code/mobs/chocoslime.dm index f9663af8..7236d0dc 100644 --- a/GainStation13/code/mobs/chocoslime.dm +++ b/GainStation13/code/mobs/chocoslime.dm @@ -36,7 +36,7 @@ move_to_delay = 7 ventcrawler = VENTCRAWLER_ALWAYS attacktext = "feeds itself to" - attack_sound = 'sound/items/eat.ogg' + attack_sound = 'sound/items/eatfood.ogg' unique_name = 1 gold_core_spawnable = HOSTILE_SPAWN see_in_dark = 3 diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm index 9a4b6122..47c98280 100644 --- a/GainStation13/code/obj/items/minor_items.dm +++ b/GainStation13/code/obj/items/minor_items.dm @@ -23,19 +23,19 @@ /obj/item/reagent_containers/glass/beaker/cornoil list_reagents = list(/datum/reagent/consumable/cornoil = 50) -/obj/item/reagent_containers/glass/beaker/cornoil +/obj/item/reagent_containers/glass/beaker/blueberry_juice list_reagents = list(/datum/reagent/blueberry_juice = 50) -/obj/item/reagent_containers/glass/beaker/cornoil +/obj/item/reagent_containers/glass/beaker/fizulphite list_reagents = list(/datum/chemical_reaction/fizulphite = 50) -/obj/item/reagent_containers/glass/beaker/cornoil +/obj/item/reagent_containers/glass/beaker/extilphite list_reagents = list(/datum/chemical_reaction/extilphite = 50) -/obj/item/reagent_containers/glass/beaker/cornoil +/obj/item/reagent_containers/glass/beaker/calorite_blessing list_reagents = list(/datum/reagent/consumable/caloriteblessing = 50) -/obj/item/reagent_containers/glass/beaker/cornoil +/obj/item/reagent_containers/glass/beaker/flatulose list_reagents = list(/datum/reagent/consumable/flatulose = 50) //blueberry gum snack diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 8c5fa832..683958bd 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1343,6 +1343,7 @@ "zW" = (/obj/machinery/light{dir = 8},/obj/structure/window{dir = 4},/turf/open/floor/plasteel,/area/centcom/ferry) "zX" = (/obj/machinery/vending/clothing,/turf/open/floor/wood,/area/centcom/holding) "zY" = (/obj/structure/table/wood,/turf/open/floor/plasteel,/area/centcom/ferry) +"zZ" = (/obj/machinery/door/airlock/centcom{name = "Thunderdome Administration"; opacity = 1; req_access_txt = "102"},/turf/open/floor/plasteel/dark,/area/tdome/tdomeadmin) "Aa" = (/turf/open/floor/mech_bay_recharge_floor,/area/syndicate_mothership) "Ab" = (/obj/machinery/photocopier,/turf/open/floor/plasteel/grimy,/area/centcom/ferry) "Ac" = (/obj/structure/table/reinforced,/obj/item/folder/red{pixel_x = -2; pixel_y = -2},/obj/item/folder/blue{pixel_x = 2; pixel_y = 2},/obj/item/lighter,/turf/open/floor/plasteel/grimy,/area/centcom/ferry) @@ -1961,7 +1962,7 @@ "MH" = (/obj/structure/ladder/unbreakable/binary/unlinked,/turf/open/indestructible/airblock,/area/fabric_of_reality) "MI" = (/turf/open/floor/plating,/area/syndicate_mothership) "MJ" = (/obj/structure/table/plasmaglass,/obj/machinery/chem_dispenser/drinks/fullupgrade{dir = 8},/turf/open/floor/mineral/basaltstone_floor,/area/centcom/ferry) -"MK" = (/turf/closed/indestructible/fakedoor{name = "Thunderdome Admin"},/area/centcom/ferry) +"MK" = (/obj/machinery/door/airlock/centcom{name = "Thunderdome Administration"; opacity = 1; req_access_txt = "102"},/turf/open/floor/plasteel/dark,/area/centcom/ferry) "MM" = (/obj/machinery/deepfryer,/turf/open/floor/plasteel/cafeteria,/area/centcom/holding) "MN" = (/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/centcom/ferry) "MO" = (/obj/item/reagent_containers/food/drinks/trophy/silver_cup,/obj/structure/window/fulltile,/turf/open/floor/light,/area/centcom/ferry) @@ -2712,7 +2713,7 @@ aaaakKkLJAJBJCkPkQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlI aaaalgJFlilililjlkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIZclIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIZcZclIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDVNRTKmwfwgmDTeHLmDRyXCKFCmRWUbmDHyImZWmDBkWTWTWTWTYGVJzANqQzXPWTWTWTWTCkIvJdIRJGJGJGJGIvJHJHJHJHJHIvJIJIJIJIJIJIJIJIJIJIJIJIJIJIJIIvJLJLJLJLJLIvJGJGJGJGIRJmIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaalBlCJMlEJNlGlHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIZclIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIZcZcZcZclIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDRTQGmDRtwemDTmVCmDTmTDLDSnNNxOmDZWImZWqRmDoeoeoemDmDqRZTnUmDmDoeoeoemDmDIvJnIRJGJGJGJOIvIvIvIvIvIvIvJPJQJQJRJQJQJRJSJTJQJQJRJQJQJPIvIvIvIvIvIvIvJUJGJGJGIRJrIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaalXlYlilililjlZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIZcZclIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDRTRTmDxtweOgTmVCSzTmTDNXVSTDVCGtZWImTEZWGZZWZWZWZWGZZWZWZWGZZWZWZWZWGZZWIvIvIvIvIvJGJGJXJGJGJGJGJGIvJZKaKaJGKaKaJGKbJGKaKaJGKaKaKcIvJGJGJGJGJGJXJGJGIvIvIvIvIvIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaamrmsmtmumvmwmxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIZcZclIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDQGRTKmWfQxmDTmVCmDZdEZPQPQEZTJmDZWMsImImImImImImImImImImImImImImImImImImImTEMKzAKgJGJGJXJGJGJGJGJGKhJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGKhJGJGJGJGJGJXJGJGKgJGJGJGJGKjKkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaamrmsmtmumvmwmxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIZcZclIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDQGRTKmWfQxmDTmVCmDZdEZPQPQEZTJmDZWMsImImImImImImImImImImImImImImImImImImImTEMKzAzZJGJGJXJGJGJGJGJGKhJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGKhJGJGJGJGJGJXJGJGKgJGJGJGJGKjKkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaanbncndnenfaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIlIZclIlIlIlIMBToToToToToMBToNFToToToToMBToToTolIlIlIlIlIlIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDmDmDmDmDmDmDYFWBmDmDmDmDmDmDmDmDVoZWTRzYXhZWZWZWZWTRzYXhZWZWZWZWTRzYXhZWZWVomDmDIvIvIvIvIvIRIRIRIvIvKnKoKpKqKrKcKsKtKuKcKvKwKxKyKnIvIvIRIRIRIvIvIvIvIvIvIvIvIvIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIlIlIlIZclIlIMBToToToToToMBMBToToToToMBMBToToTolIlIlIlIlIlIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDHlLyoBoBFeUMSAUtmDaaaamDmDmDoeoeoemDmDmDmDoeoeoemDmDmDmDoeoeoemDmDmDmDaaaaaaaaaaIvKAKBKAIvIvIvKCIRIRIvIRIRKDIRIRIvIRIRKCIvIvIvKAKBKAIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIlIlIlIlIZclIMBMBToToToToToToToToToMBMBToToToTolIlIlIlIlIlIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDRGPkPkoBoBztUYRJmDaaaaaaaamDvaPuvamDaaaamDvaPuvamDaaaamDvaPuvamDaaaaaaaaaaaaaaaaIvIvIvIvIvaaaaIvKGKAIRKAKGIRKGKAIRKGKAIvaaaaIvIvIvIvIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index a977e3ad..8ca069fe 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -115,8 +115,6 @@ #define TRAIT_DEPRESSION "depression" #define TRAIT_JOLLY "jolly" #define TRAIT_HEADPAT_SLUT "headpat_slut" -#define TRAIT_WEAKLEGS "weak_legs" -#define TRAIT_STRONGLEGS "strong_legs" #define TRAIT_NOCRITDAMAGE "no_crit" #define TRAIT_NOSLIPWATER "noslip_water" #define TRAIT_NOSLIPALL "noslip_all" @@ -200,8 +198,13 @@ #define TRAIT_COLDBLOODED "coldblooded" // Your body is literal room temperature. Does not make you immune to the temp. #define TRAIT_FLIMSY "flimsy" //you have 20% less maxhealth #define TRAIT_TRASHCAN "trashcan" //Im the TRASH MAN! (Shamlessly stolen from hyper for local trash eater, flint) + +//GS13 quirks #define TRAIT_FAT_GOOD "fat_good" -#define TRAIT_FAT_BAD "fat_bad" +#define TRAIT_FAT_BAD "fat_bad" +#define TRAIT_LIPOLICIDE_TOLERANCE "lipolicide_tolerance" +#define TRAIT_WEAKLEGS "weak_legs" +#define TRAIT_STRONGLEGS "strong_legs" //Hyper #define TRAIT_VIRILE "virile" //you have 20% more chance of impreg diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index fbfc7053..a411f2d1 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -32,8 +32,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks) list("Prosthetic Limb","Prosthetic Limb (Right Leg)"), list("Paraplegic","Prosthetic Limb (Left Leg)"), list("Paraplegic","Prosthetic Limb (Right Leg)"), - list("Fat Affinity","Fat Aversion"), - list("Weak Legs", "Strong Legs") + list("Fat Affinity","Fat Aversion"), //GS13 + list("Weak Legs", "Strong Legs") //GS13 ) return ..() diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 319542c8..72a77af9 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -61,7 +61,7 @@ lose_text = "You feel clumsy again." medical_record_text = "Patient scored highly on cardio tests." -/datum/quirk/strong_legs +/datum/quirk/strong_legs //GS13 name = "Strong Legs" desc = "Your body is able to handle heavier sizes very well." value = 2 diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index dc13d40d..9bd0ac36 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -518,7 +518,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms) if(quirk_holder) quirk_holder.maxHealth += healthchange -/datum/quirk/weak_legs +/datum/quirk/weak_legs //GS13 name = "Weak Legs" desc = "Your legs can't handle the heaviest of charges. Being too fat will render you unable to move at all." mob_trait = TRAIT_WEAKLEGS diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index a5cdf67b..a5b2b81e 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -117,6 +117,16 @@ if(quirk_holder) quirk_holder.remove_client_colour(/datum/client_colour/monochrome) +/datum/quirk/lipolicide_tolerance //GS13 + name = "Lipolicide Tolerance" + desc = "Whether because your liver turned resistant to weight-loss chemicals, or just because your genes were aligned this way, your body barely processes lipolicide." + mob_trait = TRAIT_LIPOLICIDE_TOLERANCE + value = 0 + category = CATEGORY_SEXUAL + gain_text = "You feel like you need to watch what to eat." + lose_text = "You feel like you can be careless with your diet." + medical_record_text = "Patient's digestive system exhibits strong resistance to lipolicide." + /datum/quirk/crocrin_immunity name = "Crocin Immunity" desc = "You're one of the few people in the galaxy who are genetically immune to Crocin and Hexacrocin products and their addictive properties! However, you can still get brain damage from Hexacrocin addiction." @@ -200,7 +210,7 @@ var/datum/species/species = H.dna.species species.disliked_food = initial(species.disliked_food) -/datum/quirk/fatness_liker +/datum/quirk/fatness_liker //GS13 name = "Fat Affinity" desc = "You like being fat, alot, maybe even a little bit too much. Being fat gives you a bigger mood boost." mob_trait = TRAIT_FAT_GOOD @@ -208,7 +218,7 @@ category = CATEGORY_MOODS medical_record_text = "Patient seems overly content with gaining weight." -/datum/quirk/fatness_hater +/datum/quirk/fatness_hater //GS13 name = "Fat Aversion" desc = "You dislike being fat. Being fat brings your mood down, alot." mob_trait = TRAIT_FAT_BAD diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 2133535c..c86c3775 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -452,8 +452,8 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA if(!usr.client.respawn_observing) var/responserespawn = alert(src,"Are you sure you want to respawn?","Warning","Yes","No") - // if(responserespawn != "Yes") - // return + if(responserespawn != "Yes") + return // usr.client.pastcharacters += usr.real_name //GS13 - commented out to allow players to rejoin with the same char diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 88e1338a..0e24063e 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -607,8 +607,8 @@ taste_description = "mothballs" reagent_state = LIQUID color = "#F0FFF0" - metabolization_rate = 0.5 * REAGENTS_METABOLISM - overdose_threshold = 100 + metabolization_rate = 0.7 * REAGENTS_METABOLISM + overdose_threshold = 105 /datum/reagent/medicine/lipolicide/overdose_process(mob/living/carbon/C) . = ..() @@ -621,8 +621,10 @@ M.adjustToxLoss(1*REM, 0) if(M.fatness == 0) M.nutrition = max(M.nutrition - 3, 0) // making the chef more valuable, one meme trap at a time + if(HAS_TRAIT(M, TRAIT_LIPOLICIDE_TOLERANCE)) //GS13 edit + M.adjust_fatness(-1, FATTENING_TYPE_WEIGHT_LOSS) else - M.adjust_fatness(-10, FATTENING_TYPE_WEIGHT_LOSS) + M.adjust_fatness(-5, FATTENING_TYPE_WEIGHT_LOSS) M.overeatduration = 0 return ..()