cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-12 08:27:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

wew

Browse Source
This commit is contained in:
Pinta
2023-02-08 18:24:13 -05:00
parent 8b3ee4ffe3
commit 9fc2f81150
14 changed files with 126 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/mechanics/fatness.dm
+34 -27
View File
@@ -1,18 +1,6 @@
#define MINIMUM_FATNESS_LEVEL = 0
#define FATTENING_TYPE_ITEM 0
#define FATTENING_TYPE_FOOD 1
#define FATTENING_TYPE_CHEM 2
#define FATTENING_TYPE_WEAPON 3
#define FATTENING_TYPE_MAGIC 4
#define FATTENING_TYPE_VIRUS 5
#define FATTENING_TYPE_WEIGHT_LOSS 6
/mob/living/carbon
///What level of fatness is the parent mob at?
var/fatness = 0
///How full is the parent mob?
var/fullness = FULLNESS_LEVEL_HALF_FULL
///At what rate does the parent mob gain weight? 1 = 100%
var/weight_gain_rate = 1
//At what rate does the parent mob lose weight? 1 = 100%
@@ -28,28 +16,47 @@
if(!adjustment_amount || !type_of_fattening)
return FALSE
if(!HAS_TRAIT(src, TRAIT_UNIVERSAL_GAINER))
if(!HAS_TRAIT(src, TRAIT_UNIVERSAL_GAINER) && client?.prefs)
switch(type_of_fattening)
if(FATTENING_TYPE_ITEM && HAS_TRAIT(src, TRAIT_GAIN_ITEM_IMMUNE))
return FALSE
if(FATTENING_TYPE_FOOD && HAS_TRAIT(src, TRAIT_GAIN_FOOD_IMMUNE))
return FALSE
if(FATTENING_TYPE_CHEM && HAS_TRAIT(src, TRAIT_GAIN_CHEM_IMMUNE))
return FALSE
if(FATTENING_TYPE_WEAPON && HAS_TRAIT(src, TRAIT_GAIN_WEAPON_IMMUNE))
return FALSE
if(FATTENING_TYPE_MAGIC && HAS_TRAIT(src, TRAIT_GAIN_MAGIC_IMMUNE))
return FALSE
if(FATTENING_TYPE_WEIGHT_LOSS && HAS_TRAIT(src, TRAIT_WEIGHT_LOSS_IMMUNE))
return FALSE
if(FATTENING_TYPE_ITEM)
if(!client.prefs.weight_gain_items)
return FALSE
if(FATTENING_TYPE_FOOD)
if(!client.prefs.weight_gain_food)
return FALSE
if(FATTENING_TYPE_CHEM)
if(!client.prefs.weight_gain_chems)
return FALSE
if(FATTENING_TYPE_WEAPON)
if(!client.prefs.weight_gain_weapons)
return FALSE
if(FATTENING_TYPE_MAGIC)
if(!client.prefs.weight_gain_magic)
return FALSE
if(FATTENING_TYPE_VIRUS)
if(!client.prefs.weight_gain_viruses)
return FALSE
if(FATTENING_TYPE_WEIGHT_LOSS)
if(!HAS_TRAIT(src, TRAIT_WEIGHT_LOSS_IMMUNE))
return FALSE
var/amount_to_change = adjustment_amount
if(adjustment_amount > 0)
amount_to_change * weight_gain_rate
amount_to_change = amount_to_change * weight_gain_rate
else
amount_to_change * weight_loss_rate
amount_to_change = amount_to_change * weight_loss_rate
fatness += amount_to_change
fatness = max(fatness, MINIMUM_FATNESS_LEVEL) //It would be a little silly if someone got negative fat.
return TRUE
/mob/living/carbon/fully_heal(admin_revive)
fatness = 0
. = ..()
GainStation13/code/modules/client/preferences/preferences.dm
+18
View File
@@ -0,0 +1,18 @@
//GS13 Preferences
/datum/preferences
//Weight Gain Sources
///Weight gain from food
var/weight_gain_food = FALSE
///Weight gain from chems
var/weight_gain_chems = FALSE
///Weight gain from items
var/weight_gain_items = FALSE
///Weight gain from weapons
var/weight_gain_weapons = FALSE
///Weight gain from magic
var/weight_gain_magic = FALSE
///Weight gain from viruses
var/weight_gain_viruses = FALSE
///Does the person wish to be involved with non-con weight gain events?
var/noncon_weight_gain = FALSE
code/__DEFINES/misc.dm
+11
View File
@@ -517,3 +517,14 @@ GLOBAL_LIST_INIT(lighter_reskins, list(ZIPPO_SKIN_PLAIN = "plain", ZIPPO_SKIN_DA
#define FOURSPACES "    "
#define CANT_REENTER_ROUND -1
//GS13 WEIGHT GAIN TYPES
#define MINIMUM_FATNESS_LEVEL 0
#define FATTENING_TYPE_ITEM "item"
#define FATTENING_TYPE_FOOD "food"
#define FATTENING_TYPE_CHEM "chem"
#define FATTENING_TYPE_WEAPON "weapon"
#define FATTENING_TYPE_MAGIC "magic"
#define FATTENING_TYPE_VIRUS "virus"
#define FATTENING_TYPE_WEIGHT_LOSS "weight_loss"
code/__DEFINES/traits.dm
+1 -10
View File
@@ -215,16 +215,7 @@
#define TRAIT_NO_ALCOHOL "alcohol_intolerance"
//GS13
//Weight gain immunity traits
#define TRAIT_GAIN_FOOD_IMMUNE "food_gain_immune"
#define TRAIT_GAIN_CHEM_IMMUNE "chem_gain_immune"
#define TRAIT_GAIN_ITEM_IMMUNE "item_gain_immune"
#define TRAIT_GAIN_WEAPON_IMMUNE "weapon_gain_immune"
#define TRAIT_GAIN_MAGIC_IMMUNE "magic_gain_immune"
#define TRAIT_GAIN_VIRUS_IMMUNE "virus_gain_immune"
#define TRIAT_WEIGHT_LOSS_IMMUNE "weight_loss_immune"
#define TRAIT_WEIGHT_LOSS_IMMUNE "weight_loss_immune"
#define TRAIT_UNIVERSAL_GAINER "universal_gainer"
code/datums/components/mood.dm
+4 -1
View File
@@ -291,7 +291,10 @@
/datum/component/mood/proc/hud_click(datum/source, location, control, params, mob/user)
print_mood(user)
/datum/component/mood/proc/HandleFatness(mob/living/L)
/datum/component/mood/proc/HandleFatness(mob/living/carbon/L)
if(!L)
return FALSE
switch(L.fatness)
if(FATNESS_LEVEL_FAT to INFINITY)
add_event(null, "fatness", /datum/mood_event/fat)
code/datums/diseases/advance/symptoms/weight.dm
+4 -4
View File
@@ -42,7 +42,7 @@ Bonus
/datum/symptom/weight_loss/Activate(datum/disease/advance/A)
if(!..())
return
var/mob/living/M = A.affected_mob
var/mob/living/carbon/M = A.affected_mob
switch(A.stage)
if(1, 2, 3, 4)
if(prob(base_message_chance))
@@ -74,9 +74,9 @@ Bonus
/datum/symptom/weight_gain/Activate(datum/disease/advance/A)
if(!..())
return
var/mob/living/M = A.affected_mob
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
return
var/mob/living/carbon/M = A.affected_mob
if(!(M?.client?.prefs?.weight_gain_viruses))
return FALSE
switch(A.stage)
if(1, 2, 3, 4)
if(prob(base_message_chance))
code/datums/traits/neutral.dm
-10
View File
@@ -127,16 +127,6 @@
lose_text = "<span class='notice'>You don't feel as prudish as before.</span>"
medical_record_text = "Patient exhibits a special gene that makes them immune to Crocin and Hexacrocin."
/datum/quirk/lipoifier_immunity
name = "Lipoifier Immunity"
desc = "Your body is mostly immune to widening properties of Lipoifier chemical and its cheaper alternative: corn oil."
mob_trait = TRAIT_LIPOIFIER_IMMUNE
value = 0
category = CATEGORY_SEXUAL
gain_text = "<span class='notice'>You feel less prone to sudden weight gain.</span>"
lose_text = "<span class='notice'>You don't feel that resistant to gaining sudden weight anymore.</span>"
medical_record_text = "Patient exhibits a special gene that makes them immune to Lipoifier and Corn Oil."
/datum/quirk/assblastusa
name = "Buns of Steel"
desc = "You've never skipped ass day. With this trait, you are completely immune to all forms of ass slapping and anyone who tries to slap your rock hard ass usually gets a broken hand."
code/game/objects/structures/statues.dm
+47 -49
View File
@@ -359,57 +359,55 @@
..()
/obj/structure/statue/calorite/fatty/attackby(obj/item/W, mob/living/carbon/M, params)
if(!M.adjust_fatness(20, FATTENING_TYPE_ITEM))
to_chat(M, "<span class='warning'>Nothing happens.</span>")
return
if(M.fatness < 200)
to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
if(HAS_TRAIT(M, TRAIT_FAT))
to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
if(HAS_TRAIT(M, TRAIT_OBESE))
to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
if(HAS_TRAIT(M, TRAIT_IMMOBILE))
to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
if(HAS_TRAIT(M, TRAIT_BLOB))
to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
to_chat(M, "<span class='warning'>Nothing happens.</span>")
else
M.adjust_fatness(20, FATTENING_TYPE_ITEM)
if(M.fatness < 200)
to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
if(HAS_TRAIT(M, TRAIT_FAT))
to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
if(HAS_TRAIT(M, TRAIT_OBESE))
to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
if(HAS_TRAIT(M, TRAIT_IMMOBILE))
to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
if(HAS_TRAIT(M, TRAIT_BLOB))
to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
/obj/structure/statue/calorite/fatty/attack_hand(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
if(!M.adjust_fatness(20, FATTENING_TYPE_ITEM))
to_chat(M, "<span class='warning'>Nothing happens.</span>")
else
M.adjust_fatness(20, FATTENING_TYPE_ITEM)
if(M.fatness < 200)
to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
if(HAS_TRAIT(M, TRAIT_FAT))
to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
if(HAS_TRAIT(M, TRAIT_OBESE))
to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
if(HAS_TRAIT(M, TRAIT_IMMOBILE))
to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
if(HAS_TRAIT(M, TRAIT_BLOB))
to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
return
if(M.fatness < 200)
to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
if(HAS_TRAIT(M, TRAIT_FAT))
to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
if(HAS_TRAIT(M, TRAIT_OBESE))
to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
if(HAS_TRAIT(M, TRAIT_IMMOBILE))
to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
if(HAS_TRAIT(M, TRAIT_BLOB))
to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
/obj/structure/statue/calorite/fatty/attack_paw(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
if(!M.adjust_fatness(20, FATTENING_TYPE_ITEM))
to_chat(M, "<span class='warning'>Nothing happens.</span>")
else
M.adjust_fatness(20, FATTENING_TYPE_ITEM)
if(M.fatness < 200)
to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
if(HAS_TRAIT(M, TRAIT_FAT))
to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
if(HAS_TRAIT(M, TRAIT_OBESE))
to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
if(HAS_TRAIT(M, TRAIT_IMMOBILE))
to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
if(HAS_TRAIT(M, TRAIT_BLOB))
to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
return
if(M.fatness < 200)
to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
if(HAS_TRAIT(M, TRAIT_FAT))
to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
if(HAS_TRAIT(M, TRAIT_OBESE))
to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
if(HAS_TRAIT(M, TRAIT_IMMOBILE))
to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
if(HAS_TRAIT(M, TRAIT_BLOB))
to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
code/game/turfs/simulated/floor/mineral_floor.dm
+1 -1
View File
@@ -218,7 +218,7 @@
var/fat_to_add = 50
/turf/open/floor/mineral/calorite/Entered(mob/living/carbon/M)
if(!istype(M, /mob/living/carbon) || HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
if(!istype(M, /mob/living/carbon))
return FALSE
else
M.adjust_fatness(fat_to_add, FATTENING_TYPE_ITEM)
code/modules/mob/living/living.dm
-1
View File
@@ -517,7 +517,6 @@
radiation = 0
nutrition = NUTRITION_LEVEL_FED + 50
fullness = FULLNESS_LEVEL_HALF_FULL // GS13
fatness = 0 // GS13
thirst = THIRST_LEVEL_QUENCHED + 50
bodytemperature = BODYTEMP_NORMAL
set_blindness(0)
code/modules/mob/mob_defines.dm
+2
View File
@@ -61,6 +61,8 @@
var/dizziness = 0//Carbon
var/jitteriness = 0//Carbon
///How full is the parent mob?
var/fullness = FULLNESS_LEVEL_HALF_FULL
var/nutrition = NUTRITION_LEVEL_START_MIN // randomised in Initialize
var/thirst = THIRST_LEVEL_START_MIN //same for this
var/satiety = 0//Carbon
code/modules/projectiles/guns/misc/fatbeam.dm
+2 -2
View File
@@ -114,8 +114,8 @@
/obj/item/gun/fatbeam/proc/on_beam_tick(var/mob/living/target)
if(target.health != target.maxHealth)
new /obj/effect/temp_visual/heal(get_turf(target), "#FFC2F8")
if(HAS_TRAIT(target, TRAIT_GAIN_WEAPON_IMMUNE))
target.nutrition += 50
if(target?.client?.prefs?.weight_gain_weapons)
target.nutrition += 50
return
/obj/item/gun/fatbeam/proc/on_beam_release(var/mob/living/target)
code/modules/reagents/chemistry/reagents/food_reagents.dm
+1 -1
View File
@@ -453,7 +453,7 @@
taste_description = "slime"
/datum/reagent/consumable/cornoil/on_mob_life(mob/living/carbon/M)
if(M && !HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
if(M && M?.client?.prefs.weight_gain_chems)
M.nutrition += 20 * REAGENTS_METABOLISM
else
M.nutrition += 1
tgstation.dme
+1
View File
@@ -3317,6 +3317,7 @@
#include "code\modules\zombie\items.dm"
#include "code\modules\zombie\organs.dm"
#include "GainStation13\code\mechanics\fatness.dm"
#include "GainStation13\code\modules\client\preferences\preferences.dm"
#include "GainStation13\code\modules\mob\living\emote.dm"
#include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm"
#include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm"