cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

lipolicide tolerance + small fixes

Browse Source 
- 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
This commit is contained in:
GDLW
2023-05-11 18:12:21 +02:00
parent b90c4cdc65
commit a9ca3bebb4
10 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GainStation13/code/mobs/chocoslime.dm
View File

@@ -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

10
GainStation13/code/obj/items/minor_items.dm
View File

@@ -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

5
_maps/map_files/generic/CentCom.dmm
View File

@@ -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

9
code/__DEFINES/traits.dm
View File

@@ -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

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

@@ -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 ..()

2
code/datums/traits/good.dm
View File

@@ -61,7 +61,7 @@
lose_text = "<span class='danger'>You feel clumsy again.</span>"
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

2
code/datums/traits/negative.dm
View File

@@ -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

14
code/datums/traits/neutral.dm
View File

@@ -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 = "<span class='notice'>You feel like you need to watch what to eat.</span>"
lose_text = "<span class='notice'>You feel like you can be careless with your diet.</span>"
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

4
code/modules/mob/mob.dm
View File

@@ -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

8
code/modules/reagents/chemistry/reagents/toxin_reagents.dm
View File

@@ -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 ..()