diff --git a/GainStation13/code/mechanics/fatness.dm b/GainStation13/code/mechanics/fatness.dm index 411a0fe6..f4c761a4 100644 --- a/GainStation13/code/mechanics/fatness.dm +++ b/GainStation13/code/mechanics/fatness.dm @@ -2,9 +2,9 @@ ///What level of fatness is the parent mob at? var/fatness = 0 ///At what rate does the parent mob gain weight? 1 = 100% - var/weight_gain_rate = 1 + var/weight_gain_rate = 0.4 // IMPORTANT!!! due to complaints, I've cut the value in half as a placeholder method of nerfing WG. Set it back to 1 once an actual WG speed preference system is implemented - Lew //At what rate does the parent mob lose weight? 1 = 100% - var/weight_loss_rate = 1 + var/weight_loss_rate = 0.4 /** * Adjusts the fatness level of the parent mob. diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index 8b7edef6..d6a1c4ac 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -10,7 +10,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM /datum/reagent/consumable/lipoifier/on_mob_life(mob/living/carbon/M) - M.adjust_fatness(10, FATTENING_TYPE_CHEM) + M.adjust_fatness(8, FATTENING_TYPE_CHEM) return ..() diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 031109b0..c747298b 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -30936,21 +30936,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) -"bfe" = ( -/obj/machinery/deepfryer, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/mob/living/carbon/monkey/punpun, -/turf/open/floor/plasteel, -/area/crew_quarters/kitchen) "bff" = ( /obj/machinery/holopad, /obj/effect/landmark/start/cook, @@ -164878,7 +164863,7 @@ aLL aKz bcj bdJ -bfe +bfg bgs bhQ bjF diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index cd5083d5..10fe32b2 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -279,7 +279,7 @@ if(world.time > last_event+15) active = 1 for(var/mob/living/carbon/human/M in orange(3,src)) - M.adjust_fatness(50, FATTENING_TYPE_ITEM) + M.adjust_fatness(30, FATTENING_TYPE_ITEM) last_event = world.time active = null return diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index a2fd1256..e4deb3ed 100644 --- a/code/game/turfs/simulated/floor/mineral_floor.dm +++ b/code/game/turfs/simulated/floor/mineral_floor.dm @@ -215,7 +215,7 @@ var/last_event = 0 var/active = null ///How much fatness is added to the user upon crossing? - var/fat_to_add = 30 + var/fat_to_add = 25 /turf/open/floor/mineral/calorite/Entered(mob/living/carbon/M) if(!istype(M, /mob/living/carbon)) diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index 436648ca..57ee8e5b 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -55,7 +55,7 @@ if(world.time > last_event+15) active = 1 for(var/mob/living/carbon/human/M in orange(3,src)) - M.adjust_fatness(50, FATTENING_TYPE_ITEM) + M.adjust_fatness(30, FATTENING_TYPE_ITEM) last_event = world.time active = null return diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index ceb6de20..68f48ba8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2529,7 +2529,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("fatness") var/new_fatness = input(user, "Choose your amount of fat at start :\n(0-4000), Fat changes appearance and move speed. \nThresholds are 170, 250, 330, 440, 840, 1240, 1840, 2540, 3440. Warning : If using the 'weak legs' trait, being too fat will make you immobile and unable to leave the shuttle without a wheelchair or help", "Character Preference") as num|null if (new_fatness) - starting_weight = max(min( round(text2num(new_fatness)), 4000),0) + starting_weight = max(min( round(text2num(new_fatness)), 8000),0) if("ui") var/pickedui = input(user, "Choose your UI style.", "Character Preference", UI_style) as null|anything in GLOB.available_ui_styles diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 73bc6be4..5384152f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -150,3 +150,66 @@ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril fromtendril = TRUE + + +//GS13 - will move this elsewhere - Sono +/mob/living/simple_animal/hostile/asteroid/basilisk/fudgebeast + name = "Fudgebeast" + desc = "A strange mass of thick, sweet pudge given some sense of instinct." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "Basilisk" + icon_living = "Basilisk" + icon_aggro = "Basilisk_alert" + icon_dead = "Basilisk_dead" + icon_gib = "syndicate_gib" + mob_biotypes = MOB_ORGANIC|MOB_BEAST + move_to_delay = 20 + projectiletype = /obj/item/projectile/energy/fattening/fudge + projectilesound = 'sound/weapons/pierce.ogg' + ranged = 1 + ranged_message = "schlorps" + ranged_cooldown_time = 30 + throw_message = "does nothing against the malleable body of" + vision_range = 2 + speed = 3 + maxHealth = 200 + health = 200 + harm_intent_damage = 5 + obj_damage = 60 + melee_damage_lower = 12 + melee_damage_upper = 12 + attacktext = "bites into" + a_intent = INTENT_HARM + speak_emote = list("chitters") + attack_sound = 'sound/weapons/bladeslice.ogg' + vision_range = 2 + aggro_vision_range = 9 + turns_per_move = 5 + gold_core_spawnable = HOSTILE_SPAWN + loot = list(/obj/item/stack/ore/diamond{layer = ABOVE_MOB_LAYER}, + /obj/item/stack/ore/diamond{layer = ABOVE_MOB_LAYER}) + +/obj/item/projectile/energy/fattening/fudge //might as well make use of the energy projectile + name = "fudge blob" + icon = 'GainStation13/icons/obj/fatoray.dmi' + icon_state = "ray" + ricochets_max = 0 + ricochet_chance = 0 + hitsound = 'sound/weapons/sear.ogg' + hitsound_wall = 'sound/weapons/effects/searwall.ogg' + is_reflectable = FALSE + light_range = 0 + ///How much fat is added to the target mob? + var/food_per_feeding = 10 + var/food_fed = /datum/reagent/consumable/nutriment + var/fullness_add = 10 + +/obj/item/projectile/energy/fattening/fudge/on_hit(atom/target, blocked) + + . = ..() + var/mob/living/carbon/L = target + if(L.client?.prefs?.weight_gain_weapons) + if(L.reagents) + if(!L.is_mouth_covered(head_only = 1)) + L.reagents.add_reagent(food_fed, food_per_feeding) + L.fullness += (fullness_add) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 5873bb2a..46241ca7 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -623,7 +623,7 @@ 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) + M.adjust_fatness(-0.5, FATTENING_TYPE_WEIGHT_LOSS) else M.adjust_fatness(-5, FATTENING_TYPE_WEIGHT_LOSS) diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 0e887069..07078b97 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -83,7 +83,7 @@ /obj/effect/gluttony/CanPass(atom/movable/mover, turf/target)//So bullets will fly over and stuff. if(ishuman(mover)) var/mob/living/carbon/human/H = mover - if(H.fatness >= 1000) // GS13 + if(H.fatness >= 1000) H.visible_message("[H] pushes through [src]!", "You've seen and eaten worse than this.") return TRUE else